AyeCode / invoicing

includes/wpinv-email-functions.php

Spacing +588 added lines, -588 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,381 +30,381 @@ 
         '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;
     }
 
-    if($invoice->is_renewal() && wpinv_email_is_enabled( 'completed_invoice_renewal' )){
+    if ($invoice->is_renewal() && wpinv_email_is_enabled('completed_invoice_renewal')) {
         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,
@@ -412,50 +412,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,
@@ -463,95 +463,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;
     }
 
@@ -559,19 +559,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,
@@ -579,36 +579,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;
@@ -623,35 +623,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
@@ -659,39 +659,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'
             ),
@@ -699,39 +699,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'
             ),
@@ -739,39 +739,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'
             ),
@@ -779,46 +779,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'
             ),
@@ -826,46 +826,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'
             ),
@@ -873,52 +873,52 @@ 
         '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_renewal_active' => array(
                 'id'   => 'email_completed_invoice_renewal_active',
-                'name' => __( 'Enable renewal notification', 'invoicing' ),
-                'desc' => __( 'Enable renewal invoice email notification. This notification will be sent on renewal.', 'invoicing' ),
+                'name' => __('Enable renewal notification', 'invoicing'),
+                'desc' => __('Enable renewal invoice email notification. This notification will be sent on renewal.', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => 0
             ),
             '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'
             ),
@@ -927,46 +927,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'
             ),
@@ -974,46 +974,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'
             ),
@@ -1021,39 +1021,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'
             ),
@@ -1062,165 +1062,165 @@ 
         '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_admin_bcc' => array(
                 'id'   => 'email_overdue_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_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(
@@ -1230,65 +1230,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();
@@ -1296,92 +1296,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 ( !wpinv_current_user_can_manage_invoicing() ) {
-        wp_die( __( 'You do not have permission to send invoice notification', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!wpinv_current_user_can_manage_invoicing()) {
+        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 ( !wpinv_current_user_can_manage_invoicing() ) {
-        wp_die( __( 'You do not have permission to send reminder notification', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!wpinv_current_user_can_manage_invoicing()) {
+        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
         }
@@ -1390,21 +1390,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',
@@ -1414,7 +1414,7 @@ 
             'meta_query'    => array(
                 array(
                     'key'       =>  '_wpinv_due_date',
-                    'value'     =>  array( '', 'none' ),
+                    'value'     =>  array('', 'none'),
                     'compare'   =>  'NOT IN',
                 )
             ),
@@ -1423,149 +1423,149 @@ 
             '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);
     }
 
-    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;
 }
-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 = wpinv_get_invoice( $invoice );
+    if (is_int($invoice)) {
+        $invoice = 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/class-wpinv.php

Indentation +16 added lines, -16 removed lines

@@ -171,11 +171,11 @@ 
         require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
         require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
         require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
         require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
         require_once( WPINV_PLUGIN_DIR . 'widgets/payment-form.php' );
         require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-payment-form-elements.php' );
@@ -491,19 +491,19 @@ 
         require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
     }
 
-	/**
-	 * Register widgets
-	 *
-	 */
-	public function register_widgets() {
-		register_widget( "WPInv_Checkout_Widget" );
-		register_widget( "WPInv_History_Widget" );
-		register_widget( "WPInv_Receipt_Widget" );
-		register_widget( "WPInv_Subscriptions_Widget" );
-		register_widget( "WPInv_Buy_Item_Widget" );
+    /**
+     * Register widgets
+     *
+     */
+    public function register_widgets() {
+        register_widget( "WPInv_Checkout_Widget" );
+        register_widget( "WPInv_History_Widget" );
+        register_widget( "WPInv_Receipt_Widget" );
+        register_widget( "WPInv_Subscriptions_Widget" );
+        register_widget( "WPInv_Buy_Item_Widget" );
         register_widget( "WPInv_Messages_Widget" );
         register_widget( 'WPInv_Payment_Form_Widget' );
-	}
+    }
     
     /**
      * Remove our pages from yoast sitemaps.

Spacing +244 added lines, -244 removed lines

@@ -7,15 +7,15 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Plugin {
     private static $instance;
     
     public static function run() {
-        if ( !isset( self::$instance ) && !( self::$instance instanceof WPInv_Plugin ) ) {
+        if (!isset(self::$instance) && !(self::$instance instanceof WPInv_Plugin)) {
             self::$instance = new WPInv_Plugin;
             self::$instance->includes();
             self::$instance->actions();
@@ -33,34 +33,34 @@ 
     }
     
     public function define_constants() {
-        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+        define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
     }
     
     private function actions() {
         /* Internationalize the text strings used. */
-        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+        add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
         
         /* Perform actions on admin initialization. */
-        add_action( 'admin_init', array( &$this, 'admin_init') );
-        add_action( 'init', array( &$this, 'init' ), 3 );
-        add_action( 'init', array( &$this, 'wpinv_actions' ) );
+        add_action('admin_init', array(&$this, 'admin_init'));
+        add_action('init', array(&$this, 'init'), 3);
+        add_action('init', array(&$this, 'wpinv_actions'));
         
-        if ( class_exists( 'BuddyPress' ) ) {
-            add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
+        if (class_exists('BuddyPress')) {
+            add_action('bp_include', array(&$this, 'bp_invoicing_init'));
         }
 
-        add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
-        add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
-        add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
+        add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
+        add_action('widgets_init', array(&$this, 'register_widgets'));
+        add_filter('wpseo_exclude_from_sitemap_by_post_ids', array($this, 'wpseo_exclude_from_sitemap_by_post_ids'));
 
-        if ( is_admin() ) {
-            add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
-            add_filter( 'admin_body_class', array( &$this, 'admin_body_class' ) );
-            add_action( 'admin_init', array( &$this, 'init_ayecode_connect_helper' ) );
+        if (is_admin()) {
+            add_action('admin_enqueue_scripts', array(&$this, 'admin_enqueue_scripts'));
+            add_filter('admin_body_class', array(&$this, 'admin_body_class'));
+            add_action('admin_init', array(&$this, 'init_ayecode_connect_helper'));
 
         } else {
-            add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+            add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
         }
         
         /**
@@ -70,28 +70,28 @@ 
          *
          * @param WPInv_Plugin $this. Current WPInv_Plugin instance. Passed by reference.
          */
-        do_action_ref_array( 'wpinv_actions', array( &$this ) );
+        do_action_ref_array('wpinv_actions', array(&$this));
 
-        add_action( 'admin_init', array( &$this, 'activation_redirect') );
+        add_action('admin_init', array(&$this, 'activation_redirect'));
     }
 
     /**
      * Maybe show the AyeCode Connect Notice.
      */
-    public function init_ayecode_connect_helper(){
+    public function init_ayecode_connect_helper() {
         // AyeCode Connect notice
-        if ( is_admin() ){
+        if (is_admin()) {
             // set the strings so they can be translated
             $strings = array(
-                'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
-                'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
-                'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
-                'connect_button'    => __("Connect Site","invoicing"),
-                'connecting_button'    => __("Connecting...","invoicing"),
-                'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
-                'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
+                'connect_title' => __("WP Invoicing - an AyeCode product!", "invoicing"),
+                'connect_external'  => __("Please confirm you wish to connect your site?", "invoicing"),
+                'connect'           => sprintf(__("<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", "invoicing"), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>"),
+                'connect_button'    => __("Connect Site", "invoicing"),
+                'connecting_button'    => __("Connecting...", "invoicing"),
+                'error_localhost'   => __("This service will only work with a live domain, not a localhost.", "invoicing"),
+                'error'             => __("Something went wrong, please refresh and try again.", "invoicing"),
             );
-            new AyeCode_Connect_Helper($strings,array('wpi-addons'));
+            new AyeCode_Connect_Helper($strings, array('wpi-addons'));
         }
     }
     
@@ -99,10 +99,10 @@ 
         /* Internationalize the text strings used. */
         $this->load_textdomain();
 
-        do_action( 'wpinv_loaded' );
+        do_action('wpinv_loaded');
 
         // Fix oxygen page builder conflict
-        if ( function_exists( 'ct_css_output' ) ) {
+        if (function_exists('ct_css_output')) {
             wpinv_oxygen_fix_conflict();
         }
     }
@@ -112,237 +112,237 @@ 
      *
      * @since 1.0
      */
-    public function load_textdomain( $locale = NULL ) {
-        if ( empty( $locale ) ) {
-            $locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+    public function load_textdomain($locale = NULL) {
+        if (empty($locale)) {
+            $locale = is_admin() && function_exists('get_user_locale') ? get_user_locale() : get_locale();
         }
 
-        $locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+        $locale = apply_filters('plugin_locale', $locale, 'invoicing');
         
-        unload_textdomain( 'invoicing' );
-        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+        unload_textdomain('invoicing');
+        load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
+        load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages');
         
         /**
          * Define language constants.
          */
-        require_once( WPINV_PLUGIN_DIR . 'language.php' );
+        require_once(WPINV_PLUGIN_DIR . 'language.php');
     }
         
     public function includes() {
         global $wpinv_options;
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
         $wpinv_options = wpinv_get_settings();
         
-        require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/libraries/action-scheduler/action-scheduler.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-discount.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-	    require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
-        require_once( WPINV_PLUGIN_DIR . 'widgets/payment-form.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-payment-form-elements.php' );
-
-        if ( !class_exists( 'WPInv_EUVat' ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
+        require_once(WPINV_PLUGIN_DIR . 'vendor/autoload.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/libraries/action-scheduler/action-scheduler.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-discount.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/checkout.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-history.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php');
+	    require_once(WPINV_PLUGIN_DIR . 'widgets/subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'widgets/buy-item.php');
+        require_once(WPINV_PLUGIN_DIR . 'widgets/payment-form.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-payment-form-elements.php');
+
+        if (!class_exists('WPInv_EUVat')) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php');
         }
         
-        $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
-        if ( !empty( $gateways ) ) {
-            foreach ( $gateways as $gateway ) {
-                if ( $gateway == 'manual' ) {
+        $gateways = array_keys(wpinv_get_enabled_payment_gateways());
+        if (!empty($gateways)) {
+            foreach ($gateways as $gateway) {
+                if ($gateway == 'manual') {
                     continue;
                 }
                 
                 $gateway_file = WPINV_PLUGIN_DIR . 'includes/gateways/' . $gateway . '.php';
                 
-                if ( file_exists( $gateway_file ) ) {
-                    require_once( $gateway_file );
+                if (file_exists($gateway_file)) {
+                    require_once($gateway_file);
                 }
             }
         }
-        require_once( WPINV_PLUGIN_DIR . 'includes/gateways/manual.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/gateways/manual.php');
         
-        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php' );
+        if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-recurring-admin.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
             // load the user class only on the users.php page
             global $pagenow;
-            if($pagenow=='users.php'){
+            if ($pagenow == 'users.php') {
                 new WPInv_Admin_Users();
             }
         }
 
         // Register cli commands
-        if ( defined( 'WP_CLI' ) && WP_CLI ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
-            WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+        if (defined('WP_CLI') && WP_CLI) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php');
+            WP_CLI::add_command('invoicing', 'WPInv_CLI');
         }
         
         // include css inliner
-        if ( ! class_exists( 'Emogrifier' ) && class_exists( 'DOMDocument' ) ) {
-            include_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php' );
+        if (!class_exists('Emogrifier') && class_exists('DOMDocument')) {
+            include_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php');
         }
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/install.php');
     }
     
     public function init() {
     }
     
     public function admin_init() {
-        add_action( 'admin_print_scripts-edit.php', array( &$this, 'admin_print_scripts_edit_php' ) );
+        add_action('admin_print_scripts-edit.php', array(&$this, 'admin_print_scripts_edit_php'));
     }
 
     public function activation_redirect() {
         // Bail if no activation redirect
-        if ( !get_transient( '_wpinv_activation_redirect' ) ) {
+        if (!get_transient('_wpinv_activation_redirect')) {
             return;
         }
 
         // Delete the redirect transient
-        delete_transient( '_wpinv_activation_redirect' );
+        delete_transient('_wpinv_activation_redirect');
 
         // Bail if activating from network, or bulk
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+        if (is_network_admin() || isset($_GET['activate-multi'])) {
             return;
         }
 
-        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+        wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
         exit;
     }
     
     public function enqueue_scripts() {
-        $suffix       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
         
-        wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_front_style' );
+        wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_front_style');
                
         // Register scripts
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
-        wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  filemtime( WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js' ) );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
+        wp_register_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array('jquery'), filemtime(WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js'));
 
         $localize                         = array();
-        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['ajax_url']             = admin_url('admin-ajax.php');
+        $localize['nonce']                = wp_create_nonce('wpinv-nonce');
         $localize['currency_symbol']      = wpinv_currency_symbol();
         $localize['currency_pos']         = wpinv_currency_position();
         $localize['thousand_sep']         = wpinv_thousands_separator();
         $localize['decimal_sep']          = wpinv_decimal_separator();
         $localize['decimals']             = wpinv_decimals();
-        $localize['txtComplete']          = __( 'Complete', 'invoicing' );
+        $localize['txtComplete']          = __('Complete', 'invoicing');
         $localize['UseTaxes']             = wpinv_use_taxes();
-        $localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
+        $localize['checkoutNonce']        = wp_create_nonce('wpinv_checkout_nonce');
 
-        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+        $localize = apply_filters('wpinv_front_js_localize', $localize);
         
-        wp_enqueue_script( 'jquery-blockui' );
+        wp_enqueue_script('jquery-blockui');
         $autofill_api = wpinv_get_option('address_autofill_api');
         $autofill_active = wpinv_get_option('address_autofill_active');
-        if ( isset( $autofill_active ) && 1 == $autofill_active && !empty( $autofill_api ) && wpinv_is_checkout() ) {
-            if ( wp_script_is( 'google-maps-api', 'enqueued' ) ) {
-                wp_dequeue_script( 'google-maps-api' );
+        if (isset($autofill_active) && 1 == $autofill_active && !empty($autofill_api) && wpinv_is_checkout()) {
+            if (wp_script_is('google-maps-api', 'enqueued')) {
+                wp_dequeue_script('google-maps-api');
             }
-            wp_enqueue_script( 'google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array( 'jquery' ), '', false );
-            wp_enqueue_script( 'google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array( 'jquery', 'google-maps-api' ), '', true );
+            wp_enqueue_script('google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array('jquery'), '', false);
+            wp_enqueue_script('google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array('jquery', 'google-maps-api'), '', true);
         }
 
-        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all' );
-        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+        wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all');
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        wp_enqueue_script( 'wpinv-front-script' );
-        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+        wp_enqueue_script('wpinv-front-script');
+        wp_localize_script('wpinv-front-script', 'WPInv', $localize);
 
-        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-        wp_enqueue_script( 'wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'wpinv-front-script' ),  $version, true );
+        $version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js');
+        wp_enqueue_script('wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array('wpinv-front-script'), $version, true);
     }
 
-    public function admin_enqueue_scripts( $hook ) {
+    public function admin_enqueue_scripts($hook) {
         global $post, $pagenow;
         
         $post_type  = wpinv_admin_post_type();
-        $suffix     = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-        $page       = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : '';
+        $suffix     = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+        $page       = isset($_GET['page']) ? strtolower($_GET['page']) : '';
 
         $jquery_ui_css = false;
-        if ( ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount' ) && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) ) {
+        if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $jquery_ui_css = true;
-        } else if ( $page == 'wpinv-settings' || $page == 'wpinv-reports' ) {
+        } else if ($page == 'wpinv-settings' || $page == 'wpinv-reports') {
             $jquery_ui_css = true;
         }
-        if ( $jquery_ui_css ) {
-            wp_register_style( 'jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16' );
-            wp_enqueue_style( 'jquery-ui-css' );
+        if ($jquery_ui_css) {
+            wp_register_style('jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16');
+            wp_enqueue_style('jquery-ui-css');
         }
 
-        wp_register_style( 'wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_meta_box_style' );
+        wp_register_style('wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_meta_box_style');
         
-        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/admin.css' );
-        wp_register_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), $version );
-        wp_enqueue_style( 'wpinv_admin_style' );
+        $version = filemtime(WPINV_PLUGIN_DIR . 'assets/css/admin.css');
+        wp_register_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), $version);
+        wp_enqueue_style('wpinv_admin_style');
 
-        $enqueue = ( $post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) );
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        $enqueue = ($post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ($pagenow == 'post-new.php' || $pagenow == 'post.php'));
+        if ($page == 'wpinv-subscriptions') {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
         
-        if ( $enqueue_datepicker = apply_filters( 'wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if ($enqueue_datepicker = apply_filters('wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue)) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
 
-        wp_enqueue_style( 'wp-color-picker' );
-        wp_enqueue_script( 'wp-color-picker' );
+        wp_enqueue_style('wp-color-picker');
+        wp_enqueue_script('wp-color-picker');
         
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
 
         if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $autofill_api = wpinv_get_option('address_autofill_api');
@@ -353,20 +353,20 @@ 
             }
         }
 
-        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all' );
-        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+        wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all');
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        wp_register_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'jquery-blockui','jquery-ui-tooltip' ),  WPINV_VERSION );
-        wp_enqueue_script( 'wpinv-admin-script' );
+        wp_register_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'jquery-blockui', 'jquery-ui-tooltip'), WPINV_VERSION);
+        wp_enqueue_script('wpinv-admin-script');
         
         $localize                               = array();
-        $localize['ajax_url']                   = admin_url( 'admin-ajax.php' );
-        $localize['post_ID']                    = isset( $post->ID ) ? $post->ID : '';
-        $localize['wpinv_nonce']                = wp_create_nonce( 'wpinv-nonce' );
-        $localize['add_invoice_note_nonce']     = wp_create_nonce( 'add-invoice-note' );
-        $localize['delete_invoice_note_nonce']  = wp_create_nonce( 'delete-invoice-note' );
-        $localize['invoice_item_nonce']         = wp_create_nonce( 'invoice-item' );
-        $localize['billing_details_nonce']      = wp_create_nonce( 'get-billing-details' );
+        $localize['ajax_url']                   = admin_url('admin-ajax.php');
+        $localize['post_ID']                    = isset($post->ID) ? $post->ID : '';
+        $localize['wpinv_nonce']                = wp_create_nonce('wpinv-nonce');
+        $localize['add_invoice_note_nonce']     = wp_create_nonce('add-invoice-note');
+        $localize['delete_invoice_note_nonce']  = wp_create_nonce('delete-invoice-note');
+        $localize['invoice_item_nonce']         = wp_create_nonce('invoice-item');
+        $localize['billing_details_nonce']      = wp_create_nonce('get-billing-details');
         $localize['tax']                        = wpinv_tax_amount();
         $localize['discount']                   = wpinv_discount_amount();
         $localize['currency_symbol']            = wpinv_currency_symbol();
@@ -374,95 +374,95 @@ 
         $localize['thousand_sep']               = wpinv_thousands_separator();
         $localize['decimal_sep']                = wpinv_decimal_separator();
         $localize['decimals']                   = wpinv_decimals();
-        $localize['save_invoice']               = __( 'Save Invoice', 'invoicing' );
-        $localize['status_publish']             = wpinv_status_nicename( 'publish' );
-        $localize['status_pending']             = wpinv_status_nicename( 'wpi-pending' );
-        $localize['delete_tax_rate']            = __( 'Are you sure you wish to delete this tax rate?', 'invoicing' );
-        $localize['OneItemMin']                 = __( 'Invoice must contain at least one item', 'invoicing' );
-        $localize['DeleteInvoiceItem']          = __( 'Are you sure you wish to delete this item?', 'invoicing' );
-        $localize['FillBillingDetails']         = __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' );
-        $localize['confirmCalcTotals']          = __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' );
-        $localize['AreYouSure']                 = __( 'Are you sure?', 'invoicing' );
-        $localize['emptyInvoice']               = __( 'Add at least one item to save invoice!', 'invoicing' );
-        $localize['errDeleteItem']              = __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' );
-        $localize['delete_subscription']        = __( 'Are you sure you want to delete this subscription?', 'invoicing' );
-        $localize['action_edit']                = __( 'Edit', 'invoicing' );
-        $localize['action_cancel']              = __( 'Cancel', 'invoicing' );
-
-        $localize = apply_filters( 'wpinv_admin_js_localize', $localize );
-
-        wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', $localize );
+        $localize['save_invoice']               = __('Save Invoice', 'invoicing');
+        $localize['status_publish']             = wpinv_status_nicename('publish');
+        $localize['status_pending']             = wpinv_status_nicename('wpi-pending');
+        $localize['delete_tax_rate']            = __('Are you sure you wish to delete this tax rate?', 'invoicing');
+        $localize['OneItemMin']                 = __('Invoice must contain at least one item', 'invoicing');
+        $localize['DeleteInvoiceItem']          = __('Are you sure you wish to delete this item?', 'invoicing');
+        $localize['FillBillingDetails']         = __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing');
+        $localize['confirmCalcTotals']          = __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing');
+        $localize['AreYouSure']                 = __('Are you sure?', 'invoicing');
+        $localize['emptyInvoice']               = __('Add at least one item to save invoice!', 'invoicing');
+        $localize['errDeleteItem']              = __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing');
+        $localize['delete_subscription']        = __('Are you sure you want to delete this subscription?', 'invoicing');
+        $localize['action_edit']                = __('Edit', 'invoicing');
+        $localize['action_cancel']              = __('Cancel', 'invoicing');
+
+        $localize = apply_filters('wpinv_admin_js_localize', $localize);
+
+        wp_localize_script('wpinv-admin-script', 'WPInv_Admin', $localize);
 
         // Load payment form scripts on our admin pages only.
-        if ( ( $hook == 'post-new.php' || $hook == 'post.php' ) && 'wpi_payment_form' === $post->post_type ) {
+        if (($hook == 'post-new.php' || $hook == 'post.php') && 'wpi_payment_form' === $post->post_type) {
 
-            wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION );
-            wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
-            wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
+            wp_enqueue_script('vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION);
+            wp_enqueue_script('sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION);
+            wp_enqueue_script('vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array('sortable', 'vue'), WPINV_VERSION);
 
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
-            wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js');
+            wp_register_script('wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array('wpinv-admin-script', 'vue_draggable'), $version);
         
-            wp_localize_script( 'wpinv-admin-payment-form-script', 'wpinvPaymentFormAdmin', array(
+            wp_localize_script('wpinv-admin-payment-form-script', 'wpinvPaymentFormAdmin', array(
                 'elements'      => $this->form_elements->get_elements(),
-                'form_elements' => $this->form_elements->get_form_elements( $post->ID ),
+                'form_elements' => $this->form_elements->get_form_elements($post->ID),
                 'all_items'     => $this->form_elements->get_published_items(),
                 'currency'      => wpinv_currency_symbol(),
                 'position'      => wpinv_currency_position(),
                 'decimals'      => (int) wpinv_decimals(),
                 'thousands_sep' => wpinv_thousands_separator(),
                 'decimals_sep'  => wpinv_decimal_separator(),
-                'form_items'    => $this->form_elements->get_form_items( $post->ID ),
-            ) );
+                'form_items'    => $this->form_elements->get_form_items($post->ID),
+            ));
 
-            wp_enqueue_script( 'wpinv-admin-payment-form-script' );
+            wp_enqueue_script('wpinv-admin-payment-form-script');
         }
 
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
-            wp_enqueue_script( 'wpinv-sub-admin-script' );
+        if ($page == 'wpinv-subscriptions') {
+            wp_register_script('wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array('wpinv-admin-script'), WPINV_VERSION);
+            wp_enqueue_script('wpinv-sub-admin-script');
         }
 
     }
     
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
         global $pagenow, $post, $current_screen;
         
-        if ( !empty( $current_screen->post_type ) && ( $current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_payment_form' || $current_screen->post_type == 'wpi_quote' ) ) {
+        if (!empty($current_screen->post_type) && ($current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_payment_form' || $current_screen->post_type == 'wpi_quote')) {
             $classes .= ' wpinv-cpt';
         }
         
-        $page = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : false;
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
 
-        $add_class = $page && $pagenow == 'admin.php' && strpos( $page, 'wpinv-' ) === 0 ? true : false;
-        if ( $add_class ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( $page );
+        $add_class = $page && $pagenow == 'admin.php' && strpos($page, 'wpinv-') === 0 ? true : false;
+        if ($add_class) {
+            $classes .= ' wpi-' . wpinv_sanitize_key($page);
         }
         
         $settings_class = array();
-        if ( $page == 'wpinv-settings' ) {
-            if ( !empty( $_REQUEST['tab'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['tab'] );
+        if ($page == 'wpinv-settings') {
+            if (!empty($_REQUEST['tab'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['tab']);
             }
             
-            if ( !empty( $_REQUEST['section'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['section'] );
+            if (!empty($_REQUEST['section'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['section']);
             }
             
-            $settings_class[] = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field( $_REQUEST['wpi_sub'] ) : 'main';
+            $settings_class[] = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field($_REQUEST['wpi_sub']) : 'main';
         }
         
-        if ( !empty( $settings_class ) ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( implode( $settings_class, '-' ) );
+        if (!empty($settings_class)) {
+            $classes .= ' wpi-' . wpinv_sanitize_key(implode($settings_class, '-'));
         }
         
         $post_type = wpinv_admin_post_type();
 
-        if ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false ) {
+        if ($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false) {
             return $classes .= ' wpinv';
         }
         
-        if ( $pagenow == 'post.php' && $post_type == 'wpi_item' && !empty( $post ) && !wpinv_item_is_editable( $post ) ) {
+        if ($pagenow == 'post.php' && $post_type == 'wpi_item' && !empty($post) && !wpinv_item_is_editable($post)) {
             $classes .= ' wpi-editable-n';
         }
 
@@ -474,21 +474,21 @@ 
     }
     
     public function wpinv_actions() {
-        if ( isset( $_REQUEST['wpi_action'] ) ) {
-            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        if (isset($_REQUEST['wpi_action'])) {
+            do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
         }
     }
     
-    public function pre_get_posts( $wp_query ) {
-        if ( !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );
+    public function pre_get_posts($wp_query) {
+        if (!empty($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+            $wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses());
         }
         
         return $wp_query;
     }
     
     public function bp_invoicing_init() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php');
     }
 
 	/**
@@ -496,13 +496,13 @@ 
 	 *
 	 */
 	public function register_widgets() {
-		register_widget( "WPInv_Checkout_Widget" );
-		register_widget( "WPInv_History_Widget" );
-		register_widget( "WPInv_Receipt_Widget" );
-		register_widget( "WPInv_Subscriptions_Widget" );
-		register_widget( "WPInv_Buy_Item_Widget" );
-        register_widget( "WPInv_Messages_Widget" );
-        register_widget( 'WPInv_Payment_Form_Widget' );
+		register_widget("WPInv_Checkout_Widget");
+		register_widget("WPInv_History_Widget");
+		register_widget("WPInv_Receipt_Widget");
+		register_widget("WPInv_Subscriptions_Widget");
+		register_widget("WPInv_Buy_Item_Widget");
+        register_widget("WPInv_Messages_Widget");
+        register_widget('WPInv_Payment_Form_Widget');
 	}
     
     /**
@@ -511,10 +511,10 @@ 
      * @since 1.0.19
      * @param int[] $excluded_posts_ids
      */
-    function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
+    function wpseo_exclude_from_sitemap_by_post_ids($excluded_posts_ids) {
 
         // Ensure that we have an array.
-        if ( ! is_array( $excluded_posts_ids ) ) {
+        if (!is_array($excluded_posts_ids)) {
             $excluded_posts_ids = array();
         }
 
@@ -522,24 +522,24 @@ 
         $our_pages = array();
     
         // Checkout page.
-        $our_pages[] = wpinv_get_option( 'checkout_page', false );
+        $our_pages[] = wpinv_get_option('checkout_page', false);
 
         // Success page.
-        $our_pages[] = wpinv_get_option( 'success_page', false );
+        $our_pages[] = wpinv_get_option('success_page', false);
 
         // Failure page.
-        $our_pages[] = wpinv_get_option( 'failure_page', false );
+        $our_pages[] = wpinv_get_option('failure_page', false);
 
         // History page.
-        $our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+        $our_pages[] = wpinv_get_option('invoice_history_page', false);
 
         // Subscriptions page.
-        $our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+        $our_pages[] = wpinv_get_option('invoice_subscription_page', false);
 
-        $our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+        $our_pages   = array_map('intval', array_filter($our_pages));
 
         $excluded_posts_ids = $excluded_posts_ids + $our_pages;
-        return array_unique( $excluded_posts_ids );
+        return array_unique($excluded_posts_ids);
 
     }
 }

includes/admin/admin-meta-boxes.php

Indentation +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', 'wpi_invoice', 'side', 'high' );
     }
 
-	remove_meta_box('wpseo_meta', 'wpi_invoice', 'normal');
+    remove_meta_box('wpseo_meta', 'wpi_invoice', 'normal');
 }
 add_action( 'add_meta_boxes', 'wpinv_add_meta_boxes', 30, 2 );
 

Spacing +153 added lines, -153 removed lines

@@ -1,74 +1,74 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-function wpinv_add_meta_boxes( $post_type, $post ) {
+function wpinv_add_meta_boxes($post_type, $post) {
     global $wpi_mb_invoice;
-    if ( $post_type == 'wpi_invoice' && !empty( $post->ID ) ) {
-        $wpi_mb_invoice = wpinv_get_invoice( $post->ID );
+    if ($post_type == 'wpi_invoice' && !empty($post->ID)) {
+        $wpi_mb_invoice = wpinv_get_invoice($post->ID);
     }
     
-    if ( !empty( $wpi_mb_invoice ) && !$wpi_mb_invoice->has_status( array( 'draft', 'auto-draft' ) ) ) {
-        add_meta_box( 'wpinv-mb-resend-invoice', __( 'Resend Invoice', 'invoicing' ), 'WPInv_Meta_Box_Details::resend_invoice', 'wpi_invoice', 'side', 'high' );
+    if (!empty($wpi_mb_invoice) && !$wpi_mb_invoice->has_status(array('draft', 'auto-draft'))) {
+        add_meta_box('wpinv-mb-resend-invoice', __('Resend Invoice', 'invoicing'), 'WPInv_Meta_Box_Details::resend_invoice', 'wpi_invoice', 'side', 'high');
     }
     
-    if ( !empty( $wpi_mb_invoice ) && $wpi_mb_invoice->is_recurring() && $wpi_mb_invoice->is_parent() ) {
-        add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscriptions', 'invoicing' ), 'WPInv_Meta_Box_Details::subscriptions', 'wpi_invoice', 'side', 'high' );
+    if (!empty($wpi_mb_invoice) && $wpi_mb_invoice->is_recurring() && $wpi_mb_invoice->is_parent()) {
+        add_meta_box('wpinv-mb-subscriptions', __('Subscriptions', 'invoicing'), 'WPInv_Meta_Box_Details::subscriptions', 'wpi_invoice', 'side', 'high');
     }
     
-    if ( wpinv_is_subscription_payment( $wpi_mb_invoice ) ) {
-        add_meta_box( 'wpinv-mb-renewals', __( 'Renewal Payment', 'invoicing' ), 'WPInv_Meta_Box_Details::renewals', 'wpi_invoice', 'side', 'high' );
+    if (wpinv_is_subscription_payment($wpi_mb_invoice)) {
+        add_meta_box('wpinv-mb-renewals', __('Renewal Payment', 'invoicing'), 'WPInv_Meta_Box_Details::renewals', 'wpi_invoice', 'side', 'high');
     }
     
-    add_meta_box( 'wpinv-details', __( 'Invoice Details', 'invoicing' ), 'WPInv_Meta_Box_Details::output', 'wpi_invoice', 'side', 'default' );
-    add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'WPInv_Meta_Box_Details::payment_meta', 'wpi_invoice', 'side', 'default' );
+    add_meta_box('wpinv-details', __('Invoice Details', 'invoicing'), 'WPInv_Meta_Box_Details::output', 'wpi_invoice', 'side', 'default');
+    add_meta_box('wpinv-payment-meta', __('Payment Meta', 'invoicing'), 'WPInv_Meta_Box_Details::payment_meta', 'wpi_invoice', 'side', 'default');
 
-    add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
-    add_meta_box( 'wpinv-payment-form-shortcode', __( 'Shortcode', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_shortcode', 'wpi_payment_form', 'side' );
+    add_meta_box('wpinv-payment-form-design', __('Payment Form', 'invoicing'), 'WPInv_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal');
+    add_meta_box('wpinv-payment-form-shortcode', __('Shortcode', 'invoicing'), 'WPInv_Meta_Box_Payment_Form::output_shortcode', 'wpi_payment_form', 'side');
    
-    add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'WPInv_Meta_Box_Billing_Details::output', 'wpi_invoice', 'normal', 'high' );
-    add_meta_box( 'wpinv-items', __( 'Invoice Items', 'invoicing' ), 'WPInv_Meta_Box_Items::output', 'wpi_invoice', 'normal', 'high' );
-    add_meta_box( 'wpinv-notes', __( 'Invoice Notes', 'invoicing' ), 'WPInv_Meta_Box_Notes::output', 'wpi_invoice', 'normal', 'high' );
+    add_meta_box('wpinv-address', __('Billing Details', 'invoicing'), 'WPInv_Meta_Box_Billing_Details::output', 'wpi_invoice', 'normal', 'high');
+    add_meta_box('wpinv-items', __('Invoice Items', 'invoicing'), 'WPInv_Meta_Box_Items::output', 'wpi_invoice', 'normal', 'high');
+    add_meta_box('wpinv-notes', __('Invoice Notes', 'invoicing'), 'WPInv_Meta_Box_Notes::output', 'wpi_invoice', 'normal', 'high');
     
-    if ( ! empty( $post->ID ) && get_post_meta( $post->ID, 'payment_form_data', true ) ) {
-        add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', 'wpi_invoice', 'side', 'high' );
+    if (!empty($post->ID) && get_post_meta($post->ID, 'payment_form_data', true)) {
+        add_meta_box('wpinv-invoice-payment-form-details', __('Payment Form Details', 'invoicing'), 'WPInv_Meta_Box_Payment_Form::output_details', 'wpi_invoice', 'side', 'high');
     }
 
 	remove_meta_box('wpseo_meta', 'wpi_invoice', 'normal');
 }
-add_action( 'add_meta_boxes', 'wpinv_add_meta_boxes', 30, 2 );
+add_action('add_meta_boxes', 'wpinv_add_meta_boxes', 30, 2);
 
-function wpinv_save_meta_boxes( $post_id, $post, $update = false ) {
-    remove_action( 'save_post', __FUNCTION__ );
+function wpinv_save_meta_boxes($post_id, $post, $update = false) {
+    remove_action('save_post', __FUNCTION__);
     
     // $post_id and $post are required
-    if ( empty( $post_id ) || empty( $post ) ) {
+    if (empty($post_id) || empty($post)) {
         return;
     }
         
-    if ( !current_user_can( 'edit_post', $post_id ) || empty( $post->post_type ) ) {
+    if (!current_user_can('edit_post', $post_id) || empty($post->post_type)) {
         return;
     }
     
     // Dont' save meta boxes for revisions or autosaves
-    if ( defined( 'DOING_AUTOSAVE' ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+    if (defined('DOING_AUTOSAVE') || is_int(wp_is_post_revision($post)) || is_int(wp_is_post_autosave($post))) {
         return;
     }
         
-    if ( $post->post_type == 'wpi_invoice' or $post->post_type == 'wpi_quote' ) {
-        if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+    if ($post->post_type == 'wpi_invoice' or $post->post_type == 'wpi_quote') {
+        if ((defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
             return;
         }
     
-        if ( isset( $_POST['wpinv_save_invoice'] ) && wp_verify_nonce( $_POST['wpinv_save_invoice'], 'wpinv_save_invoice' ) ) {
-            WPInv_Meta_Box_Items::save( $post_id, $_POST, $post );
+        if (isset($_POST['wpinv_save_invoice']) && wp_verify_nonce($_POST['wpinv_save_invoice'], 'wpinv_save_invoice')) {
+            WPInv_Meta_Box_Items::save($post_id, $_POST, $post);
         }
-    } else if ( $post->post_type == 'wpi_item' ) {
+    } else if ($post->post_type == 'wpi_item') {
         // verify nonce
-        if ( isset( $_POST['wpinv_vat_meta_box_nonce'] ) && wp_verify_nonce( $_POST['wpinv_vat_meta_box_nonce'], 'wpinv_item_meta_box_save' ) ) {
-            $fields                                 = array();
+        if (isset($_POST['wpinv_vat_meta_box_nonce']) && wp_verify_nonce($_POST['wpinv_vat_meta_box_nonce'], 'wpinv_item_meta_box_save')) {
+            $fields = array();
             $fields['_wpinv_price']              = 'wpinv_item_price';
             $fields['_wpinv_vat_class']          = 'wpinv_vat_class';
             $fields['_wpinv_vat_rule']           = 'wpinv_vat_rules';
@@ -83,96 +83,96 @@ 
             $fields['_wpinv_dynamic_pricing']    = 'wpinv_name_your_price';
             $fields['_minimum_price']            = 'wpinv_minimum_price';
             
-            if ( !isset( $_POST['wpinv_is_recurring'] ) ) {
+            if (!isset($_POST['wpinv_is_recurring'])) {
                 $_POST['wpinv_is_recurring'] = 0;
             }
 
-            if ( !isset( $_POST['wpinv_name_your_price'] ) ) {
+            if (!isset($_POST['wpinv_name_your_price'])) {
                 $_POST['wpinv_name_your_price'] = 0;
             }
             
-            if ( !isset( $_POST['wpinv_free_trial'] ) || empty( $_POST['wpinv_is_recurring'] ) ) {
+            if (!isset($_POST['wpinv_free_trial']) || empty($_POST['wpinv_is_recurring'])) {
                 $_POST['wpinv_free_trial'] = 0;
             }
             
-            foreach ( $fields as $field => $name ) {
-                if ( isset( $_POST[ $name ] ) ) {
-                    $allowed = apply_filters( 'wpinv_item_allowed_save_meta_value', true, $field, $post_id );
+            foreach ($fields as $field => $name) {
+                if (isset($_POST[$name])) {
+                    $allowed = apply_filters('wpinv_item_allowed_save_meta_value', true, $field, $post_id);
 
-                    if ( !$allowed ) {
+                    if (!$allowed) {
                         continue;
                     }
 
-                    if ( $field == '_wpinv_price' ) {
-                        $value = wpinv_sanitize_amount( $_POST[ $name ] );
+                    if ($field == '_wpinv_price') {
+                        $value = wpinv_sanitize_amount($_POST[$name]);
                     } else {
-                        $value = is_string( $_POST[ $name ] ) ? sanitize_text_field( $_POST[ $name ] ) : $_POST[ $name ];
+                        $value = is_string($_POST[$name]) ? sanitize_text_field($_POST[$name]) : $_POST[$name];
                     }
                     
-                    $value = apply_filters( 'wpinv_item_metabox_save_' . $field, $value, $name );
-                    update_post_meta( $post_id, $field, $value );
+                    $value = apply_filters('wpinv_item_metabox_save_' . $field, $value, $name);
+                    update_post_meta($post_id, $field, $value);
                 }
             }
             
-            if ( !get_post_meta( $post_id, '_wpinv_custom_id', true ) ) {
-                update_post_meta( $post_id, '_wpinv_custom_id', $post_id );
+            if (!get_post_meta($post_id, '_wpinv_custom_id', true)) {
+                update_post_meta($post_id, '_wpinv_custom_id', $post_id);
             }
         }
     }
 }
-add_action( 'save_post', 'wpinv_save_meta_boxes', 10, 3 );
+add_action('save_post', 'wpinv_save_meta_boxes', 10, 3);
 
 function wpinv_register_item_meta_boxes() {    
     global $wpinv_euvat;
     
-    add_meta_box( 'wpinv_field_prices', __( 'Item Price', 'invoicing' ), 'WPInv_Meta_Box_Items::prices', 'wpi_item', 'normal', 'high' );
+    add_meta_box('wpinv_field_prices', __('Item Price', 'invoicing'), 'WPInv_Meta_Box_Items::prices', 'wpi_item', 'normal', 'high');
 
-    if ( $wpinv_euvat->allow_vat_rules() ) {
-        add_meta_box( 'wpinv_field_vat_rules', __( 'VAT rules type to use', 'invoicing' ), 'WPInv_Meta_Box_Items::vat_rules', 'wpi_item', 'normal', 'high' );
+    if ($wpinv_euvat->allow_vat_rules()) {
+        add_meta_box('wpinv_field_vat_rules', __('VAT rules type to use', 'invoicing'), 'WPInv_Meta_Box_Items::vat_rules', 'wpi_item', 'normal', 'high');
     }
     
-    if ( $wpinv_euvat->allow_vat_classes() ) {
-        add_meta_box( 'wpinv_field_vat_classes', __( 'VAT rates class to use', 'invoicing' ), 'WPInv_Meta_Box_Items::vat_classes', 'wpi_item', 'normal', 'high' );
+    if ($wpinv_euvat->allow_vat_classes()) {
+        add_meta_box('wpinv_field_vat_classes', __('VAT rates class to use', 'invoicing'), 'WPInv_Meta_Box_Items::vat_classes', 'wpi_item', 'normal', 'high');
     }
     
-    add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'WPInv_Meta_Box_Items::item_info', 'wpi_item', 'side', 'core' );
-    add_meta_box( 'wpinv_field_meta_values', __( 'Item Meta Values', 'invoicing' ), 'WPInv_Meta_Box_Items::meta_values', 'wpi_item', 'side', 'core' );
+    add_meta_box('wpinv_field_item_info', __('Item info', 'invoicing'), 'WPInv_Meta_Box_Items::item_info', 'wpi_item', 'side', 'core');
+    add_meta_box('wpinv_field_meta_values', __('Item Meta Values', 'invoicing'), 'WPInv_Meta_Box_Items::meta_values', 'wpi_item', 'side', 'core');
 }
 
 function wpinv_register_discount_meta_boxes() {
-    add_meta_box( 'wpinv_discount_fields', __( 'Discount Details', 'invoicing' ), 'wpinv_discount_metabox_details', 'wpi_discount', 'normal', 'high' );
+    add_meta_box('wpinv_discount_fields', __('Discount Details', 'invoicing'), 'wpinv_discount_metabox_details', 'wpi_discount', 'normal', 'high');
 }
 
-function wpinv_discount_metabox_details( $post ) {
+function wpinv_discount_metabox_details($post) {
     $discount_id    = $post->ID;
-    $discount       = wpinv_get_discount( $discount_id );
+    $discount       = wpinv_get_discount($discount_id);
     
-    $type               = wpinv_get_discount_type( $discount_id );
-    $item_reqs          = wpinv_get_discount_item_reqs( $discount_id );
-    $excluded_items     = wpinv_get_discount_excluded_items( $discount_id );
-    $min_total          = wpinv_get_discount_min_total( $discount_id );
-    $max_total          = wpinv_get_discount_max_total( $discount_id );
-    $max_uses           = wpinv_get_discount_max_uses( $discount_id );
-    $single_use         = wpinv_discount_is_single_use( $discount_id );
-    $recurring          = (bool)wpinv_discount_is_recurring( $discount_id );
-    $start_date         = wpinv_get_discount_start_date( $discount_id );
-    $expiration_date    = wpinv_get_discount_expiration( $discount_id );
+    $type               = wpinv_get_discount_type($discount_id);
+    $item_reqs          = wpinv_get_discount_item_reqs($discount_id);
+    $excluded_items     = wpinv_get_discount_excluded_items($discount_id);
+    $min_total          = wpinv_get_discount_min_total($discount_id);
+    $max_total          = wpinv_get_discount_max_total($discount_id);
+    $max_uses           = wpinv_get_discount_max_uses($discount_id);
+    $single_use         = wpinv_discount_is_single_use($discount_id);
+    $recurring          = (bool) wpinv_discount_is_recurring($discount_id);
+    $start_date         = wpinv_get_discount_start_date($discount_id);
+    $expiration_date    = wpinv_get_discount_expiration($discount_id);
     
-    if ( ! empty( $start_date ) && strpos( $start_date, '0000' ) === false ) {
-        $start_time         = strtotime( $start_date );
-        $start_h            = date_i18n( 'H', $start_time );
-        $start_m            = date_i18n( 'i', $start_time );
-        $start_date         = date_i18n( 'Y-m-d', $start_time );
+    if (!empty($start_date) && strpos($start_date, '0000') === false) {
+        $start_time         = strtotime($start_date);
+        $start_h            = date_i18n('H', $start_time);
+        $start_m            = date_i18n('i', $start_time);
+        $start_date         = date_i18n('Y-m-d', $start_time);
     } else {
         $start_h            = '00';
         $start_m            = '00';
     }
 
-    if ( ! empty( $expiration_date ) && strpos( $expiration_date, '0000' ) === false ) {
-        $expiration_time    = strtotime( $expiration_date );
-        $expiration_h       = date_i18n( 'H', $expiration_time );
-        $expiration_m       = date_i18n( 'i', $expiration_time );
-        $expiration_date    = date_i18n( 'Y-m-d', $expiration_time );
+    if (!empty($expiration_date) && strpos($expiration_date, '0000') === false) {
+        $expiration_time    = strtotime($expiration_date);
+        $expiration_h       = date_i18n('H', $expiration_time);
+        $expiration_m       = date_i18n('i', $expiration_time);
+        $expiration_date    = date_i18n('Y-m-d', $expiration_time);
     } else {
         $expiration_h       = '23';
         $expiration_m       = '59';
@@ -182,207 +182,207 @@ 
     $max_total          = $max_total > 0 ? $max_total : '';
     $max_uses           = $max_uses > 0 ? $max_uses : '';
 ?>
-<?php do_action( 'wpinv_discount_form_top', $post ); ?>
-<?php wp_nonce_field( 'wpinv_discount_metabox_nonce', 'wpinv_discount_metabox_nonce' ); ;?>
+<?php do_action('wpinv_discount_form_top', $post); ?>
+<?php wp_nonce_field('wpinv_discount_metabox_nonce', 'wpinv_discount_metabox_nonce'); ;?>
 <table class="form-table wpi-form-table">
     <tbody>
-        <?php do_action( 'wpinv_discount_form_first', $post ); ?>
-        <?php do_action( 'wpinv_discount_form_before_code', $post ); ?>
+        <?php do_action('wpinv_discount_form_first', $post); ?>
+        <?php do_action('wpinv_discount_form_before_code', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_code"><?php _e( 'Discount Code', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_code"><?php _e('Discount Code', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" name="code" id="wpinv_discount_code" class="medium-text" value="<?php echo esc_attr( wpinv_get_discount_code( $discount_id ) ); ?>" required>
-                <p class="description"><?php _e( 'Enter a code for this discount, such as 10OFF', 'invoicing' ); ?></p>
+                <input type="text" name="code" id="wpinv_discount_code" class="medium-text" value="<?php echo esc_attr(wpinv_get_discount_code($discount_id)); ?>" required>
+                <p class="description"><?php _e('Enter a code for this discount, such as 10OFF', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_type', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_type', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_type"><?php _e( 'Discount Type', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_type"><?php _e('Discount Type', 'invoicing'); ?></label>
             </th>
             <td>
                 <select id="wpinv_discount_type" name="type" class="medium-text wpi_select2">
-                    <?php foreach ( wpinv_get_discount_types() as $value => $label ) { ?>
-                    <option value="<?php echo $value ;?>" <?php selected( $type, $value ); ?>><?php echo $label; ?></option>
+                    <?php foreach (wpinv_get_discount_types() as $value => $label) { ?>
+                    <option value="<?php echo $value; ?>" <?php selected($type, $value); ?>><?php echo $label; ?></option>
                     <?php } ?>
                 </select>
-                <p class="description"><?php _e( 'The kind of discount to apply for this discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('The kind of discount to apply for this discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_amount', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_amount', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_amount"><?php _e( 'Amount', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_amount"><?php _e('Amount', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" name="amount" id="wpinv_discount_amount" class="wpi-field-price wpi-price" value="<?php echo esc_attr( wpinv_get_discount_amount( $discount_id ) ); ?>" required> <font class="wpi-discount-p">%</font><font class="wpi-discount-f" style="display:none;"><?php echo wpinv_currency_symbol() ;?></font>
-                <p style="display:none;" class="description"><?php _e( 'Enter the discount amount in USD', 'invoicing' ); ?></p>
-                <p class="description"><?php _e( 'Enter the discount value. Ex: 10', 'invoicing' ); ?></p>
+                <input type="text" name="amount" id="wpinv_discount_amount" class="wpi-field-price wpi-price" value="<?php echo esc_attr(wpinv_get_discount_amount($discount_id)); ?>" required> <font class="wpi-discount-p">%</font><font class="wpi-discount-f" style="display:none;"><?php echo wpinv_currency_symbol(); ?></font>
+                <p style="display:none;" class="description"><?php _e('Enter the discount amount in USD', 'invoicing'); ?></p>
+                <p class="description"><?php _e('Enter the discount value. Ex: 10', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_items', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_items', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_items"><?php _e( 'Items', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_items"><?php _e('Items', 'invoicing'); ?></label>
             </th>
             <td>
-                <p><?php echo wpinv_item_dropdown( array(
+                <p><?php echo wpinv_item_dropdown(array(
                         'name'              => 'items[]',
                         'id'                => 'items',
                         'selected'          => $item_reqs,
                         'multiple'          => true,
                         'class'             => 'medium-text wpi_select2',
-                        'placeholder'       => __( 'Select one or more Items', 'invoicing' ),
+                        'placeholder'       => __('Select one or more Items', 'invoicing'),
                         'show_recurring'    => true,
-                    ) ); ?>
+                    )); ?>
                 </p>
-                <p class="description"><?php _e( 'Items which need to be in the cart to use this discount or, for "Item Discounts", which items are discounted. If left blank, this discount can be used on any item.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('Items which need to be in the cart to use this discount or, for "Item Discounts", which items are discounted. If left blank, this discount can be used on any item.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_excluded_items', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_excluded_items', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_excluded_items"><?php _e( 'Excluded Items', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_excluded_items"><?php _e('Excluded Items', 'invoicing'); ?></label>
             </th>
             <td>
-                <p><?php echo wpinv_item_dropdown( array(
+                <p><?php echo wpinv_item_dropdown(array(
                         'name'              => 'excluded_items[]',
                         'id'                => 'excluded_items',
                         'selected'          => $excluded_items,
                         'multiple'          => true,
                         'class'             => 'medium-text wpi_select2',
-                        'placeholder'       => __( 'Select one or more Items', 'invoicing' ),
+                        'placeholder'       => __('Select one or more Items', 'invoicing'),
                         'show_recurring'    => true,
-                    ) ); ?>
+                    )); ?>
                 </p>
-                <p class="description"><?php _e( 'Items which are NOT allowed to use this discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('Items which are NOT allowed to use this discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_start', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_start', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_start"><?php _e( 'Start Date', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_start"><?php _e('Start Date', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" class="w120 wpiDatepicker" id="wpinv_discount_start" data-dateFormat="yy-mm-dd" name="start" value="<?php echo esc_attr( $start_date ); ?>"> @ <select id="wpinv_discount_start_h" name="start_h">
-                    <?php for ( $i = 0; $i <= 23; $i++ ) { $value = str_pad( $i, 2, '0', STR_PAD_LEFT ); ?>
-                    <option value="<?php echo $value;?>" <?php selected( $value, $start_h ); ?>><?php echo $value;?></option>
+                <input type="text" class="w120 wpiDatepicker" id="wpinv_discount_start" data-dateFormat="yy-mm-dd" name="start" value="<?php echo esc_attr($start_date); ?>"> @ <select id="wpinv_discount_start_h" name="start_h">
+                    <?php for ($i = 0; $i <= 23; $i++) { $value = str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+                    <option value="<?php echo $value; ?>" <?php selected($value, $start_h); ?>><?php echo $value; ?></option>
                     <?php } ?>
                 </select> : <select id="wpinv_discount_start_m" name="start_m">
-                    <?php for ( $i = 0; $i <= 59; $i++ ) { $value = str_pad( $i, 2, '0', STR_PAD_LEFT ); ?>
-                    <option value="<?php echo $value;?>" <?php selected( $value, $start_m ); ?>><?php echo $value;?></option>
+                    <?php for ($i = 0; $i <= 59; $i++) { $value = str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+                    <option value="<?php echo $value; ?>" <?php selected($value, $start_m); ?>><?php echo $value; ?></option>
                     <?php } ?>
                 </select>
-                <p class="description"><?php _e( 'Enter the start date for this discount code in the format of yyyy-mm-dd. For no start date, leave blank. If entered, the discount can only be used after or on this date.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('Enter the start date for this discount code in the format of yyyy-mm-dd. For no start date, leave blank. If entered, the discount can only be used after or on this date.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_expiration', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_expiration', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_expiration"><?php _e( 'Expiration Date', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_expiration"><?php _e('Expiration Date', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="text" class="w120 wpiDatepicker" id="wpinv_discount_expiration" data-dateFormat="yy-mm-dd" name="expiration" value="<?php echo esc_attr( $expiration_date ); ?>"> @ <select id="wpinv_discount_expiration_h" name="expiration_h">
-                    <?php for ( $i = 0; $i <= 23; $i++ ) { $value = str_pad( $i, 2, '0', STR_PAD_LEFT ); ?>
-                    <option value="<?php echo $value;?>" <?php selected( $value, $expiration_h ); ?>><?php echo $value;?></option>
+                <input type="text" class="w120 wpiDatepicker" id="wpinv_discount_expiration" data-dateFormat="yy-mm-dd" name="expiration" value="<?php echo esc_attr($expiration_date); ?>"> @ <select id="wpinv_discount_expiration_h" name="expiration_h">
+                    <?php for ($i = 0; $i <= 23; $i++) { $value = str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+                    <option value="<?php echo $value; ?>" <?php selected($value, $expiration_h); ?>><?php echo $value; ?></option>
                     <?php } ?>
                 </select> : <select id="wpinv_discount_expiration_m" name="expiration_m">
-                    <?php for ( $i = 0; $i <= 59; $i++ ) { $value = str_pad( $i, 2, '0', STR_PAD_LEFT ); ?>
-                    <option value="<?php echo $value;?>" <?php selected( $value, $expiration_m ); ?>><?php echo $value;?></option>
+                    <?php for ($i = 0; $i <= 59; $i++) { $value = str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+                    <option value="<?php echo $value; ?>" <?php selected($value, $expiration_m); ?>><?php echo $value; ?></option>
                     <?php } ?>
                 </select>
-                <p class="description"><?php _e( 'Enter the expiration date for this discount code in the format of yyyy-mm-dd. Leave blank for no expiration.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('Enter the expiration date for this discount code in the format of yyyy-mm-dd. Leave blank for no expiration.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_min_total', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_min_total', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_min_total"><?php _e( 'Minimum Amount', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_min_total"><?php _e('Minimum Amount', 'invoicing'); ?></label>
             </th>
             <td>
                 <input type="text" name="min_total" id="wpinv_discount_min_total" class="wpi-field-price wpi-price" value="<?php echo $min_total; ?>">
-                <p class="description"><?php _e( 'This allows you to set the minimum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('This allows you to set the minimum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_max_total', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_max_total', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_max_total"><?php _e( 'Maximum Amount', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_max_total"><?php _e('Maximum Amount', 'invoicing'); ?></label>
             </th>
             <td>
                 <input type="text" name="max_total" id="wpinv_discount_max_total" class="wpi-field-price wpi-price" value="<?php echo $max_total; ?>">
-                <p class="description"><?php _e( 'This allows you to set the maximum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('This allows you to set the maximum amount (subtotal, including taxes) allowed when using the discount.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_recurring', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_recurring', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_recurring"><?php _e( 'For recurring apply to', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_recurring"><?php _e('For recurring apply to', 'invoicing'); ?></label>
             </th>
             <td>
                 <select id="wpinv_discount_recurring" name="recurring" class="medium-text wpi_select2">
-                    <option value="0" <?php selected( false, $recurring ); ?>><?php _e( 'First payment only', 'invoicing' ); ?></option>
-                    <option value="1" <?php selected( true, $recurring ); ?>><?php _e( 'All payments', 'invoicing' ); ?></option>
+                    <option value="0" <?php selected(false, $recurring); ?>><?php _e('First payment only', 'invoicing'); ?></option>
+                    <option value="1" <?php selected(true, $recurring); ?>><?php _e('All payments', 'invoicing'); ?></option>
                 </select>
-                <p class="description"><?php _e( '<b>All payments:</b> Apply this discount to all recurring payments of the recurring invoice. <br><b>First payment only:</b> Apply this discount to only first payment of the recurring invoice.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('<b>All payments:</b> Apply this discount to all recurring payments of the recurring invoice. <br><b>First payment only:</b> Apply this discount to only first payment of the recurring invoice.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_max_uses', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_max_uses', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_max_uses"><?php _e( 'Max Uses', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_max_uses"><?php _e('Max Uses', 'invoicing'); ?></label>
             </th>
             <td>
                 <input type="number" min="0" step="1" id="wpinv_discount_max_uses" name="max_uses" class="medium-text" value="<?php echo $max_uses; ?>">
-                <p class="description"><?php _e( 'The maximum number of times this discount can be used. Leave blank for unlimited.', 'invoicing' ); ?></p>
+                <p class="description"><?php _e('The maximum number of times this discount can be used. Leave blank for unlimited.', 'invoicing'); ?></p>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_before_single_use', $post ); ?>
+        <?php do_action('wpinv_discount_form_before_single_use', $post); ?>
         <tr>
             <th valign="top" scope="row">
-                <label for="wpinv_discount_single_use"><?php _e( 'Use Once Per User', 'invoicing' ); ?></label>
+                <label for="wpinv_discount_single_use"><?php _e('Use Once Per User', 'invoicing'); ?></label>
             </th>
             <td>
-                <input type="checkbox" value="1" name="single_use" id="wpinv_discount_single_use" <?php checked( true, $single_use ); ?>>
-                <span class="description"><?php _e( 'Limit this discount to a single use per user?', 'invoicing' ); ?></span>
+                <input type="checkbox" value="1" name="single_use" id="wpinv_discount_single_use" <?php checked(true, $single_use); ?>>
+                <span class="description"><?php _e('Limit this discount to a single use per user?', 'invoicing'); ?></span>
             </td>
         </tr>
-        <?php do_action( 'wpinv_discount_form_last', $post ); ?>
+        <?php do_action('wpinv_discount_form_last', $post); ?>
     </tbody>
 </table>
-<?php do_action( 'wpinv_discount_form_bottom', $post ); ?>
+<?php do_action('wpinv_discount_form_bottom', $post); ?>
     <?php
 }
 
-function wpinv_discount_metabox_save( $post_id, $post, $update = false ) {
-    $post_type = !empty( $post ) ? $post->post_type : '';
+function wpinv_discount_metabox_save($post_id, $post, $update = false) {
+    $post_type = !empty($post) ? $post->post_type : '';
     
-    if ( $post_type != 'wpi_discount' ) {
+    if ($post_type != 'wpi_discount') {
         return;
     }
     
-    if ( !isset( $_POST['wpinv_discount_metabox_nonce'] ) || ( isset( $_POST['wpinv_discount_metabox_nonce'] ) && !wp_verify_nonce( $_POST['wpinv_discount_metabox_nonce'], 'wpinv_discount_metabox_nonce' ) ) ) {
+    if (!isset($_POST['wpinv_discount_metabox_nonce']) || (isset($_POST['wpinv_discount_metabox_nonce']) && !wp_verify_nonce($_POST['wpinv_discount_metabox_nonce'], 'wpinv_discount_metabox_nonce'))) {
         return;
     }
     
-    if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+    if ((defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) || (defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
         return;
     }
     
-    if ( !current_user_can( wpinv_get_capability(), $post_id ) ) {
+    if (!current_user_can(wpinv_get_capability(), $post_id)) {
         return;
     }
     
-    if ( !empty( $_POST['start'] ) && isset( $_POST['start_h'] ) && isset( $_POST['start_m'] ) && $_POST['start_h'] !== '' && $_POST['start_m'] !== '' ) {
+    if (!empty($_POST['start']) && isset($_POST['start_h']) && isset($_POST['start_m']) && $_POST['start_h'] !== '' && $_POST['start_m'] !== '') {
         $_POST['start'] = $_POST['start'] . ' ' . $_POST['start_h'] . ':' . $_POST['start_m'];
     }
 
-    if ( !empty( $_POST['expiration'] ) && isset( $_POST['expiration_h'] ) && isset( $_POST['expiration_m'] ) ) {
+    if (!empty($_POST['expiration']) && isset($_POST['expiration_h']) && isset($_POST['expiration_m'])) {
         $_POST['expiration'] = $_POST['expiration'] . ' ' . $_POST['expiration_h'] . ':' . $_POST['expiration_m'];
     }
     
-    return /** @scrutinizer ignore-call */ wpinv_store_discount( $post_id, $_POST, $post, $update );
+    return /** @scrutinizer ignore-call */ wpinv_store_discount($post_id, $_POST, $post, $update);
 }
-add_action( 'save_post', 'wpinv_discount_metabox_save', 10, 3 );
\ No newline at end of file
+add_action('save_post', 'wpinv_discount_metabox_save', 10, 3);
\ No newline at end of file

includes/admin/meta-boxes/class-mb-payment-form.php

Spacing +51 added lines, -51 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Meta_Box_Payment_Form {
@@ -11,23 +11,23 @@ 
      *
      * @param WP_Post $post
      */
-    public static function output_details( $post ) {
-        $details = get_post_meta( $post->ID, 'payment_form_data', true );
+    public static function output_details($post) {
+        $details = get_post_meta($post->ID, 'payment_form_data', true);
 
-        if ( ! is_array( $details ) ) {
+        if (!is_array($details)) {
             return;
         }
 
         echo '<div class="gdmbx2-wrap form-table"> <div class="gdmbx2-metabox gdmbx-field-list">';
 
-        foreach ( $details as $key => $value ) {
-            $key = sanitize_text_field( $key );
+        foreach ($details as $key => $value) {
+            $key = sanitize_text_field($key);
 
-            if ( is_array( $value ) ) {
-                $value = implode( ',', $value );
+            if (is_array($value)) {
+                $value = implode(',', $value);
             }
 
-            $value = esc_html( $value );
+            $value = esc_html($value);
 
             echo "<div class='gdmbx-row gdmbx-type-select'>";
             echo "<div class='gdmbx-th'><label>$key:</label></div>";
@@ -43,9 +43,9 @@ 
      *
      * @param WP_Post $post
      */
-    public static function output_shortcode( $post ) {
+    public static function output_shortcode($post) {
 
-        if ( ! is_numeric( $post ) ) {
+        if (!is_numeric($post)) {
             $post = $post->ID;
         }
 
@@ -57,9 +57,9 @@ 
      *
      * @param WP_Post $post
      */
-    public static function output ( $post ) {
-        $success_page        = get_post_meta( $post->ID, 'wpinv_success_page', true );
-        $success_page        = empty( $success_page ) ? wpinv_get_success_page_uri() : $success_page
+    public static function output($post) {
+        $success_page        = get_post_meta($post->ID, 'wpinv_success_page', true);
+        $success_page        = empty($success_page) ? wpinv_get_success_page_uri() : $success_page
         ?>
 
         <div id="wpinv-form-builder" style="display: flex; flex-flow: wrap;">
@@ -67,20 +67,20 @@ 
             <div class="wpinv-form-builder-left bsui" style="flex: 0 0 320px;">
                 <ul class="wpinv-form-builder-tabs  nav nav-tabs">
                     <li class='nav-item' v-if="active_tab!='new_item'">
-                        <a @click.prevent="active_tab='new_item'" class="nav-link p-3" :class="{ 'active': active_tab=='new_item' }" href="#"><?php _e( 'Add new element', 'invoicing' ); ?></a>
+                        <a @click.prevent="active_tab='new_item'" class="nav-link p-3" :class="{ 'active': active_tab=='new_item' }" href="#"><?php _e('Add new element', 'invoicing'); ?></a>
                     </li>
                     <li class='nav-item' v-if='false'>
-                        <a @click.prevent="active_tab='edit_item'" class="nav-link p-3" :class="{ 'active': active_tab=='edit_item' }" href="#"><?php _e( 'Edit element', 'invoicing' ); ?></a>
+                        <a @click.prevent="active_tab='edit_item'" class="nav-link p-3" :class="{ 'active': active_tab=='edit_item' }" href="#"><?php _e('Edit element', 'invoicing'); ?></a>
                     </li>
                     <li class='nav-item' v-if='false'>
-                        <a @click.prevent="active_tab='settings'" class="nav-link p-3" :class="{ 'active': active_tab=='settings' }" href="#"><?php _e( 'Settings', 'invoicing' ); ?></a>
+                        <a @click.prevent="active_tab='settings'" class="nav-link p-3" :class="{ 'active': active_tab=='settings' }" href="#"><?php _e('Settings', 'invoicing'); ?></a>
                     </li>
                 </ul>
 
                 <div class="wpinv-form-builder-tab-content bsui" style="margin-top: 16px;">
                     <div class="wpinv-form-builder-tab-pane" v-if="active_tab=='new_item'">
                         <div class="wpinv-form-builder-add-field-types">
-                            <small class='form-text text-muted'><?php _e( 'Add an element by dragging it to the payment form.', 'invoicing' ); ?></small>
+                            <small class='form-text text-muted'><?php _e('Add an element by dragging it to the payment form.', 'invoicing'); ?></small>
                             <draggable class="section mt-2" style="display: flex; flex-flow: wrap; justify-content: space-between;" v-model="elements" :group="{ name: 'fields', pull: 'clone', put: false }" :sort="false" :clone="addDraggedField" tag="ul" filter=".wpinv-undraggable">
                                 <li v-for="element in elements" style="width: 49%; background-color: #fafafa; margin-bottom: 9px; cursor: move; border: 1px solid #eeeeee;" @click.prevent="addField(element)" :class="{ 'd-none': element.defaults.premade }">
                                     <button class="button btn" style="width: 100%; cursor: move;">
@@ -95,9 +95,9 @@ 
 
                     <div class="wpinv-form-builder-tab-pane bsui" v-if="active_tab=='edit_item'" style="font-size: 16px;">
                         <div class="wpinv-form-builder-edit-field-wrapper">
-                            <?php do_action( 'wpinv_payment_form_edit_element_template', 'active_form_element', $post ); ?>
+                            <?php do_action('wpinv_payment_form_edit_element_template', 'active_form_element', $post); ?>
                             <div>
-                                <button type="button" class="button button-link button-link-delete" @click.prevent="removeField(active_form_element)" v-show="! active_form_element.premade"><?php _e( 'Delete Field', 'invoicing' ); ?></button>
+                                <button type="button" class="button button-link button-link-delete" @click.prevent="removeField(active_form_element)" v-show="! active_form_element.premade"><?php _e('Delete Field', 'invoicing'); ?></button>
                             </div>
                         </div>
                     </div>
@@ -106,9 +106,9 @@ 
                         <div class="wpinv-form-builder-settings-wrapper">
                         
                             <div class='form-group'>
-                                <label for="wpi-success-page"><?php _e( 'Success Page', 'invoicing' ); ?></label>
-                                <input  placeholder="https://" id='wpi-success-page' value="<?php echo esc_url( $success_page ); ?>" class='form-control' type='text'>
-                                <small class='form-text text-muted'><?php _e( 'Where should we redirect users after successfuly completing their payment?', 'invoicing' ); ?></small>
+                                <label for="wpi-success-page"><?php _e('Success Page', 'invoicing'); ?></label>
+                                <input  placeholder="https://" id='wpi-success-page' value="<?php echo esc_url($success_page); ?>" class='form-control' type='text'>
+                                <small class='form-text text-muted'><?php _e('Where should we redirect users after successfuly completing their payment?', 'invoicing'); ?></small>
                             </div>
 
                         </div>
@@ -119,12 +119,12 @@ 
 
             <div class="wpinv-form-builder-right" style="flex: 1; padding-top: 40px;border-left: 1px solid #ddd;padding-left: 20px;min-height: 520px;margin-left: 10px;">
 
-                <small class='form-text text-muted' v-if='form_elements.length'><?php _e( 'Click on any element to edit or delete it.', 'invoicing' ); ?></small>
-                <p class='form-text text-muted' v-if='! form_elements.length'><?php _e( 'This form is empty. Add new elements by dragging them from the right.', 'invoicing' ); ?></p>
+                <small class='form-text text-muted' v-if='form_elements.length'><?php _e('Click on any element to edit or delete it.', 'invoicing'); ?></small>
+                <p class='form-text text-muted' v-if='! form_elements.length'><?php _e('This form is empty. Add new elements by dragging them from the right.', 'invoicing'); ?></p>
 
                 <draggable class="section bsui" v-model="form_elements" @add="highlightLastDroppedField" group="fields" tag="div" style="min-height: 100%; font-size: 16px;">
                     <div v-for="form_element in form_elements" class="wpinv-form-builder-element-preview" :class="{ active: active_form_element==form_element &&  active_tab=='edit_item' }" @click="active_tab = 'edit_item'; active_form_element = form_element">
-                        <?php do_action( 'wpinv_payment_form_render_element_template', 'form_element', $post ); ?>
+                        <?php do_action('wpinv_payment_form_render_element_template', 'form_element', $post); ?>
                     </div>
                 </draggable>
             </div>
@@ -133,7 +133,7 @@ 
             <textarea style="display:none;" name="wpinv_form_items" v-model="itemString"></textarea>
         </div>
         
-        <?php wp_nonce_field( 'wpinv_save_payment_form', 'wpinv_save_payment_form' ) ;?>
+        <?php wp_nonce_field('wpinv_save_payment_form', 'wpinv_save_payment_form'); ?>
 
         <?php
     }
@@ -141,83 +141,83 @@ 
     /**
      * Saves our payment forms.
      */
-    public static function save( $post_id, $post ) {
+    public static function save($post_id, $post) {
 
-        remove_action( 'save_post', 'WPInv_Meta_Box_Payment_Form::save' );
+        remove_action('save_post', 'WPInv_Meta_Box_Payment_Form::save');
 
         // $post_id and $post are required.
-        if ( empty( $post_id ) || empty( $post ) ) {
+        if (empty($post_id) || empty($post)) {
             return;
         }
         
         // Ensure that this user can edit the post.
-        if ( ! current_user_can( 'edit_post', $post_id ) ) {
+        if (!current_user_can('edit_post', $post_id)) {
             return;
         }
 
         // Dont' save meta boxes for revisions or autosaves
-        if ( defined( 'DOING_AUTOSAVE' ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+        if (defined('DOING_AUTOSAVE') || is_int(wp_is_post_revision($post)) || is_int(wp_is_post_autosave($post))) {
             return;
         }
 
         // Do not save for ajax requests.
-        if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+        if ((defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
             return;
         }
 
         // Confirm the security nonce.
-        if ( empty( $_POST['wpinv_save_payment_form'] ) || ! wp_verify_nonce( $_POST['wpinv_save_payment_form'], 'wpinv_save_payment_form' ) ) {
+        if (empty($_POST['wpinv_save_payment_form']) || !wp_verify_nonce($_POST['wpinv_save_payment_form'], 'wpinv_save_payment_form')) {
             return;
         }
 
         // Save form items.
-        $form_items = json_decode( wp_unslash( $_POST['wpinv_form_items'] ), true );
+        $form_items = json_decode(wp_unslash($_POST['wpinv_form_items']), true);
 
-        if ( empty( $form_items ) ) {
+        if (empty($form_items)) {
             $form_items = array();
         }
 
-        update_post_meta( $post_id, 'wpinv_form_items', self::maybe_save_items( $form_items ) );
+        update_post_meta($post_id, 'wpinv_form_items', self::maybe_save_items($form_items));
 
         // Save form elements.
-        $wpinv_form_elements = json_decode( wp_unslash( $_POST['wpinv_form_elements'] ), true );
-        if ( empty( $wpinv_form_elements ) ) {
+        $wpinv_form_elements = json_decode(wp_unslash($_POST['wpinv_form_elements']), true);
+        if (empty($wpinv_form_elements)) {
             $wpinv_form_elements = array();
         }
 
-        update_post_meta( $post_id, 'wpinv_form_elements', $wpinv_form_elements );
+        update_post_meta($post_id, 'wpinv_form_elements', $wpinv_form_elements);
     }
 
     /**
      * Saves unsaved form items.
      */
-    public static function maybe_save_items( $items ) {
+    public static function maybe_save_items($items) {
 
         $saved = array();
 
-        foreach( $items as $item ) {
+        foreach ($items as $item) {
 
-            if ( is_numeric( $item['id'] ) ) {
+            if (is_numeric($item['id'])) {
                 $saved[] = $item;
                 continue;
             }
 
             $data = array(
-                'post_title'   => sanitize_text_field( $item['title'] ),
-                'post_excerpt' => wp_kses_post( $item['description'] ),
+                'post_title'   => sanitize_text_field($item['title']),
+                'post_excerpt' => wp_kses_post($item['description']),
                 'post_status'  => 'publish',
                 'meta'         => array(
                     'type'      => 'custom',
-                    'price'     => wpinv_sanitize_amount( $item['price'] ),
+                    'price'     => wpinv_sanitize_amount($item['price']),
                     'vat_rule'  => 'digital',
                     'vat_class' => '_standard',
                 )
             );
             
-            $new_item  = new WPInv_Item();
-            $new_item->create( $data );
+            $new_item = new WPInv_Item();
+            $new_item->create($data);
     
-            if ( ! empty( $new_item ) ) {
+            if (!empty($new_item)) {
                 $item['id'] = $new_item->ID;
                 $saved[] = $item;
             }
@@ -230,5 +230,5 @@ 
 
 }
 
-add_action( 'save_post_wpi_payment_form', 'WPInv_Meta_Box_Payment_Form::save', 10, 2 );
+add_action('save_post_wpi_payment_form', 'WPInv_Meta_Box_Payment_Form::save', 10, 2);
 

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

Spacing +98 added lines, -98 removed lines

@@ -1,29 +1,29 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Meta_Box_Details {
-    public static function output( $post ) {
+    public static function output($post) {
         $currency_symbol    = wpinv_currency_symbol();
-        $statuses           = wpinv_get_invoice_statuses( true );
+        $statuses           = wpinv_get_invoice_statuses(true);
         
-        $post_id            = !empty( $post->ID ) ? $post->ID : 0;
-        $invoice            = new WPInv_Invoice( $post_id );
-        $status             = $invoice->get_status( false ); // Current status    
+        $post_id            = !empty($post->ID) ? $post->ID : 0;
+        $invoice            = new WPInv_Invoice($post_id);
+        $status             = $invoice->get_status(false); // Current status    
         $discount           = $invoice->get_discount();
         $discount_code      = $discount > 0 ? $invoice->get_discount_code() : '';
         $invoice_number     = $invoice->get_number();
         
         $date_created       = $invoice->get_created_date();
-        $datetime_created   = strtotime( $date_created );
-        $date_created       = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $datetime_created ) : '';
+        $datetime_created   = strtotime($date_created);
+        $date_created       = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $datetime_created) : '';
         $date_completed     = $invoice->get_completed_date();
-        $date_completed     = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), strtotime( $date_completed ) ) : 'n/a';
-        $title['status'] = __( 'Invoice Status:', 'invoicing' );
-        $title['number'] = __( 'Invoice Number:', 'invoicing' );
-        $mail_notice = esc_attr__( 'After saving invoice, this will send a copy of the invoice to the user&#8217;s email address.', 'invoicing' );
+        $date_completed     = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? date_i18n(get_option('date_format') . ' ' . get_option('time_format'), strtotime($date_completed)) : 'n/a';
+        $title['status'] = __('Invoice Status:', 'invoicing');
+        $title['number'] = __('Invoice Number:', 'invoicing');
+        $mail_notice = esc_attr__('After saving invoice, this will send a copy of the invoice to the user&#8217;s email address.', 'invoicing');
         
         $title = apply_filters('wpinv_details_metabox_titles', $title, $invoice);
         $statuses = apply_filters('wpinv_invoice_statuses', $statuses, $invoice);
@@ -33,36 +33,36 @@ 
 <div class="gdmbx2-wrap form-table">
     <div class="gdmbx2-metabox gdmbx-field-list" id="gdmbx2-metabox-wpinv_details">
         <div class="gdmbx-row gdmbx-type-select gdmbx2-id-wpinv-date-created">
-            <div class="gdmbx-th"><label><?php _e( 'Date Created:', 'invoicing' );?></label></div>
-            <div class="gdmbx-td"><?php echo $date_created;?></div>
+            <div class="gdmbx-th"><label><?php _e('Date Created:', 'invoicing'); ?></label></div>
+            <div class="gdmbx-td"><?php echo $date_created; ?></div>
         </div>
-        <?php if ( $invoice->post_type == 'wpi_invoice' && wpinv_get_option( 'overdue_active' ) && ( $invoice->needs_payment() || $invoice->has_status( array( 'auto-draft', 'draft' ) ) ) ) { ?>
+        <?php if ($invoice->post_type == 'wpi_invoice' && wpinv_get_option('overdue_active') && ($invoice->needs_payment() || $invoice->has_status(array('auto-draft', 'draft')))) { ?>
         <div class="gdmbx-row gdmbx-type-select gdmbx2-id-wpinv-date-overdue">
-            <div class="gdmbx-th"><label for="wpinv_due_date"><?php _e( 'Due Date:', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_due_date"><?php _e('Due Date:', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" placeholder="<?php esc_attr_e( 'Y-m-d', 'invoicing' );?>" value="<?php echo esc_attr( $invoice->get_due_date() );?>" id="wpinv_due_date" name="wpinv_due_date" class="regular-text wpiDatepicker" data-minDate="<?php echo esc_attr( date_i18n( 'Y-m-d', $datetime_created ) );?>" data-dateFormat="yy-mm-dd">
-                <p class="wpi-meta-row wpi-meta-desc"><?php _e( 'Leave blank to disable sending auto reminder for this invoice.', 'invoicing' );?></p>
+                <input type="text" placeholder="<?php esc_attr_e('Y-m-d', 'invoicing'); ?>" value="<?php echo esc_attr($invoice->get_due_date()); ?>" id="wpinv_due_date" name="wpinv_due_date" class="regular-text wpiDatepicker" data-minDate="<?php echo esc_attr(date_i18n('Y-m-d', $datetime_created)); ?>" data-dateFormat="yy-mm-dd">
+                <p class="wpi-meta-row wpi-meta-desc"><?php _e('Leave blank to disable sending auto reminder for this invoice.', 'invoicing'); ?></p>
             </div>
         </div>
         <?php } ?>
-        <?php do_action( 'wpinv_meta_box_details_after_due_date', $post_id ); ?>
-        <?php if ( $date_completed && $date_completed != 'n/a' ) { ?>
+        <?php do_action('wpinv_meta_box_details_after_due_date', $post_id); ?>
+        <?php if ($date_completed && $date_completed != 'n/a') { ?>
         <div class="gdmbx-row gdmbx-type-select gdmbx2-id-wpinv-date-completed">
-            <div class="gdmbx-th"><label><?php _e( 'Payment Date:', 'invoicing' );?></label></div>
-            <div class="gdmbx-td"><?php echo $date_completed;?></div>
+            <div class="gdmbx-th"><label><?php _e('Payment Date:', 'invoicing'); ?></label></div>
+            <div class="gdmbx-td"><?php echo $date_completed; ?></div>
         </div>
         <?php } ?>
-        <?php $is_viewed = wpinv_is_invoice_viewed( $post_id ); ?>
+        <?php $is_viewed = wpinv_is_invoice_viewed($post_id); ?>
         <div class="gdmbx-row gdmbx-type-select gdmbx2-id-wpinv-customer-viewed">
-            <div class="gdmbx-th"><label><?php _e( 'Viewed by Customer:', 'invoicing' );?></label></div>
-            <div class="gdmbx-td"><?php ( 1 == $is_viewed ) ? _e( 'Yes', 'invoicing' ) : _e( 'No', 'invoicing' ); ?></div>
+            <div class="gdmbx-th"><label><?php _e('Viewed by Customer:', 'invoicing'); ?></label></div>
+            <div class="gdmbx-td"><?php (1 == $is_viewed) ? _e('Yes', 'invoicing') : _e('No', 'invoicing'); ?></div>
         </div>
         <div class="gdmbx-row gdmbx-type-select gdmbx2-id-wpinv-status">
             <div class="gdmbx-th"><label for="wpinv_status"><?php echo $title['status']; ?></label></div>
             <div class="gdmbx-td">
                 <select required="required" id="wpinv_status" name="wpinv_status" class="gdmbx2_select wpi_select2">
-                    <?php foreach ( $statuses as $value => $label ) { ?>
-                    <option value="<?php echo $value;?>" <?php selected( $status, $value );?>><?php echo $label;?></option>
+                    <?php foreach ($statuses as $value => $label) { ?>
+                    <option value="<?php echo $value; ?>" <?php selected($status, $value); ?>><?php echo $label; ?></option>
                     <?php } ?>
                 </select>
             </div>
@@ -70,117 +70,117 @@ 
         <div class="gdmbx-row gdmbx-type-text gdmbx2-id-wpinv-number table-layout">
             <div class="gdmbx-th"><label for="wpinv_number"><?php echo $title['number']; ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" value="<?php echo esc_attr( $invoice_number );?>" id="wpinv_number" name="wpinv_number" class="regular-text" readonly>
+                <input type="text" value="<?php echo esc_attr($invoice_number); ?>" id="wpinv_number" name="wpinv_number" class="regular-text" readonly>
             </div>
         </div>
-        <?php do_action( 'wpinv_meta_box_details_inner', $post_id );
+        <?php do_action('wpinv_meta_box_details_inner', $post_id);
         $disable_discount = apply_filters('wpinv_disable_apply_discount', false, $invoice, $post_id);
         ?>
-        <?php if ( !( $is_paid = ( $invoice->is_paid() || $invoice->is_refunded() ) ) && !$disable_discount || $discount_code ) { ?>
+        <?php if (!($is_paid = ($invoice->is_paid() || $invoice->is_refunded())) && !$disable_discount || $discount_code) { ?>
         <div class="gdmbx-row gdmbx-type-text gdmbx2-id-wpinv-discount-code table-layout">
-            <div class="gdmbx-th"><label for="wpinv_discount_code"><?php _e( 'Discount Code:', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_discount_code"><?php _e('Discount Code:', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" value="<?php echo esc_attr( $discount_code ); ?>" id="wpinv_discount" class="medium-text" <?php echo ( $discount_code ? 'readonly' : '' ); ?> /><?php if ( !$is_paid && !$disable_discount ) { ?><input value="<?php echo esc_attr_e( 'Apply', 'invoicing' ); ?>" class="button button-small button-primary <?php echo ( $discount_code ? 'wpi-hide' : 'wpi-inlineb' ); ?>" id="wpinv-apply-code" type="button" /><input value="<?php echo esc_attr_e( 'Remove', 'invoicing' ); ?>" class="button button-small button-primary <?php echo ( $discount_code ? 'wpi-inlineb' : 'wpi-hide' ); ?>" id="wpinv-remove-code" type="button" /><?php } ?>
+                <input type="text" value="<?php echo esc_attr($discount_code); ?>" id="wpinv_discount" class="medium-text" <?php echo ($discount_code ? 'readonly' : ''); ?> /><?php if (!$is_paid && !$disable_discount) { ?><input value="<?php echo esc_attr_e('Apply', 'invoicing'); ?>" class="button button-small button-primary <?php echo ($discount_code ? 'wpi-hide' : 'wpi-inlineb'); ?>" id="wpinv-apply-code" type="button" /><input value="<?php echo esc_attr_e('Remove', 'invoicing'); ?>" class="button button-small button-primary <?php echo ($discount_code ? 'wpi-inlineb' : 'wpi-hide'); ?>" id="wpinv-remove-code" type="button" /><?php } ?>
             </div>
         </div>
         <?php } ?>
     </div>
 </div>
 <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-save-send table-layout">
-    <p class="wpi-meta-row wpi-save-send"><label for="wpi_save_send"><?php echo sprintf(__( 'Send %s:', 'invoicing' ),$post_obj->labels->singular_name) ; ?></label>
+    <p class="wpi-meta-row wpi-save-send"><label for="wpi_save_send"><?php echo sprintf(__('Send %s:', 'invoicing'), $post_obj->labels->singular_name); ?></label>
         <select id="wpi_save_send" name="wpi_save_send" class="wpi_select2">
-            <option value="1"><?php _e( 'Yes', 'invoicing' ); ?></option>
-            <option value="" selected="selected"><?php _e( 'No', 'invoicing' ); ?></option>
+            <option value="1"><?php _e('Yes', 'invoicing'); ?></option>
+            <option value="" selected="selected"><?php _e('No', 'invoicing'); ?></option>
         </select>
     </p>
     <p class="wpi-meta-row wpi-send-info"><?php echo $mail_notice; ?></p>
 </div>
-<?php wp_nonce_field( 'wpinv_details', 'wpinv_details_nonce' ) ;?>
+<?php wp_nonce_field('wpinv_details', 'wpinv_details_nonce'); ?>
         <?php
     }
     
-    public static function resend_invoice( $post ) {
+    public static function resend_invoice($post) {
         global $wpi_mb_invoice;
         
-        if ( empty( $wpi_mb_invoice ) ) {
+        if (empty($wpi_mb_invoice)) {
             return;
         }
         
         $text = array(
-            'message'       => esc_attr__( 'This will send a copy of the invoice to the customer&#8217;s email address.', 'invoicing' ),
-            'button_text'   =>  __( 'Resend Invoice', 'invoicing' ),
+            'message'       => esc_attr__('This will send a copy of the invoice to the customer&#8217;s email address.', 'invoicing'),
+            'button_text'   =>  __('Resend Invoice', 'invoicing'),
         );
             
         $text = apply_filters('wpinv_resend_invoice_metabox_text', $text);
-        do_action( 'wpinv_metabox_resend_invoice_before', $wpi_mb_invoice );
+        do_action('wpinv_metabox_resend_invoice_before', $wpi_mb_invoice);
         
-        if ( $email = $wpi_mb_invoice->get_email() ) {
+        if ($email = $wpi_mb_invoice->get_email()) {
             $email_actions = array();
-            $email_actions['email_url']      = remove_query_arg( 'wpinv-message', add_query_arg( array( 'wpi_action' => 'send_invoice', 'invoice_id' => $post->ID ) ) );
-            $email_actions['reminder_url']   = add_query_arg( array( 'wpi_action' => 'send_reminder', 'invoice_id' => $post->ID ) );
+            $email_actions['email_url']      = remove_query_arg('wpinv-message', add_query_arg(array('wpi_action' => 'send_invoice', 'invoice_id' => $post->ID)));
+            $email_actions['reminder_url']   = add_query_arg(array('wpi_action' => 'send_reminder', 'invoice_id' => $post->ID));
             
-            $email_actions = apply_filters('wpinv_resend_invoice_email_actions', $email_actions );
+            $email_actions = apply_filters('wpinv_resend_invoice_email_actions', $email_actions);
         ?>
         <p class="wpi-meta-row wpi-resend-info"><?php echo $text['message']; ?></p>
-        <p class="wpi-meta-row wpi-resend-email"><a href="<?php echo esc_url( $email_actions['email_url'] ); ?>" class="button button-secondary"><?php echo $text['button_text']; ?></a></p>
-        <?php if ( wpinv_get_option( 'overdue_active' ) && "wpi_invoice" === $wpi_mb_invoice->post_type && $wpi_mb_invoice->needs_payment() && ( $due_date = $wpi_mb_invoice->get_due_date() ) ) { ?>
-        <p class="wpi-meta-row wpi-send-reminder"><a title="<?php esc_attr_e( 'Send overdue reminder notification to customer', 'invoicing' ); ?>" href="<?php echo esc_url( $email_actions['reminder_url'] ); ?>" class="button button-secondary"><?php esc_attr_e( 'Send Reminder', 'invoicing' ); ?></a></p>
+        <p class="wpi-meta-row wpi-resend-email"><a href="<?php echo esc_url($email_actions['email_url']); ?>" class="button button-secondary"><?php echo $text['button_text']; ?></a></p>
+        <?php if (wpinv_get_option('overdue_active') && "wpi_invoice" === $wpi_mb_invoice->post_type && $wpi_mb_invoice->needs_payment() && ($due_date = $wpi_mb_invoice->get_due_date())) { ?>
+        <p class="wpi-meta-row wpi-send-reminder"><a title="<?php esc_attr_e('Send overdue reminder notification to customer', 'invoicing'); ?>" href="<?php echo esc_url($email_actions['reminder_url']); ?>" class="button button-secondary"><?php esc_attr_e('Send Reminder', 'invoicing'); ?></a></p>
         <?php } ?>
         <?php
         }
         
-        do_action( 'wpinv_metabox_resend_invoice_after', $wpi_mb_invoice );
+        do_action('wpinv_metabox_resend_invoice_after', $wpi_mb_invoice);
     }
     
-    public static function subscriptions( $post ) {
-        $invoice = wpinv_get_invoice( $post->ID );
+    public static function subscriptions($post) {
+        $invoice = wpinv_get_invoice($post->ID);
 
-        if ( ! empty( $invoice ) && $invoice->is_recurring() && $invoice->is_parent() ) {
-            $subscription = wpinv_get_subscription( $invoice );
+        if (!empty($invoice) && $invoice->is_recurring() && $invoice->is_parent()) {
+            $subscription = wpinv_get_subscription($invoice);
 
-            if ( empty( $subscription ) ) {
+            if (empty($subscription)) {
                 ?>
-                <p class="wpi-meta-row"><?php echo wp_sprintf( __( 'New Subscription will be created when customer will checkout and pay the invoice. Go to: %sSubscriptions%s', 'invoicing' ), '<a href="' . admin_url( 'admin.php?page=wpinv-subscriptions' ).'">', '</a>' ); ?></p>
+                <p class="wpi-meta-row"><?php echo wp_sprintf(__('New Subscription will be created when customer will checkout and pay the invoice. Go to: %sSubscriptions%s', 'invoicing'), '<a href="' . admin_url('admin.php?page=wpinv-subscriptions') . '">', '</a>'); ?></p>
                 <?php
                 return;
             }
-            $frequency = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $subscription->period, $subscription->frequency );
-            $billing = wpinv_price(wpinv_format_amount( $subscription->recurring_amount ), wpinv_get_invoice_currency_code( $subscription->parent_payment_id ) ) . ' / ' . $frequency;
-            $initial = wpinv_price(wpinv_format_amount( $subscription->initial_amount ), wpinv_get_invoice_currency_code( $subscription->parent_payment_id ) );
+            $frequency = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency($subscription->period, $subscription->frequency);
+            $billing = wpinv_price(wpinv_format_amount($subscription->recurring_amount), wpinv_get_invoice_currency_code($subscription->parent_payment_id)) . ' / ' . $frequency;
+            $initial = wpinv_price(wpinv_format_amount($subscription->initial_amount), wpinv_get_invoice_currency_code($subscription->parent_payment_id));
             $payments = $subscription->get_child_payments();
             ?>
             <p class="wpi-meta-row wpi-sub-label <?php echo 'status-' . $subscription->status; ?>"><?php _e('Recurring Payment', 'invoicing'); ?></p>
-            <?php if ( ! empty( $subscription ) && ! empty( $subscription->id ) ) { ?>
+            <?php if (!empty($subscription) && !empty($subscription->id)) { ?>
                 <p class="wpi-meta-row wpi-sub-id">
-                    <label><?php _e( 'Subscription ID:', 'invoicing' ); ?> </label><a href="<?php echo esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $subscription->id ) ); ?>" title="<?php esc_attr_e( 'View or edit subscription', 'invoicing' ); ?>" target="_blank"><?php echo $subscription->id; ?></a></p>
+                    <label><?php _e('Subscription ID:', 'invoicing'); ?> </label><a href="<?php echo esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . $subscription->id)); ?>" title="<?php esc_attr_e('View or edit subscription', 'invoicing'); ?>" target="_blank"><?php echo $subscription->id; ?></a></p>
             <?php } ?>
             <p class="wpi-meta-row wpi-bill-cycle">
-                <label><?php _e( 'Billing Cycle:', 'invoicing'); ?> </label><?php printf( _x( '%s then %s', 'Initial subscription amount then billing cycle and amount', 'invoicing' ), $initial, $billing ); ?>
+                <label><?php _e('Billing Cycle:', 'invoicing'); ?> </label><?php printf(_x('%s then %s', 'Initial subscription amount then billing cycle and amount', 'invoicing'), $initial, $billing); ?>
             </p>
             <p class="wpi-meta-row wpi-billed-times">
-                <label><?php _e( 'Times Billed:', 'invoicing' ); ?> </label><?php echo $subscription->get_times_billed() . ' / ' . ( ( $subscription->bill_times == 0 ) ? 'Until Cancelled' : $subscription->bill_times ); ?>
+                <label><?php _e('Times Billed:', 'invoicing'); ?> </label><?php echo $subscription->get_times_billed() . ' / ' . (($subscription->bill_times == 0) ? 'Until Cancelled' : $subscription->bill_times); ?>
             </p>
             <p class="wpi-meta-row wpi-start-date">
-                <label><?php _e( 'Start Date:', 'invoicing' ); ?> </label><?php echo date_i18n( get_option( 'date_format' ), strtotime( $subscription->created, current_time( 'timestamp' ) ) ); ?>
+                <label><?php _e('Start Date:', 'invoicing'); ?> </label><?php echo date_i18n(get_option('date_format'), strtotime($subscription->created, current_time('timestamp'))); ?>
             </p>
             <p class="wpi-meta-row wpi-end-date">
-                <label><?php echo ( 'trialling' == $subscription->status ? __( 'Trialling Until:', 'invoicing' ) : __( 'Expiration Date:', 'invoicing' ) ); ?> </label><?php echo date_i18n( get_option( 'date_format' ), strtotime( $subscription->expiration, current_time( 'timestamp' ) ) ); ?>
+                <label><?php echo ('trialling' == $subscription->status ? __('Trialling Until:', 'invoicing') : __('Expiration Date:', 'invoicing')); ?> </label><?php echo date_i18n(get_option('date_format'), strtotime($subscription->expiration, current_time('timestamp'))); ?>
             </p>
-            <?php if ( $subscription->status ) { ?>
+            <?php if ($subscription->status) { ?>
                 <p class="wpi-meta-row wpi-sub-status">
-                    <label><?php _e( 'Subscription Status:', 'invoicing'); ?> </label><?php echo $subscription->get_status_label(); ?>
+                    <label><?php _e('Subscription Status:', 'invoicing'); ?> </label><?php echo $subscription->get_status_label(); ?>
                 </p>
             <?php } ?>
-            <?php if ( !empty( $payments ) ) { ?>
-                <p><strong><?php _e( 'Renewal Payments:', 'invoicing' ); ?></strong></p>
+            <?php if (!empty($payments)) { ?>
+                <p><strong><?php _e('Renewal Payments:', 'invoicing'); ?></strong></p>
                 <ul id="wpi-sub-payments">
-                <?php foreach ( $payments as $payment ) {
+                <?php foreach ($payments as $payment) {
                     $invoice_id = $payment->ID;
                     ?>
                     <li>
-                        <a href="<?php echo esc_url( get_edit_post_link( $invoice_id ) ); ?>"><?php echo wpinv_get_invoice_number( $invoice_id ); ?></a>&nbsp;&ndash;&nbsp;
-                        <span><?php echo wpinv_get_invoice_date( $invoice_id ); ?>&nbsp;&ndash;&nbsp;</span>
-                        <span><?php echo wpinv_payment_total( $invoice_id, true ); ?></span>
+                        <a href="<?php echo esc_url(get_edit_post_link($invoice_id)); ?>"><?php echo wpinv_get_invoice_number($invoice_id); ?></a>&nbsp;&ndash;&nbsp;
+                        <span><?php echo wpinv_get_invoice_date($invoice_id); ?>&nbsp;&ndash;&nbsp;</span>
+                        <span><?php echo wpinv_payment_total($invoice_id, true); ?></span>
                     </li>
                 <?php } ?>
                 </ul>
@@ -188,16 +188,16 @@ 
         }
     }
     
-    public static function renewals( $post ) {
-        $invoice = wpinv_get_invoice( $post->ID );
+    public static function renewals($post) {
+        $invoice = wpinv_get_invoice($post->ID);
         
-        if ( wpinv_is_subscription_payment( $invoice ) ) {
-            $parent_url = get_edit_post_link( $invoice->parent_invoice );
-            $parent_id  = wpinv_get_invoice_number( $invoice->parent_invoice );
-            $subscription = wpinv_get_subscription( $invoice );
+        if (wpinv_is_subscription_payment($invoice)) {
+            $parent_url = get_edit_post_link($invoice->parent_invoice);
+            $parent_id  = wpinv_get_invoice_number($invoice->parent_invoice);
+            $subscription = wpinv_get_subscription($invoice);
         ?>
-        <?php if ( ! empty( $subscription ) ) { ?><p class="wpi-meta-row wpi-sub-id"><label><?php _e('Subscription ID:', 'invoicing'); ?> </label><a href="<?php echo esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $subscription->id ) ); ?>" title="<?php esc_attr_e( 'View or edit subscription', 'invoicing' ); ?>" target="_blank"><?php echo $subscription->id; ?></a></p><?php } ?>
-        <p class="wpi-meta-row wpi-parent-id"><label><?php _e( 'Parent Invoice:', 'invoicing' );?> </label><a href="<?php echo esc_url( $parent_url ); ?>"><?php echo $parent_id; ?></a></p>
+        <?php if (!empty($subscription)) { ?><p class="wpi-meta-row wpi-sub-id"><label><?php _e('Subscription ID:', 'invoicing'); ?> </label><a href="<?php echo esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . $subscription->id)); ?>" title="<?php esc_attr_e('View or edit subscription', 'invoicing'); ?>" target="_blank"><?php echo $subscription->id; ?></a></p><?php } ?>
+        <p class="wpi-meta-row wpi-parent-id"><label><?php _e('Parent Invoice:', 'invoicing'); ?> </label><a href="<?php echo esc_url($parent_url); ?>"><?php echo $parent_id; ?></a></p>
         <?php
         }
     }
@@ -205,47 +205,47 @@ 
     /**
      * Renders a metabox to edit a payment form.
      */
-    public static function payment_form( $post ) {
-        WPInv_Meta_Box_Form_Items::output_options( $post );
+    public static function payment_form($post) {
+        WPInv_Meta_Box_Form_Items::output_options($post);
     }
 
     /**
      * Renders a metabox to select items.
      */
-    public static function payment_form_items( $post ) {
-        WPInv_Meta_Box_Form_Items::output( $post );
+    public static function payment_form_items($post) {
+        WPInv_Meta_Box_Form_Items::output($post);
     }
     
-    public static function payment_meta( $post ) {
+    public static function payment_meta($post) {
         global $wpi_mb_invoice;
 
-        $set_dateway = empty( $wpi_mb_invoice->gateway ) ? true : false;
-        if ( !$set_dateway && !$wpi_mb_invoice->get_meta( '_wpinv_checkout', true ) && !$wpi_mb_invoice->is_paid() && !$wpi_mb_invoice->is_refunded() ) {
+        $set_dateway = empty($wpi_mb_invoice->gateway) ? true : false;
+        if (!$set_dateway && !$wpi_mb_invoice->get_meta('_wpinv_checkout', true) && !$wpi_mb_invoice->is_paid() && !$wpi_mb_invoice->is_refunded()) {
             $set_dateway = true;
         }
         
         ?>
         <p class="wpi-meta-row">
-        <?php if ( $set_dateway ) { $gateways = wpinv_get_enabled_payment_gateways( true ); ?>
-            <label for="wpinv_gateway"><?php _e( 'Gateway:', 'invoicing' ) ; ?></label>
+        <?php if ($set_dateway) { $gateways = wpinv_get_enabled_payment_gateways(true); ?>
+            <label for="wpinv_gateway"><?php _e('Gateway:', 'invoicing'); ?></label>
             <select required="required" id="wpinv_gateway" class="wpi_select2" name="wpinv_gateway">
-                <?php foreach ( $gateways as $name => $gateway ) {
-                    if ( $wpi_mb_invoice->is_recurring() && !wpinv_gateway_support_subscription( $name ) ) {
+                <?php foreach ($gateways as $name => $gateway) {
+                    if ($wpi_mb_invoice->is_recurring() && !wpinv_gateway_support_subscription($name)) {
                         continue;
                     }
                     ?>
-                <option value="<?php echo $name;?>" <?php selected( $wpi_mb_invoice->gateway, $name );?>><?php echo !empty( $gateway['admin_label'] ) ? $gateway['admin_label'] : $gateway['checkout_label']; ?></option>
+                <option value="<?php echo $name; ?>" <?php selected($wpi_mb_invoice->gateway, $name); ?>><?php echo !empty($gateway['admin_label']) ? $gateway['admin_label'] : $gateway['checkout_label']; ?></option>
                 <?php } ?>
             </select>
         <?php } else { 
-            echo wp_sprintf( __( '<label>Gateway:</label> %s', 'invoicing' ), wpinv_get_gateway_admin_label( $wpi_mb_invoice->gateway ) );
+            echo wp_sprintf(__('<label>Gateway:</label> %s', 'invoicing'), wpinv_get_gateway_admin_label($wpi_mb_invoice->gateway));
         } ?>
         </p>
-        <?php if ( $key = $wpi_mb_invoice->get_key() ) { ?>
-        <p class="wpi-meta-row"><?php echo wp_sprintf( __( '<label>Key:</label> %s', 'invoicing' ), $key ); ?></p>
+        <?php if ($key = $wpi_mb_invoice->get_key()) { ?>
+        <p class="wpi-meta-row"><?php echo wp_sprintf(__('<label>Key:</label> %s', 'invoicing'), $key); ?></p>
         <?php } ?>
-        <?php if ( $wpi_mb_invoice->is_paid() || $wpi_mb_invoice->is_refunded() ) { ?>
-        <p class="wpi-meta-row"><?php echo wp_sprintf( __( '<label>Transaction ID:</label> %s', 'invoicing' ), wpinv_payment_link_transaction_id( $wpi_mb_invoice ) ); ?></p>
+        <?php if ($wpi_mb_invoice->is_paid() || $wpi_mb_invoice->is_refunded()) { ?>
+        <p class="wpi-meta-row"><?php echo wp_sprintf(__('<label>Transaction ID:</label> %s', 'invoicing'), wpinv_payment_link_transaction_id($wpi_mb_invoice)); ?></p>
         <?php } ?>
         <?php
     }

includes/class-wpinv-payment-form-elements.php

Spacing +474 added lines, -474 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -13,19 +13,19 @@ 
 
     public function __construct() {
 
-        foreach( $this->get_elements() as $element ) {
+        foreach ($this->get_elements() as $element) {
             $element = $element['type'];
 
-            if ( method_exists( $this, "render_{$element}_template" ) ) {
-                add_action( 'wpinv_payment_form_render_element_template', array( $this, "render_{$element}_template" ), 10, 2 );
+            if (method_exists($this, "render_{$element}_template")) {
+                add_action('wpinv_payment_form_render_element_template', array($this, "render_{$element}_template"), 10, 2);
             }
 
-            if ( method_exists( $this, "edit_{$element}_template" ) ) {
-                add_action( 'wpinv_payment_form_edit_element_template', array( $this, "edit_{$element}_template" ), 10, 2 );
+            if (method_exists($this, "edit_{$element}_template")) {
+                add_action('wpinv_payment_form_edit_element_template', array($this, "edit_{$element}_template"), 10, 2);
             }
 
-            if ( method_exists( $this, "frontend_render_{$element}_template" ) ) {
-                add_action( "wpinv_frontend_render_payment_form_$element", array( $this, "frontend_render_{$element}_template" ), 10, 3 );
+            if (method_exists($this, "frontend_render_{$element}_template")) {
+                add_action("wpinv_frontend_render_payment_form_$element", array($this, "frontend_render_{$element}_template"), 10, 3);
             }
 
         }
@@ -37,7 +37,7 @@ 
      */
     public function get_elements() {
 
-        if ( ! empty( $this->elements ) ) {
+        if (!empty($this->elements)) {
             return $this->elements;
         }
 
@@ -45,28 +45,28 @@ 
 
             array(
                 'type'     => 'heading',
-                'name'     => __( 'Heading', 'invoicing' ),
+                'name'     => __('Heading', 'invoicing'),
                 'defaults' => array(
                     'level' => 'h2',
-                    'text'  => __( 'Heading', 'invoicing' ),
+                    'text'  => __('Heading', 'invoicing'),
                 )
             ),
 
             array(
                 'type' => 'paragraph',
-                'name' => __( 'Paragraph', 'invoicing' ),
+                'name' => __('Paragraph', 'invoicing'),
                 'defaults'  => array(
-                    'text'  => __( 'Paragraph text', 'invoicing' ),
+                    'text'  => __('Paragraph text', 'invoicing'),
                 )
             ),
 
             array( 
                 'type' => 'alert',
-                'name' => __( 'Alert', 'invoicing' ),
+                'name' => __('Alert', 'invoicing'),
                 'defaults'  => array(
                     'value'        => '',
                     'class'        => 'alert-warning',
-                    'text'         => __( 'Alert', 'invoicing' ),
+                    'text'         => __('Alert', 'invoicing'),
                     'dismissible'  => false,
                 )
             ),
@@ -82,11 +82,11 @@ 
 
             array(
                 'type' => 'text',
-                'name' => __( 'Text Input', 'invoicing' ),
+                'name' => __('Text Input', 'invoicing'),
                 'defaults'  => array(
-                    'placeholder'  => __( 'Enter some text', 'invoicing' ),
+                    'placeholder'  => __('Enter some text', 'invoicing'),
                     'value'        => '',
-                    'label'        => __( 'Field Label', 'invoicing' ),
+                    'label'        => __('Field Label', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                 )
@@ -94,11 +94,11 @@ 
 
             array(
                 'type' => 'textarea',
-                'name' => __( 'Textarea', 'invoicing' ),
+                'name' => __('Textarea', 'invoicing'),
                 'defaults'         => array(
-                    'placeholder'  => __( 'Enter your text hear', 'invoicing' ),
+                    'placeholder'  => __('Enter your text hear', 'invoicing'),
                     'value'        => '',
-                    'label'        => __( 'Textarea Label', 'invoicing' ),
+                    'label'        => __('Textarea Label', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                 )
@@ -106,27 +106,27 @@ 
 
             array(
                 'type' => 'select',
-                'name' => __( 'Dropdown', 'invoicing' ),
+                'name' => __('Dropdown', 'invoicing'),
                 'defaults'         => array(
-                    'placeholder'  => __( 'Select a value', 'invoicing' ),
+                    'placeholder'  => __('Select a value', 'invoicing'),
                     'value'        => '',
-                    'label'        => __( 'Dropdown Label', 'invoicing' ),
+                    'label'        => __('Dropdown Label', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'options'      => array(
-                        esc_attr__( 'Option One', 'invoicing' ),
-                        esc_attr__( 'Option Two', 'invoicing' ),
-                        esc_attr__( 'Option Three', 'invoicing' )
+                        esc_attr__('Option One', 'invoicing'),
+                        esc_attr__('Option Two', 'invoicing'),
+                        esc_attr__('Option Three', 'invoicing')
                     ),
                 )
             ),
 
             array(
                 'type' => 'checkbox',
-                'name' => __( 'Checkbox', 'invoicing' ),
+                'name' => __('Checkbox', 'invoicing'),
                 'defaults'         => array(
                     'value'        => '',
-                    'label'        => __( 'Checkbox Label', 'invoicing' ),
+                    'label'        => __('Checkbox Label', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                 )
@@ -134,24 +134,24 @@ 
 
             array( 
                 'type' => 'radio',
-                'name' => __( 'Multiple Choice', 'invoicing' ),
+                'name' => __('Multiple Choice', 'invoicing'),
                 'defaults'     => array(
-                    'label'    => __( 'Select one choice', 'invoicing' ),
+                    'label'    => __('Select one choice', 'invoicing'),
                     'options'  => array(
-                        esc_attr__( 'Choice One', 'invoicing' ),
-                        esc_attr__( 'Choice Two', 'invoicing' ),
-                        esc_attr__( 'Choice Three', 'invoicing' )
+                        esc_attr__('Choice One', 'invoicing'),
+                        esc_attr__('Choice Two', 'invoicing'),
+                        esc_attr__('Choice Three', 'invoicing')
                     ),
                 )
             ),
 
             array( 
                 'type' => 'date',
-                'name' => __( 'Date', 'invoicing' ),
+                'name' => __('Date', 'invoicing'),
                 'defaults' => array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'Date', 'invoicing' ),
+                    'label'        => __('Date', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                 )
@@ -159,11 +159,11 @@ 
 
             array( 
                 'type' => 'time',
-                'name' => __( 'Time', 'invoicing' ),
+                'name' => __('Time', 'invoicing'),
                 'defaults' => array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'Time', 'invoicing' ),
+                    'label'        => __('Time', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                 )
@@ -171,11 +171,11 @@ 
 
             array( 
                 'type' => 'number',
-                'name' => __( 'Number', 'invoicing' ),
+                'name' => __('Number', 'invoicing'),
                 'defaults' => array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'Number', 'invoicing' ),
+                    'label'        => __('Number', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                 )
@@ -183,11 +183,11 @@ 
 
             array( 
                 'type' => 'website',
-                'name' => __( 'Website', 'invoicing' ),
+                'name' => __('Website', 'invoicing'),
                 'defaults' => array(
                     'placeholder'  => 'http://example.com',
                     'value'        => '',
-                    'label'        => __( 'Website', 'invoicing' ),
+                    'label'        => __('Website', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                 )
@@ -195,11 +195,11 @@ 
 
             array( 
                 'type' => 'email',
-                'name' => __( 'Email', 'invoicing' ),
+                'name' => __('Email', 'invoicing'),
                 'defaults'  => array(
                     'placeholder'  => 'jon@snow.com',
                     'value'        => '',
-                    'label'        => __( 'Email Address', 'invoicing' ),
+                    'label'        => __('Email Address', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                 )
@@ -207,11 +207,11 @@ 
 
             array( 
                 'type' => 'billing_email',
-                'name' => __( 'Billing Email', 'invoicing' ),
+                'name' => __('Billing Email', 'invoicing'),
                 'defaults'  => array(
                     'placeholder'  => 'jon@snow.com',
                     'value'        => '',
-                    'label'        => __( 'Billing Email', 'invoicing' ),
+                    'label'        => __('Billing Email', 'invoicing'),
                     'description'  => '',
                     'premade'      => true,
                 )
@@ -230,7 +230,7 @@ 
 
             array( 
                 'type' => 'items',
-                'name' => __( 'Items', 'invoicing' ),
+                'name' => __('Items', 'invoicing'),
                 'defaults'  => array(
                     'value'        => '',
                     'items_type'   => 'total',
@@ -241,25 +241,25 @@ 
 
             array( 
                 'type'       => 'pay_button',
-                'name'       => __( 'Payment Button', 'invoicing' ),
+                'name'       => __('Payment Button', 'invoicing'),
                 'defaults'   => array(
                     'value'        => '',
                     'class'        => 'btn-primary',
-                    'label'        => __( 'Pay Now »', 'invoicing' ),
-                    'description'  => __( 'By continuing with our payment, you are agreeing to our privacy policy and terms of service.', 'invoicing' ),
+                    'label'        => __('Pay Now »', 'invoicing'),
+                    'description'  => __('By continuing with our payment, you are agreeing to our privacy policy and terms of service.', 'invoicing'),
                     'premade'      => true,
                 )
             )
         );
 
-        $this->elements = apply_filters( 'wpinv_filter_core_payment_form_elements', $this->elements );
+        $this->elements = apply_filters('wpinv_filter_core_payment_form_elements', $this->elements);
         return $this->elements;
     }
 
     /**
      * Returns the restrict markup.
      */
-    public function get_restrict_markup( $field, $field_type ) {
+    public function get_restrict_markup($field, $field_type) {
         $restrict = "$field.type=='$field_type'";
         return "v-if=\"$restrict\"";
     }
@@ -267,15 +267,15 @@ 
     /**
      * Renders the title element template.
      */
-    public function render_heading_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'heading' );
+    public function render_heading_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'heading');
         echo "<component :is='$field.level' $restrict v-html='$field.text'></component>";
     }
 
     /**
      * Renders the title element on the frontend.
      */
-    public function frontend_render_heading_template( $field ) {
+    public function frontend_render_heading_template($field) {
         $tag = $field['level'];
         echo "<$tag>{$field['text']}</$tag>";
     }
@@ -283,10 +283,10 @@ 
     /**
      * Renders the edit title element template.
      */
-    public function edit_heading_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'heading' );
-        $label    = __( 'Heading', 'invoicing' );
-        $label2   = __( 'Select Heading Level', 'invoicing' );
+    public function edit_heading_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'heading');
+        $label    = __('Heading', 'invoicing');
+        $label2   = __('Select Heading Level', 'invoicing');
         $id       = $field . '.id + "_edit"';
         $id2      = $field . '.id + "_edit2"';
 
@@ -318,8 +318,8 @@ 
     /**
      * Renders a paragraph element template.
      */
-    public function render_paragraph_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'paragraph' );
+    public function render_paragraph_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'paragraph');
         $label    = "$field.text";
         echo "<p $restrict v-html='$label' style='font-size: 16px;'></p>";
     }
@@ -327,16 +327,16 @@ 
     /**
      * Renders the paragraph element on the frontend.
      */
-    public function frontend_render_paragraph_template( $field ) {
+    public function frontend_render_paragraph_template($field) {
         echo "<p>{$field['text']}</p>";
     }
 
     /**
      * Renders the edit paragraph element template.
      */
-    public function edit_paragraph_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'paragraph' );
-        $label    = __( 'Enter your text', 'invoicing' );
+    public function edit_paragraph_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'paragraph');
+        $label    = __('Enter your text', 'invoicing');
         $id       = $field . '.id + "_edit"';
         echo "
             <div $restrict>
@@ -352,8 +352,8 @@ 
     /**
      * Renders the text element template.
      */
-    public function render_text_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'text' );
+    public function render_text_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'text');
         $label    = "$field.label";
         echo "
             <div $restrict>
@@ -367,23 +367,23 @@ 
     /**
      * Renders the text element on the frontend.
      */
-    public function frontend_render_text_template( $field ) {
+    public function frontend_render_text_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
-                'placeholder'=> esc_attr( $field['placeholder'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
+                'placeholder'=> esc_attr($field['placeholder']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -394,16 +394,16 @@ 
     /**
      * Renders the edit text element template.
      */
-    public function edit_text_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'text' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_text_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'text');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -431,8 +431,8 @@ 
     /**
      * Renders the textarea element template.
      */
-    public function render_textarea_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'textarea' );
+    public function render_textarea_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'textarea');
         $label    = "$field.label";
         echo "
             <div $restrict>
@@ -446,24 +446,24 @@ 
     /**
      * Renders the textarea element on the frontend.
      */
-    public function frontend_render_textarea_template( $field ) {
+    public function frontend_render_textarea_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->textarea(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
-                'placeholder'=> esc_attr( $field['placeholder'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
+                'placeholder'=> esc_attr($field['placeholder']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
                 'rows'       => 3,
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -474,16 +474,16 @@ 
     /**
      * Renders the edit textarea element template.
      */
-    public function edit_textarea_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'textarea' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_textarea_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'textarea');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -511,8 +511,8 @@ 
     /**
      * Renders the select element template.
      */
-    public function render_select_template( $field ) {
-        $restrict    = $this->get_restrict_markup( $field, 'select' );
+    public function render_select_template($field) {
+        $restrict    = $this->get_restrict_markup($field, 'select');
         $label       = "$field.label";
         $placeholder = "$field.placeholder";
         $id          = $field . '.id';
@@ -531,24 +531,24 @@ 
     /**
      * Renders the select element on the frontend.
      */
-    public function frontend_render_select_template( $field ) {
+    public function frontend_render_select_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->select(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
-                'placeholder'=> esc_attr( $field['placeholder'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
+                'placeholder'=> esc_attr($field['placeholder']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
-                'options'    => array_combine( $field['options'], $field['options'] ),
+                'options'    => array_combine($field['options'], $field['options']),
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -559,18 +559,18 @@ 
     /**
      * Renders the edit select element template.
      */
-    public function edit_select_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'select' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_select_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'select');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
-        $label6   = __( 'Available Options', 'invoicing' );
+        $label6   = __('Available Options', 'invoicing');
         echo "
             <div $restrict>
                 <div class='form-group'>
@@ -608,8 +608,8 @@ 
     /**
      * Renders the checkbox element template.
      */
-    public function render_checkbox_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'checkbox' );
+    public function render_checkbox_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'checkbox');
         $label    = "$field.label";
         echo "
             <div class='form-check' $restrict>
@@ -623,24 +623,24 @@ 
     /**
      * Renders the checkbox element on the frontend.
      */
-    public function frontend_render_checkbox_template( $field ) {
+    public function frontend_render_checkbox_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
-                'value'      => esc_attr__( 'Yes', 'invoicing' ),
+                'value'      => esc_attr__('Yes', 'invoicing'),
                 'type'       => 'checkbox',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -651,14 +651,14 @@ 
     /**
      * Renders the edit checkbox element template.
      */
-    public function edit_checkbox_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'checkbox' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_checkbox_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'checkbox');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Help text', 'invoicing' );
-        $label3   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label2   = __('Help text', 'invoicing');
+        $label3   = esc_attr__('Add some help text for this field', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label4   = __( 'Is this field required?', 'invoicing' );
+        $label4   = __('Is this field required?', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
         echo "
             <div $restrict>
@@ -682,8 +682,8 @@ 
     /**
      * Renders the radio element template.
      */
-    public function render_radio_template( $field ) {
-        $restrict    = $this->get_restrict_markup( $field, 'radio' );
+    public function render_radio_template($field) {
+        $restrict    = $this->get_restrict_markup($field, 'radio');
         $label       = "$field.label";
         $id          = $field . '.id';
         echo "
@@ -701,20 +701,20 @@ 
     /**
      * Renders the radio element on the frontend.
      */
-    public function frontend_render_radio_template( $field ) {
+    public function frontend_render_radio_template($field) {
         
         echo "<div class='form-group'>";
 
-        if ( ! empty( $field['label'] ) ) {
-            $label = wp_kses_post( $field['label'] );
+        if (!empty($field['label'])) {
+            $label = wp_kses_post($field['label']);
             echo "<legend class='col-form-label'>$label</legend>";
         }
 
-        foreach( $field['options'] as $index => $option ) {
+        foreach ($field['options'] as $index => $option) {
             $id    = $field['id'] . $index;
             $name  = $field['id'];
-            $value = esc_attr( $option );
-            $label = wp_kses_post( $option );
+            $value = esc_attr($option);
+            $label = wp_kses_post($option);
 
             echo "
                 <div class='form-check'>
@@ -724,8 +724,8 @@ 
             ";
         }
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -736,16 +736,16 @@ 
     /**
      * Renders the edit radio element template.
      */
-    public function edit_radio_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'radio' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_radio_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'radio');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Help text', 'invoicing' );
-        $label3   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label2   = __('Help text', 'invoicing');
+        $label3   = esc_attr__('Add some help text for this field', 'invoicing');
         $id2      = $field . '.id + "_edit3"';
-        $label4   = __( 'Is this field required?', 'invoicing' );
+        $label4   = __('Is this field required?', 'invoicing');
         $id3      = $field . '.id + "_edit4"';
-        $label5   = __( 'Available Options', 'invoicing' );
+        $label5   = __('Available Options', 'invoicing');
         echo "
             <div $restrict>
                 <div class='form-group'>
@@ -779,8 +779,8 @@ 
     /**
      * Renders the email element template.
      */
-    public function render_email_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'email' );
+    public function render_email_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'email');
         $label    = "$field.label";
         echo "
             <div $restrict>
@@ -794,8 +794,8 @@ 
     /**
      * Renders the billing_email element template.
      */
-    public function render_billing_email_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'billing_email' );
+    public function render_billing_email_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'billing_email');
         $label    = "$field.label";
         echo "
             <div $restrict>
@@ -809,24 +809,24 @@ 
     /**
      * Renders the email element on the frontend.
      */
-    public function frontend_render_email_template( $field ) {
+    public function frontend_render_email_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
-                'placeholder' => esc_attr( $field['placeholder'] ),
+                'placeholder' => esc_attr($field['placeholder']),
                 'type'       => 'email',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -837,30 +837,30 @@ 
     /**
      * Renders the billing email element on the frontend.
      */
-    public function frontend_render_billing_email_template( $field ) {
+    public function frontend_render_billing_email_template($field) {
         
         echo "<div class='form-group'>";
         $value = '';
 
-        if ( is_user_logged_in() ) {
+        if (is_user_logged_in()) {
             $user  = wp_get_current_user();
-            $value = sanitize_email( $user->user_email );
+            $value = sanitize_email($user->user_email);
         }
         echo aui()->input(
             array(
                 'name'       => 'billing_email',
                 'value'      => $value,
-                'id'         => esc_attr( $field['id'] ),
+                'id'         => esc_attr($field['id']),
                 'required'   => true,
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
-                'placeholder' => esc_attr( $field['placeholder'] ),
+                'placeholder' => esc_attr($field['placeholder']),
                 'type'       => 'email',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -871,16 +871,16 @@ 
     /**
      * Renders the edit email element template.
      */
-    public function edit_email_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'email' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_email_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'email');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -908,16 +908,16 @@ 
     /**
      * Renders the edit billing_email element template.
      */
-    public function edit_billing_email_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'billing_email' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_billing_email_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'billing_email');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -941,8 +941,8 @@ 
     /**
      * Renders the website element template.
      */
-    public function render_website_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'website' );
+    public function render_website_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'website');
         $label    = "$field.label";
         echo "
             <div $restrict>
@@ -956,24 +956,24 @@ 
     /**
      * Renders the website element on the frontend.
      */
-    public function frontend_render_website_template( $field ) {
+    public function frontend_render_website_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
-                'placeholder' => esc_attr( $field['placeholder'] ),
+                'placeholder' => esc_attr($field['placeholder']),
                 'type'       => 'url',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -984,16 +984,16 @@ 
     /**
      * Renders the edit website element template.
      */
-    public function edit_website_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'website' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_website_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'website');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -1021,8 +1021,8 @@ 
     /**
      * Renders the date element template.
      */
-    public function render_date_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'date' );
+    public function render_date_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'date');
         $label    = "$field.label";
         echo "
             <div $restrict>
@@ -1036,24 +1036,24 @@ 
     /**
      * Renders the date element on the frontend.
      */
-    public function frontend_render_date_template( $field ) {
+    public function frontend_render_date_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
-                'placeholder' => esc_attr( $field['placeholder'] ),
+                'label'      => wp_kses_post($field['label']),
+                'placeholder' => esc_attr($field['placeholder']),
                 'no_wrap'    => true,
                 'type'       => 'date',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -1064,16 +1064,16 @@ 
     /**
      * Renders the edit date element template.
      */
-    public function edit_date_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'date' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_date_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'date');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -1101,8 +1101,8 @@ 
     /**
      * Renders the time element template.
      */
-    public function render_time_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'time' );
+    public function render_time_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'time');
         $label    = "$field.label";
         echo "
             <div $restrict>
@@ -1116,24 +1116,24 @@ 
     /**
      * Renders the time element on the frontend.
      */
-    public function frontend_render_time_template( $field ) {
+    public function frontend_render_time_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
+                'label'      => wp_kses_post($field['label']),
                 'no_wrap'    => true,
-                'placeholder' => esc_attr( $field['placeholder'] ),
+                'placeholder' => esc_attr($field['placeholder']),
                 'type'       => 'time',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -1144,16 +1144,16 @@ 
     /**
      * Renders the edit time element template.
      */
-    public function edit_time_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'time' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_time_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'time');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -1181,8 +1181,8 @@ 
     /**
      * Renders the number element template.
      */
-    public function render_number_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'number' );
+    public function render_number_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'number');
         $label    = "$field.label";
         echo "
             <div $restrict>
@@ -1196,24 +1196,24 @@ 
     /**
      * Renders the number element on the frontend.
      */
-    public function frontend_render_number_template( $field ) {
+    public function frontend_render_number_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
                 'required'   => (bool) $field['required'],
-                'label'      => wp_kses_post( $field['label'] ),
-                'placeholder' => esc_attr( $field['placeholder'] ),
+                'label'      => wp_kses_post($field['label']),
+                'placeholder' => esc_attr($field['placeholder']),
                 'no_wrap'    => true,
                 'type'       => 'number',
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -1224,16 +1224,16 @@ 
     /**
      * Renders the edit number element template.
      */
-    public function edit_number_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'number' );
-        $label    = __( 'Field Label', 'invoicing' );
+    public function edit_number_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'number');
+        $label    = __('Field Label', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Placeholder text', 'invoicing' );
+        $label2   = __('Placeholder text', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label3   = __( 'Help text', 'invoicing' );
-        $label4   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label3   = __('Help text', 'invoicing');
+        $label4   = esc_attr__('Add some help text for this field', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
-        $label5   = __( 'Is this field required?', 'invoicing' );
+        $label5   = __('Is this field required?', 'invoicing');
         $id4      = $field . '.id + "_edit4"';
         echo "
             <div $restrict>
@@ -1261,23 +1261,23 @@ 
     /**
      * Renders the separator element template.
      */
-    public function render_separator_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'separator' );
+    public function render_separator_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'separator');
         echo "<hr class='featurette-divider mt-0 mb-2' $restrict>";
     }
 
     /**
      * Renders the separator element on the frontend.
      */
-    public function frontend_render_separator_template( $field ) {
+    public function frontend_render_separator_template($field) {
         echo '<hr class="featurette-divider mt-0 mb-2" />';
     }
 
     /**
      * Renders the pay button element template.
      */
-    public function render_pay_button_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'pay_button' );
+    public function render_pay_button_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'pay_button');
         $label    = "$field.label";
         echo "
             <div $restrict>
@@ -1290,24 +1290,24 @@ 
     /**
      * Renders the pay_button element on the frontend.
      */
-    public function frontend_render_pay_button_template( $field ) {
+    public function frontend_render_pay_button_template($field) {
         
         echo "<div class='form-group'>";
 
-        $class = 'btn btn-block submit-button ' . sanitize_html_class( $field['class'] );
+        $class = 'btn btn-block submit-button ' . sanitize_html_class($field['class']);
         echo aui()->input(
             array(
-                'name'       => esc_attr( $field['id'] ),
-                'id'         => esc_attr( $field['id'] ),
-                'value'      => esc_attr( $field['label'] ),
+                'name'       => esc_attr($field['id']),
+                'id'         => esc_attr($field['id']),
+                'value'      => esc_attr($field['label']),
                 'no_wrap'    => true,
                 'type'       => 'submit',
                 'class'      => $class,
             )
         );
 
-        if ( ! empty( $field['description'] ) ) {
-            $description = wp_kses_post( $field['description'] );
+        if (!empty($field['description'])) {
+            $description = wp_kses_post($field['description']);
             echo "<small class='form-text text-muted'>$description</small>";
         }
 
@@ -1318,14 +1318,14 @@ 
     /**
      * Renders the pay button element template.
      */
-    public function edit_pay_button_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'pay_button' );
-        $label    = __( 'Button Text', 'invoicing' );
+    public function edit_pay_button_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'pay_button');
+        $label    = __('Button Text', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label2   = __( 'Help text', 'invoicing' );
-        $label3   = esc_attr__( 'Add some help text for this field', 'invoicing' );
+        $label2   = __('Help text', 'invoicing');
+        $label3   = esc_attr__('Add some help text for this field', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label4   = esc_attr__( 'Button Type', 'invoicing' );
+        $label4   = esc_attr__('Button Type', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
         echo "
             <div $restrict>
@@ -1341,15 +1341,15 @@ 
                     <label :for='$id3'>$label4</label>
 
                     <select class='form-control custom-select' :id='$id3' v-model='$field.class'>
-                        <option value='btn-primary'>"   . __( 'Primary', 'invoicing' ) ."</option>
-                        <option value='btn-secondary'>" . __( 'Secondary', 'invoicing' ) ."</option>
-                        <option value='btn-success'>"   . __( 'Success', 'invoicing' ) ."</option>
-                        <option value='btn-danger'>"    . __( 'Danger', 'invoicing' ) ."</option>
-                        <option value='btn-warning'>"   . __( 'Warning', 'invoicing' ) ."</option>
-                        <option value='btn-info'>"      . __( 'Info', 'invoicing' ) ."</option>
-                        <option value='btn-light'>"     . __( 'Light', 'invoicing' ) ."</option>
-                        <option value='btn-dark'>"      . __( 'Dark', 'invoicing' ) ."</option>
-                        <option value='btn-link'>"      . __( 'Link', 'invoicing' ) ."</option>
+                        <option value='btn-primary'>" . __('Primary', 'invoicing') . "</option>
+                        <option value='btn-secondary'>" . __('Secondary', 'invoicing') . "</option>
+                        <option value='btn-success'>"   . __('Success', 'invoicing') . "</option>
+                        <option value='btn-danger'>"    . __('Danger', 'invoicing') . "</option>
+                        <option value='btn-warning'>"   . __('Warning', 'invoicing') . "</option>
+                        <option value='btn-info'>"      . __('Info', 'invoicing') . "</option>
+                        <option value='btn-light'>"     . __('Light', 'invoicing') . "</option>
+                        <option value='btn-dark'>"      . __('Dark', 'invoicing') . "</option>
+                        <option value='btn-link'>"      . __('Link', 'invoicing') . "</option>
                     </select>
                 </div>
             </div>
@@ -1360,8 +1360,8 @@ 
     /**
      * Renders the alert element template.
      */
-    public function render_alert_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'alert' );
+    public function render_alert_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'alert');
         $text     = "$field.text";
         echo "
             <div $restrict class='alert' :class='$field.class' role='alert'>
@@ -1376,15 +1376,15 @@ 
     /**
      * Renders the alert element on the frontend.
      */
-    public function frontend_render_alert_template( $field ) {
+    public function frontend_render_alert_template($field) {
         
         echo "<div class='form-group'>";
 
         echo aui()->alert(
             array(
-                'content'     => wp_kses_post( $field['text'] ),
+                'content'     => wp_kses_post($field['text']),
                 'dismissible' => $field['dismissible'],
-                'type'        => str_replace( 'alert-', '', $field['class'] ),
+                'type'        => str_replace('alert-', '', $field['class']),
             )
         );
 
@@ -1395,14 +1395,14 @@ 
     /**
      * Renders the alert element template.
      */
-    public function edit_alert_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'alert' );
-        $label    = __( 'Alert Text', 'invoicing' );
-        $label2   = esc_attr__( 'Enter your alert text here', 'invoicing' );
+    public function edit_alert_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'alert');
+        $label    = __('Alert Text', 'invoicing');
+        $label2   = esc_attr__('Enter your alert text here', 'invoicing');
         $id       = $field . '.id + "_edit"';
-        $label3   = __( 'Is Dismissible?', 'invoicing' );
+        $label3   = __('Is Dismissible?', 'invoicing');
         $id2      = $field . '.id + "_edit2"';
-        $label4   = esc_attr__( 'Alert Type', 'invoicing' );
+        $label4   = esc_attr__('Alert Type', 'invoicing');
         $id3      = $field . '.id + "_edit3"';
         echo "
             <div $restrict>
@@ -1418,14 +1418,14 @@ 
                     <label :for='$id3'>$label4</label>
 
                     <select class='form-control custom-select' :id='$id3' v-model='$field.class'>
-                        <option value='alert-primary'>"   . __( 'Primary', 'invoicing' ) ."</option>
-                        <option value='alert-secondary'>" . __( 'Secondary', 'invoicing' ) ."</option>
-                        <option value='alert-success'>"   . __( 'Success', 'invoicing' ) ."</option>
-                        <option value='alert-danger'>"    . __( 'Danger', 'invoicing' ) ."</option>
-                        <option value='alert-warning'>"   . __( 'Warning', 'invoicing' ) ."</option>
-                        <option value='alert-info'>"      . __( 'Info', 'invoicing' ) ."</option>
-                        <option value='alert-light'>"     . __( 'Light', 'invoicing' ) ."</option>
-                        <option value='alert-dark'>"      . __( 'Dark', 'invoicing' ) ."</option>
+                        <option value='alert-primary'>" . __('Primary', 'invoicing') . "</option>
+                        <option value='alert-secondary'>" . __('Secondary', 'invoicing') . "</option>
+                        <option value='alert-success'>"   . __('Success', 'invoicing') . "</option>
+                        <option value='alert-danger'>"    . __('Danger', 'invoicing') . "</option>
+                        <option value='alert-warning'>"   . __('Warning', 'invoicing') . "</option>
+                        <option value='alert-info'>"      . __('Info', 'invoicing') . "</option>
+                        <option value='alert-light'>"     . __('Light', 'invoicing') . "</option>
+                        <option value='alert-dark'>"      . __('Dark', 'invoicing') . "</option>
                     </select>
                 </div>
             </div>
@@ -1436,8 +1436,8 @@ 
     /**
      * Renders the discount element template.
      */
-    public function render_discount_template( $field ) {
-        $restrict  = $this->get_restrict_markup( $field, 'discount' );
+    public function render_discount_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'discount');
         ?>
 
             <div <?php echo $restrict; ?> class="discount_field  border rounded p-3">
@@ -1454,13 +1454,13 @@ 
     /**
      * Renders the discount element on the frontend.
      */
-    public function frontend_render_discount_template( $field ) {
+    public function frontend_render_discount_template($field) {
         
-        $placeholder = esc_attr( $field['input_label'] );
-        $label       = sanitize_text_field( $field['button_label'] );
+        $placeholder = esc_attr($field['input_label']);
+        $label       = sanitize_text_field($field['button_label']);
         $description = '';
 
-        if ( ! empty( $field['description'] ) ) {
+        if (!empty($field['description'])) {
             $description = "<small class='form-text text-muted'>{$field['description']}</small>";
         }
 ?>
@@ -1481,12 +1481,12 @@ 
     /**
      * Renders the discount element template.
      */
-    public function edit_discount_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'discount' );
-        $label    = __( 'Discount Input Placeholder', 'invoicing' );
-        $label2   = __( 'Help Text', 'invoicing' );
-        $label3   = esc_attr__( 'Add some help text for this field', 'invoicing' );
-        $label4   = __( 'Button Text', 'invoicing' );
+    public function edit_discount_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'discount');
+        $label    = __('Discount Input Placeholder', 'invoicing');
+        $label2   = __('Help Text', 'invoicing');
+        $label3   = esc_attr__('Add some help text for this field', 'invoicing');
+        $label4   = __('Button Text', 'invoicing');
         $id       = $field . '.id + "_edit"';
         $id2      = $field . '.id + "_edit2"';
         $id3      = $field . '.id + "_edit3"';
@@ -1515,48 +1515,48 @@ 
     /**
      * Renders the items element template.
      */
-    public function render_items_template( $field ) {
-        $restrict  = $this->get_restrict_markup( $field, 'items' );
-        $label     = __( 'Item totals placeholder. Item totals will appear here. Click to set items.', 'invoicing' );
+    public function render_items_template($field) {
+        $restrict  = $this->get_restrict_markup($field, 'items');
+        $label     = __('Item totals placeholder. Item totals will appear here. Click to set items.', 'invoicing');
         echo "<div $restrict class='item_totals p-4 bg-warning'>$label</div>";
     }
 
     /**
      * Renders the items element on the frontend.
      */
-    public function frontend_render_items_template( $field, $items ) {
+    public function frontend_render_items_template($field, $items) {
         
         echo "<div class='form-group item_totals'>";
         
-        $id = esc_attr( $field['id'] );
-        if ( 'total' == $field[ 'items_type' ] ) {
+        $id = esc_attr($field['id']);
+        if ('total' == $field['items_type']) {
             $total = 0;
 
             ?>
             <div class="border item_totals_type_total">
 
                 <?php
-                    foreach( $items as $item ) {
-                        $total = $total + floatval( $item['price'] );
+                    foreach ($items as $item) {
+                        $total = $total + floatval($item['price']);
 
                         $class  = 'col-8';
                         $class2 = '';
 
-                        if ( ! empty( $item['allow_quantities'] ) ) {
+                        if (!empty($item['allow_quantities'])) {
                             $class = 'col-6 pt-2';
                             $class2 = 'pt-2';
                         }
 
-                        if ( ! empty( $item['custom_price'] ) ) {
+                        if (!empty($item['custom_price'])) {
                             $class .= ' pt-2';
                         }
             
                 ?>
                     <div  class="item_totals_item">
                         <div class='row pl-2 pr-2 pt-2'>
-                            <div class='<?php echo $class; ?>'><?php echo esc_html( $item['title'] ) ?></div>
+                            <div class='<?php echo $class; ?>'><?php echo esc_html($item['title']) ?></div>
 
-                            <?php  if ( ! empty( $item['allow_quantities'] ) ) { ?>
+                            <?php  if (!empty($item['allow_quantities'])) { ?>
 
                                 <div class='col-2'>
                                     <input name='wpinv-item-<?php echo (int) $item['id']; ?>-quantity' type='number' class='form-control wpinv-item-quantity-input pr-1' value='1' min='1' required>
@@ -1564,11 +1564,11 @@ 
 
                             <?php } else { ?>
                                 <input type='hidden' class='wpinv-item-quantity-input' value='1'>
-                            <?php } if ( empty( $item['custom_price'] ) ) { ?>
+                            <?php } if (empty($item['custom_price'])) { ?>
 
                                 <div class='col-4 <?php echo $class2; ?>'>
-                                    <?php echo wpinv_price( wpinv_format_amount( $item['price'] ) ) ?>
-                                    <input name='wpinv-items[<?php echo (int) $item['id']; ?>]' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval( $item['price'] ); ?>'>
+                                    <?php echo wpinv_price(wpinv_format_amount($item['price'])) ?>
+                                    <input name='wpinv-items[<?php echo (int) $item['id']; ?>]' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval($item['price']); ?>'>
                                 </div>
 
                             <?php } else {?>
@@ -1576,15 +1576,15 @@ 
                                 <div class='col-4'>
                                     <div class='input-group'>
 
-                                        <?php if ( 'left' == wpinv_currency_position() ) { ?>
+                                        <?php if ('left' == wpinv_currency_position()) { ?>
                                             <div class='input-group-prepend'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
                                         <?php } ?>
 
-                                        <input type='number' name='wpinv-items[<?php echo (int) $item['id']; ?>]' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval( $item['price'] ); ?>' value='<?php echo floatval( $item['price'] ); ?>' min='<?php echo intval( $item['minimum_price'] ); ?>'>
+                                        <input type='number' name='wpinv-items[<?php echo (int) $item['id']; ?>]' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval($item['price']); ?>' value='<?php echo floatval($item['price']); ?>' min='<?php echo intval($item['minimum_price']); ?>'>
                                     
-                                        <?php if ( 'left' != wpinv_currency_position() ) { ?>
+                                        <?php if ('left' != wpinv_currency_position()) { ?>
                                             <div class='input-group-append'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
@@ -1595,38 +1595,38 @@ 
                             <?php } ?>
 
                         </div>
-                        <?php if ( ! empty( $item['description'] )) { ?>
-                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post( $item['description'] ); ?></small>
+                        <?php if (!empty($item['description'])) { ?>
+                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post($item['description']); ?></small>
                         <?php } ?>
                     </div>
                 <?php } ?>
 
                 <div class='mt-4 border-top item_totals_total'>
                     <div class='row p-2'>
-                        <div class='col-8'><strong class='mr-5'><?php _e( 'Total', 'invoicing' ); ?></strong></div>
-                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price( wpinv_format_amount( $total ) ) ?></strong></div>
+                        <div class='col-8'><strong class='mr-5'><?php _e('Total', 'invoicing'); ?></strong></div>
+                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price(wpinv_format_amount($total)) ?></strong></div>
                     </div>
                 </div>
 
             </div>
         <?php } ?>
 
-        <?php if ( 'radio' == $field[ 'items_type' ] ) { ?>
+        <?php if ('radio' == $field['items_type']) { ?>
             <div class="item_totals_type_radio">
 
                 <?php
-                    foreach( $items as $index => $item ) {
+                    foreach ($items as $index => $item) {
                 
-                        if ( ! empty( $item['required'] ) ) {
+                        if (!empty($item['required'])) {
                             continue;
                         }
                 ?>
                     <div  class="form-check">
-                        <input class='form-check-input wpinv-items-selector' <?php checked( ! isset( $selected_radio_item ) ); $selected_radio_item = 1; ?> type='radio' value='<?php echo $item['id']; ?>' id='<?php echo $id . $index; ?>' name='wpinv-payment-form-selected-item'>
-                        <label class='form-check-label' for='<?php echo $id . $index; ?>'><?php echo sanitize_text_field( $item['title'] ); ?>&nbsp;<strong><?php echo wpinv_price( wpinv_format_amount( (float) sanitize_text_field(  $item['price'] ) ) ); ?></strong></label>
+                        <input class='form-check-input wpinv-items-selector' <?php checked(!isset($selected_radio_item)); $selected_radio_item = 1; ?> type='radio' value='<?php echo $item['id']; ?>' id='<?php echo $id . $index; ?>' name='wpinv-payment-form-selected-item'>
+                        <label class='form-check-label' for='<?php echo $id . $index; ?>'><?php echo sanitize_text_field($item['title']); ?>&nbsp;<strong><?php echo wpinv_price(wpinv_format_amount((float) sanitize_text_field($item['price']))); ?></strong></label>
                     </div>
-                    <?php if ( ! empty( $item['description'] )) { ?>
-                        <small class='form-text text-muted pl-4 pr-2 m-0'><?php echo wp_kses_post( $item['description'] ); ?></small>
+                    <?php if (!empty($item['description'])) { ?>
+                        <small class='form-text text-muted pl-4 pr-2 m-0'><?php echo wp_kses_post($item['description']); ?></small>
                     <?php } ?>
                 <?php } ?>
 
@@ -1636,29 +1636,29 @@ 
 
                         $total = 0;
 
-                        foreach ( $items as $item ) {
+                        foreach ($items as $item) {
 
                             $class  = 'col-8';
                             $class2 = '';
 
-                            if ( ! empty( $item['allow_quantities'] ) ) {
+                            if (!empty($item['allow_quantities'])) {
                                 $class = 'col-6 pt-2';
                                 $class2 = 'pt-2';
                             }
 
-                            if ( ! empty( $item['custom_price'] ) ) {
+                            if (!empty($item['custom_price'])) {
                                 $class .= ' pt-2';
                             }
 
                             $class3 = 'd-none';
                             $name   = '';
-                            if ( ! empty( $item['required'] ) || ! isset( $totals_selected_radio_item ) ) {
+                            if (!empty($item['required']) || !isset($totals_selected_radio_item)) {
 
-                                $total = $total + floatval( $item['price'] );
+                                $total = $total + floatval($item['price']);
                                 $class3 = '';
                                 $name   = "wpinv-items[{$item['id']}]";
 
-                                if ( empty( $item['required'] ) ) {
+                                if (empty($item['required'])) {
                                     $totals_selected_radio_item = 1;
                                 }
 
@@ -1670,9 +1670,9 @@ 
 
                     <div  class="item_totals_item <?php echo $class3; ?>" data-id="<?php echo (int) $item['id']; ?>">
                         <div class='row pl-2 pr-2 pt-2'>
-                            <div class='<?php echo $class; ?>'><?php echo esc_html( $item['title'] ) ?></div>
+                            <div class='<?php echo $class; ?>'><?php echo esc_html($item['title']) ?></div>
 
-                            <?php  if ( ! empty( $item['allow_quantities'] ) ) { ?>
+                            <?php  if (!empty($item['allow_quantities'])) { ?>
 
                                 <div class='col-2'>
                                     <input name='wpinv-item-<?php echo (int) $item['id']; ?>-quantity' type='number' class='form-control wpinv-item-quantity-input pr-1' value='1' min='1' required>
@@ -1680,11 +1680,11 @@ 
 
                             <?php } else { ?>
                                 <input type='hidden' class='wpinv-item-quantity-input' value='1'>
-                            <?php } if ( empty( $item['custom_price'] ) ) { ?>
+                            <?php } if (empty($item['custom_price'])) { ?>
 
                                 <div class='col-4 <?php echo $class2; ?>'>
-                                    <?php echo wpinv_price( wpinv_format_amount( $item['price'] ) ) ?>
-                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval( $item['price'] ); ?>'>
+                                    <?php echo wpinv_price(wpinv_format_amount($item['price'])) ?>
+                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval($item['price']); ?>'>
                                 </div>
 
                             <?php } else {?>
@@ -1692,15 +1692,15 @@ 
                                 <div class='col-4'>
                                     <div class='input-group'>
 
-                                        <?php if ( 'left' == wpinv_currency_position() ) { ?>
+                                        <?php if ('left' == wpinv_currency_position()) { ?>
                                             <div class='input-group-prepend'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
                                         <?php } ?>
 
-                                        <input type='number' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval( $item['price'] ); ?>' value='<?php echo floatval( $item['price'] ); ?>' min='<?php echo intval( $item['minimum_price'] ); ?>'>
+                                        <input type='number' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval($item['price']); ?>' value='<?php echo floatval($item['price']); ?>' min='<?php echo intval($item['minimum_price']); ?>'>
                                     
-                                        <?php if ( 'left' != wpinv_currency_position() ) { ?>
+                                        <?php if ('left' != wpinv_currency_position()) { ?>
                                             <div class='input-group-append'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
@@ -1711,16 +1711,16 @@ 
                             <?php } ?>
 
                         </div>
-                        <?php if ( ! empty( $item['description'] )) { ?>
-                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post( $item['description'] ); ?></small>
+                        <?php if (!empty($item['description'])) { ?>
+                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post($item['description']); ?></small>
                         <?php } ?>
                     </div>
                 <?php } ?>
 
                 <div class='mt-4 border-top item_totals_total'>
                     <div class='row p-2'>
-                        <div class='col-8'><strong class='mr-5'><?php _e( 'Total', 'invoicing' ); ?></strong></div>
-                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price( wpinv_format_amount( $total ) ) ?></strong></div>
+                        <div class='col-8'><strong class='mr-5'><?php _e('Total', 'invoicing'); ?></strong></div>
+                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price(wpinv_format_amount($total)) ?></strong></div>
                     </div>
                 </div>
 
@@ -1728,22 +1728,22 @@ 
             </div>
         <?php } ?>
 
-        <?php if ( 'checkbox' == $field[ 'items_type' ] ) { ?>
+        <?php if ('checkbox' == $field['items_type']) { ?>
 
             <div class="item_totals_type_checkbox">
 
                 <?php
-                    foreach ( $items as $index => $item ) {
+                    foreach ($items as $index => $item) {
 
-                        if ( ! empty( $item['required'] ) ) {
+                        if (!empty($item['required'])) {
                             continue;
                         }
 
-                        $title = sanitize_text_field(  $item['title'] );
-                        $price = wpinv_price( wpinv_format_amount( (float) sanitize_text_field(  $item['price'] ) ) );
-                        $item_id    = esc_attr( $id . "_$index" );
-                        $value = esc_attr( $item['id'] );
-                        $checked = checked( ! isset( $selected_checkbox_item ), true, false );
+                        $title = sanitize_text_field($item['title']);
+                        $price = wpinv_price(wpinv_format_amount((float) sanitize_text_field($item['price'])));
+                        $item_id = esc_attr($id . "_$index");
+                        $value = esc_attr($item['id']);
+                        $checked = checked(!isset($selected_checkbox_item), true, false);
                         $selected_checkbox_item = 1;
 
                         echo "
@@ -1752,7 +1752,7 @@ 
                                 <label for='$item_id' class='custom-control-label'>$title &nbsp; ($price)</label>
                             </div>";
 
-                        if ( ! empty( $item['description'] ) ) {
+                        if (!empty($item['description'])) {
                             echo "<small class='form-text text-muted'>{$item['description']}</small>";
                         }
                     }
@@ -1764,29 +1764,29 @@ 
 
                         $total = 0;
 
-                        foreach ( $items as $item ) {
+                        foreach ($items as $item) {
 
                             $class  = 'col-8';
                             $class2 = '';
 
-                            if ( ! empty( $item['allow_quantities'] ) ) {
+                            if (!empty($item['allow_quantities'])) {
                                 $class = 'col-6 pt-2';
                                 $class2 = 'pt-2';
                             }
 
-                            if ( ! empty( $item['custom_price'] ) ) {
+                            if (!empty($item['custom_price'])) {
                                 $class .= ' pt-2';
                             }
 
                             $class3 = 'd-none';
-                            $name  = '';
-                            if ( ! empty( $item['required'] ) || ! isset( $totals_selected_checkbox_item ) ) {
+                            $name = '';
+                            if (!empty($item['required']) || !isset($totals_selected_checkbox_item)) {
 
-                                $total = $total + floatval( $item['price'] );
+                                $total = $total + floatval($item['price']);
                                 $class3 = '';
                                 $name  = "wpinv-items[{$item['id']}]";
 
-                                if ( empty( $item['required'] ) ) {
+                                if (empty($item['required'])) {
                                     $totals_selected_checkbox_item = 1;
                                 }
 
@@ -1798,9 +1798,9 @@ 
 
                     <div  class="item_totals_item <?php echo $class3; ?>" data-id="<?php echo (int) $item['id']; ?>">
                         <div class='row pl-2 pr-2 pt-2'>
-                            <div class='<?php echo $class; ?>'><?php echo esc_html( $item['title'] ) ?></div>
+                            <div class='<?php echo $class; ?>'><?php echo esc_html($item['title']) ?></div>
 
-                            <?php  if ( ! empty( $item['allow_quantities'] ) ) { ?>
+                            <?php  if (!empty($item['allow_quantities'])) { ?>
 
                                 <div class='col-2'>
                                     <input name='wpinv-item-<?php echo (int) $item['id']; ?>-quantity' type='number' class='form-control wpinv-item-quantity-input pr-1' value='1' min='1' required>
@@ -1808,11 +1808,11 @@ 
 
                             <?php } else { ?>
                                 <input type='hidden' class='wpinv-item-quantity-input' value='1'>
-                            <?php } if ( empty( $item['custom_price'] ) ) { ?>
+                            <?php } if (empty($item['custom_price'])) { ?>
 
                                 <div class='col-4 <?php echo $class2; ?>'>
-                                    <?php echo wpinv_price( wpinv_format_amount( $item['price'] ) ) ?>
-                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval( $item['price'] ); ?>'>
+                                    <?php echo wpinv_price(wpinv_format_amount($item['price'])) ?>
+                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval($item['price']); ?>'>
                                 </div>
 
                             <?php } else {?>
@@ -1820,15 +1820,15 @@ 
                                 <div class='col-4'>
                                     <div class='input-group'>
 
-                                        <?php if ( 'left' == wpinv_currency_position() ) { ?>
+                                        <?php if ('left' == wpinv_currency_position()) { ?>
                                             <div class='input-group-prepend'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
                                         <?php } ?>
 
-                                        <input type='number' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval( $item['price'] ); ?>' value='<?php echo floatval( $item['price'] ); ?>' min='<?php echo intval( $item['minimum_price'] ); ?>'>
+                                        <input type='number' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval($item['price']); ?>' value='<?php echo floatval($item['price']); ?>' min='<?php echo intval($item['minimum_price']); ?>'>
                                     
-                                        <?php if ( 'left' != wpinv_currency_position() ) { ?>
+                                        <?php if ('left' != wpinv_currency_position()) { ?>
                                             <div class='input-group-append'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
@@ -1839,23 +1839,23 @@ 
                             <?php } ?>
 
                         </div>
-                        <?php if ( ! empty( $item['description'] )) { ?>
-                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post( $item['description'] ); ?></small>
+                        <?php if (!empty($item['description'])) { ?>
+                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post($item['description']); ?></small>
                         <?php } ?>
                     </div>
                 <?php } ?>
 
                 <div class='mt-4 border-top item_totals_total'>
                     <div class='row p-2'>
-                        <div class='col-8'><strong class='mr-5'><?php _e( 'Total', 'invoicing' ); ?></strong></div>
-                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price( wpinv_format_amount( $total ) ) ?></strong></div>
+                        <div class='col-8'><strong class='mr-5'><?php _e('Total', 'invoicing'); ?></strong></div>
+                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price(wpinv_format_amount($total)) ?></strong></div>
                     </div>
                 </div>
             </div>
             </div>
         <?php } ?>
 
-        <?php if ( 'select' == $field[ 'items_type' ] ) { ?>
+        <?php if ('select' == $field['items_type']) { ?>
 
             <div class="item_totals_type_select">
 
@@ -1863,17 +1863,17 @@ 
 
                     $options  = array();
                     $selected = '';
-                    foreach ( $items as $index => $item ) {
+                    foreach ($items as $index => $item) {
 
-                        if ( ! empty( $item['required'] ) ) {
+                        if (!empty($item['required'])) {
                             continue;
                         }
 
-                        $title = sanitize_text_field(  $item['title'] );
-                        $price = wpinv_price( wpinv_format_amount( (float) sanitize_text_field(  $item['price'] ) ) );
-                        $options[ $item['id'] ] = "$title &nbsp; ($price)";
+                        $title = sanitize_text_field($item['title']);
+                        $price = wpinv_price(wpinv_format_amount((float) sanitize_text_field($item['price'])));
+                        $options[$item['id']] = "$title &nbsp; ($price)";
 
-                        if ( ! isset( $selected_item ) ) {
+                        if (!isset($selected_item)) {
                             $selected = $item['id'];
                             $selected_item = 1;
                         }
@@ -1884,7 +1884,7 @@ 
                         array(
                                 'name'        => 'payment-form-items',
                                 'id'          => $id,
-                                'placeholder' => __( 'Select an item', 'invoicing' ),
+                                'placeholder' => __('Select an item', 'invoicing'),
                                 'no_wrap'     => true,
                                 'options'     => $options,
                                 'class'       => 'wpi_select2 wpinv-items-select-selector',
@@ -1899,29 +1899,29 @@ 
 
                         $total = 0;
 
-                        foreach ( $items as $item ) {
+                        foreach ($items as $item) {
 
                             $class  = 'col-8';
                             $class2 = '';
 
-                            if ( ! empty( $item['allow_quantities'] ) ) {
+                            if (!empty($item['allow_quantities'])) {
                                 $class = 'col-6 pt-2';
                                 $class2 = 'pt-2';
                             }
 
-                            if ( ! empty( $item['custom_price'] ) ) {
+                            if (!empty($item['custom_price'])) {
                                 $class .= ' pt-2';
                             }
 
                             $class3 = 'd-none';
-                            $name  = '';
-                            if ( ! empty( $item['required'] ) || ! isset( $totals_selected_select_item ) ) {
+                            $name = '';
+                            if (!empty($item['required']) || !isset($totals_selected_select_item)) {
 
-                                $total = $total + floatval( $item['price'] );
+                                $total = $total + floatval($item['price']);
                                 $class3 = '';
                                 $name  = "wpinv-items[{$item['id']}]";
 
-                                if ( empty( $item['required'] ) ) {
+                                if (empty($item['required'])) {
                                     $totals_selected_select_item = 1;
                                 }
 
@@ -1933,9 +1933,9 @@ 
 
                     <div  class="item_totals_item <?php echo $class3; ?>" data-id="<?php echo (int) $item['id']; ?>">
                         <div class='row pl-2 pr-2 pt-2'>
-                            <div class='<?php echo $class; ?>'><?php echo esc_html( $item['title'] ) ?></div>
+                            <div class='<?php echo $class; ?>'><?php echo esc_html($item['title']) ?></div>
 
-                            <?php  if ( ! empty( $item['allow_quantities'] ) ) { ?>
+                            <?php  if (!empty($item['allow_quantities'])) { ?>
 
                                 <div class='col-2'>
                                     <input name='wpinv-item-<?php echo (int) $item['id']; ?>-quantity' type='number' class='form-control wpinv-item-quantity-input pr-1' value='1' min='1' required>
@@ -1943,11 +1943,11 @@ 
 
                             <?php } else { ?>
                                 <input type='hidden' class='wpinv-item-quantity-input' value='1'>
-                            <?php } if ( empty( $item['custom_price'] ) ) { ?>
+                            <?php } if (empty($item['custom_price'])) { ?>
 
                                 <div class='col-4 <?php echo $class2; ?>'>
-                                    <?php echo wpinv_price( wpinv_format_amount( $item['price'] ) ) ?>
-                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval( $item['price'] ); ?>'>
+                                    <?php echo wpinv_price(wpinv_format_amount($item['price'])) ?>
+                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval($item['price']); ?>'>
                                 </div>
 
                             <?php } else {?>
@@ -1955,15 +1955,15 @@ 
                                 <div class='col-4'>
                                     <div class='input-group'>
 
-                                        <?php if ( 'left' == wpinv_currency_position() ) { ?>
+                                        <?php if ('left' == wpinv_currency_position()) { ?>
                                             <div class='input-group-prepend'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
                                         <?php } ?>
 
-                                        <input type='number' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval( $item['price'] ); ?>' value='<?php echo floatval( $item['price'] ); ?>' min='<?php echo intval( $item['minimum_price'] ); ?>'>
+                                        <input type='number' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval($item['price']); ?>' value='<?php echo floatval($item['price']); ?>' min='<?php echo intval($item['minimum_price']); ?>'>
                                     
-                                        <?php if ( 'left' != wpinv_currency_position() ) { ?>
+                                        <?php if ('left' != wpinv_currency_position()) { ?>
                                             <div class='input-group-append'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
@@ -1974,23 +1974,23 @@ 
                             <?php } ?>
 
                         </div>
-                        <?php if ( ! empty( $item['description'] )) { ?>
-                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post( $item['description'] ); ?></small>
+                        <?php if (!empty($item['description'])) { ?>
+                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post($item['description']); ?></small>
                         <?php } ?>
                     </div>
                 <?php } ?>
 
                 <div class='mt-4 border-top item_totals_total'>
                     <div class='row p-2'>
-                        <div class='col-8'><strong class='mr-5'><?php _e( 'Total', 'invoicing' ); ?></strong></div>
-                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price( wpinv_format_amount( $total ) ) ?></strong></div>
+                        <div class='col-8'><strong class='mr-5'><?php _e('Total', 'invoicing'); ?></strong></div>
+                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price(wpinv_format_amount($total)) ?></strong></div>
                     </div>
                 </div>
 
             </div>
         <?php } ?>
 
-        <?php if ( 'multi_select' == $field[ 'items_type' ] ) { ?>
+        <?php if ('multi_select' == $field['items_type']) { ?>
 
             <div class="item_totals_type_multi_select">
 
@@ -1999,18 +1999,18 @@ 
                     $options  = array();
                     $selected = array();
 
-                    foreach ( $items as $index => $item ) {
+                    foreach ($items as $index => $item) {
 
-                        if ( ! empty( $item['required'] ) ) {
+                        if (!empty($item['required'])) {
                             continue;
                         }
                     
-                        $title = sanitize_text_field(  $item['title'] );
-                        $price = wpinv_price( wpinv_format_amount( (float) sanitize_text_field(  $item['price'] ) ) );
-                        $options[ $item['id'] ] = "$title &nbsp; ($price)";
+                        $title = sanitize_text_field($item['title']);
+                        $price = wpinv_price(wpinv_format_amount((float) sanitize_text_field($item['price'])));
+                        $options[$item['id']] = "$title &nbsp; ($price)";
 
-                        if ( ! isset( $selected_item ) ) {
-                            $selected = array( $item['id'] );
+                        if (!isset($selected_item)) {
+                            $selected = array($item['id']);
                             $selected_item = 1;
                         }
 
@@ -2035,29 +2035,29 @@ 
 
                         $total = 0;
 
-                        foreach ( $items as $item ) {
+                        foreach ($items as $item) {
 
                             $class  = 'col-8';
                             $class2 = '';
 
-                            if ( ! empty( $item['allow_quantities'] ) ) {
+                            if (!empty($item['allow_quantities'])) {
                                 $class = 'col-6 pt-2';
                                 $class2 = 'pt-2';
                             }
 
-                            if ( ! empty( $item['custom_price'] ) ) {
+                            if (!empty($item['custom_price'])) {
                                 $class .= ' pt-2';
                             }
 
                             $class3 = 'd-none';
-                            $name  = '';
-                            if ( ! empty( $item['required'] ) || ! isset( $totals_selected_select_item ) ) {
+                            $name = '';
+                            if (!empty($item['required']) || !isset($totals_selected_select_item)) {
 
-                                $total = $total + floatval( $item['price'] );
+                                $total = $total + floatval($item['price']);
                                 $class3 = '';
                                 $name  = "wpinv-items[{$item['id']}]";
 
-                                if ( empty( $item['required'] ) ) {
+                                if (empty($item['required'])) {
                                     $totals_selected_select_item = 1;
                                 }
 
@@ -2069,9 +2069,9 @@ 
 
                     <div  class="item_totals_item <?php echo $class3; ?>" data-id="<?php echo (int) $item['id']; ?>">
                         <div class='row pl-2 pr-2 pt-2'>
-                            <div class='<?php echo $class; ?>'><?php echo esc_html( $item['title'] ) ?></div>
+                            <div class='<?php echo $class; ?>'><?php echo esc_html($item['title']) ?></div>
 
-                            <?php  if ( ! empty( $item['allow_quantities'] ) ) { ?>
+                            <?php  if (!empty($item['allow_quantities'])) { ?>
 
                                 <div class='col-2'>
                                     <input name='wpinv-item-<?php echo (int) $item['id']; ?>-quantity' type='number' class='form-control wpinv-item-quantity-input pr-1' value='1' min='1' required>
@@ -2079,11 +2079,11 @@ 
 
                             <?php } else { ?>
                                 <input type='hidden' class='wpinv-item-quantity-input' value='1'>
-                            <?php } if ( empty( $item['custom_price'] ) ) { ?>
+                            <?php } if (empty($item['custom_price'])) { ?>
 
                                 <div class='col-4 <?php echo $class2; ?>'>
-                                    <?php echo wpinv_price( wpinv_format_amount( $item['price'] ) ) ?>
-                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval( $item['price'] ); ?>'>
+                                    <?php echo wpinv_price(wpinv_format_amount($item['price'])) ?>
+                                    <input name='<?php echo $name; ?>' type='hidden' class='wpinv-item-price-input' value='<?php echo floatval($item['price']); ?>'>
                                 </div>
 
                             <?php } else {?>
@@ -2091,15 +2091,15 @@ 
                                 <div class='col-4'>
                                     <div class='input-group'>
 
-                                        <?php if ( 'left' == wpinv_currency_position() ) { ?>
+                                        <?php if ('left' == wpinv_currency_position()) { ?>
                                             <div class='input-group-prepend'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
                                         <?php } ?>
 
-                                        <input type='number' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval( $item['price'] ); ?>' value='<?php echo floatval( $item['price'] ); ?>' min='<?php echo intval( $item['minimum_price'] ); ?>'>
+                                        <input type='number' name='<?php echo $name; ?>' class='form-control wpinv-item-price-input' placeholder='<?php echo floatval($item['price']); ?>' value='<?php echo floatval($item['price']); ?>' min='<?php echo intval($item['minimum_price']); ?>'>
                                     
-                                        <?php if ( 'left' != wpinv_currency_position() ) { ?>
+                                        <?php if ('left' != wpinv_currency_position()) { ?>
                                             <div class='input-group-append'>
                                                 <span class='input-group-text'><?php echo wpinv_currency_symbol(); ?></span>
                                             </div>
@@ -2110,23 +2110,23 @@ 
                             <?php } ?>
 
                         </div>
-                        <?php if ( ! empty( $item['description'] )) { ?>
-                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post( $item['description'] ); ?></small>
+                        <?php if (!empty($item['description'])) { ?>
+                            <small class='form-text text-muted pl-2 pr-2 m-0'><?php echo wp_kses_post($item['description']); ?></small>
                         <?php } ?>
                     </div>
                 <?php } ?>
 
                 <div class='mt-4 border-top item_totals_total'>
                     <div class='row p-2'>
-                        <div class='col-8'><strong class='mr-5'><?php _e( 'Total', 'invoicing' ); ?></strong></div>
-                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price( wpinv_format_amount( $total ) ) ?></strong></div>
+                        <div class='col-8'><strong class='mr-5'><?php _e('Total', 'invoicing'); ?></strong></div>
+                        <div class='col-4'><strong class='wpinv-items-total' data-currency='<?php echo wpinv_currency_symbol(); ?>' data-currency-position='<?php echo wpinv_currency_position(); ?>'><?php echo wpinv_price(wpinv_format_amount($total)) ?></strong></div>
                     </div>
                 </div>
 
             </div>
         <?php } ?>
-        <?php if ( ! empty( $field[ 'description' ] ) ) { ?>
-            <small class='form-text text-muted'><?php echo wp_kses_post( $field[ 'description' ] ); ?></small>
+        <?php if (!empty($field['description'])) { ?>
+            <small class='form-text text-muted'><?php echo wp_kses_post($field['description']); ?></small>
         <?php } ?>
         </div>
         <?php
@@ -2135,20 +2135,20 @@ 
     /**
      * Renders the items element template.
      */
-    public function edit_items_template( $field ) {
-        $restrict = $this->get_restrict_markup( $field, 'items' );
-        $label    = __( 'Let customers...', 'invoicing' );
-        $label2   = __( 'Available Items', 'invoicing' );
-        $label3   = esc_attr__( 'Add some help text for this element', 'invoicing' );
+    public function edit_items_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'items');
+        $label    = __('Let customers...', 'invoicing');
+        $label2   = __('Available Items', 'invoicing');
+        $label3   = esc_attr__('Add some help text for this element', 'invoicing');
         $id       = $field . '.id + "_edit"';
         $id2      = $field . '.id + "_edit2"';
         $id3      = $field . '.id + "_edit3"';
         $id4      = $field . '.id + "_edit4"';
-        $label4   = esc_attr__( 'This will be shown to the customer as the recommended price', 'invoicing' );
-        $label5   = esc_attr__( 'Allow users to pay what they want', 'invoicing' );
-        $label6   = esc_attr__( 'Enter the minimum price that a user can pay', 'invoicing' );
-        $label7   = esc_attr__( 'Allow users to buy several quantities', 'invoicing' );
-        $label8   = esc_attr__( 'This item is required', 'invoicing' );
+        $label4   = esc_attr__('This will be shown to the customer as the recommended price', 'invoicing');
+        $label5   = esc_attr__('Allow users to pay what they want', 'invoicing');
+        $label6   = esc_attr__('Enter the minimum price that a user can pay', 'invoicing');
+        $label7   = esc_attr__('Allow users to buy several quantities', 'invoicing');
+        $label8   = esc_attr__('This item is required', 'invoicing');
         echo "<div $restrict>
 
                 <label>$label2</label>
@@ -2218,7 +2218,7 @@ 
                 <div class='form-group mt-2'>
 
                     <select class='form-control custom-select' v-model='selected_item'>
-                        <option value=''>"        . __( 'Add an existing item to the form', 'invoicing' ) ."</option>
+                        <option value=''>" . __('Add an existing item to the form', 'invoicing') . "</option>
                         <option v-for='(item, index) in all_items' :value='index'>{{item.title}}</option>
                     </select>
 
@@ -2233,11 +2233,11 @@ 
                     <label :for='$id2'>$label</label>
 
                     <select class='form-control custom-select' :id='$id2' v-model='$field.items_type'>
-                        <option value='total'>"        . __( 'Buy all items on the list', 'invoicing' ) ."</option>
-                        <option value='radio'>"        . __( 'Select a single item from the list', 'invoicing' ) ."</option>
-                        <option value='checkbox'>"     . __( 'Select one or more items on the list', 'invoicing' ) ."</option>
-                        <option value='select'>"       . __( 'Select a single item from a dropdown', 'invoicing' ) ."</option>
-                        <option value='multi_select'>" . __( 'Select a one or more items from a dropdown', 'invoicing' ) ."</option>
+                        <option value='total'>" . __('Buy all items on the list', 'invoicing') . "</option>
+                        <option value='radio'>"        . __('Select a single item from the list', 'invoicing') . "</option>
+                        <option value='checkbox'>"     . __('Select one or more items on the list', 'invoicing') . "</option>
+                        <option value='select'>"       . __('Select a single item from a dropdown', 'invoicing') . "</option>
+                        <option value='multi_select'>" . __('Select a one or more items from a dropdown', 'invoicing') . "</option>
                     </select>
 
                 </div>
@@ -2262,27 +2262,27 @@ 
             'orderby'        => 'title',
             'order'          => 'ASC',
             'posts_per_page' => -1,
-            'post_status'    => array( 'publish' ),
+            'post_status'    => array('publish'),
         );
     
-        $items      = get_posts( apply_filters( 'wpinv_item_dropdown_query_args', $item_args ) );
+        $items = get_posts(apply_filters('wpinv_item_dropdown_query_args', $item_args));
 
-        if ( empty( $items ) ) {
+        if (empty($items)) {
             return array();
         }
 
-        $options    = array();
-        foreach ( $items as $item ) {
-            $title            = esc_html( $item->post_title );
-            $title           .= wpinv_get_item_suffix( $item->ID, false );
-            $id               = absint( $item->ID );
-            $price            = wpinv_sanitize_amount( get_post_meta( $id, '_wpinv_price', true ) );
-            $recurring        = (bool) get_post_meta( $id, '_wpinv_is_recurring', true );
+        $options = array();
+        foreach ($items as $item) {
+            $title            = esc_html($item->post_title);
+            $title           .= wpinv_get_item_suffix($item->ID, false);
+            $id               = absint($item->ID);
+            $price            = wpinv_sanitize_amount(get_post_meta($id, '_wpinv_price', true));
+            $recurring        = (bool) get_post_meta($id, '_wpinv_is_recurring', true);
             $description      = $item->post_excerpt;
-            $custom_price     = (bool) get_post_meta( $id, '_wpinv_dynamic_pricing', true );
-            $minimum_price    = (float) get_post_meta( $id, '_minimum_price', true );
+            $custom_price     = (bool) get_post_meta($id, '_wpinv_dynamic_pricing', true);
+            $minimum_price    = (float) get_post_meta($id, '_minimum_price', true);
             $allow_quantities = false;
-            $options[]        = compact( 'title', 'id', 'price', 'recurring', 'description', 'custom_price', 'minimum_price', 'allow_quantities' );
+            $options[]        = compact('title', 'id', 'price', 'recurring', 'description', 'custom_price', 'minimum_price', 'allow_quantities');
 
         }
         return $options;
@@ -2292,38 +2292,38 @@ 
     /**
      * Returns an array of items for the currently being edited form.
      */
-    public function get_form_items( $id = false ) {
+    public function get_form_items($id = false) {
         
-        if ( empty( $id ) ) {
-            return wpinv_get_data( 'sample-payment-form-items' );
+        if (empty($id)) {
+            return wpinv_get_data('sample-payment-form-items');
         }
         
-        $form_elements = get_post_meta( $id, 'wpinv_form_items', true );
+        $form_elements = get_post_meta($id, 'wpinv_form_items', true);
 
-        if ( is_array( $form_elements ) ) {
+        if (is_array($form_elements)) {
             return $form_elements;
         }
 
-        return wpinv_get_data( 'sample-payment-form-items' );
+        return wpinv_get_data('sample-payment-form-items');
 
     }
 
     /**
      * Returns an array of elements for the currently being edited form.
      */
-    public function get_form_elements( $id = false ) {
+    public function get_form_elements($id = false) {
 
-        if ( empty( $id ) ) {
-            return wpinv_get_data( 'sample-payment-form' );
+        if (empty($id)) {
+            return wpinv_get_data('sample-payment-form');
         }
         
-        $form_elements = get_post_meta( $id, 'wpinv_form_elements', true );
+        $form_elements = get_post_meta($id, 'wpinv_form_elements', true);
 
-        if ( is_array( $form_elements ) ) {
+        if (is_array($form_elements)) {
             return $form_elements;
         }
 
-        return wpinv_get_data( 'sample-payment-form' );
+        return wpinv_get_data('sample-payment-form');
     }
 
 }