AyeCode / invoicing

includes/admin/wpinv-admin-functions.php

Spacing +246 added lines, -246 removed lines

@@ -7,245 +7,245 @@ 
  */
  
 // 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_columns( $columns ) {
+function wpinv_columns($columns) {
     $columns = array(
         'cb'                => $columns['cb'],
-        'number'            => __( 'Number', 'invoicing' ),
-        'customer'          => __( 'Customer', 'invoicing' ),
-        'amount'            => __( 'Amount', 'invoicing' ),
-        'invoice_date'      => __( 'Created Date', 'invoicing' ),
-        'payment_date'      => __( 'Payment Date', 'invoicing' ),
-        'status'            => __( 'Status', 'invoicing' ),
-        'ID'                => __( 'ID', 'invoicing' ),
-        'wpi_actions'       => __( 'Actions', 'invoicing' ),
+        'number'            => __('Number', 'invoicing'),
+        'customer'          => __('Customer', 'invoicing'),
+        'amount'            => __('Amount', 'invoicing'),
+        'invoice_date'      => __('Created Date', 'invoicing'),
+        'payment_date'      => __('Payment Date', 'invoicing'),
+        'status'            => __('Status', 'invoicing'),
+        'ID'                => __('ID', 'invoicing'),
+        'wpi_actions'       => __('Actions', 'invoicing'),
     );
 
-    return apply_filters( 'wpi_invoice_table_columns', $columns );
+    return apply_filters('wpi_invoice_table_columns', $columns);
 }
-add_filter( 'manage_wpi_invoice_posts_columns', 'wpinv_columns' );
+add_filter('manage_wpi_invoice_posts_columns', 'wpinv_columns');
 
-function wpinv_bulk_actions( $actions ) {
-    if ( isset( $actions['edit'] ) ) {
-        unset( $actions['edit'] );
+function wpinv_bulk_actions($actions) {
+    if (isset($actions['edit'])) {
+        unset($actions['edit']);
     }
 
     return $actions;
 }
-add_filter( 'bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions' );
-add_filter( 'bulk_actions-edit-wpi_item', 'wpinv_bulk_actions' );
+add_filter('bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions');
+add_filter('bulk_actions-edit-wpi_item', 'wpinv_bulk_actions');
 
-function wpinv_sortable_columns( $columns ) {
+function wpinv_sortable_columns($columns) {
     $columns = array(
-        'ID'            => array( 'ID', true ),
-        'number'        => array( 'number', false ),
-        'amount'        => array( 'amount', false ),
-        'invoice_date'  => array( 'date', false ),
-        'payment_date'  => array( 'payment_date', true ),
-        'customer'      => array( 'customer', false ),
-        'status'        => array( 'status', false ),
+        'ID'            => array('ID', true),
+        'number'        => array('number', false),
+        'amount'        => array('amount', false),
+        'invoice_date'  => array('date', false),
+        'payment_date'  => array('payment_date', true),
+        'customer'      => array('customer', false),
+        'status'        => array('status', false),
     );
     
-    return apply_filters( 'wpi_invoice_table_sortable_columns', $columns );
+    return apply_filters('wpi_invoice_table_sortable_columns', $columns);
 }
-add_filter( 'manage_edit-wpi_invoice_sortable_columns', 'wpinv_sortable_columns' );
+add_filter('manage_edit-wpi_invoice_sortable_columns', 'wpinv_sortable_columns');
 
-add_action( 'manage_wpi_invoice_posts_custom_column', 'wpinv_posts_custom_column');
-function wpinv_posts_custom_column( $column_name, $post_id = 0 ) {
+add_action('manage_wpi_invoice_posts_custom_column', 'wpinv_posts_custom_column');
+function wpinv_posts_custom_column($column_name, $post_id = 0) {
     global $post, $wpi_invoice;
     
-    if ( empty( $wpi_invoice ) || ( !empty( $wpi_invoice ) && $post->ID != $wpi_invoice->ID ) ) {
-        $wpi_invoice = new WPInv_Invoice( $post->ID );
+    if (empty($wpi_invoice) || (!empty($wpi_invoice) && $post->ID != $wpi_invoice->ID)) {
+        $wpi_invoice = new WPInv_Invoice($post->ID);
     }
 
     $value = NULL;
     
-    switch ( $column_name ) {
+    switch ($column_name) {
         case 'email' :
-            $value   = $wpi_invoice->get_email();
+            $value = $wpi_invoice->get_email();
             break;
         case 'customer' :
             $customer_name = $wpi_invoice->get_user_full_name();
-            $customer_name = $customer_name != '' ? $customer_name : __( 'Customer', 'invoicing' );
-            $value = '<a href="' . esc_url( get_edit_user_link( $wpi_invoice->get_user_id() ) ) . '">' . $customer_name . '</a>';
-            if ( $email = $wpi_invoice->get_email() ) {
+            $customer_name = $customer_name != '' ? $customer_name : __('Customer', 'invoicing');
+            $value = '<a href="' . esc_url(get_edit_user_link($wpi_invoice->get_user_id())) . '">' . $customer_name . '</a>';
+            if ($email = $wpi_invoice->get_email()) {
                 $value .= '<br><a class="email" href="mailto:' . $email . '">' . $email . '</a>';
             }
             break;
         case 'amount' :
-            echo $wpi_invoice->get_total( true );
+            echo $wpi_invoice->get_total(true);
             break;
         case 'invoice_date' :
-            $date_format = get_option( 'date_format' );
+            $date_format = get_option('date_format');
             
             $m_time = $post->post_date;
-            $h_time = mysql2date( $date_format, $m_time );
+            $h_time = mysql2date($date_format, $m_time);
             
-            $value   = '<abbr title="' . $m_time . '">' . $h_time . '</abbr>';
+            $value = '<abbr title="' . $m_time . '">' . $h_time . '</abbr>';
             break;
         case 'payment_date' :
-            if ( $date_completed = $wpi_invoice->get_meta( '_wpinv_completed_date', true ) ) {
-                $date_format = get_option( 'date_format' );
+            if ($date_completed = $wpi_invoice->get_meta('_wpinv_completed_date', true)) {
+                $date_format = get_option('date_format');
                 
                 $m_time = $date_completed;
-                $h_time = mysql2date( $date_format, $m_time );
+                $h_time = mysql2date($date_format, $m_time);
                 
-                $value   = '<abbr title="' . $m_time . '">' . $h_time . '</abbr>';
+                $value = '<abbr title="' . $m_time . '">' . $h_time . '</abbr>';
             } else {
                 $value = '-';
             }
             break;
         case 'status' :
-            $value   = $wpi_invoice->get_status( true ) . ( $wpi_invoice->is_recurring() && $wpi_invoice->is_parent() ? ' <span class="wpi-suffix">' . __( '(r)', 'invoicing' ) . '</span>' : '' );
-            $is_viewed = wpinv_is_invoice_viewed( $wpi_invoice->ID );
-	        $gateway_title = wpinv_get_gateway_admin_label( $wpi_invoice->get_gateway() );
+            $value = $wpi_invoice->get_status(true) . ($wpi_invoice->is_recurring() && $wpi_invoice->is_parent() ? ' <span class="wpi-suffix">' . __('(r)', 'invoicing') . '</span>' : '');
+            $is_viewed = wpinv_is_invoice_viewed($wpi_invoice->ID);
+	        $gateway_title = wpinv_get_gateway_admin_label($wpi_invoice->get_gateway());
 	        $offline_gateways = apply_filters('wpinv_offline_payments', array('bank_transfer', 'cheque', 'cod'));
 	        $is_offline_payment = in_array($wpi_invoice->get_gateway(), $offline_gateways) ? true : false;
 
-            if ( 1 == $is_viewed ) {
-                $value .= '&nbsp;&nbsp;<i class="fa fa-eye" title="'.__( 'Viewed by Customer', 'invoicing' ).'"></i>';
+            if (1 == $is_viewed) {
+                $value .= '&nbsp;&nbsp;<i class="fa fa-eye" title="' . __('Viewed by Customer', 'invoicing') . '"></i>';
             }
-            if ( ( $wpi_invoice->is_paid() || $wpi_invoice->is_refunded() || $is_offline_payment ) && ( isset( $gateway_title ) ) ) {
-                $value .= '<br><small class="meta gateway">' . wp_sprintf( __( 'Via %s', 'invoicing' ), $gateway_title ) . '</small>';
+            if (($wpi_invoice->is_paid() || $wpi_invoice->is_refunded() || $is_offline_payment) && (isset($gateway_title))) {
+                $value .= '<br><small class="meta gateway">' . wp_sprintf(__('Via %s', 'invoicing'), $gateway_title) . '</small>';
             }
             break;
         case 'number' :
-            $edit_link = get_edit_post_link( $post->ID );
-            $value = '<a title="' . esc_attr__( 'View Invoice Details', 'invoicing' ) . '" href="' . esc_url( $edit_link ) . '">' . $wpi_invoice->get_number() . '</a>';
+            $edit_link = get_edit_post_link($post->ID);
+            $value = '<a title="' . esc_attr__('View Invoice Details', 'invoicing') . '" href="' . esc_url($edit_link) . '">' . $wpi_invoice->get_number() . '</a>';
             break;
         case 'wpi_actions' :
             $value = '';
-            if ( !empty( $post->post_name ) ) {
-                $value .= '<a title="' . esc_attr__( 'Print invoice', 'invoicing' ) . '" href="' . esc_url( get_permalink( $post->ID ) ) . '" class="button ui-tip column-act-btn" title="" target="_blank"><span class="dashicons dashicons-print"><i style="" class="fa fa-print"></i></span></a>';
+            if (!empty($post->post_name)) {
+                $value .= '<a title="' . esc_attr__('Print invoice', 'invoicing') . '" href="' . esc_url(get_permalink($post->ID)) . '" class="button ui-tip column-act-btn" title="" target="_blank"><span class="dashicons dashicons-print"><i style="" class="fa fa-print"></i></span></a>';
             }
             
-            if ( $email = $wpi_invoice->get_email() ) {
-                $value .= '<a title="' . esc_attr__( 'Send invoice to customer', 'invoicing' ) . '" href="' . esc_url( add_query_arg( array( 'wpi_action' => 'send_invoice', 'invoice_id' => $post->ID ) ) ) . '" class="button ui-tip column-act-btn"><span class="dashicons dashicons-email-alt"></span></a>';
+            if ($email = $wpi_invoice->get_email()) {
+                $value .= '<a title="' . esc_attr__('Send invoice to customer', 'invoicing') . '" href="' . esc_url(add_query_arg(array('wpi_action' => 'send_invoice', 'invoice_id' => $post->ID))) . '" class="button ui-tip column-act-btn"><span class="dashicons dashicons-email-alt"></span></a>';
             }
             
             break;
         default:
-            $value = isset( $post->$column_name ) ? $post->$column_name : '';
+            $value = isset($post->$column_name) ? $post->$column_name : '';
             break;
 
     }
-    $value = apply_filters( 'wpinv_payments_table_column', $value, $post->ID, $column_name );
+    $value = apply_filters('wpinv_payments_table_column', $value, $post->ID, $column_name);
     
-    if ( $value !== NULL ) {
+    if ($value !== NULL) {
         echo $value;
     }
 }
 
-function wpinv_admin_post_id( $id = 0 ) {
+function wpinv_admin_post_id($id = 0) {
     global $post;
 
-    if ( isset( $id ) && ! empty( $id ) ) {
-        return (int)$id;
-    } else if ( get_the_ID() ) {
+    if (isset($id) && !empty($id)) {
+        return (int) $id;
+    } else if (get_the_ID()) {
         return (int) get_the_ID();
-    } else if ( isset( $post->ID ) && !empty( $post->ID ) ) {
+    } else if (isset($post->ID) && !empty($post->ID)) {
         return (int) $post->ID;
-    } else if ( isset( $_GET['post'] ) && !empty( $_GET['post'] ) ) {
+    } else if (isset($_GET['post']) && !empty($_GET['post'])) {
         return (int) $_GET['post'];
-    } else if ( isset( $_GET['id'] ) && !empty( $_GET['id'] ) ) {
+    } else if (isset($_GET['id']) && !empty($_GET['id'])) {
         return (int) $_GET['id'];
-    } else if ( isset( $_POST['id'] ) && !empty( $_POST['id'] ) ) {
+    } else if (isset($_POST['id']) && !empty($_POST['id'])) {
         return (int) $_POST['id'];
     } 
 
     return null;
 }
     
-function wpinv_admin_post_type( $id = 0 ) {
-    if ( !$id ) {
+function wpinv_admin_post_type($id = 0) {
+    if (!$id) {
         $id = wpinv_admin_post_id();
     }
     
-    $type = get_post_type( $id );
+    $type = get_post_type($id);
     
-    if ( !$type ) {
-        $type = isset( $_GET['post_type'] ) && !empty( $_GET['post_type'] ) ? $_GET['post_type'] : null;
+    if (!$type) {
+        $type = isset($_GET['post_type']) && !empty($_GET['post_type']) ? $_GET['post_type'] : null;
     }
     
-    return apply_filters( 'wpinv_admin_post_type', $type, $id );
+    return apply_filters('wpinv_admin_post_type', $type, $id);
 }
 
 function wpinv_admin_messages() {
 	global $wpinv_options, $pagenow, $post;
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-added', __( 'Discount code added.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'discount_added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		 add_settings_error('wpinv-notices', 'wpinv-discount-added', __('Discount code added.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_add_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-add-fail', __( 'There was a problem adding your discount code, please try again.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'discount_add_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-discount-add-fail', __('There was a problem adding your discount code, please try again.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_exists' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-exists', __( 'A discount with that code already exists, please use a different code.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'discount_exists' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-discount-exists', __('A discount with that code already exists, please use a different code.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-updated', __( 'Discount code updated.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'discount_updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		 add_settings_error('wpinv-notices', 'wpinv-discount-updated', __('Discount code updated.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_update_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-updated-fail', __( 'There was a problem updating your discount code, please try again.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'discount_update_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-discount-updated-fail', __('There was a problem updating your discount code, please try again.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice_deleted' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-deleted', __( 'The invoice has been deleted.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'invoice_deleted' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-deleted', __('The invoice has been deleted.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_disabled' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Email notification is disabled. Please check settings.', 'invoicing' ), 'error' );
+	if (isset($_GET['wpinv-message']) && 'email_disabled' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-sent-fail', __('Email notification is disabled. Please check settings.', 'invoicing'), 'error');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_sent' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent', __( 'The email has been sent to customer.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'email_sent' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-sent', __('The email has been sent to customer.', 'invoicing'), 'updated');
     }
     
-    if ( isset( $_GET['wpinv-message'] ) && 'email_fail' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Fail to send email to the customer.', 'invoicing' ), 'error' );
+    if (isset($_GET['wpinv-message']) && 'email_fail' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-sent-fail', __('Fail to send email to the customer.', 'invoicing'), 'error');
     }
 
-    if ( isset( $_GET['wpinv-message'] ) && 'invoice-note-deleted' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-        add_settings_error( 'wpinv-notices', 'wpinv-note-deleted', __( 'The invoice note has been deleted.', 'invoicing' ), 'updated' );
+    if (isset($_GET['wpinv-message']) && 'invoice-note-deleted' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+        add_settings_error('wpinv-notices', 'wpinv-note-deleted', __('The invoice note has been deleted.', 'invoicing'), 'updated');
     }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'settings-imported' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-settings-imported', __( 'The settings have been imported.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'settings-imported' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-settings-imported', __('The settings have been imported.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'note-added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-note-added', __( 'The invoice note has been added successfully.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'note-added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-note-added', __('The invoice note has been added successfully.', 'invoicing'), 'updated');
 	}
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice-updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-updated', __( 'The invoice has been successfully updated.', 'invoicing' ), 'updated' );
+	if (isset($_GET['wpinv-message']) && 'invoice-updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing()) {
+		add_settings_error('wpinv-notices', 'wpinv-updated', __('The invoice has been successfully updated.', 'invoicing'), 'updated');
 	}
     
-	if ( $pagenow == 'post.php' && !empty( $post->post_type ) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable( $post ) ) {
-		$message = apply_filters( 'wpinv_item_non_editable_message', __( 'This item in not editable.', 'invoicing' ), $post->ID );
+	if ($pagenow == 'post.php' && !empty($post->post_type) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable($post)) {
+		$message = apply_filters('wpinv_item_non_editable_message', __('This item in not editable.', 'invoicing'), $post->ID);
 
-		if ( !empty( $message ) ) {
-			add_settings_error( 'wpinv-notices', 'wpinv-edit-n', $message, 'updated' );
+		if (!empty($message)) {
+			add_settings_error('wpinv-notices', 'wpinv-edit-n', $message, 'updated');
 		}
 	}
 
-	settings_errors( 'wpinv-notices' );
+	settings_errors('wpinv-notices');
 }
-add_action( 'admin_notices', 'wpinv_admin_messages' );
+add_action('admin_notices', 'wpinv_admin_messages');
 
-add_action( 'admin_init', 'wpinv_show_test_payment_gateway_notice' );
-function wpinv_show_test_payment_gateway_notice(){
-    add_action( 'admin_notices', 'wpinv_test_payment_gateway_messages' );
+add_action('admin_init', 'wpinv_show_test_payment_gateway_notice');
+function wpinv_show_test_payment_gateway_notice() {
+    add_action('admin_notices', 'wpinv_test_payment_gateway_messages');
 }
 
-function wpinv_test_payment_gateway_messages(){
+function wpinv_test_payment_gateway_messages() {
     $gateways = wpinv_get_enabled_payment_gateways();
     $name = array(); $test_gateways = '';
     if ($gateways) {
@@ -256,9 +256,9 @@ 
         }
         $test_gateways = implode(', ', $name);
     }
-    if(isset($test_gateways) && !empty($test_gateways)){
+    if (isset($test_gateways) && !empty($test_gateways)) {
         $link = admin_url('admin.php?page=wpinv-settings&tab=gateways');
-        $notice = wp_sprintf( __('<strong>Important:</strong> Payment Gateway(s) %s are in testing mode and will not receive real payments. Go to <a href="%s"> Gateway Settings</a>.', 'invoicing'), $test_gateways, $link );
+        $notice = wp_sprintf(__('<strong>Important:</strong> Payment Gateway(s) %s are in testing mode and will not receive real payments. Go to <a href="%s"> Gateway Settings</a>.', 'invoicing'), $test_gateways, $link);
         ?>
         <div class="notice notice-warning is-dismissible">
             <p><?php echo $notice; ?></p>
@@ -267,29 +267,29 @@ 
     }
 }
 
-function wpinv_items_columns( $existing_columns ) {
+function wpinv_items_columns($existing_columns) {
     global $wpinv_euvat;
     
     $columns                = array();
     $columns['cb']          = $existing_columns['cb'];
-    $columns['title']       = __( 'Title', 'invoicing' );
-    $columns['price']       = __( 'Price', 'invoicing' );
-    if ( $wpinv_euvat->allow_vat_rules() ) {
-        $columns['vat_rule']    = __( 'VAT rule type', 'invoicing' );
+    $columns['title']       = __('Title', 'invoicing');
+    $columns['price']       = __('Price', 'invoicing');
+    if ($wpinv_euvat->allow_vat_rules()) {
+        $columns['vat_rule']    = __('VAT rule type', 'invoicing');
     }
-    if ( $wpinv_euvat->allow_vat_classes() ) {
-        $columns['vat_class']   = __( 'VAT class', 'invoicing' );
+    if ($wpinv_euvat->allow_vat_classes()) {
+        $columns['vat_class']   = __('VAT class', 'invoicing');
     }
-    $columns['type']        = __( 'Type', 'invoicing' );
-    $columns['recurring']   = __( 'Recurring', 'invoicing' );
-    $columns['date']        = __( 'Date', 'invoicing' );
-    $columns['id']          = __( 'ID', 'invoicing' );
+    $columns['type']        = __('Type', 'invoicing');
+    $columns['recurring']   = __('Recurring', 'invoicing');
+    $columns['date']        = __('Date', 'invoicing');
+    $columns['id']          = __('ID', 'invoicing');
 
-    return apply_filters( 'wpinv_items_columns', $columns );
+    return apply_filters('wpinv_items_columns', $columns);
 }
-add_filter( 'manage_wpi_item_posts_columns', 'wpinv_items_columns' );
+add_filter('manage_wpi_item_posts_columns', 'wpinv_items_columns');
 
-function wpinv_items_sortable_columns( $columns ) {
+function wpinv_items_sortable_columns($columns) {
     $columns['price']       = 'price';
     $columns['vat_rule']    = 'vat_rule';
     $columns['vat_class']   = 'vat_class';
@@ -299,175 +299,175 @@ 
 
     return $columns;
 }
-add_filter( 'manage_edit-wpi_item_sortable_columns', 'wpinv_items_sortable_columns' );
+add_filter('manage_edit-wpi_item_sortable_columns', 'wpinv_items_sortable_columns');
 
-function wpinv_items_table_custom_column( $column ) {
+function wpinv_items_table_custom_column($column) {
     global $wpinv_euvat, $post, $wpi_item;
     
-    if ( empty( $wpi_item ) || ( !empty( $wpi_item ) && $post->ID != $wpi_item->ID ) ) {
-        $wpi_item = new WPInv_Item( $post->ID );
+    if (empty($wpi_item) || (!empty($wpi_item) && $post->ID != $wpi_item->ID)) {
+        $wpi_item = new WPInv_Item($post->ID);
     }
 
-    switch ( $column ) {
+    switch ($column) {
         case 'price' :
-            echo wpinv_item_price( $post->ID );
+            echo wpinv_item_price($post->ID);
         break;
         case 'vat_rule' :
-            echo $wpinv_euvat->item_rule_label( $post->ID );
+            echo $wpinv_euvat->item_rule_label($post->ID);
         break;
         case 'vat_class' :
-            echo $wpinv_euvat->item_class_label( $post->ID );
+            echo $wpinv_euvat->item_class_label($post->ID);
         break;
         case 'type' :
-            echo wpinv_item_type( $post->ID ) . '<span class="meta">' . $wpi_item->get_custom_singular_name() . '</span>';
+            echo wpinv_item_type($post->ID) . '<span class="meta">' . $wpi_item->get_custom_singular_name() . '</span>';
         break;
         case 'recurring' :
-            echo ( wpinv_is_recurring_item( $post->ID ) ? '<i class="fa fa-check fa-recurring-y"></i>' : '<i class="fa fa-close fa-recurring-n"></i>' );
+            echo (wpinv_is_recurring_item($post->ID) ? '<i class="fa fa-check fa-recurring-y"></i>' : '<i class="fa fa-close fa-recurring-n"></i>');
         break;
         case 'id' :
            echo $post->ID;
            echo '<div class="hidden" id="wpinv_inline-' . $post->ID . '">
-                    <div class="price">' . wpinv_get_item_price( $post->ID ) . '</div>';
-                    if ( $wpinv_euvat->allow_vat_rules() ) {
-                        echo '<div class="vat_rule">' . $wpinv_euvat->get_item_rule( $post->ID ) . '</div>';
+                    <div class="price">' . wpinv_get_item_price($post->ID) . '</div>';
+                    if ($wpinv_euvat->allow_vat_rules()) {
+                        echo '<div class="vat_rule">' . $wpinv_euvat->get_item_rule($post->ID) . '</div>';
                     }
-                    if ( $wpinv_euvat->allow_vat_classes() ) {
-                        echo '<div class="vat_class">' . $wpinv_euvat->get_item_class( $post->ID ) . '</div>';
+                    if ($wpinv_euvat->allow_vat_classes()) {
+                        echo '<div class="vat_class">' . $wpinv_euvat->get_item_class($post->ID) . '</div>';
                     }
-                    echo '<div class="type">' . wpinv_get_item_type( $post->ID ) . '</div>
+                    echo '<div class="type">' . wpinv_get_item_type($post->ID) . '</div>
                 </div>';
         break;
     }
     
-    do_action( 'wpinv_items_table_column_item_' . $column, $wpi_item, $post );
+    do_action('wpinv_items_table_column_item_' . $column, $wpi_item, $post);
 }
-add_action( 'manage_wpi_item_posts_custom_column', 'wpinv_items_table_custom_column' );
+add_action('manage_wpi_item_posts_custom_column', 'wpinv_items_table_custom_column');
 
 function wpinv_add_items_filters() {
     global $wpinv_euvat, $typenow;
 
     // Checks if the current post type is 'item'
-    if ( $typenow == 'wpi_item') {
-        if ( $wpinv_euvat->allow_vat_rules() ) {
+    if ($typenow == 'wpi_item') {
+        if ($wpinv_euvat->allow_vat_rules()) {
 
             // Sanitize selected vat rule.
-            $vat_rule   = '';
-            if( isset( $_GET['vat_rule'] ) && array_key_exists(  $_GET['type'], $wpinv_euvat->get_rules() ) ) {
-                $class   =  $_GET['type'];
+            $vat_rule = '';
+            if (isset($_GET['vat_rule']) && array_key_exists($_GET['type'], $wpinv_euvat->get_rules())) {
+                $class = $_GET['type'];
             }
 
-            echo wpinv_html_select( array(
-                    'options'          => array_merge( array( '' => __( 'All VAT rules', 'invoicing' ) ), $wpinv_euvat->get_rules() ),
+            echo wpinv_html_select(array(
+                    'options'          => array_merge(array('' => __('All VAT rules', 'invoicing')), $wpinv_euvat->get_rules()),
                     'name'             => 'vat_rule',
                     'id'               => 'vat_rule',
-                    'selected'         => ( isset( $_GET['vat_rule'] ) ? $_GET['vat_rule'] : '' ),
+                    'selected'         => (isset($_GET['vat_rule']) ? $_GET['vat_rule'] : ''),
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpi_select2',
-                    'placeholder'      => __( 'Select VAT rule', 'invoicing' ),
-                ) );
+                    'placeholder'      => __('Select VAT rule', 'invoicing'),
+                ));
         }
 
-        if ( $wpinv_euvat->allow_vat_classes() ) {
+        if ($wpinv_euvat->allow_vat_classes()) {
 
             $classes = $wpinv_euvat->get_all_classes();
 
             // Sanitize selected vat class.
             $class   = '';
-            if( isset( $_GET['vat_class'] ) && array_key_exists(  $_GET['vat_class'], $classes ) ) {
-                $class   =  $_GET['vat_class'];
+            if (isset($_GET['vat_class']) && array_key_exists($_GET['vat_class'], $classes)) {
+                $class = $_GET['vat_class'];
             }
 
-            echo wpinv_html_select( array(
-                    'options'          => array_merge( array( '' => __( 'All VAT classes', 'invoicing' ) ), $classes ),
+            echo wpinv_html_select(array(
+                    'options'          => array_merge(array('' => __('All VAT classes', 'invoicing')), $classes),
                     'name'             => 'vat_class',
                     'id'               => 'vat_class',
                     'selected'         => $class,
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpi_select2',
-                    'placeholder'      => __( 'Select VAT class', 'invoicing' ),
-                ) );
+                    'placeholder'      => __('Select VAT class', 'invoicing'),
+                ));
         }
         
         // Sanitize selected item type.
-        $type   = '';
-        if( isset( $_GET['type'] ) && array_key_exists(  $_GET['type'], wpinv_get_item_types() ) ) {
-            $class   =  $_GET['type'];
+        $type = '';
+        if (isset($_GET['type']) && array_key_exists($_GET['type'], wpinv_get_item_types())) {
+            $class = $_GET['type'];
         }
 
-        echo wpinv_html_select( array(
-                'options'          => array_merge( array( '' => __( 'All item types', 'invoicing' ) ), wpinv_get_item_types() ),
+        echo wpinv_html_select(array(
+                'options'          => array_merge(array('' => __('All item types', 'invoicing')), wpinv_get_item_types()),
                 'name'             => 'type',
                 'id'               => 'type',
                 'selected'         => $type,
                 'show_option_all'  => false,
                 'show_option_none' => false,
                 'class'            => 'gdmbx2-text-medium',
-            ) );
+            ));
 
-        if ( isset( $_REQUEST['all_posts'] ) && '1' === $_REQUEST['all_posts'] ) {
+        if (isset($_REQUEST['all_posts']) && '1' === $_REQUEST['all_posts']) {
             echo '<input type="hidden" name="all_posts" value="1" />';
         }
     }
 }
-add_action( 'restrict_manage_posts', 'wpinv_add_items_filters', 100 );
+add_action('restrict_manage_posts', 'wpinv_add_items_filters', 100);
 
-function wpinv_send_invoice_after_save( $invoice ) {
-    if ( empty( $_POST['wpi_save_send'] ) ) {
+function wpinv_send_invoice_after_save($invoice) {
+    if (empty($_POST['wpi_save_send'])) {
         return;
     }
     
-    if ( !empty( $invoice->ID ) && !empty( $invoice->post_type ) && 'wpi_invoice' == $invoice->post_type ) {
-        wpinv_user_invoice_notification( $invoice->ID );
+    if (!empty($invoice->ID) && !empty($invoice->post_type) && 'wpi_invoice' == $invoice->post_type) {
+        wpinv_user_invoice_notification($invoice->ID);
     }
 }
-add_action( 'wpinv_invoice_metabox_saved', 'wpinv_send_invoice_after_save', 100, 1 );
+add_action('wpinv_invoice_metabox_saved', 'wpinv_send_invoice_after_save', 100, 1);
 
-function wpinv_send_register_new_user( $data, $postarr ) {
-    if ( wpinv_current_user_can_manage_invoicing() && !empty( $data['post_type'] ) && ( 'wpi_invoice' == $data['post_type'] || 'wpi_quote' == $data['post_type'] ) ) {
-        $is_new_user = !empty( $postarr['wpinv_new_user'] ) ? true : false;
-        $email = !empty( $postarr['wpinv_email'] ) && $postarr['wpinv_email'] && is_email( $postarr['wpinv_email'] ) ? $postarr['wpinv_email'] : NULL;
+function wpinv_send_register_new_user($data, $postarr) {
+    if (wpinv_current_user_can_manage_invoicing() && !empty($data['post_type']) && ('wpi_invoice' == $data['post_type'] || 'wpi_quote' == $data['post_type'])) {
+        $is_new_user = !empty($postarr['wpinv_new_user']) ? true : false;
+        $email = !empty($postarr['wpinv_email']) && $postarr['wpinv_email'] && is_email($postarr['wpinv_email']) ? $postarr['wpinv_email'] : NULL;
         
-        if ( $is_new_user && $email && !email_exists( $email ) ) {
-            $first_name = !empty( $postarr['wpinv_first_name'] ) ? sanitize_text_field( $postarr['wpinv_first_name'] ) : '';
-            $last_name = !empty( $postarr['wpinv_last_name'] ) ? sanitize_text_field( $postarr['wpinv_last_name'] ) : '';
-            $display_name = $first_name || $last_name ? trim( $first_name . ' ' . $last_name ) : '';
-            $user_nicename = $display_name ? trim( $display_name ) : $email;
-            $user_company = !empty( $postarr['wpinv_company'] ) ? sanitize_text_field( $postarr['wpinv_company'] ) : '';
+        if ($is_new_user && $email && !email_exists($email)) {
+            $first_name = !empty($postarr['wpinv_first_name']) ? sanitize_text_field($postarr['wpinv_first_name']) : '';
+            $last_name = !empty($postarr['wpinv_last_name']) ? sanitize_text_field($postarr['wpinv_last_name']) : '';
+            $display_name = $first_name || $last_name ? trim($first_name . ' ' . $last_name) : '';
+            $user_nicename = $display_name ? trim($display_name) : $email;
+            $user_company = !empty($postarr['wpinv_company']) ? sanitize_text_field($postarr['wpinv_company']) : '';
             
-            $user_login = sanitize_user( str_replace( ' ', '', $display_name ), true );
-            if ( !( validate_username( $user_login ) && !username_exists( $user_login ) ) ) {
+            $user_login = sanitize_user(str_replace(' ', '', $display_name), true);
+            if (!(validate_username($user_login) && !username_exists($user_login))) {
                 $new_user_login = strstr($email, '@', true);
-                if ( validate_username( $user_login ) && username_exists( $user_login ) ) {
-                    $user_login = sanitize_user($new_user_login, true );
+                if (validate_username($user_login) && username_exists($user_login)) {
+                    $user_login = sanitize_user($new_user_login, true);
                 }
-                if ( validate_username( $user_login ) && username_exists( $user_login ) ) {
-                    $user_append_text = rand(10,1000);
-                    $user_login = sanitize_user($new_user_login.$user_append_text, true );
+                if (validate_username($user_login) && username_exists($user_login)) {
+                    $user_append_text = rand(10, 1000);
+                    $user_login = sanitize_user($new_user_login . $user_append_text, true);
                 }
                 
-                if ( !( validate_username( $user_login ) && !username_exists( $user_login ) ) ) {
+                if (!(validate_username($user_login) && !username_exists($user_login))) {
                     $user_login = $email;
                 }
             }
             
             $userdata = array(
                 'user_login' => $user_login,
-                'user_pass' => wp_generate_password( 12, false ),
-                'user_email' => sanitize_text_field( $email ),
+                'user_pass' => wp_generate_password(12, false),
+                'user_email' => sanitize_text_field($email),
                 'first_name' => $first_name,
                 'last_name' => $last_name,
-                'user_nicename' => wpinv_utf8_substr( $user_nicename, 0, 50 ),
+                'user_nicename' => wpinv_utf8_substr($user_nicename, 0, 50),
                 'nickname' => $display_name,
                 'display_name' => $display_name,
             );
 
-            $userdata = apply_filters( 'wpinv_register_new_user_data', $userdata );
+            $userdata = apply_filters('wpinv_register_new_user_data', $userdata);
             
-            $new_user_id = wp_insert_user( $userdata );
+            $new_user_id = wp_insert_user($userdata);
             
-            if ( !is_wp_error( $new_user_id ) ) {
+            if (!is_wp_error($new_user_id)) {
                 $data['post_author'] = $new_user_id;
                 $_POST['post_author'] = $new_user_id;
                 $_POST['post_author_override'] = $new_user_id;
@@ -488,86 +488,86 @@ 
                 
                 $meta = array();
                 ///$meta['_wpinv_user_id'] = $new_user_id;
-                foreach ( $meta_fields as $field ) {
-                    $meta['_wpinv_' . $field] = isset( $postarr['wpinv_' . $field] ) ? sanitize_text_field( $postarr['wpinv_' . $field] ) : '';
+                foreach ($meta_fields as $field) {
+                    $meta['_wpinv_' . $field] = isset($postarr['wpinv_' . $field]) ? sanitize_text_field($postarr['wpinv_' . $field]) : '';
                 }
                 
-                $meta = apply_filters( 'wpinv_register_new_user_meta', $meta, $new_user_id );
+                $meta = apply_filters('wpinv_register_new_user_meta', $meta, $new_user_id);
 
                 // Update user meta.
-                foreach ( $meta as $key => $value ) {
-                    update_user_meta( $new_user_id, $key, $value );
+                foreach ($meta as $key => $value) {
+                    update_user_meta($new_user_id, $key, $value);
                 }
                 
-                if ( function_exists( 'wp_send_new_user_notifications' ) ) {
+                if (function_exists('wp_send_new_user_notifications')) {
                     // Send email notifications related to the creation of new user.
-                    wp_send_new_user_notifications( $new_user_id, 'user' );
+                    wp_send_new_user_notifications($new_user_id, 'user');
                 }
             } else {
-                wpinv_error_log( $new_user_id->get_error_message(), 'Invoice add new user', __FILE__, __LINE__ );
+                wpinv_error_log($new_user_id->get_error_message(), 'Invoice add new user', __FILE__, __LINE__);
             }
         }
     }
     
     return $data;
 }
-add_filter( 'wp_insert_post_data', 'wpinv_send_register_new_user', 10, 2 );
+add_filter('wp_insert_post_data', 'wpinv_send_register_new_user', 10, 2);
 
-function wpinv_show_recurring_supported_gateways( $item_ID ) {
+function wpinv_show_recurring_supported_gateways($item_ID) {
     $all_gateways = wpinv_get_payment_gateways();
 
-    if ( !empty( $all_gateways ) ) {
+    if (!empty($all_gateways)) {
         $gateways = array();
 
-        foreach ( $all_gateways as $key => $gateway ) {
-            if ( wpinv_gateway_support_subscription( $key ) ) {
+        foreach ($all_gateways as $key => $gateway) {
+            if (wpinv_gateway_support_subscription($key)) {
                 $gateways[] = $gateway['admin_label'];
             }
         }
 
-        if ( !empty( $gateways ) ) {
+        if (!empty($gateways)) {
             ?>
-            <span class="description"><?php echo wp_sprintf( __( 'Recurring payments only supported by: %s', 'invoicing' ), implode( ', ', $gateways ) ); ?></span>
+            <span class="description"><?php echo wp_sprintf(__('Recurring payments only supported by: %s', 'invoicing'), implode(', ', $gateways)); ?></span>
             <?php
         }
     }
 }
-add_action( 'wpinv_item_price_field', 'wpinv_show_recurring_supported_gateways', -10, 1 );
+add_action('wpinv_item_price_field', 'wpinv_show_recurring_supported_gateways', -10, 1);
 
-function wpinv_post_updated_messages( $messages ) {
+function wpinv_post_updated_messages($messages) {
     global $post, $post_ID;
 
     $messages['wpi_discount'] = array(
         0   => '',
-        1   => __( 'Discount updated.', 'invoicing' ),
-        2   => __( 'Custom field updated.', 'invoicing' ),
-        3   => __( 'Custom field deleted.', 'invoicing' ),
-        4   => __( 'Discount updated.', 'invoicing' ),
-        5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-        6   => __( 'Discount updated.', 'invoicing' ),
-        7   => __( 'Discount saved.', 'invoicing' ),
-        8   => __( 'Discount submitted.', 'invoicing' ),
-        9   => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-        10  => __( 'Discount draft updated.', 'invoicing' ),
+        1   => __('Discount updated.', 'invoicing'),
+        2   => __('Custom field updated.', 'invoicing'),
+        3   => __('Custom field deleted.', 'invoicing'),
+        4   => __('Discount updated.', 'invoicing'),
+        5   => isset($_GET['revision']) ? wp_sprintf(__('Discount restored to revision from %s', 'invoicing'), wp_post_revision_title((int) $_GET['revision'], false)) : false,
+        6   => __('Discount updated.', 'invoicing'),
+        7   => __('Discount saved.', 'invoicing'),
+        8   => __('Discount submitted.', 'invoicing'),
+        9   => wp_sprintf(__('Discount scheduled for: <strong>%1$s</strong>.', 'invoicing'), date_i18n(__('M j, Y @ G:i', 'invoicing'), strtotime($post->post_date))),
+        10  => __('Discount draft updated.', 'invoicing'),
     );
 
     $messages['wpi_payment_form'] = array(
         0   => '',
-        1   => __( 'Payment Form updated.', 'invoicing' ),
-        2   => __( 'Custom field updated.', 'invoicing' ),
-        3   => __( 'Custom field deleted.', 'invoicing' ),
-        4   => __( 'Payment Form updated.', 'invoicing' ),
-        5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-        6   => __( 'Payment Form updated.', 'invoicing' ),
-        7   => __( 'Payment Form saved.', 'invoicing' ),
-        8   => __( 'Payment Form submitted.', 'invoicing' ),
-        9   => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-        10  => __( 'Payment Form draft updated.', 'invoicing' ),
+        1   => __('Payment Form updated.', 'invoicing'),
+        2   => __('Custom field updated.', 'invoicing'),
+        3   => __('Custom field deleted.', 'invoicing'),
+        4   => __('Payment Form updated.', 'invoicing'),
+        5   => isset($_GET['revision']) ? wp_sprintf(__('Payment Form restored to revision from %s', 'invoicing'), wp_post_revision_title((int) $_GET['revision'], false)) : false,
+        6   => __('Payment Form updated.', 'invoicing'),
+        7   => __('Payment Form saved.', 'invoicing'),
+        8   => __('Payment Form submitted.', 'invoicing'),
+        9   => wp_sprintf(__('Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing'), date_i18n(__('M j, Y @ G:i', 'invoicing'), strtotime($post->post_date))),
+        10  => __('Payment Form draft updated.', 'invoicing'),
     );
 
     return $messages;
 }
-add_filter( 'post_updated_messages', 'wpinv_post_updated_messages', 10, 1 );
+add_filter('post_updated_messages', 'wpinv_post_updated_messages', 10, 1);
 
 add_action('admin_init', 'admin_init_example_type');
 
@@ -577,7 +577,7 @@ 
 function admin_init_example_type() {
     global $typenow;
 
-    if ($typenow === 'wpi_invoice' || $typenow === 'wpi_quote' ) {
+    if ($typenow === 'wpi_invoice' || $typenow === 'wpi_quote') {
         add_filter('posts_search', 'posts_search_example_type', 10, 2);
     }
 }
@@ -592,9 +592,9 @@ 
     global $wpdb;
 
     if ($query->is_main_query() && !empty($query->query['s'])) {
-        $conditions_str = "{$wpdb->posts}.post_author IN ( SELECT ID FROM {$wpdb->users} WHERE user_email LIKE '%" . esc_sql( $query->query['s'] ) . "%' )";
-        if ( ! empty( $search ) ) {
-            $search = preg_replace( '/^ AND /', '', $search );
+        $conditions_str = "{$wpdb->posts}.post_author IN ( SELECT ID FROM {$wpdb->users} WHERE user_email LIKE '%" . esc_sql($query->query['s']) . "%' )";
+        if (!empty($search)) {
+            $search = preg_replace('/^ AND /', '', $search);
             $search = " AND ( {$search} OR ( {$conditions_str} ) )";
         } else {
             $search = " AND ( {$conditions_str} )";
@@ -604,9 +604,9 @@ 
     return $search;
 }
 
-add_action( 'admin_init', 'wpinv_reset_invoice_count' );
-function wpinv_reset_invoice_count(){
-    if(isset($_GET['reset_invoice_count']) && 1 == $_GET['reset_invoice_count'] && isset($_GET['_nonce']) && wp_verify_nonce($_GET['_nonce'], 'reset_invoice_count')) {
+add_action('admin_init', 'wpinv_reset_invoice_count');
+function wpinv_reset_invoice_count() {
+    if (isset($_GET['reset_invoice_count']) && 1 == $_GET['reset_invoice_count'] && isset($_GET['_nonce']) && wp_verify_nonce($_GET['_nonce'], 'reset_invoice_count')) {
         wpinv_update_option('invoice_sequence_start', 1);
         delete_option('wpinv_last_invoice_number');
         $url = add_query_arg(array('reset_invoice_done' => 1));
@@ -617,8 +617,8 @@ 
 }
 
 add_action('admin_notices', 'wpinv_invoice_count_reset_message');
-function wpinv_invoice_count_reset_message(){
-    if(isset($_GET['reset_invoice_done']) && 1 == $_GET['reset_invoice_done']) {
+function wpinv_invoice_count_reset_message() {
+    if (isset($_GET['reset_invoice_done']) && 1 == $_GET['reset_invoice_done']) {
         $notice = __('Invoice number sequence reset successfully.', 'invoicing');
         ?>
         <div class="notice notice-success is-dismissible">

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" class= "wpinv-payment-form-left-fields-field" @click.prevent="addField(element)" :class="{ 'd-none': element.defaults.premade }">
                                     <button class="button btn">
@@ -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/class-wpinv-payment-form-elements.php

Spacing +579 added lines, -579 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,23 +134,23 @@ 
 
             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(
                     'value'        => '',
-                    'label'        => __( 'Date', 'invoicing' ),
+                    'label'        => __('Date', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                 )
@@ -158,10 +158,10 @@ 
 
             array( 
                 'type' => 'time',
-                'name' => __( 'Time', 'invoicing' ),
+                'name' => __('Time', 'invoicing'),
                 'defaults' => array(
                     'value'        => '',
-                    'label'        => __( 'Time', 'invoicing' ),
+                    'label'        => __('Time', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                 )
@@ -169,11 +169,11 @@ 
 
             array( 
                 'type' => 'number',
-                'name' => __( 'Number', 'invoicing' ),
+                'name' => __('Number', 'invoicing'),
                 'defaults' => array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'Number', 'invoicing' ),
+                    'label'        => __('Number', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                 )
@@ -181,11 +181,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,
                 )
@@ -193,11 +193,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,
                 )
@@ -205,14 +205,14 @@ 
 
             array( 
                 'type' => 'address',
-                'name' => __( 'Address', 'invoicing' ),
+                'name' => __('Address', 'invoicing'),
                 'defaults'  => array(
 
                     'fields' => array(
                         array(
                             'placeholder'  => 'Jon',
                             'value'        => '',
-                            'label'        => __( 'First Name', 'invoicing' ),
+                            'label'        => __('First Name', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => true,
@@ -222,7 +222,7 @@ 
                         array(
                             'placeholder'  => 'Snow',
                             'value'        => '',
-                            'label'        => __( 'Last Name', 'invoicing' ),
+                            'label'        => __('Last Name', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => true,
@@ -232,7 +232,7 @@ 
                         array(
                             'placeholder'  => '',
                             'value'        => '',
-                            'label'        => __( 'Address', 'invoicing' ),
+                            'label'        => __('Address', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => true,
@@ -242,7 +242,7 @@ 
                         array(
                             'placeholder'  => '',
                             'value'        => '',
-                            'label'        => __( 'City', 'invoicing' ),
+                            'label'        => __('City', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => true,
@@ -250,9 +250,9 @@ 
                         ),
 
                         array(
-                            'placeholder'  => __( 'Select your country' ),
+                            'placeholder'  => __('Select your country'),
                             'value'        => '',
-                            'label'        => __( 'Country', 'invoicing' ),
+                            'label'        => __('Country', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => true,
@@ -260,9 +260,9 @@ 
                         ),
 
                         array(
-                            'placeholder'  => __( 'Choose a state', 'invoicing' ),
+                            'placeholder'  => __('Choose a state', 'invoicing'),
                             'value'        => '',
-                            'label'        => __( 'State / Province', 'invoicing' ),
+                            'label'        => __('State / Province', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => true,
@@ -272,7 +272,7 @@ 
                         array(
                             'placeholder'  => '',
                             'value'        => '',
-                            'label'        => __( 'ZIP / Postcode', 'invoicing' ),
+                            'label'        => __('ZIP / Postcode', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => true,
@@ -282,7 +282,7 @@ 
                         array(
                             'placeholder'  => '',
                             'value'        => '',
-                            'label'        => __( 'Phone', 'invoicing' ),
+                            'label'        => __('Phone', 'invoicing'),
                             'description'  => '',
                             'required'     => false,
                             'visible'      => true,
@@ -294,11 +294,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,
                 )
@@ -317,7 +317,7 @@ 
 
             array( 
                 'type' => 'items',
-                'name' => __( 'Items', 'invoicing' ),
+                'name' => __('Items', 'invoicing'),
                 'defaults'  => array(
                     'value'        => '',
                     'items_type'   => 'total',
@@ -328,25 +328,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\"";
     }
@@ -354,15 +354,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>";
     }
@@ -370,10 +370,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"';
 
@@ -405,8 +405,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>";
     }
@@ -414,16 +414,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>
@@ -439,8 +439,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 class='wpinv-payment-form-field-preview'>
@@ -455,23 +455,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>";
         }
 
@@ -482,16 +482,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>
@@ -519,8 +519,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 class='wpinv-payment-form-field-preview'>
@@ -535,24 +535,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>";
         }
 
@@ -563,16 +563,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>
@@ -600,8 +600,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';
@@ -621,24 +621,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>";
         }
 
@@ -649,18 +649,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'>
@@ -698,8 +698,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>
@@ -714,24 +714,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>";
         }
 
@@ -742,14 +742,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>
@@ -773,8 +773,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 "
@@ -793,20 +793,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'>
@@ -816,8 +816,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>";
         }
 
@@ -828,16 +828,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'>
@@ -871,8 +871,8 @@ 
     /**
      * Renders the address element template.
      */
-    public function render_address_template( $field ) {
-        $restrict    = $this->get_restrict_markup( $field, 'address' );
+    public function render_address_template($field) {
+        $restrict = $this->get_restrict_markup($field, 'address');
 
         echo "
             <div class='wpinv-address-wrapper' $restrict>
@@ -894,55 +894,55 @@ 
     /**
      * Renders the address element on the frontend.
      */
-    public function frontend_render_address_template( $field ) {
+    public function frontend_render_address_template($field) {
         
         echo "<div class='wpinv-address-fields'>";
 
-        foreach( $field['fields'] as $address_field ) {
+        foreach ($field['fields'] as $address_field) {
 
-            if ( empty( $address_field['visible'] ) ) {
+            if (empty($address_field['visible'])) {
                 continue;
             }
 
-            $class = esc_attr( $address_field['name'] );
+            $class = esc_attr($address_field['name']);
             echo "<div class='form-group $class'>";
 
             $label = $address_field['label'];
 
-            if ( ! empty( $address_field['required'] ) ) {
+            if (!empty($address_field['required'])) {
                 $label .= "<span class='text-danger'> *</span>";
             }
 
-            if ( 'wpinv_country' == $address_field['name'] ) {
+            if ('wpinv_country' == $address_field['name']) {
 
-                echo aui()->select( array(
+                echo aui()->select(array(
                     'options'          => wpinv_get_country_list(),
-                    'name'             => esc_attr( $address_field['name'] ),
-                    'id'               => esc_attr( $address_field['name'] ),
+                    'name'             => esc_attr($address_field['name']),
+                    'id'               => esc_attr($address_field['name']),
                     'value'            => wpinv_get_default_country(),
-                    'placeholder'      => esc_attr( $address_field['placeholder'] ),
+                    'placeholder'      => esc_attr($address_field['placeholder']),
                     'required'         => (bool) $address_field['required'],
                     'no_wrap'          => true,
-                    'label'            => wp_kses_post( $label ),
+                    'label'            => wp_kses_post($label),
                     'select2'          => false,
                 ));
     
-            } else if ( 'wpinv_state' == $address_field['name'] ) {
+            } else if ('wpinv_state' == $address_field['name']) {
 
-                $states = wpinv_get_country_states( wpinv_get_default_country() );
+                $states = wpinv_get_country_states(wpinv_get_default_country());
                 $state  = wpinv_get_default_state();
 
-                if ( ! empty( $states ) ) {
+                if (!empty($states)) {
 
-                    echo aui()->select( array(
+                    echo aui()->select(array(
                         'options'          => $states,
-                        'name'             => esc_attr( $address_field['name'] ),
-                        'id'               => esc_attr( $address_field['name'] ),
+                        'name'             => esc_attr($address_field['name']),
+                        'id'               => esc_attr($address_field['name']),
                         'value'            => $state,
-                        'placeholder'      => esc_attr( $address_field['placeholder'] ),
+                        'placeholder'      => esc_attr($address_field['placeholder']),
                         'required'         => (bool) $address_field['required'],
                         'no_wrap'          => true,
-                        'label'            => wp_kses_post( $label ),
+                        'label'            => wp_kses_post($label),
                         'select2'          => false,
                     ));
 
@@ -950,10 +950,10 @@ 
 
                     echo aui()->input(
                         array(
-                            'name'       => esc_attr( $address_field['name'] ),
-                            'id'         => esc_attr( $address_field['name'] ),
+                            'name'       => esc_attr($address_field['name']),
+                            'id'         => esc_attr($address_field['name']),
                             'required'   => (bool) $address_field['required'],
-                            'label'      => wp_kses_post( $label ),
+                            'label'      => wp_kses_post($label),
                             'no_wrap'    => true,
                             'type'       => 'text',
                         )
@@ -965,12 +965,12 @@ 
 
                 echo aui()->input(
                     array(
-                        'name'       => esc_attr( $address_field['name'] ),
-                        'id'         => esc_attr( $address_field['name'] ),
+                        'name'       => esc_attr($address_field['name']),
+                        'id'         => esc_attr($address_field['name']),
                         'required'   => (bool) $address_field['required'],
-                        'label'      => wp_kses_post( $label ),
+                        'label'      => wp_kses_post($label),
                         'no_wrap'    => true,
-                        'placeholder' => esc_attr( $address_field['placeholder'] ),
+                        'placeholder' => esc_attr($address_field['placeholder']),
                         'type'       => 'text',
                     )
                 );
@@ -978,8 +978,8 @@ 
             }
             
 
-            if ( ! empty( $address_field['description'] ) ) {
-                $description = wp_kses_post( $address_field['description'] );
+            if (!empty($address_field['description'])) {
+                $description = wp_kses_post($address_field['description']);
                 echo "<small class='form-text text-muted'>$description</small>";
             }
     
@@ -994,13 +994,13 @@ 
     /**
      * Renders the edit address element template.
      */
-    public function edit_address_template( $field ) {
-        $restrict  = $this->get_restrict_markup( $field, 'address' );
-        $label     = __( 'Field Label', 'invoicing' );
-        $label2    = __( 'Placeholder', 'invoicing' );
-        $label3    = __( 'Description', 'invoicing' );
-        $label4    = __( 'Is required', 'invoicing' );
-        $label5    = __( 'Is visible', 'invoicing' );
+    public function edit_address_template($field) {
+        $restrict  = $this->get_restrict_markup($field, 'address');
+        $label     = __('Field Label', 'invoicing');
+        $label2    = __('Placeholder', 'invoicing');
+        $label3    = __('Description', 'invoicing');
+        $label4    = __('Is required', 'invoicing');
+        $label5    = __('Is visible', 'invoicing');
         $id        = $field . '.id + "_edit_label"';
         $id2       = $field . '.id + "_edit_placeholder"';
         $id3       = $field . '.id + "_edit_description"';
@@ -1068,8 +1068,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 class='wpinv-payment-form-field-preview'>
@@ -1084,8 +1084,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>
@@ -1099,24 +1099,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>";
         }
 
@@ -1127,30 +1127,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>";
         }
 
@@ -1161,16 +1161,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>
@@ -1198,16 +1198,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>
@@ -1231,8 +1231,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 class='wpinv-payment-form-field-preview'>
@@ -1247,24 +1247,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>";
         }
 
@@ -1275,16 +1275,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>
@@ -1312,8 +1312,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 class='wpinv-payment-form-field-preview'>
@@ -1328,23 +1328,23 @@ 
     /**
      * 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'] ),
+                'label'      => wp_kses_post($field['label']),
                 '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>";
         }
 
@@ -1355,14 +1355,14 @@ 
     /**
      * 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"';
-        $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>
@@ -1386,8 +1386,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 class='wpinv-payment-form-field-preview'>
@@ -1402,23 +1402,23 @@ 
     /**
      * 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,
                 '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>";
         }
 
@@ -1429,14 +1429,14 @@ 
     /**
      * 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"';
-        $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>
@@ -1460,8 +1460,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 class='wpinv-payment-form-field-preview'>
@@ -1476,24 +1476,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>";
         }
 
@@ -1504,16 +1504,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>
@@ -1541,23 +1541,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>
@@ -1570,28 +1570,28 @@ 
     /**
      * 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='mt-4 mb-4'>";
-            do_action( 'wpinv_payment_mode_select' );
+            do_action('wpinv_payment_mode_select');
         echo "</div>";
 
         echo "<div class='form-group'>";
 
-        $class = 'wpinv-payment-form-submit btn btn-block submit-button ' . sanitize_html_class( $field['class'] );
+        $class = 'wpinv-payment-form-submit 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>";
         }
 
@@ -1602,14 +1602,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>
@@ -1625,15 +1625,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>
@@ -1644,8 +1644,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'>
@@ -1660,15 +1660,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']),
             )
         );
 
@@ -1679,14 +1679,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>
@@ -1702,14 +1702,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>
@@ -1720,8 +1720,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">
@@ -1738,13 +1738,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>";
         }
 ?>
@@ -1765,12 +1765,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"';
@@ -1799,11 +1799,11 @@ 
     /**
      * Renders the items element template.
      */
-    public function render_items_template( $field ) {
-        $restrict  = $this->get_restrict_markup( $field, 'items' );
-        $label     = __( 'Item totals will appear here. Click to set items.', 'invoicing' );
-        $label2    = __( 'Your form allows customers to buy several recurring items. This is not supported and will lead to unexpected behaviour.', 'invoicing' );
-        $label2   .= ' ' . __( 'To prevent this, limit customers to selecting a single item.', 'invoicing' );
+    public function render_items_template($field) {
+        $restrict  = $this->get_restrict_markup($field, 'items');
+        $label     = __('Item totals will appear here. Click to set items.', 'invoicing');
+        $label2    = __('Your form allows customers to buy several recurring items. This is not supported and will lead to unexpected behaviour.', 'invoicing');
+        $label2   .= ' ' . __('To prevent this, limit customers to selecting a single item.', 'invoicing');
         echo "
             <div $restrict class='item_totals text-center'>
                 <div v-if='canCheckoutSeveralSubscriptions($field)' class='p-4 bg-danger text-light'>$label2</div>
@@ -1815,12 +1815,12 @@ 
     /**
      * 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;
             $tax       = 0;
             $sub_total = 0;
@@ -1829,16 +1829,16 @@ 
             <div class="border item_totals_type_total">
 
                 <?php
-                    foreach( $items as $item ) {
+                    foreach ($items as $item) {
 
-                        $amount = floatval( $item['price'] );
+                        $amount = floatval($item['price']);
 
-                        if ( wpinv_use_taxes() ) {
+                        if (wpinv_use_taxes()) {
 
-                            $rate = wpinv_get_tax_rate( wpinv_get_default_country(), false, (int) $item['id'] );
+                            $rate = wpinv_get_tax_rate(wpinv_get_default_country(), false, (int) $item['id']);
 
-                            if ( wpinv_prices_include_tax() ) {
-                                $pre_tax  = ( $amount - $amount * $rate * 0.01 );
+                            if (wpinv_prices_include_tax()) {
+                                $pre_tax  = ($amount - $amount * $rate * 0.01);
                                 $item_tax = $amount - $pre_tax;
                             } else {
                                 $pre_tax  = $amount;
@@ -1850,27 +1850,27 @@ 
                             $total     = $sub_total + $tax;
 
                         } else {
-                            $total  = $total + $amount;
+                            $total = $total + $amount;
                         }
 
                         $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>
@@ -1878,11 +1878,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 {?>
@@ -1890,15 +1890,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>
@@ -1909,28 +1909,28 @@ 
                             <?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 p-2'>
 
-                    <?php if ( wpinv_use_taxes() ) { ?>
+                    <?php if (wpinv_use_taxes()) { ?>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Sub Total', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price( wpinv_format_amount( $sub_total ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Sub Total', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price(wpinv_format_amount($sub_total)) ?></strong></div>
                         </div>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Tax', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price( wpinv_format_amount( $tax ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Tax', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price(wpinv_format_amount($tax)) ?></strong></div>
                         </div>
                     <?php } ?>
 
                     <div class='row'>
-                        <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>
@@ -1938,22 +1938,22 @@ 
             </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 } ?>
 
@@ -1965,32 +1965,32 @@ 
                         $tax       = 0;
                         $sub_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)) {
 
-                                $amount = floatval( $item['price'] );
+                                $amount = floatval($item['price']);
 
-                                if ( wpinv_use_taxes() ) {
+                                if (wpinv_use_taxes()) {
 
-                                    $rate = wpinv_get_tax_rate( wpinv_get_default_country(), false, (int) $item['id'] );
+                                    $rate = wpinv_get_tax_rate(wpinv_get_default_country(), false, (int) $item['id']);
 
-                                    if ( wpinv_prices_include_tax() ) {
-                                        $pre_tax  = ( $amount - $amount * $rate * 0.01 );
+                                    if (wpinv_prices_include_tax()) {
+                                        $pre_tax  = ($amount - $amount * $rate * 0.01);
                                         $item_tax = $amount - $pre_tax;
                                     } else {
                                         $pre_tax  = $amount;
@@ -2002,13 +2002,13 @@ 
                                     $total     = $sub_total + $tax;
 
                                 } else {
-                                    $total  = $total + $amount;
+                                    $total = $total + $amount;
                                 }
 
                                 $class3 = '';
                                 $name   = "wpinv-items[{$item['id']}]";
 
-                                if ( empty( $item['required'] ) ) {
+                                if (empty($item['required'])) {
                                     $totals_selected_radio_item = 1;
                                 }
 
@@ -2020,9 +2020,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>
@@ -2030,11 +2030,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 {?>
@@ -2042,15 +2042,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>
@@ -2061,27 +2061,27 @@ 
                             <?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 p-2'>
-                    <?php if ( wpinv_use_taxes() ) { ?>
+                    <?php if (wpinv_use_taxes()) { ?>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Sub Total', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price( wpinv_format_amount( $sub_total ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Sub Total', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price(wpinv_format_amount($sub_total)) ?></strong></div>
                         </div>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Tax', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price( wpinv_format_amount( $tax ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Tax', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price(wpinv_format_amount($tax)) ?></strong></div>
                         </div>
                     <?php } ?>
 
                     <div class='row'>
-                        <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>
 
@@ -2089,22 +2089,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 "
@@ -2113,7 +2113,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>";
                         }
                     }
@@ -2127,31 +2127,31 @@ 
                         $tax       = 0;
                         $sub_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)) {
 
-                                $amount = floatval( $item['price'] );
-                                if ( wpinv_use_taxes() ) {
+                                $amount = floatval($item['price']);
+                                if (wpinv_use_taxes()) {
 
-                                    $rate = wpinv_get_tax_rate( wpinv_get_default_country(), false, (int) $item['id'] );
+                                    $rate = wpinv_get_tax_rate(wpinv_get_default_country(), false, (int) $item['id']);
 
-                                    if ( wpinv_prices_include_tax() ) {
-                                        $pre_tax  = ( $amount - $amount * $rate * 0.01 );
+                                    if (wpinv_prices_include_tax()) {
+                                        $pre_tax  = ($amount - $amount * $rate * 0.01);
                                         $item_tax = $amount - $pre_tax;
                                     } else {
                                         $pre_tax  = $amount;
@@ -2163,13 +2163,13 @@ 
                                     $total     = $sub_total + $tax;
 
                                 } else {
-                                    $total  = $total + $amount;
+                                    $total = $total + $amount;
                                 }
 
                                 $class3 = '';
-                                $name  = "wpinv-items[{$item['id']}]";
+                                $name = "wpinv-items[{$item['id']}]";
 
-                                if ( empty( $item['required'] ) ) {
+                                if (empty($item['required'])) {
                                     $totals_selected_checkbox_item = 1;
                                 }
 
@@ -2181,9 +2181,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>
@@ -2191,11 +2191,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 {?>
@@ -2203,15 +2203,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>
@@ -2222,35 +2222,35 @@ 
                             <?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 p-2'>
 
-                    <?php if ( wpinv_use_taxes() ) { ?>
+                    <?php if (wpinv_use_taxes()) { ?>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Sub Total', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price( wpinv_format_amount( $sub_total ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Sub Total', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price(wpinv_format_amount($sub_total)) ?></strong></div>
                         </div>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Tax', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price( wpinv_format_amount( $tax ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Tax', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price(wpinv_format_amount($tax)) ?></strong></div>
                         </div>
                     <?php } ?>
 
                     <div class='row'>
-                        <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">
 
@@ -2258,17 +2258,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;
                         }
@@ -2279,7 +2279,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',
@@ -2296,31 +2296,31 @@ 
                         $tax       = 0;
                         $sub_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)) {
 
-                                $amount = floatval( $item['price'] );
-                                if ( wpinv_use_taxes() ) {
+                                $amount = floatval($item['price']);
+                                if (wpinv_use_taxes()) {
 
-                                    $rate = wpinv_get_tax_rate( wpinv_get_default_country(), false, (int) $item['id'] );
+                                    $rate = wpinv_get_tax_rate(wpinv_get_default_country(), false, (int) $item['id']);
 
-                                    if ( wpinv_prices_include_tax() ) {
-                                        $pre_tax  = ( $amount - $amount * $rate * 0.01 );
+                                    if (wpinv_prices_include_tax()) {
+                                        $pre_tax  = ($amount - $amount * $rate * 0.01);
                                         $item_tax = $amount - $pre_tax;
                                     } else {
                                         $pre_tax  = $amount;
@@ -2332,13 +2332,13 @@ 
                                     $total     = $sub_total + $tax;
 
                                 } else {
-                                    $total  = $total + $amount;
+                                    $total = $total + $amount;
                                 }
 
                                 $class3 = '';
-                                $name  = "wpinv-items[{$item['id']}]";
+                                $name = "wpinv-items[{$item['id']}]";
 
-                                if ( empty( $item['required'] ) ) {
+                                if (empty($item['required'])) {
                                     $totals_selected_select_item = 1;
                                 }
 
@@ -2350,9 +2350,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>
@@ -2360,11 +2360,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 {?>
@@ -2372,15 +2372,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>
@@ -2391,34 +2391,34 @@ 
                             <?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 p-2'>
 
-                    <?php if ( wpinv_use_taxes() ) { ?>
+                    <?php if (wpinv_use_taxes()) { ?>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Sub Total', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price( wpinv_format_amount( $sub_total ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Sub Total', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price(wpinv_format_amount($sub_total)) ?></strong></div>
                         </div>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Tax', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price( wpinv_format_amount( $tax ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Tax', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price(wpinv_format_amount($tax)) ?></strong></div>
                         </div>
                     <?php } ?>
                     <div class='row'>
-                        <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">
 
@@ -2427,18 +2427,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;
                         }
 
@@ -2465,31 +2465,31 @@ 
                         $tax       = 0;
                         $sub_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)) {
 
-                                $amount = floatval( $item['price'] );
-                                if ( wpinv_use_taxes() ) {
+                                $amount = floatval($item['price']);
+                                if (wpinv_use_taxes()) {
 
-                                    $rate = wpinv_get_tax_rate( wpinv_get_default_country(), false, (int) $item['id'] );
+                                    $rate = wpinv_get_tax_rate(wpinv_get_default_country(), false, (int) $item['id']);
 
-                                    if ( wpinv_prices_include_tax() ) {
-                                        $pre_tax  = ( $amount - $amount * $rate * 0.01 );
+                                    if (wpinv_prices_include_tax()) {
+                                        $pre_tax  = ($amount - $amount * $rate * 0.01);
                                         $item_tax = $amount - $pre_tax;
                                     } else {
                                         $pre_tax  = $amount;
@@ -2501,13 +2501,13 @@ 
                                     $total     = $sub_total + $tax;
 
                                 } else {
-                                    $total  = $total + $amount;
+                                    $total = $total + $amount;
                                 }
 
                                 $class3 = '';
-                                $name  = "wpinv-items[{$item['id']}]";
+                                $name = "wpinv-items[{$item['id']}]";
 
-                                if ( empty( $item['required'] ) ) {
+                                if (empty($item['required'])) {
                                     $totals_selected_select_item = 1;
                                 }
 
@@ -2519,9 +2519,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>
@@ -2529,11 +2529,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 {?>
@@ -2541,15 +2541,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>
@@ -2560,35 +2560,35 @@ 
                             <?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 p-2'>
 
-                    <?php if ( wpinv_use_taxes() ) { ?>
+                    <?php if (wpinv_use_taxes()) { ?>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Sub Total', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price( wpinv_format_amount( $sub_total ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Sub Total', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-sub-total'><?php echo wpinv_price(wpinv_format_amount($sub_total)) ?></strong></div>
                         </div>
                         <div class='row'>
-                            <div class='col-8'><strong class='mr-5'><?php _e( 'Tax', 'invoicing' ); ?></strong></div>
-                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price( wpinv_format_amount( $tax ) ) ?></strong></div>
+                            <div class='col-8'><strong class='mr-5'><?php _e('Tax', 'invoicing'); ?></strong></div>
+                            <div class='col-4'><strong class='wpinv-items-tax' ><?php echo wpinv_price(wpinv_format_amount($tax)) ?></strong></div>
                         </div>
                     <?php } ?>
 
                     <div class='row'>
-                        <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
@@ -2597,20 +2597,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>
@@ -2680,7 +2680,7 @@ 
                 <div class='form-group mt-2'>
 
                     <select class='form-control custom-select' v-model='selected_item' @change='addSelectedItem'>
-                        <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>
 
@@ -2695,11 +2695,11 @@ 
                     <label :for='$id2'>$label</label>
 
                     <select class='form-control custom-select' :id='$id2' v-model='$field.items_type'>
-                        <option value='total' :disabled='canCheckoutSeveralSubscriptions($field)'>"        . __( 'Buy all items on the list', 'invoicing' ) ."</option>
-                        <option value='radio'>"        . __( 'Select a single item from the list', 'invoicing' ) ."</option>
-                        <option value='checkbox' :disabled='canCheckoutSeveralSubscriptions($field)'>"     . __( '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' :disabled='canCheckoutSeveralSubscriptions($field)'>" . __( 'Select a one or more items from a dropdown', 'invoicing' ) ."</option>
+                        <option value='total' :disabled='canCheckoutSeveralSubscriptions($field)'>" . __('Buy all items on the list', 'invoicing') . "</option>
+                        <option value='radio'>"        . __('Select a single item from the list', 'invoicing') . "</option>
+                        <option value='checkbox' :disabled='canCheckoutSeveralSubscriptions($field)'>" . __('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' :disabled='canCheckoutSeveralSubscriptions($field)'>" . __('Select a one or more items from a dropdown', 'invoicing') . "</option>
                     </select>
 
                 </div>
@@ -2724,7 +2724,7 @@ 
             'orderby'        => 'title',
             'order'          => 'ASC',
             'posts_per_page' => -1,
-            'post_status'    => array( 'publish' ),
+            'post_status'    => array('publish'),
             'meta_query'     => array(
                 array(
                     'key'       => '_wpinv_type',
@@ -2734,24 +2734,24 @@ 
             )
         );
     
-        $items = get_posts( apply_filters( 'wpinv_payment_form_item_dropdown_query_args', $item_args ) );
+        $items = get_posts(apply_filters('wpinv_payment_form_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;
@@ -2761,47 +2761,47 @@ 
     /**
      * 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');
     }
 
     /**
      * Sends a redrect response to payment details.
      *
      */
-    public function send_redirect_response( $url ) {
-        $url = urlencode( $url );
-        wp_send_json_success( $url );
+    public function send_redirect_response($url) {
+        $url = urlencode($url);
+        wp_send_json_success($url);
     }
 
     /**
@@ -2812,12 +2812,12 @@ 
 
         $errors = wpinv_get_errors();
 
-        if ( ! empty( $errors ) ) {
+        if (!empty($errors)) {
             wpinv_print_errors();
             exit;
         }
 
-        wp_send_json_error( __( 'An error occured while processing your payment. Please try again.', 'invoicing' ) );
+        wp_send_json_error(__('An error occured while processing your payment. Please try again.', 'invoicing'));
         exit;
 
     }

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

Spacing +101 added lines, -101 removed lines

@@ -1,32 +1,32 @@ 
 <?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) {
         global $wpinv_euvat;
 
         $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();
         $taxable            = $invoice->is_taxable();
 
         $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);
@@ -37,39 +37,39 @@ 
     <div class="gdmbx2-metabox gdmbx-field-list" id="gdmbx2-metabox-wpinv_details">
 
         <div class="gdmbx-row gdmbx-type-text gdmbx2-id-wpinv-date-created table-layout">
-            <div class="gdmbx-th"><label for="wpinv_date_created"><?php _e( 'Date Created:', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_date_created"><?php _e('Date Created:', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="datetime-local" value="<?php echo esc_attr( date( 'Y-m-d\TH:i:s', $datetime_created ) );?>" id="wpinv_date_created" name="date_created" class="regular-text">
+                <input type="datetime-local" value="<?php echo esc_attr(date('Y-m-d\TH:i:s', $datetime_created)); ?>" id="wpinv_date_created" name="date_created" class="regular-text">
             </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>
@@ -78,129 +78,129 @@ 
         <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 ( $wpinv_euvat->allow_vat_rules() && ! ( $invoice->is_paid() || $invoice->is_refunded() ) ) { ?>
+        <?php if ($wpinv_euvat->allow_vat_rules() && !($invoice->is_paid() || $invoice->is_refunded())) { ?>
         <div class="gdmbx-row gdmbx-type-select gdmbx2-id-wpinv-taxable">
             <div class="gdmbx-th">
                 <label for="wpinv_taxable">
-                    <input type="checkbox" name="disable_taxes" value="1" <?php checked( $taxable, false ); ?> id="wpinv_taxable">
-                    <?php _e( 'Disable taxes', 'invoicing' ); ?>
+                    <input type="checkbox" name="disable_taxes" value="1" <?php checked($taxable, false); ?> id="wpinv_taxable">
+                    <?php _e('Disable taxes', 'invoicing'); ?>
                 </label>
             </div>
         </div>
         <?php } ?>
 
-        <?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>
@@ -208,16 +208,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
         }
     }
@@ -225,47 +225,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.php

Spacing +245 added lines, -245 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']          = __( 'Continue', 'invoicing' );
+        $localize['txtComplete']          = __('Continue', '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', 'wp-hooks' ),  $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', 'wp-hooks'), $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,21 +353,21 @@ 
             }
         }
 
-        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);
 
-        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin.js' );
-        wp_register_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'jquery-blockui','jquery-ui-tooltip' ),  $version );
-        wp_enqueue_script( 'wpinv-admin-script' );
+        $version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin.js');
+        wp_register_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'jquery-blockui', 'jquery-ui-tooltip'), $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();
@@ -375,95 +375,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';
         }
 
@@ -475,21 +475,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');
     }
 
 	/**
@@ -497,13 +497,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');
 	}
     
     /**
@@ -512,10 +512,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();
         }
 
@@ -523,24 +523,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/class-wpinv-invoice.php

Spacing +625 added lines, -625 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__));
 }
 
 final class WPInv_Invoice {
-    public $ID  = 0;
+    public $ID = 0;
     public $title;
     public $post_type;
     
@@ -66,17 +66,17 @@ 
     public $full_name = '';
     public $parent_invoice = 0;
     
-    public function __construct( $invoice_id = false ) {
-        if( empty( $invoice_id ) ) {
+    public function __construct($invoice_id = false) {
+        if (empty($invoice_id)) {
             return false;
         }
 
-        $this->setup_invoice( $invoice_id );
+        $this->setup_invoice($invoice_id);
     }
 
-    public function get( $key ) {
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            $value = call_user_func( array( $this, 'get_' . $key ) );
+    public function get($key) {
+        if (method_exists($this, 'get_' . $key)) {
+            $value = call_user_func(array($this, 'get_' . $key));
         } else {
             $value = $this->$key;
         }
@@ -84,51 +84,51 @@ 
         return $value;
     }
 
-    public function set( $key, $value ) {
-        $ignore = array( 'items', 'cart_details', 'fees', '_ID' );
+    public function set($key, $value) {
+        $ignore = array('items', 'cart_details', 'fees', '_ID');
 
-        if ( $key === 'status' ) {
+        if ($key === 'status') {
             $this->old_status = $this->status;
         }
 
-        if ( ! in_array( $key, $ignore ) ) {
-            $this->pending[ $key ] = $value;
+        if (!in_array($key, $ignore)) {
+            $this->pending[$key] = $value;
         }
 
-        if( '_ID' !== $key ) {
+        if ('_ID' !== $key) {
             $this->$key = $value;
         }
     }
 
-    public function _isset( $name ) {
-        if ( property_exists( $this, $name) ) {
-            return false === empty( $this->$name );
+    public function _isset($name) {
+        if (property_exists($this, $name)) {
+            return false === empty($this->$name);
         } else {
             return null;
         }
     }
 
-    private function setup_invoice( $invoice_id ) {
+    private function setup_invoice($invoice_id) {
         $this->pending = array();
 
-        if ( empty( $invoice_id ) ) {
+        if (empty($invoice_id)) {
             return false;
         }
 
-        $invoice = get_post( $invoice_id );
+        $invoice = get_post($invoice_id);
 
-        if( !$invoice || is_wp_error( $invoice ) ) {
+        if (!$invoice || is_wp_error($invoice)) {
             return false;
         }
 
-        if( !('wpi_invoice' == $invoice->post_type OR 'wpi_quote' == $invoice->post_type) ) {
+        if (!('wpi_invoice' == $invoice->post_type OR 'wpi_quote' == $invoice->post_type)) {
             return false;
         }
 
-        do_action( 'wpinv_pre_setup_invoice', $this, $invoice_id );
+        do_action('wpinv_pre_setup_invoice', $this, $invoice_id);
         
         // Primary Identifier
-        $this->ID              = absint( $invoice_id );
+        $this->ID              = absint($invoice_id);
         $this->post_type       = $invoice->post_type;
         
         // We have a payment, get the generic payment_meta item to reduce calls to it
@@ -138,14 +138,14 @@ 
         $this->completed_date  = $this->setup_completed_date();
         $this->status          = $invoice->post_status;
 
-        if ( 'future' == $this->status ) {
+        if ('future' == $this->status) {
             $this->status = 'publish';
         }
 
         $this->post_status     = $this->status;
         $this->mode            = $this->setup_mode();
         $this->parent_invoice  = $invoice->post_parent;
-        $this->post_name       = $this->setup_post_name( $invoice );
+        $this->post_name       = $this->setup_post_name($invoice);
         $this->status_nicename = $this->setup_status_nicename($invoice->post_status);
 
         // Items
@@ -168,8 +168,8 @@ 
         
         // User based
         $this->ip              = $this->setup_ip();
-        $this->user_id         = !empty( $invoice->post_author ) ? $invoice->post_author : get_current_user_id();///$this->setup_user_id();
-        $this->email           = get_the_author_meta( 'email', $this->user_id );
+        $this->user_id         = !empty($invoice->post_author) ? $invoice->post_author : get_current_user_id(); ///$this->setup_user_id();
+        $this->email           = get_the_author_meta('email', $this->user_id);
         
         $this->user_info       = $this->setup_user_info();
                 
@@ -178,7 +178,7 @@ 
         $this->company         = $this->user_info['company'];
         $this->vat_number      = $this->user_info['vat_number'];
         $this->vat_rate        = $this->user_info['vat_rate'];
-        $this->adddress_confirmed  = $this->user_info['adddress_confirmed'];
+        $this->adddress_confirmed = $this->user_info['adddress_confirmed'];
         $this->address         = $this->user_info['address'];
         $this->city            = $this->user_info['city'];
         $this->country         = $this->user_info['country'];
@@ -193,39 +193,39 @@ 
         // Other Identifiers
         $this->key             = $this->setup_invoice_key();
         $this->number          = $this->setup_invoice_number();
-        $this->title           = !empty( $invoice->post_title ) ? $invoice->post_title : $this->number;
+        $this->title           = !empty($invoice->post_title) ? $invoice->post_title : $this->number;
         
-        $this->full_name       = trim( $this->first_name . ' '. $this->last_name );
+        $this->full_name       = trim($this->first_name . ' ' . $this->last_name);
         
         // Allow extensions to add items to this object via hook
-        do_action( 'wpinv_setup_invoice', $this, $invoice_id );
+        do_action('wpinv_setup_invoice', $this, $invoice_id);
 
         return true;
     }
 
-    private function setup_status_nicename( $status ) {
-        $all_invoice_statuses  = wpinv_get_invoice_statuses( true, true, $this );
+    private function setup_status_nicename($status) {
+        $all_invoice_statuses = wpinv_get_invoice_statuses(true, true, $this);
 
-        if ( $this->is_quote() && class_exists( 'Wpinv_Quotes_Shared' ) ) {
-            $all_invoice_statuses  = Wpinv_Quotes_Shared::wpinv_get_quote_statuses();
+        if ($this->is_quote() && class_exists('Wpinv_Quotes_Shared')) {
+            $all_invoice_statuses = Wpinv_Quotes_Shared::wpinv_get_quote_statuses();
         }
-        $status   = isset( $all_invoice_statuses[$status] ) ? $all_invoice_statuses[$status] : __( $status, 'invoicing' );
+        $status = isset($all_invoice_statuses[$status]) ? $all_invoice_statuses[$status] : __($status, 'invoicing');
 
-        return apply_filters( 'setup_status_nicename', $status );
+        return apply_filters('setup_status_nicename', $status);
     }
 
-    private function setup_post_name( $post = NULL ) {
+    private function setup_post_name($post = NULL) {
         global $wpdb;
         
         $post_name = '';
         
-        if ( !empty( $post ) ) {
-            if( !empty( $post->post_name ) ) {
+        if (!empty($post)) {
+            if (!empty($post->post_name)) {
                 $post_name = $post->post_name;
-            } else if ( !empty( $post->ID ) ) {
-                $post_name = wpinv_generate_post_name( $post->ID );
+            } else if (!empty($post->ID)) {
+                $post_name = wpinv_generate_post_name($post->ID);
 
-                $wpdb->update( $wpdb->posts, array( 'post_name' => $post_name ), array( 'ID' => $post->ID ) );
+                $wpdb->update($wpdb->posts, array('post_name' => $post_name), array('ID' => $post->ID));
             }
         }
 
@@ -233,12 +233,12 @@ 
     }
     
     private function setup_due_date() {
-        $due_date = $this->get_meta( '_wpinv_due_date' );
+        $due_date = $this->get_meta('_wpinv_due_date');
         
-        if ( empty( $due_date ) ) {
-            $overdue_time = strtotime( $this->date ) + ( DAY_IN_SECONDS * absint( wpinv_get_option( 'overdue_days' ) ) );
-            $due_date = date_i18n( 'Y-m-d', $overdue_time );
-        } else if ( $due_date == 'none' ) {
+        if (empty($due_date)) {
+            $overdue_time = strtotime($this->date) + (DAY_IN_SECONDS * absint(wpinv_get_option('overdue_days')));
+            $due_date = date_i18n('Y-m-d', $overdue_time);
+        } else if ($due_date == 'none') {
             $due_date = '';
         }
         
@@ -246,67 +246,67 @@ 
     }
     
     private function setup_completed_date() {
-        $invoice = get_post( $this->ID );
+        $invoice = get_post($this->ID);
 
-        if ( 'wpi-pending' == $invoice->post_status || 'preapproved' == $invoice->post_status ) {
+        if ('wpi-pending' == $invoice->post_status || 'preapproved' == $invoice->post_status) {
             return false; // This invoice was never paid
         }
 
-        $date = ( $date = $this->get_meta( '_wpinv_completed_date', true ) ) ? $date : $invoice->modified_date;
+        $date = ($date = $this->get_meta('_wpinv_completed_date', true)) ? $date : $invoice->modified_date;
 
         return $date;
     }
     
     private function setup_cart_details() {
-        $cart_details = isset( $this->payment_meta['cart_details'] ) ? maybe_unserialize( $this->payment_meta['cart_details'] ) : array();
+        $cart_details = isset($this->payment_meta['cart_details']) ? maybe_unserialize($this->payment_meta['cart_details']) : array();
         return $cart_details;
     }
     
     public function array_convert() {
-        return get_object_vars( $this );
+        return get_object_vars($this);
     }
     
     private function setup_items() {
-        $items = isset( $this->payment_meta['items'] ) ? maybe_unserialize( $this->payment_meta['items'] ) : array();
+        $items = isset($this->payment_meta['items']) ? maybe_unserialize($this->payment_meta['items']) : array();
         return $items;
     }
     
     private function setup_fees() {
-        $payment_fees = isset( $this->payment_meta['fees'] ) ? $this->payment_meta['fees'] : array();
+        $payment_fees = isset($this->payment_meta['fees']) ? $this->payment_meta['fees'] : array();
         return $payment_fees;
     }
         
     private function setup_currency() {
-        $currency = isset( $this->payment_meta['currency'] ) ? $this->payment_meta['currency'] : apply_filters( 'wpinv_currency_default', wpinv_get_currency(), $this );
+        $currency = isset($this->payment_meta['currency']) ? $this->payment_meta['currency'] : apply_filters('wpinv_currency_default', wpinv_get_currency(), $this);
         return $currency;
     }
     
     private function setup_discount() {
         //$discount = $this->get_meta( '_wpinv_discount', true );
-        $discount = (float)$this->subtotal - ( (float)$this->total - (float)$this->tax - (float)$this->fees_total );
-        if ( $discount < 0 ) {
+        $discount = (float) $this->subtotal - ((float) $this->total - (float) $this->tax - (float) $this->fees_total);
+        if ($discount < 0) {
             $discount = 0;
         }
-        $discount = wpinv_round_amount( $discount );
+        $discount = wpinv_round_amount($discount);
         
         return $discount;
     }
     
     private function setup_discount_code() {
-        $discount_code = !empty( $this->discounts ) ? $this->discounts : $this->get_meta( '_wpinv_discount_code', true );
+        $discount_code = !empty($this->discounts) ? $this->discounts : $this->get_meta('_wpinv_discount_code', true);
         return $discount_code;
     }
     
     private function setup_tax() {
 
-        $tax = $this->get_meta( '_wpinv_tax', true );
+        $tax = $this->get_meta('_wpinv_tax', true);
 
         // We don't have tax as it's own meta and no meta was passed
-        if ( '' === $tax ) {            
-            $tax = isset( $this->payment_meta['tax'] ) ? $this->payment_meta['tax'] : 0;
+        if ('' === $tax) {            
+            $tax = isset($this->payment_meta['tax']) ? $this->payment_meta['tax'] : 0;
         }
         
-        if ( $tax < 0 || ! $this->is_taxable() ) {
+        if ($tax < 0 || !$this->is_taxable()) {
             $tax = 0;
         }
 
@@ -317,16 +317,16 @@ 
      * If taxes are enabled, allow users to enable/disable taxes per invoice.
      */
     private function setup_is_taxable() {
-        return (int) $this->get_meta( '_wpinv_disable_taxes', true );
+        return (int) $this->get_meta('_wpinv_disable_taxes', true);
     }
 
     private function setup_subtotal() {
         $subtotal     = 0;
         $cart_details = $this->cart_details;
 
-        if ( is_array( $cart_details ) ) {
-            foreach ( $cart_details as $item ) {
-                if ( isset( $item['subtotal'] ) ) {
+        if (is_array($cart_details)) {
+            foreach ($cart_details as $item) {
+                if (isset($item['subtotal'])) {
                     $subtotal += $item['subtotal'];
                 }
             }
@@ -340,23 +340,23 @@ 
     }
 
     private function setup_discounts() {
-        $discounts = ! empty( $this->payment_meta['user_info']['discount'] ) ? $this->payment_meta['user_info']['discount'] : array();
+        $discounts = !empty($this->payment_meta['user_info']['discount']) ? $this->payment_meta['user_info']['discount'] : array();
         return $discounts;
     }
     
     private function setup_total() {
-        $amount = $this->get_meta( '_wpinv_total', true );
+        $amount = $this->get_meta('_wpinv_total', true);
 
-        if ( empty( $amount ) && '0.00' != $amount ) {
-            $meta   = $this->get_meta( '_wpinv_payment_meta', true );
-            $meta   = maybe_unserialize( $meta );
+        if (empty($amount) && '0.00' != $amount) {
+            $meta   = $this->get_meta('_wpinv_payment_meta', true);
+            $meta   = maybe_unserialize($meta);
 
-            if ( isset( $meta['amount'] ) ) {
+            if (isset($meta['amount'])) {
                 $amount = $meta['amount'];
             }
         }
 
-        if($amount < 0){
+        if ($amount < 0) {
             $amount = 0;
         }
 
@@ -364,13 +364,13 @@ 
     }
     
     private function setup_mode() {
-        return $this->get_meta( '_wpinv_mode' );
+        return $this->get_meta('_wpinv_mode');
     }
 
     private function setup_gateway() {
-        $gateway = $this->get_meta( '_wpinv_gateway' );
+        $gateway = $this->get_meta('_wpinv_gateway');
         
-        if ( empty( $gateway ) && 'publish' === $this->status ) {
+        if (empty($gateway) && 'publish' === $this->status) {
             $gateway = 'manual';
         }
         
@@ -378,23 +378,23 @@ 
     }
 
     private function setup_gateway_title() {
-        $gateway_title = wpinv_get_gateway_checkout_label( $this->gateway );
+        $gateway_title = wpinv_get_gateway_checkout_label($this->gateway);
         return $gateway_title;
     }
 
     private function setup_transaction_id() {
-        $transaction_id = $this->get_meta( '_wpinv_transaction_id' );
+        $transaction_id = $this->get_meta('_wpinv_transaction_id');
 
-        if ( empty( $transaction_id ) || (int) $transaction_id === (int) $this->ID ) {
+        if (empty($transaction_id) || (int) $transaction_id === (int) $this->ID) {
             $gateway        = $this->gateway;
-            $transaction_id = apply_filters( 'wpinv_get_invoice_transaction_id-' . $gateway, $this->ID );
+            $transaction_id = apply_filters('wpinv_get_invoice_transaction_id-' . $gateway, $this->ID);
         }
 
         return $transaction_id;
     }
 
     private function setup_ip() {
-        $ip = $this->get_meta( '_wpinv_user_ip' );
+        $ip = $this->get_meta('_wpinv_user_ip');
         return $ip;
     }
 
@@ -404,62 +404,62 @@ 
     ///}
         
     private function setup_first_name() {
-        $first_name = $this->get_meta( '_wpinv_first_name' );
+        $first_name = $this->get_meta('_wpinv_first_name');
         return $first_name;
     }
     
     private function setup_last_name() {
-        $last_name = $this->get_meta( '_wpinv_last_name' );
+        $last_name = $this->get_meta('_wpinv_last_name');
         return $last_name;
     }
     
     private function setup_company() {
-        $company = $this->get_meta( '_wpinv_company' );
+        $company = $this->get_meta('_wpinv_company');
         return $company;
     }
     
     private function setup_vat_number() {
-        $vat_number = $this->get_meta( '_wpinv_vat_number' );
+        $vat_number = $this->get_meta('_wpinv_vat_number');
         return $vat_number;
     }
     
     private function setup_vat_rate() {
-        $vat_rate = $this->get_meta( '_wpinv_vat_rate' );
+        $vat_rate = $this->get_meta('_wpinv_vat_rate');
         return $vat_rate;
     }
     
     private function setup_adddress_confirmed() {
-        $adddress_confirmed = $this->get_meta( '_wpinv_adddress_confirmed' );
+        $adddress_confirmed = $this->get_meta('_wpinv_adddress_confirmed');
         return $adddress_confirmed;
     }
     
     private function setup_phone() {
-        $phone = $this->get_meta( '_wpinv_phone' );
+        $phone = $this->get_meta('_wpinv_phone');
         return $phone;
     }
     
     private function setup_address() {
-        $address = $this->get_meta( '_wpinv_address', true );
+        $address = $this->get_meta('_wpinv_address', true);
         return $address;
     }
     
     private function setup_city() {
-        $city = $this->get_meta( '_wpinv_city', true );
+        $city = $this->get_meta('_wpinv_city', true);
         return $city;
     }
     
     private function setup_country() {
-        $country = $this->get_meta( '_wpinv_country', true );
+        $country = $this->get_meta('_wpinv_country', true);
         return $country;
     }
     
     private function setup_state() {
-        $state = $this->get_meta( '_wpinv_state', true );
+        $state = $this->get_meta('_wpinv_state', true);
         return $state;
     }
     
     private function setup_zip() {
-        $zip = $this->get_meta( '_wpinv_zip', true );
+        $zip = $this->get_meta('_wpinv_zip', true);
         return $zip;
     }
 
@@ -468,7 +468,7 @@ 
             'user_id'        => $this->user_id,
             'first_name'     => $this->first_name,
             'last_name'      => $this->last_name,
-            'email'          => get_the_author_meta( 'email', $this->user_id ),
+            'email'          => get_the_author_meta('email', $this->user_id),
             'phone'          => $this->phone,
             'address'        => $this->address,
             'city'           => $this->city,
@@ -483,12 +483,12 @@ 
         );
         
         $user_info = array();
-        if ( isset( $this->payment_meta['user_info'] ) ) {
-            $user_info = maybe_unserialize( $this->payment_meta['user_info'] );
+        if (isset($this->payment_meta['user_info'])) {
+            $user_info = maybe_unserialize($this->payment_meta['user_info']);
             
-            if ( !empty( $user_info ) && isset( $user_info['user_id'] ) && $post = get_post( $this->ID ) ) {
+            if (!empty($user_info) && isset($user_info['user_id']) && $post = get_post($this->ID)) {
                 $this->user_id = $post->post_author;
-                $this->email = get_the_author_meta( 'email', $this->user_id );
+                $this->email = get_the_author_meta('email', $this->user_id);
                 
                 $user_info['user_id'] = $this->user_id;
                 $user_info['email'] = $this->email;
@@ -497,13 +497,13 @@ 
             }
         }
         
-        $user_info    = wp_parse_args( $user_info, $defaults );
+        $user_info = wp_parse_args($user_info, $defaults);
         
         // Get the user, but only if it's been created
-        $user = get_userdata( $this->user_id );
+        $user = get_userdata($this->user_id);
         
-        if ( !empty( $user ) && $user->ID > 0 ) {
-            if ( empty( $user_info ) ) {
+        if (!empty($user) && $user->ID > 0) {
+            if (empty($user_info)) {
                 $user_info = array(
                     'user_id'    => $user->ID,
                     'first_name' => $user->first_name,
@@ -512,23 +512,23 @@ 
                     'discount'   => '',
                 );
             } else {
-                foreach ( $user_info as $key => $value ) {
-                    if ( ! empty( $value ) ) {
+                foreach ($user_info as $key => $value) {
+                    if (!empty($value)) {
                         continue;
                     }
 
-                    switch( $key ) {
+                    switch ($key) {
                         case 'user_id':
-                            $user_info[ $key ] = $user->ID;
+                            $user_info[$key] = $user->ID;
                             break;
                         case 'first_name':
-                            $user_info[ $key ] = $user->first_name;
+                            $user_info[$key] = $user->first_name;
                             break;
                         case 'last_name':
-                            $user_info[ $key ] = $user->last_name;
+                            $user_info[$key] = $user->last_name;
                             break;
                         case 'email':
-                            $user_info[ $key ] = $user->user_email;
+                            $user_info[$key] = $user->user_email;
                             break;
                     }
                 }
@@ -539,25 +539,25 @@ 
     }
 
     private function setup_invoice_key() {
-        $key = $this->get_meta( '_wpinv_key', true );
+        $key = $this->get_meta('_wpinv_key', true);
         
         return $key;
     }
 
     private function setup_invoice_number() {
-        $number = $this->get_meta( '_wpinv_number', true );
+        $number = $this->get_meta('_wpinv_number', true);
 
-        if ( !$number ) {
+        if (!$number) {
             $number = $this->ID;
 
-            if ( $this->status == 'auto-draft' ) {
-                if ( wpinv_sequential_number_active( $this->post_type ) ) {
-                    $next_number = wpinv_get_next_invoice_number( $this->post_type );
+            if ($this->status == 'auto-draft') {
+                if (wpinv_sequential_number_active($this->post_type)) {
+                    $next_number = wpinv_get_next_invoice_number($this->post_type);
                     $number      = $next_number;
                 }
             }
             
-            $number = wpinv_format_invoice_number( $number, $this->post_type );
+            $number = wpinv_format_invoice_number($number, $this->post_type);
         }
 
         return $number;
@@ -566,10 +566,10 @@ 
     private function insert_invoice() {
         global $wpdb;
 
-        if ( empty( $this->post_type ) ) {
-            if ( !empty( $this->ID ) && $post_type = get_post_type( $this->ID ) ) {
+        if (empty($this->post_type)) {
+            if (!empty($this->ID) && $post_type = get_post_type($this->ID)) {
                 $this->post_type = $post_type;
-            } else if ( !empty( $this->parent_invoice ) && $post_type = get_post_type( $this->parent_invoice ) ) {
+            } else if (!empty($this->parent_invoice) && $post_type = get_post_type($this->parent_invoice)) {
                 $this->post_type = $post_type;
             } else {
                 $this->post_type = 'wpi_invoice';
@@ -577,16 +577,16 @@ 
         }
 
         $invoice_number = $this->ID;
-        if ( $number = $this->get_meta( '_wpinv_number', true ) ) {
+        if ($number = $this->get_meta('_wpinv_number', true)) {
             $invoice_number = $number;
         }
 
-        if ( empty( $this->key ) ) {
+        if (empty($this->key)) {
             $this->key = self::generate_key();
             $this->pending['key'] = $this->key;
         }
 
-        if ( empty( $this->ip ) ) {
+        if (empty($this->ip)) {
             $this->ip = wpinv_get_ip();
             $this->pending['ip'] = $this->ip;
         }
@@ -623,61 +623,61 @@ 
                         'post_status'   => $this->status,
                         'post_author'   => $this->user_id,
                         'post_type'     => $this->post_type,
-                        'post_date'     => ! empty( $this->date ) && $this->date != '0000-00-00 00:00:00' ? $this->date : current_time( 'mysql' ),
-                        'post_date_gmt' => ! empty( $this->date ) && $this->date != '0000-00-00 00:00:00' ? get_gmt_from_date( $this->date ) : current_time( 'mysql', 1 ),
+                        'post_date'     => !empty($this->date) && $this->date != '0000-00-00 00:00:00' ? $this->date : current_time('mysql'),
+                        'post_date_gmt' => !empty($this->date) && $this->date != '0000-00-00 00:00:00' ? get_gmt_from_date($this->date) : current_time('mysql', 1),
                         'post_parent'   => $this->parent_invoice,
                     );
-        $args = apply_filters( 'wpinv_insert_invoice_args', $post_data, $this );
+        $args = apply_filters('wpinv_insert_invoice_args', $post_data, $this);
 
         // Create a blank invoice
-        if ( !empty( $this->ID ) ) {
-            $args['ID']         = $this->ID;
+        if (!empty($this->ID)) {
+            $args['ID'] = $this->ID;
 
-            $invoice_id = wp_update_post( $args, true );
+            $invoice_id = wp_update_post($args, true);
         } else {
-            $invoice_id = wp_insert_post( $args, true );
+            $invoice_id = wp_insert_post($args, true);
         }
 
-        if ( is_wp_error( $invoice_id ) ) {
+        if (is_wp_error($invoice_id)) {
             return false;
         }
 
-        if ( !empty( $invoice_id ) ) {
+        if (!empty($invoice_id)) {
             $this->ID  = $invoice_id;
             $this->_ID = $invoice_id;
 
-            $this->payment_meta = apply_filters( 'wpinv_payment_meta', $this->payment_meta, $payment_data );
-            if ( ! empty( $this->payment_meta['fees'] ) ) {
-                $this->fees = array_merge( $this->fees, $this->payment_meta['fees'] );
-                foreach( $this->fees as $fee ) {
-                    $this->increase_fees( $fee['amount'] );
+            $this->payment_meta = apply_filters('wpinv_payment_meta', $this->payment_meta, $payment_data);
+            if (!empty($this->payment_meta['fees'])) {
+                $this->fees = array_merge($this->fees, $this->payment_meta['fees']);
+                foreach ($this->fees as $fee) {
+                    $this->increase_fees($fee['amount']);
                 }
             }
 
-            $this->update_meta( '_wpinv_payment_meta', $this->payment_meta );    
+            $this->update_meta('_wpinv_payment_meta', $this->payment_meta);    
             $this->new = true;
         }
 
         return $this->ID;
     }
 
-    public function save( $setup = false ) {
+    public function save($setup = false) {
         global $wpi_session;
         
         $saved = false;
-        if ( empty( $this->items ) ) {
+        if (empty($this->items)) {
             return $saved; // Don't save empty invoice.
         }
         
-        if ( empty( $this->key ) ) {
+        if (empty($this->key)) {
             $this->key = self::generate_key();
             $this->pending['key'] = $this->key;
         }
         
-        if ( empty( $this->ID ) ) {
+        if (empty($this->ID)) {
             $invoice_id = $this->insert_invoice();
 
-            if ( false === $invoice_id ) {
+            if (false === $invoice_id) {
                 $saved = false;
             } else {
                 $this->ID = $invoice_id;
@@ -685,27 +685,27 @@ 
         }
 
         // If we have something pending, let's save it
-        if ( !empty( $this->pending ) ) {
+        if (!empty($this->pending)) {
             $total_increase = 0;
             $total_decrease = 0;
 
-            foreach ( $this->pending as $key => $value ) {
-                switch( $key ) {
+            foreach ($this->pending as $key => $value) {
+                switch ($key) {
                     case 'items':
                         // Update totals for pending items
-                        foreach ( $this->pending[ $key ] as $item ) {
-                            switch( $item['action'] ) {
+                        foreach ($this->pending[$key] as $item) {
+                            switch ($item['action']) {
                                 case 'add':
                                     $price = $item['price'];
                                     $taxes = $item['tax'];
 
-                                    if ( 'publish' === $this->status ) {
+                                    if ('publish' === $this->status) {
                                         $total_increase += $price;
                                     }
                                     break;
 
                                 case 'remove':
-                                    if ( 'publish' === $this->status ) {
+                                    if ('publish' === $this->status) {
                                         $total_decrease += $item['price'];
                                     }
                                     break;
@@ -713,16 +713,16 @@ 
                         }
                         break;
                     case 'fees':
-                        if ( 'publish' !== $this->status ) {
+                        if ('publish' !== $this->status) {
                             break;
                         }
 
-                        if ( empty( $this->pending[ $key ] ) ) {
+                        if (empty($this->pending[$key])) {
                             break;
                         }
 
-                        foreach ( $this->pending[ $key ] as $fee ) {
-                            switch( $fee['action'] ) {
+                        foreach ($this->pending[$key] as $fee) {
+                            switch ($fee['action']) {
                                 case 'add':
                                     $total_increase += $fee['amount'];
                                     break;
@@ -734,86 +734,86 @@ 
                         }
                         break;
                     case 'status':
-                        $this->update_status( $this->status );
+                        $this->update_status($this->status);
                         break;
                     case 'gateway':
-                        $this->update_meta( '_wpinv_gateway', $this->gateway );
+                        $this->update_meta('_wpinv_gateway', $this->gateway);
                         break;
                     case 'mode':
-                        $this->update_meta( '_wpinv_mode', $this->mode );
+                        $this->update_meta('_wpinv_mode', $this->mode);
                         break;
                     case 'transaction_id':
-                        $this->update_meta( '_wpinv_transaction_id', $this->transaction_id );
+                        $this->update_meta('_wpinv_transaction_id', $this->transaction_id);
                         break;
                     case 'ip':
-                        $this->update_meta( '_wpinv_user_ip', $this->ip );
+                        $this->update_meta('_wpinv_user_ip', $this->ip);
                         break;
                     ///case 'user_id':
                         ///$this->update_meta( '_wpinv_user_id', $this->user_id );
                         ///$this->user_info['user_id'] = $this->user_id;
                         ///break;
                     case 'first_name':
-                        $this->update_meta( '_wpinv_first_name', $this->first_name );
+                        $this->update_meta('_wpinv_first_name', $this->first_name);
                         $this->user_info['first_name'] = $this->first_name;
                         break;
                     case 'last_name':
-                        $this->update_meta( '_wpinv_last_name', $this->last_name );
+                        $this->update_meta('_wpinv_last_name', $this->last_name);
                         $this->user_info['last_name'] = $this->last_name;
                         break;
                     case 'phone':
-                        $this->update_meta( '_wpinv_phone', $this->phone );
+                        $this->update_meta('_wpinv_phone', $this->phone);
                         $this->user_info['phone'] = $this->phone;
                         break;
                     case 'address':
-                        $this->update_meta( '_wpinv_address', $this->address );
+                        $this->update_meta('_wpinv_address', $this->address);
                         $this->user_info['address'] = $this->address;
                         break;
                     case 'city':
-                        $this->update_meta( '_wpinv_city', $this->city );
+                        $this->update_meta('_wpinv_city', $this->city);
                         $this->user_info['city'] = $this->city;
                         break;
                     case 'country':
-                        $this->update_meta( '_wpinv_country', $this->country );
+                        $this->update_meta('_wpinv_country', $this->country);
                         $this->user_info['country'] = $this->country;
                         break;
                     case 'state':
-                        $this->update_meta( '_wpinv_state', $this->state );
+                        $this->update_meta('_wpinv_state', $this->state);
                         $this->user_info['state'] = $this->state;
                         break;
                     case 'zip':
-                        $this->update_meta( '_wpinv_zip', $this->zip );
+                        $this->update_meta('_wpinv_zip', $this->zip);
                         $this->user_info['zip'] = $this->zip;
                         break;
                     case 'company':
-                        $this->update_meta( '_wpinv_company', $this->company );
+                        $this->update_meta('_wpinv_company', $this->company);
                         $this->user_info['company'] = $this->company;
                         break;
                     case 'vat_number':
-                        $this->update_meta( '_wpinv_vat_number', $this->vat_number );
+                        $this->update_meta('_wpinv_vat_number', $this->vat_number);
                         $this->user_info['vat_number'] = $this->vat_number;
                         
-                        $vat_info = $wpi_session->get( 'user_vat_data' );
-                        if ( $this->vat_number && !empty( $vat_info ) && isset( $vat_info['number'] ) && isset( $vat_info['valid'] ) && $vat_info['number'] == $this->vat_number ) {
-                            $adddress_confirmed = isset( $vat_info['adddress_confirmed'] ) ? $vat_info['adddress_confirmed'] : false;
-                            $this->update_meta( '_wpinv_adddress_confirmed', (bool)$adddress_confirmed );
-                            $this->user_info['adddress_confirmed'] = (bool)$adddress_confirmed;
+                        $vat_info = $wpi_session->get('user_vat_data');
+                        if ($this->vat_number && !empty($vat_info) && isset($vat_info['number']) && isset($vat_info['valid']) && $vat_info['number'] == $this->vat_number) {
+                            $adddress_confirmed = isset($vat_info['adddress_confirmed']) ? $vat_info['adddress_confirmed'] : false;
+                            $this->update_meta('_wpinv_adddress_confirmed', (bool) $adddress_confirmed);
+                            $this->user_info['adddress_confirmed'] = (bool) $adddress_confirmed;
                         }
     
                         break;
                     case 'vat_rate':
-                        $this->update_meta( '_wpinv_vat_rate', $this->vat_rate );
+                        $this->update_meta('_wpinv_vat_rate', $this->vat_rate);
                         $this->user_info['vat_rate'] = $this->vat_rate;
                         break;
                     case 'adddress_confirmed':
-                        $this->update_meta( '_wpinv_adddress_confirmed', $this->adddress_confirmed );
+                        $this->update_meta('_wpinv_adddress_confirmed', $this->adddress_confirmed);
                         $this->user_info['adddress_confirmed'] = $this->adddress_confirmed;
                         break;
                     
                     case 'key':
-                        $this->update_meta( '_wpinv_key', $this->key );
+                        $this->update_meta('_wpinv_key', $this->key);
                         break;
                     case 'disable_taxes':
-                        $this->update_meta( '_wpinv_disable_taxes', $this->disable_taxes );
+                        $this->update_meta('_wpinv_disable_taxes', $this->disable_taxes);
                         break;
                     case 'date':
                         $args = array(
@@ -822,49 +822,49 @@ 
                             'edit_date' => true,
                         );
 
-                        wp_update_post( $args );
+                        wp_update_post($args);
                         break;
                     case 'due_date':
-                        if ( empty( $this->due_date ) ) {
+                        if (empty($this->due_date)) {
                             $this->due_date = 'none';
                         }
                         
-                        $this->update_meta( '_wpinv_due_date', $this->due_date );
+                        $this->update_meta('_wpinv_due_date', $this->due_date);
                         break;
                     case 'completed_date':
-                        $this->update_meta( '_wpinv_completed_date', $this->completed_date );
+                        $this->update_meta('_wpinv_completed_date', $this->completed_date);
                         break;
                     case 'discounts':
-                        if ( ! is_array( $this->discounts ) ) {
-                            $this->discounts = explode( ',', $this->discounts );
+                        if (!is_array($this->discounts)) {
+                            $this->discounts = explode(',', $this->discounts);
                         }
 
-                        $this->user_info['discount'] = implode( ',', $this->discounts );
+                        $this->user_info['discount'] = implode(',', $this->discounts);
                         break;
                     case 'discount':
-                        $this->update_meta( '_wpinv_discount', wpinv_round_amount( $this->discount ) );
+                        $this->update_meta('_wpinv_discount', wpinv_round_amount($this->discount));
                         break;
                     case 'discount_code':
-                        $this->update_meta( '_wpinv_discount_code', $this->discount_code );
+                        $this->update_meta('_wpinv_discount_code', $this->discount_code);
                         break;
                     case 'parent_invoice':
                         $args = array(
                             'ID'          => $this->ID,
                             'post_parent' => $this->parent_invoice,
                         );
-                        wp_update_post( $args );
+                        wp_update_post($args);
                         break;
                     default:
-                        do_action( 'wpinv_save', $this, $key );
+                        do_action('wpinv_save', $this, $key);
                         break;
                 }
             }
 
-            $this->update_meta( '_wpinv_subtotal', wpinv_round_amount( $this->subtotal ) );
-            $this->update_meta( '_wpinv_total', wpinv_round_amount( $this->total ) );
-            $this->update_meta( '_wpinv_tax', wpinv_round_amount( $this->tax ) );
+            $this->update_meta('_wpinv_subtotal', wpinv_round_amount($this->subtotal));
+            $this->update_meta('_wpinv_total', wpinv_round_amount($this->total));
+            $this->update_meta('_wpinv_tax', wpinv_round_amount($this->tax));
             
-            $this->items    = array_values( $this->items );
+            $this->items = array_values($this->items);
             
             $new_meta = array(
                 'items'         => $this->items,
@@ -875,12 +875,12 @@ 
             );
             
             $meta        = $this->get_meta();
-            $merged_meta = array_merge( $meta, $new_meta );
+            $merged_meta = array_merge($meta, $new_meta);
 
             // Only save the payment meta if it's changed
-            if ( md5( serialize( $meta ) ) !== md5( serialize( $merged_meta) ) ) {
-                $updated     = $this->update_meta( '_wpinv_payment_meta', $merged_meta );
-                if ( false !== $updated ) {
+            if (md5(serialize($meta)) !== md5(serialize($merged_meta))) {
+                $updated = $this->update_meta('_wpinv_payment_meta', $merged_meta);
+                if (false !== $updated) {
                     $saved = true;
                 }
             }
@@ -888,15 +888,15 @@ 
             $this->pending = array();
             $saved         = true;
         } else {
-            $this->update_meta( '_wpinv_subtotal', wpinv_round_amount( $this->subtotal ) );
-            $this->update_meta( '_wpinv_total', wpinv_round_amount( $this->total ) );
-            $this->update_meta( '_wpinv_tax', wpinv_round_amount( $this->tax ) );
+            $this->update_meta('_wpinv_subtotal', wpinv_round_amount($this->subtotal));
+            $this->update_meta('_wpinv_total', wpinv_round_amount($this->total));
+            $this->update_meta('_wpinv_tax', wpinv_round_amount($this->tax));
         }
         
-        do_action( 'wpinv_invoice_save', $this, $saved );
+        do_action('wpinv_invoice_save', $this, $saved);
 
-        if ( true === $saved || $setup ) {
-            $this->setup_invoice( $this->ID );
+        if (true === $saved || $setup) {
+            $this->setup_invoice($this->ID);
         }
         
         $this->refresh_item_ids();
@@ -904,7 +904,7 @@ 
         return $saved;
     }
     
-    public function add_fee( $args, $global = true ) {
+    public function add_fee($args, $global = true) {
         $default_args = array(
             'label'       => '',
             'amount'      => 0,
@@ -914,75 +914,75 @@ 
             'item_id'     => 0,
         );
 
-        $fee = wp_parse_args( $args, $default_args );
+        $fee = wp_parse_args($args, $default_args);
         
-        if ( empty( $fee['label'] ) ) {
+        if (empty($fee['label'])) {
             return false;
         }
         
-        $fee['id']  = sanitize_title( $fee['label'] );
+        $fee['id'] = sanitize_title($fee['label']);
         
-        $this->fees[]               = $fee;
+        $this->fees[] = $fee;
         
         $added_fee               = $fee;
         $added_fee['action']     = 'add';
         $this->pending['fees'][] = $added_fee;
-        reset( $this->fees );
+        reset($this->fees);
 
-        $this->increase_fees( $fee['amount'] );
+        $this->increase_fees($fee['amount']);
         return true;
     }
 
-    public function remove_fee( $key ) {
+    public function remove_fee($key) {
         $removed = false;
 
-        if ( is_numeric( $key ) ) {
-            $removed = $this->remove_fee_by( 'index', $key );
+        if (is_numeric($key)) {
+            $removed = $this->remove_fee_by('index', $key);
         }
 
         return $removed;
     }
 
-    public function remove_fee_by( $key, $value, $global = false ) {
-        $allowed_fee_keys = apply_filters( 'wpinv_fee_keys', array(
+    public function remove_fee_by($key, $value, $global = false) {
+        $allowed_fee_keys = apply_filters('wpinv_fee_keys', array(
             'index', 'label', 'amount', 'type',
-        ) );
+        ));
 
-        if ( ! in_array( $key, $allowed_fee_keys ) ) {
+        if (!in_array($key, $allowed_fee_keys)) {
             return false;
         }
 
         $removed = false;
-        if ( 'index' === $key && array_key_exists( $value, $this->fees ) ) {
-            $removed_fee             = $this->fees[ $value ];
+        if ('index' === $key && array_key_exists($value, $this->fees)) {
+            $removed_fee             = $this->fees[$value];
             $removed_fee['action']   = 'remove';
             $this->pending['fees'][] = $removed_fee;
 
-            $this->decrease_fees( $removed_fee['amount'] );
+            $this->decrease_fees($removed_fee['amount']);
 
-            unset( $this->fees[ $value ] );
+            unset($this->fees[$value]);
             $removed = true;
-        } else if ( 'index' !== $key ) {
-            foreach ( $this->fees as $index => $fee ) {
-                if ( isset( $fee[ $key ] ) && $fee[ $key ] == $value ) {
+        } else if ('index' !== $key) {
+            foreach ($this->fees as $index => $fee) {
+                if (isset($fee[$key]) && $fee[$key] == $value) {
                     $removed_fee             = $fee;
                     $removed_fee['action']   = 'remove';
                     $this->pending['fees'][] = $removed_fee;
 
-                    $this->decrease_fees( $removed_fee['amount'] );
+                    $this->decrease_fees($removed_fee['amount']);
 
-                    unset( $this->fees[ $index ] );
+                    unset($this->fees[$index]);
                     $removed = true;
 
-                    if ( false === $global ) {
+                    if (false === $global) {
                         break;
                     }
                 }
             }
         }
 
-        if ( true === $removed ) {
-            $this->fees = array_values( $this->fees );
+        if (true === $removed) {
+            $this->fees = array_values($this->fees);
         }
 
         return $removed;
@@ -990,35 +990,35 @@ 
 
     
 
-    public function add_note( $note = '', $customer_type = false, $added_by_user = false, $system = false ) {
+    public function add_note($note = '', $customer_type = false, $added_by_user = false, $system = false) {
         // Bail if no note specified
-        if( !$note ) {
+        if (!$note) {
             return false;
         }
 
-        if ( empty( $this->ID ) )
+        if (empty($this->ID))
             return false;
         
-        if ( ( ( is_user_logged_in() && wpinv_current_user_can_manage_invoicing() ) || $added_by_user ) && !$system ) {
-            $user                 = get_user_by( 'id', get_current_user_id() );
+        if (((is_user_logged_in() && wpinv_current_user_can_manage_invoicing()) || $added_by_user) && !$system) {
+            $user                 = get_user_by('id', get_current_user_id());
             $comment_author       = $user->display_name;
             $comment_author_email = $user->user_email;
         } else {
             $comment_author       = 'System';
             $comment_author_email = 'system@';
-            $comment_author_email .= isset( $_SERVER['HTTP_HOST'] ) ? str_replace( 'www.', '', $_SERVER['HTTP_HOST'] ) : 'noreply.com';
-            $comment_author_email = sanitize_email( $comment_author_email );
+            $comment_author_email .= isset($_SERVER['HTTP_HOST']) ? str_replace('www.', '', $_SERVER['HTTP_HOST']) : 'noreply.com';
+            $comment_author_email = sanitize_email($comment_author_email);
         }
 
-        do_action( 'wpinv_pre_insert_invoice_note', $this->ID, $note, $customer_type );
+        do_action('wpinv_pre_insert_invoice_note', $this->ID, $note, $customer_type);
 
-        $note_id = wp_insert_comment( wp_filter_comment( array(
+        $note_id = wp_insert_comment(wp_filter_comment(array(
             'comment_post_ID'      => $this->ID,
             'comment_content'      => $note,
             'comment_agent'        => 'WPInvoicing',
             'user_id'              => is_admin() ? get_current_user_id() : 0,
-            'comment_date'         => current_time( 'mysql' ),
-            'comment_date_gmt'     => current_time( 'mysql', 1 ),
+            'comment_date'         => current_time('mysql'),
+            'comment_date_gmt'     => current_time('mysql', 1),
             'comment_approved'     => 1,
             'comment_parent'       => 0,
             'comment_author'       => $comment_author,
@@ -1026,53 +1026,53 @@ 
             'comment_author_url'   => '',
             'comment_author_email' => $comment_author_email,
             'comment_type'         => 'wpinv_note'
-        ) ) );
+        )));
 
-        do_action( 'wpinv_insert_payment_note', $note_id, $this->ID, $note );
+        do_action('wpinv_insert_payment_note', $note_id, $this->ID, $note);
         
-        if ( $customer_type ) {
-            add_comment_meta( $note_id, '_wpi_customer_note', 1 );
+        if ($customer_type) {
+            add_comment_meta($note_id, '_wpi_customer_note', 1);
 
-            do_action( 'wpinv_new_customer_note', array( 'invoice_id' => $this->ID, 'user_note' => $note ) );
+            do_action('wpinv_new_customer_note', array('invoice_id' => $this->ID, 'user_note' => $note));
         }
 
         return $note_id;
     }
 
-    private function increase_subtotal( $amount = 0.00 ) {
+    private function increase_subtotal($amount = 0.00) {
         $amount          = (float) $amount;
         $this->subtotal += $amount;
-        $this->subtotal  = wpinv_round_amount( $this->subtotal );
+        $this->subtotal  = wpinv_round_amount($this->subtotal);
 
         $this->recalculate_total();
     }
 
-    private function decrease_subtotal( $amount = 0.00 ) {
+    private function decrease_subtotal($amount = 0.00) {
         $amount          = (float) $amount;
         $this->subtotal -= $amount;
-        $this->subtotal  = wpinv_round_amount( $this->subtotal );
+        $this->subtotal  = wpinv_round_amount($this->subtotal);
 
-        if ( $this->subtotal < 0 ) {
+        if ($this->subtotal < 0) {
             $this->subtotal = 0;
         }
 
         $this->recalculate_total();
     }
 
-    private function increase_fees( $amount = 0.00 ) {
-        $amount            = (float)$amount;
+    private function increase_fees($amount = 0.00) {
+        $amount            = (float) $amount;
         $this->fees_total += $amount;
-        $this->fees_total  = wpinv_round_amount( $this->fees_total );
+        $this->fees_total  = wpinv_round_amount($this->fees_total);
 
         $this->recalculate_total();
     }
 
-    private function decrease_fees( $amount = 0.00 ) {
+    private function decrease_fees($amount = 0.00) {
         $amount            = (float) $amount;
         $this->fees_total -= $amount;
-        $this->fees_total  = wpinv_round_amount( $this->fees_total );
+        $this->fees_total  = wpinv_round_amount($this->fees_total);
 
-        if ( $this->fees_total < 0 ) {
+        if ($this->fees_total < 0) {
             $this->fees_total = 0;
         }
 
@@ -1083,54 +1083,54 @@ 
         global $wpi_nosave;
         
         $this->total = $this->subtotal + $this->tax + $this->fees_total;
-        $this->total = wpinv_round_amount( $this->total );
+        $this->total = wpinv_round_amount($this->total);
         
-        do_action( 'wpinv_invoice_recalculate_total', $this, $wpi_nosave );
+        do_action('wpinv_invoice_recalculate_total', $this, $wpi_nosave);
     }
     
-    public function increase_tax( $amount = 0.00 ) {
+    public function increase_tax($amount = 0.00) {
         $amount       = (float) $amount;
         $this->tax   += $amount;
 
         $this->recalculate_total();
     }
 
-    public function decrease_tax( $amount = 0.00 ) {
+    public function decrease_tax($amount = 0.00) {
         $amount     = (float) $amount;
         $this->tax -= $amount;
 
-        if ( $this->tax < 0 ) {
+        if ($this->tax < 0) {
             $this->tax = 0;
         }
 
         $this->recalculate_total();
     }
 
-    public function update_status( $new_status = false, $note = '', $manual = false ) {
-        $old_status = ! empty( $this->old_status ) ? $this->old_status : get_post_status( $this->ID );
+    public function update_status($new_status = false, $note = '', $manual = false) {
+        $old_status = !empty($this->old_status) ? $this->old_status : get_post_status($this->ID);
 
-        if ( $old_status === $new_status && in_array( $new_status, array_keys( wpinv_get_invoice_statuses( true ) ) ) ) {
+        if ($old_status === $new_status && in_array($new_status, array_keys(wpinv_get_invoice_statuses(true)))) {
             return false; // Don't permit status changes that aren't changes
         }
 
-        $do_change = apply_filters( 'wpinv_should_update_invoice_status', true, $this->ID, $new_status, $old_status );
+        $do_change = apply_filters('wpinv_should_update_invoice_status', true, $this->ID, $new_status, $old_status);
         $updated = false;
 
-        if ( $do_change ) {
-            do_action( 'wpinv_before_invoice_status_change', $this->ID, $new_status, $old_status );
+        if ($do_change) {
+            do_action('wpinv_before_invoice_status_change', $this->ID, $new_status, $old_status);
 
             $update_post_data                   = array();
             $update_post_data['ID']             = $this->ID;
             $update_post_data['post_status']    = $new_status;
-            $update_post_data['edit_date']      = current_time( 'mysql', 0 );
-            $update_post_data['edit_date_gmt']  = current_time( 'mysql', 1 );
+            $update_post_data['edit_date']      = current_time('mysql', 0);
+            $update_post_data['edit_date_gmt']  = current_time('mysql', 1);
             
-            $update_post_data = apply_filters( 'wpinv_update_invoice_status_fields', $update_post_data, $this->ID );
+            $update_post_data = apply_filters('wpinv_update_invoice_status_fields', $update_post_data, $this->ID);
 
-            $updated = wp_update_post( $update_post_data );     
+            $updated = wp_update_post($update_post_data);     
            
             // Process any specific status functions
-            switch( $new_status ) {
+            switch ($new_status) {
                 case 'wpi-refunded':
                     $this->process_refund();
                     break;
@@ -1143,9 +1143,9 @@ 
             }
             
             // Status was changed.
-            do_action( 'wpinv_status_' . $new_status, $this->ID, $old_status );
-            do_action( 'wpinv_status_' . $old_status . '_to_' . $new_status, $this->ID, $old_status );
-            do_action( 'wpinv_update_status', $this->ID, $new_status, $old_status );
+            do_action('wpinv_status_' . $new_status, $this->ID, $old_status);
+            do_action('wpinv_status_' . $old_status . '_to_' . $new_status, $this->ID, $old_status);
+            do_action('wpinv_update_status', $this->ID, $new_status, $old_status);
         }
 
         return $updated;
@@ -1159,20 +1159,20 @@ 
         $this->save();
     }
 
-    public function update_meta( $meta_key = '', $meta_value = '', $prev_value = '' ) {
-        if ( empty( $meta_key ) ) {
+    public function update_meta($meta_key = '', $meta_value = '', $prev_value = '') {
+        if (empty($meta_key)) {
             return false;
         }
 
-        if ( $meta_key == 'key' || $meta_key == 'date' ) {
+        if ($meta_key == 'key' || $meta_key == 'date') {
             $current_meta = $this->get_meta();
-            $current_meta[ $meta_key ] = $meta_value;
+            $current_meta[$meta_key] = $meta_value;
 
             $meta_key     = '_wpinv_payment_meta';
             $meta_value   = $current_meta;
         }
 
-        $meta_value = apply_filters( 'wpinv_update_payment_meta_' . $meta_key, $meta_value, $this->ID );
+        $meta_value = apply_filters('wpinv_update_payment_meta_' . $meta_key, $meta_value, $this->ID);
         
         // Do not update created date on invoice marked as paid.
         /*if ( $meta_key == '_wpinv_completed_date' && !empty( $meta_value ) ) {
@@ -1187,45 +1187,45 @@ 
             wp_update_post( $args );
         }*/
         
-        return update_post_meta( $this->ID, $meta_key, $meta_value, $prev_value );
+        return update_post_meta($this->ID, $meta_key, $meta_value, $prev_value);
     }
 
     private function process_refund() {
         $process_refund = true;
 
         // If the payment was not in publish, don't decrement stats as they were never incremented
-        if ( 'publish' != $this->old_status || 'wpi-refunded' != $this->status ) {
+        if ('publish' != $this->old_status || 'wpi-refunded' != $this->status) {
             $process_refund = false;
         }
 
         // Allow extensions to filter for their own payment types, Example: Recurring Payments
-        $process_refund = apply_filters( 'wpinv_should_process_refund', $process_refund, $this );
+        $process_refund = apply_filters('wpinv_should_process_refund', $process_refund, $this);
 
-        if ( false === $process_refund ) {
+        if (false === $process_refund) {
             return;
         }
 
-        do_action( 'wpinv_pre_refund_invoice', $this );
+        do_action('wpinv_pre_refund_invoice', $this);
         
-        $decrease_store_earnings = apply_filters( 'wpinv_decrease_store_earnings_on_refund', true, $this );
-        $decrease_customer_value = apply_filters( 'wpinv_decrease_customer_value_on_refund', true, $this );
-        $decrease_purchase_count = apply_filters( 'wpinv_decrease_customer_purchase_count_on_refund', true, $this );
+        $decrease_store_earnings = apply_filters('wpinv_decrease_store_earnings_on_refund', true, $this);
+        $decrease_customer_value = apply_filters('wpinv_decrease_customer_value_on_refund', true, $this);
+        $decrease_purchase_count = apply_filters('wpinv_decrease_customer_purchase_count_on_refund', true, $this);
         
-        do_action( 'wpinv_post_refund_invoice', $this );
+        do_action('wpinv_post_refund_invoice', $this);
     }
 
     private function process_failure() {
         $discounts = $this->discounts;
-        if ( empty( $discounts ) ) {
+        if (empty($discounts)) {
             return;
         }
 
-        if ( ! is_array( $discounts ) ) {
-            $discounts = array_map( 'trim', explode( ',', $discounts ) );
+        if (!is_array($discounts)) {
+            $discounts = array_map('trim', explode(',', $discounts));
         }
 
-        foreach ( $discounts as $discount ) {
-            wpinv_decrease_discount_usage( $discount );
+        foreach ($discounts as $discount) {
+            wpinv_decrease_discount_usage($discount);
         }
     }
     
@@ -1233,92 +1233,92 @@ 
         $process_pending = true;
 
         // If the payment was not in publish or revoked status, don't decrement stats as they were never incremented
-        if ( ( 'publish' != $this->old_status && 'revoked' != $this->old_status ) || 'wpi-pending' != $this->status ) {
+        if (('publish' != $this->old_status && 'revoked' != $this->old_status) || 'wpi-pending' != $this->status) {
             $process_pending = false;
         }
 
         // Allow extensions to filter for their own payment types, Example: Recurring Payments
-        $process_pending = apply_filters( 'wpinv_should_process_pending', $process_pending, $this );
+        $process_pending = apply_filters('wpinv_should_process_pending', $process_pending, $this);
 
-        if ( false === $process_pending ) {
+        if (false === $process_pending) {
             return;
         }
 
-        $decrease_store_earnings = apply_filters( 'wpinv_decrease_store_earnings_on_pending', true, $this );
-        $decrease_customer_value = apply_filters( 'wpinv_decrease_customer_value_on_pending', true, $this );
-        $decrease_purchase_count = apply_filters( 'wpinv_decrease_customer_purchase_count_on_pending', true, $this );
+        $decrease_store_earnings = apply_filters('wpinv_decrease_store_earnings_on_pending', true, $this);
+        $decrease_customer_value = apply_filters('wpinv_decrease_customer_value_on_pending', true, $this);
+        $decrease_purchase_count = apply_filters('wpinv_decrease_customer_purchase_count_on_pending', true, $this);
 
         $this->completed_date = '';
-        $this->update_meta( '_wpinv_completed_date', '' );
+        $this->update_meta('_wpinv_completed_date', '');
     }
     
     // get data
-    public function get_meta( $meta_key = '_wpinv_payment_meta', $single = true ) {
-        $meta = get_post_meta( $this->ID, $meta_key, $single );
+    public function get_meta($meta_key = '_wpinv_payment_meta', $single = true) {
+        $meta = get_post_meta($this->ID, $meta_key, $single);
 
-        if ( $meta_key === '_wpinv_payment_meta' ) {
+        if ($meta_key === '_wpinv_payment_meta') {
 
-            if(!is_array($meta)){$meta = array();} // we need this to be an array so make sure it is.
+            if (!is_array($meta)) {$meta = array(); } // we need this to be an array so make sure it is.
 
-            if ( empty( $meta['key'] ) ) {
+            if (empty($meta['key'])) {
                 $meta['key'] = $this->setup_invoice_key();
             }
 
-            if ( empty( $meta['date'] ) ) {
-                $meta['date'] = get_post_field( 'post_date', $this->ID );
+            if (empty($meta['date'])) {
+                $meta['date'] = get_post_field('post_date', $this->ID);
             }
         }
 
-        $meta = apply_filters( 'wpinv_get_invoice_meta_' . $meta_key, $meta, $this->ID );
+        $meta = apply_filters('wpinv_get_invoice_meta_' . $meta_key, $meta, $this->ID);
 
-        return apply_filters( 'wpinv_get_invoice_meta', $meta, $this->ID, $meta_key );
+        return apply_filters('wpinv_get_invoice_meta', $meta, $this->ID, $meta_key);
     }
     
     public function get_description() {
-        $post = get_post( $this->ID );
+        $post = get_post($this->ID);
         
-        $description = !empty( $post ) ? $post->post_content : '';
-        return apply_filters( 'wpinv_get_description', $description, $this->ID, $this );
+        $description = !empty($post) ? $post->post_content : '';
+        return apply_filters('wpinv_get_description', $description, $this->ID, $this);
     }
     
-    public function get_status( $nicename = false ) {
-        if ( !$nicename ) {
+    public function get_status($nicename = false) {
+        if (!$nicename) {
             $status = $this->status;
         } else {
             $status = $this->status_nicename;
         }
         
-        return apply_filters( 'wpinv_get_status', $status, $nicename, $this->ID, $this );
+        return apply_filters('wpinv_get_status', $status, $nicename, $this->ID, $this);
     }
     
     public function get_cart_details() {
-        return apply_filters( 'wpinv_cart_details', $this->cart_details, $this->ID, $this );
+        return apply_filters('wpinv_cart_details', $this->cart_details, $this->ID, $this);
     }
     
-    public function get_subtotal( $currency = false ) {
-        $subtotal = wpinv_round_amount( $this->subtotal );
+    public function get_subtotal($currency = false) {
+        $subtotal = wpinv_round_amount($this->subtotal);
         
-        if ( $currency ) {
-            $subtotal = wpinv_price( wpinv_format_amount( $subtotal, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $subtotal = wpinv_price(wpinv_format_amount($subtotal, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_subtotal', $subtotal, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_subtotal', $subtotal, $this->ID, $this, $currency);
     }
     
-    public function get_total( $currency = false ) {        
-        if ( $this->is_free_trial() ) {
-            $total = wpinv_round_amount( 0 );
+    public function get_total($currency = false) {        
+        if ($this->is_free_trial()) {
+            $total = wpinv_round_amount(0);
         } else {
-            $total = wpinv_round_amount( $this->total );
+            $total = wpinv_round_amount($this->total);
         }
-        if ( $currency ) {
-            $total = wpinv_price( wpinv_format_amount( $total, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $total = wpinv_price(wpinv_format_amount($total, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_total', $total, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_total', $total, $this->ID, $this, $currency);
     }
     
-    public function get_recurring_details( $field = '', $currency = false ) {        
+    public function get_recurring_details($field = '', $currency = false) {        
         $data                 = array();
         $data['cart_details'] = $this->cart_details;
         $data['subtotal']     = $this->get_subtotal();
@@ -1326,119 +1326,119 @@ 
         $data['tax']          = $this->get_tax();
         $data['total']        = $this->get_total();
     
-        if ( !empty( $this->cart_details ) && ( $this->is_parent() || $this->is_renewal() ) ) {
+        if (!empty($this->cart_details) && ($this->is_parent() || $this->is_renewal())) {
             $is_free_trial = $this->is_free_trial();
-            $discounts = $this->get_discounts( true );
+            $discounts = $this->get_discounts(true);
             
-            if ( $is_free_trial || !empty( $discounts ) ) {
+            if ($is_free_trial || !empty($discounts)) {
                 $first_use_only = false;
                 
-                if ( !empty( $discounts ) ) {
-                    foreach ( $discounts as $key => $code ) {
-                        if ( wpinv_discount_is_recurring( $code, true ) && !$this->is_renewal() ) {
+                if (!empty($discounts)) {
+                    foreach ($discounts as $key => $code) {
+                        if (wpinv_discount_is_recurring($code, true) && !$this->is_renewal()) {
                             $first_use_only = true;
                             break;
                         }
                     }
                 }
                     
-                if ( !$first_use_only ) {
-                    $data['subtotal'] = wpinv_round_amount( $this->subtotal );
-                    $data['discount'] = wpinv_round_amount( $this->discount );
-                    $data['tax']      = wpinv_round_amount( $this->tax );
-                    $data['total']    = wpinv_round_amount( $this->total );
+                if (!$first_use_only) {
+                    $data['subtotal'] = wpinv_round_amount($this->subtotal);
+                    $data['discount'] = wpinv_round_amount($this->discount);
+                    $data['tax']      = wpinv_round_amount($this->tax);
+                    $data['total']    = wpinv_round_amount($this->total);
                 } else {
                     $cart_subtotal   = 0;
                     $cart_discount   = $this->discount;
                     $cart_tax        = 0;
 
-                    foreach ( $this->cart_details as $key => $item ) {
-                        $item_quantity  = $item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
-                        $item_subtotal  = !empty( $item['subtotal'] ) ? $item['subtotal'] : $item['item_price'] * $item_quantity;
+                    foreach ($this->cart_details as $key => $item) {
+                        $item_quantity  = $item['quantity'] > 0 ? absint($item['quantity']) : 1;
+                        $item_subtotal  = !empty($item['subtotal']) ? $item['subtotal'] : $item['item_price'] * $item_quantity;
                         $item_discount  = 0;
-                        $item_tax       = $item_subtotal > 0 && !empty( $item['vat_rate'] ) ? ( $item_subtotal * 0.01 * (float)$item['vat_rate'] ) : 0;
+                        $item_tax       = $item_subtotal > 0 && !empty($item['vat_rate']) ? ($item_subtotal * 0.01 * (float) $item['vat_rate']) : 0;
                         
-                        if ( wpinv_prices_include_tax() ) {
-                            $item_subtotal -= wpinv_round_amount( $item_tax );
+                        if (wpinv_prices_include_tax()) {
+                            $item_subtotal -= wpinv_round_amount($item_tax);
                         }
                         
                         $item_total     = $item_subtotal - $item_discount + $item_tax;
                         // Do not allow totals to go negative
-                        if ( $item_total < 0 ) {
+                        if ($item_total < 0) {
                             $item_total = 0;
                         }
                         
-                        $cart_subtotal  += (float)($item_subtotal);
-                        $cart_discount  += (float)($item_discount);
-                        $cart_tax       += (float)($item_tax);
+                        $cart_subtotal  += (float) ($item_subtotal);
+                        $cart_discount  += (float) ($item_discount);
+                        $cart_tax       += (float) ($item_tax);
                         
-                        $data['cart_details'][$key]['discount']   = wpinv_round_amount( $item_discount );
-                        $data['cart_details'][$key]['tax']        = wpinv_round_amount( $item_tax );
-                        $data['cart_details'][$key]['price']      = wpinv_round_amount( $item_total );
+                        $data['cart_details'][$key]['discount']   = wpinv_round_amount($item_discount);
+                        $data['cart_details'][$key]['tax']        = wpinv_round_amount($item_tax);
+                        $data['cart_details'][$key]['price']      = wpinv_round_amount($item_total);
                     }
 
 	                $total = $data['subtotal'] - $data['discount'] + $data['tax'];
-	                if ( $total < 0 ) {
+	                if ($total < 0) {
 		                $total = 0;
 	                }
 
-                    $data['subtotal'] = wpinv_round_amount( $cart_subtotal );
-                    $data['discount'] = wpinv_round_amount( $cart_discount );
-                    $data['tax']      = wpinv_round_amount( $cart_tax );
-                    $data['total']    = wpinv_round_amount( $total );
+                    $data['subtotal'] = wpinv_round_amount($cart_subtotal);
+                    $data['discount'] = wpinv_round_amount($cart_discount);
+                    $data['tax']      = wpinv_round_amount($cart_tax);
+                    $data['total']    = wpinv_round_amount($total);
                 }
             }
         }
         
-        $data = apply_filters( 'wpinv_get_invoice_recurring_details', $data, $this, $field, $currency );
+        $data = apply_filters('wpinv_get_invoice_recurring_details', $data, $this, $field, $currency);
 
-        if ( isset( $data[$field] ) ) {
-            return ( $currency ? wpinv_price( $data[$field], $this->get_currency() ) : $data[$field] );
+        if (isset($data[$field])) {
+            return ($currency ? wpinv_price($data[$field], $this->get_currency()) : $data[$field]);
         }
         
         return $data;
     }
     
-    public function get_final_tax( $currency = false ) {        
-        $final_total = wpinv_round_amount( $this->tax );
-        if ( $currency ) {
-            $final_total = wpinv_price( wpinv_format_amount( $final_total, NULL, !$currency ), $this->get_currency() );
+    public function get_final_tax($currency = false) {        
+        $final_total = wpinv_round_amount($this->tax);
+        if ($currency) {
+            $final_total = wpinv_price(wpinv_format_amount($final_total, NULL, !$currency), $this->get_currency());
         }
         
-        return apply_filters( 'wpinv_get_invoice_final_total', $final_total, $this, $currency );
+        return apply_filters('wpinv_get_invoice_final_total', $final_total, $this, $currency);
     }
     
-    public function get_discounts( $array = false ) {
+    public function get_discounts($array = false) {
         $discounts = $this->discounts;
-        if ( $array && $discounts ) {
-            $discounts = explode( ',', $discounts );
+        if ($array && $discounts) {
+            $discounts = explode(',', $discounts);
         }
-        return apply_filters( 'wpinv_payment_discounts', $discounts, $this->ID, $this, $array );
+        return apply_filters('wpinv_payment_discounts', $discounts, $this->ID, $this, $array);
     }
     
-    public function get_discount( $currency = false, $dash = false ) {
-        if ( !empty( $this->discounts ) ) {
+    public function get_discount($currency = false, $dash = false) {
+        if (!empty($this->discounts)) {
             global $ajax_cart_details;
             $ajax_cart_details = $this->get_cart_details();
             
-            if ( !empty( $ajax_cart_details ) && count( $ajax_cart_details ) == count( $this->items ) ) {
+            if (!empty($ajax_cart_details) && count($ajax_cart_details) == count($this->items)) {
                 $cart_items = $ajax_cart_details;
             } else {
                 $cart_items = $this->items;
             }
 
-            $this->discount = wpinv_get_cart_items_discount_amount( $cart_items , $this->discounts );
+            $this->discount = wpinv_get_cart_items_discount_amount($cart_items, $this->discounts);
         }
-        $discount   = wpinv_round_amount( $this->discount );
+        $discount   = wpinv_round_amount($this->discount);
         $dash       = $dash && $discount > 0 ? '&ndash;' : '';
         
-        if ( $currency ) {
-            $discount = wpinv_price( wpinv_format_amount( $discount, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $discount = wpinv_price(wpinv_format_amount($discount, NULL, !$currency), $this->get_currency());
         }
         
-        $discount   = $dash . $discount;
+        $discount = $dash . $discount;
         
-        return apply_filters( 'wpinv_get_invoice_discount', $discount, $this->ID, $this, $currency, $dash );
+        return apply_filters('wpinv_get_invoice_discount', $discount, $this->ID, $this, $currency, $dash);
     }
     
     public function get_discount_code() {
@@ -1450,49 +1450,49 @@ 
         return (int) $this->disable_taxes === 0;
     }
 
-    public function get_tax( $currency = false ) {
-        $tax = wpinv_round_amount( $this->tax );
+    public function get_tax($currency = false) {
+        $tax = wpinv_round_amount($this->tax);
 
-        if ( $currency ) {
-            $tax = wpinv_price( wpinv_format_amount( $tax, NULL, !$currency ), $this->get_currency() );
+        if ($currency) {
+            $tax = wpinv_price(wpinv_format_amount($tax, NULL, !$currency), $this->get_currency());
         }
 
-        if ( ! $this->is_taxable() ) {
-            $tax = wpinv_round_amount( 0.00 );
+        if (!$this->is_taxable()) {
+            $tax = wpinv_round_amount(0.00);
         }
 
-        return apply_filters( 'wpinv_get_invoice_tax', $tax, $this->ID, $this, $currency );
+        return apply_filters('wpinv_get_invoice_tax', $tax, $this->ID, $this, $currency);
     }
     
-    public function get_fees( $type = 'all' ) {
-        $fees    = array();
+    public function get_fees($type = 'all') {
+        $fees = array();
 
-        if ( ! empty( $this->fees ) && is_array( $this->fees ) ) {
-            foreach ( $this->fees as $fee ) {
-                if( 'all' != $type && ! empty( $fee['type'] ) && $type != $fee['type'] ) {
+        if (!empty($this->fees) && is_array($this->fees)) {
+            foreach ($this->fees as $fee) {
+                if ('all' != $type && !empty($fee['type']) && $type != $fee['type']) {
                     continue;
                 }
 
-                $fee['label'] = stripslashes( $fee['label'] );
-                $fee['amount_display'] = wpinv_price( $fee['amount'], $this->get_currency() );
-                $fees[]    = $fee;
+                $fee['label'] = stripslashes($fee['label']);
+                $fee['amount_display'] = wpinv_price($fee['amount'], $this->get_currency());
+                $fees[] = $fee;
             }
         }
 
-        return apply_filters( 'wpinv_get_invoice_fees', $fees, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_fees', $fees, $this->ID, $this);
     }
     
-    public function get_fees_total( $type = 'all' ) {
+    public function get_fees_total($type = 'all') {
         $fees_total = (float) 0.00;
 
-        $payment_fees = isset( $this->payment_meta['fees'] ) ? $this->payment_meta['fees'] : array();
-        if ( ! empty( $payment_fees ) ) {
-            foreach ( $payment_fees as $fee ) {
+        $payment_fees = isset($this->payment_meta['fees']) ? $this->payment_meta['fees'] : array();
+        if (!empty($payment_fees)) {
+            foreach ($payment_fees as $fee) {
                 $fees_total += (float) $fee['amount'];
             }
         }
 
-        return apply_filters( 'wpinv_get_invoice_fees_total', $fees_total, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_fees_total', $fees_total, $this->ID, $this);
         /*
         $fees = $this->get_fees( $type );
 
@@ -1512,116 +1512,116 @@ 
     }
 
     public function get_user_id() {
-        return apply_filters( 'wpinv_user_id', $this->user_id, $this->ID, $this );
+        return apply_filters('wpinv_user_id', $this->user_id, $this->ID, $this);
     }
     
     public function get_first_name() {
-        return apply_filters( 'wpinv_first_name', $this->first_name, $this->ID, $this );
+        return apply_filters('wpinv_first_name', $this->first_name, $this->ID, $this);
     }
     
     public function get_last_name() {
-        return apply_filters( 'wpinv_last_name', $this->last_name, $this->ID, $this );
+        return apply_filters('wpinv_last_name', $this->last_name, $this->ID, $this);
     }
     
     public function get_user_full_name() {
-        return apply_filters( 'wpinv_user_full_name', $this->full_name, $this->ID, $this );
+        return apply_filters('wpinv_user_full_name', $this->full_name, $this->ID, $this);
     }
     
     public function get_user_info() {
-        return apply_filters( 'wpinv_user_info', $this->user_info, $this->ID, $this );
+        return apply_filters('wpinv_user_info', $this->user_info, $this->ID, $this);
     }
     
     public function get_email() {
-        return apply_filters( 'wpinv_user_email', $this->email, $this->ID, $this );
+        return apply_filters('wpinv_user_email', $this->email, $this->ID, $this);
     }
     
     public function get_address() {
-        return apply_filters( 'wpinv_address', $this->address, $this->ID, $this );
+        return apply_filters('wpinv_address', $this->address, $this->ID, $this);
     }
     
     public function get_phone() {
-        return apply_filters( 'wpinv_phone', $this->phone, $this->ID, $this );
+        return apply_filters('wpinv_phone', $this->phone, $this->ID, $this);
     }
     
     public function get_number() {
-        return apply_filters( 'wpinv_number', $this->number, $this->ID, $this );
+        return apply_filters('wpinv_number', $this->number, $this->ID, $this);
     }
     
     public function get_items() {
-        return apply_filters( 'wpinv_payment_meta_items', $this->items, $this->ID, $this );
+        return apply_filters('wpinv_payment_meta_items', $this->items, $this->ID, $this);
     }
     
     public function get_key() {
-        return apply_filters( 'wpinv_key', $this->key, $this->ID, $this );
+        return apply_filters('wpinv_key', $this->key, $this->ID, $this);
     }
     
     public function get_transaction_id() {
-        return apply_filters( 'wpinv_get_invoice_transaction_id', $this->transaction_id, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_transaction_id', $this->transaction_id, $this->ID, $this);
     }
     
     public function get_gateway() {
-        return apply_filters( 'wpinv_gateway', $this->gateway, $this->ID, $this );
+        return apply_filters('wpinv_gateway', $this->gateway, $this->ID, $this);
     }
     
     public function get_gateway_title() {
-        $this->gateway_title = !empty( $this->gateway_title ) ? $this->gateway_title : wpinv_get_gateway_checkout_label( $this->gateway );
+        $this->gateway_title = !empty($this->gateway_title) ? $this->gateway_title : wpinv_get_gateway_checkout_label($this->gateway);
         
-        return apply_filters( 'wpinv_gateway_title', $this->gateway_title, $this->ID, $this );
+        return apply_filters('wpinv_gateway_title', $this->gateway_title, $this->ID, $this);
     }
     
     public function get_currency() {
-        return apply_filters( 'wpinv_currency_code', $this->currency, $this->ID, $this );
+        return apply_filters('wpinv_currency_code', $this->currency, $this->ID, $this);
     }
     
     public function get_created_date() {
-        return apply_filters( 'wpinv_created_date', $this->date, $this->ID, $this );
+        return apply_filters('wpinv_created_date', $this->date, $this->ID, $this);
     }
     
-    public function get_due_date( $display = false ) {
-        $due_date = apply_filters( 'wpinv_due_date', $this->due_date, $this->ID, $this );
+    public function get_due_date($display = false) {
+        $due_date = apply_filters('wpinv_due_date', $this->due_date, $this->ID, $this);
         
-        if ( !$display || empty( $due_date ) ) {
+        if (!$display || empty($due_date)) {
             return $due_date;
         }
         
-        return date_i18n( get_option( 'date_format' ), strtotime( $due_date ) );
+        return date_i18n(get_option('date_format'), strtotime($due_date));
     }
     
     public function get_completed_date() {
-        return apply_filters( 'wpinv_completed_date', $this->completed_date, $this->ID, $this );
+        return apply_filters('wpinv_completed_date', $this->completed_date, $this->ID, $this);
     }
     
-    public function get_invoice_date( $formatted = true ) {
+    public function get_invoice_date($formatted = true) {
         $date_completed = $this->completed_date;
         $invoice_date   = $date_completed != '' && $date_completed != '0000-00-00 00:00:00' ? $date_completed : '';
         
-        if ( $invoice_date == '' ) {
+        if ($invoice_date == '') {
             $date_created   = $this->date;
             $invoice_date   = $date_created != '' && $date_created != '0000-00-00 00:00:00' ? $date_created : '';
         }
         
-        if ( $formatted && $invoice_date ) {
-            $invoice_date   = date_i18n( get_option( 'date_format' ), strtotime( $invoice_date ) );
+        if ($formatted && $invoice_date) {
+            $invoice_date = date_i18n(get_option('date_format'), strtotime($invoice_date));
         }
 
-        return apply_filters( 'wpinv_get_invoice_date', $invoice_date, $formatted, $this->ID, $this );
+        return apply_filters('wpinv_get_invoice_date', $invoice_date, $formatted, $this->ID, $this);
     }
     
     public function get_ip() {
-        return apply_filters( 'wpinv_user_ip', $this->ip, $this->ID, $this );
+        return apply_filters('wpinv_user_ip', $this->ip, $this->ID, $this);
     }
         
-    public function has_status( $status ) {
-        return apply_filters( 'wpinv_has_status', ( is_array( $status ) && in_array( $this->get_status(), $status ) ) || $this->get_status() === $status ? true : false, $this, $status );
+    public function has_status($status) {
+        return apply_filters('wpinv_has_status', (is_array($status) && in_array($this->get_status(), $status)) || $this->get_status() === $status ? true : false, $this, $status);
     }
     
-    public function add_item( $item_id = 0, $args = array() ) {
+    public function add_item($item_id = 0, $args = array()) {
         global $wpi_current_id, $wpi_item_id;
         
-        $item = new WPInv_Item( $item_id );
+        $item = new WPInv_Item($item_id);
 
         // Bail if this post isn't a item
-        if( !$item || $item->post_type !== 'wpi_item' ) {
+        if (!$item || $item->post_type !== 'wpi_item') {
             return false;
         }
         
@@ -1640,8 +1640,8 @@ 
             'fees'          => array()
         );
 
-        $args = wp_parse_args( apply_filters( 'wpinv_add_item_args', $args, $item->ID ), $defaults );
-        $args['quantity']   = $has_quantities && $args['quantity'] > 0 ? absint( $args['quantity'] ) : 1;
+        $args = wp_parse_args(apply_filters('wpinv_add_item_args', $args, $item->ID), $defaults);
+        $args['quantity'] = $has_quantities && $args['quantity'] > 0 ? absint($args['quantity']) : 1;
 
         $wpi_current_id         = $this->ID;
         $wpi_item_id            = $item->ID;
@@ -1653,19 +1653,19 @@ 
         $found_cart_key         = false;
         
         if ($has_quantities) {
-            $this->cart_details = !empty( $this->cart_details ) ? array_values( $this->cart_details ) : $this->cart_details;
+            $this->cart_details = !empty($this->cart_details) ? array_values($this->cart_details) : $this->cart_details;
             
-            foreach ( $this->items as $key => $cart_item ) {
-                if ( (int)$item_id !== (int)$cart_item['id'] ) {
+            foreach ($this->items as $key => $cart_item) {
+                if ((int) $item_id !== (int) $cart_item['id']) {
                     continue;
                 }
 
-                $this->items[ $key ]['quantity'] += $args['quantity'];
+                $this->items[$key]['quantity'] += $args['quantity'];
                 break;
             }
             
-            foreach ( $this->cart_details as $cart_key => $cart_item ) {
-                if ( $item_id != $cart_item['id'] ) {
+            foreach ($this->cart_details as $cart_key => $cart_item) {
+                if ($item_id != $cart_item['id']) {
                     continue;
                 }
 
@@ -1677,29 +1677,29 @@ 
         if ($has_quantities && $found_cart_key !== false) {
             $cart_item          = $this->cart_details[$found_cart_key];
             $item_price         = $cart_item['item_price'];
-            $quantity           = !empty( $cart_item['quantity'] ) ? $cart_item['quantity'] : 1;
-            $tax_rate           = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : 0;
+            $quantity           = !empty($cart_item['quantity']) ? $cart_item['quantity'] : 1;
+            $tax_rate           = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : 0;
             
             $new_quantity       = $quantity + $args['quantity'];
             $subtotal           = $item_price * $new_quantity;
             
             $args['quantity']   = $new_quantity;
-            $discount           = !empty( $args['discount'] ) ? $args['discount'] : 0;
-            $tax                = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount           = !empty($args['discount']) ? $args['discount'] : 0;
+            $tax                = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float) $tax_rate) : 0;
             
-            $discount_increased = $discount > 0 && $subtotal > 0 && $discount > (float)$cart_item['discount'] ? $discount - (float)$cart_item['discount'] : 0;
-            $tax_increased      = $tax > 0 && $subtotal > 0 && $tax > (float)$cart_item['tax'] ? $tax - (float)$cart_item['tax'] : 0;
+            $discount_increased = $discount > 0 && $subtotal > 0 && $discount > (float) $cart_item['discount'] ? $discount - (float) $cart_item['discount'] : 0;
+            $tax_increased      = $tax > 0 && $subtotal > 0 && $tax > (float) $cart_item['tax'] ? $tax - (float) $cart_item['tax'] : 0;
             // The total increase equals the number removed * the item_price
-            $total_increased    = wpinv_round_amount( $item_price );
+            $total_increased    = wpinv_round_amount($item_price);
             
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total              = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
             
@@ -1715,25 +1715,25 @@ 
             $this->cart_details[$found_cart_key] = $cart_item;
         } else {
             // Set custom price.
-            if ( $args['custom_price'] !== '' ) {
+            if ($args['custom_price'] !== '') {
                 $item_price = $args['custom_price'];
             } else {
                 // Allow overriding the price
-                if ( false !== $args['item_price'] ) {
+                if (false !== $args['item_price']) {
                     $item_price = $args['item_price'];
                 } else {
-                    $item_price = wpinv_get_item_price( $item->ID );
+                    $item_price = wpinv_get_item_price($item->ID);
                 }
             }
 
             // Sanitizing the price here so we don't have a dozen calls later
-            $item_price = wpinv_sanitize_amount( $item_price );
-            $subtotal   = wpinv_round_amount( $item_price * $args['quantity'] );
+            $item_price = wpinv_sanitize_amount($item_price);
+            $subtotal   = wpinv_round_amount($item_price * $args['quantity']);
         
-            $discount   = !empty( $args['discount'] ) ? $args['discount'] : 0;
-            $tax_class  = !empty( $args['vat_class'] ) ? $args['vat_class'] : '';
-            $tax_rate   = !empty( $args['vat_rate'] ) ? $args['vat_rate'] : 0;
-            $tax        = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount   = !empty($args['discount']) ? $args['discount'] : 0;
+            $tax_class  = !empty($args['vat_class']) ? $args['vat_class'] : '';
+            $tax_rate   = !empty($args['vat_rate']) ? $args['vat_rate'] : 0;
+            $tax        = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float) $tax_rate) : 0;
 
             // Setup the items meta item
             $new_item = array(
@@ -1741,29 +1741,29 @@ 
                 'quantity' => $args['quantity'],
             );
 
-            $this->items[]  = $new_item;
+            $this->items[] = $new_item;
 
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total      = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
         
             $this->cart_details[] = array(
                 'name'          => !empty($args['name']) ? $args['name'] : $item->get_name(),
                 'id'            => $item->ID,
-                'item_price'    => wpinv_round_amount( $item_price ),
-                'custom_price'  => ( $args['custom_price'] !== '' ? wpinv_round_amount( $args['custom_price'] ) : '' ),
+                'item_price'    => wpinv_round_amount($item_price),
+                'custom_price'  => ($args['custom_price'] !== '' ? wpinv_round_amount($args['custom_price']) : ''),
                 'quantity'      => $args['quantity'],
                 'discount'      => $discount,
-                'subtotal'      => wpinv_round_amount( $subtotal ),
-                'tax'           => wpinv_round_amount( $tax ),
-                'price'         => wpinv_round_amount( $total ),
+                'subtotal'      => wpinv_round_amount($subtotal),
+                'tax'           => wpinv_round_amount($tax),
+                'price'         => wpinv_round_amount($total),
                 'vat_rate'      => $tax_rate,
                 'vat_class'     => $tax_class,
                 'meta'          => $args['meta'],
@@ -1773,18 +1773,18 @@ 
             $subtotal = $subtotal - $discount;
         }
         
-        $added_item = end( $this->cart_details );
-        $added_item['action']  = 'add';
+        $added_item = end($this->cart_details);
+        $added_item['action'] = 'add';
         
         $this->pending['items'][] = $added_item;
         
-        $this->increase_subtotal( $subtotal );
-        $this->increase_tax( $tax );
+        $this->increase_subtotal($subtotal);
+        $this->increase_tax($tax);
 
         return true;
     }
     
-    public function remove_item( $item_id, $args = array() ) {
+    public function remove_item($item_id, $args = array()) {
         // Set some defaults
         $defaults = array(
             'quantity'      => 1,
@@ -1792,51 +1792,51 @@ 
             'custom_price'  => '',
             'cart_index'    => false,
         );
-        $args = wp_parse_args( $args, $defaults );
+        $args = wp_parse_args($args, $defaults);
 
         // Bail if this post isn't a item
-        if ( get_post_type( $item_id ) !== 'wpi_item' ) {
+        if (get_post_type($item_id) !== 'wpi_item') {
             return false;
         }
         
-        $this->cart_details = !empty( $this->cart_details ) ? array_values( $this->cart_details ) : $this->cart_details;
+        $this->cart_details = !empty($this->cart_details) ? array_values($this->cart_details) : $this->cart_details;
 
-        foreach ( $this->items as $key => $item ) {
-            if ( !empty($item['id']) && (int)$item_id !== (int)$item['id'] ) {
+        foreach ($this->items as $key => $item) {
+            if (!empty($item['id']) && (int) $item_id !== (int) $item['id']) {
                 continue;
             }
 
-            if ( false !== $args['cart_index'] ) {
-                $cart_index = absint( $args['cart_index'] );
-                $cart_item  = ! empty( $this->cart_details[ $cart_index ] ) ? $this->cart_details[ $cart_index ] : false;
+            if (false !== $args['cart_index']) {
+                $cart_index = absint($args['cart_index']);
+                $cart_item  = !empty($this->cart_details[$cart_index]) ? $this->cart_details[$cart_index] : false;
 
-                if ( ! empty( $cart_item ) ) {
+                if (!empty($cart_item)) {
                     // If the cart index item isn't the same item ID, don't remove it
-                    if ( !empty($cart_item['id']) && $cart_item['id'] != $item['id'] ) {
+                    if (!empty($cart_item['id']) && $cart_item['id'] != $item['id']) {
                         continue;
                     }
                 }
             }
 
-            $item_quantity = $this->items[ $key ]['quantity'];
-            if ( $item_quantity > $args['quantity'] ) {
-                $this->items[ $key ]['quantity'] -= $args['quantity'];
+            $item_quantity = $this->items[$key]['quantity'];
+            if ($item_quantity > $args['quantity']) {
+                $this->items[$key]['quantity'] -= $args['quantity'];
                 break;
             } else {
-                unset( $this->items[ $key ] );
+                unset($this->items[$key]);
                 break;
             }
         }
 
         $found_cart_key = false;
-        if ( false === $args['cart_index'] ) {
-            foreach ( $this->cart_details as $cart_key => $item ) {
-                if ( $item_id != $item['id'] ) {
+        if (false === $args['cart_index']) {
+            foreach ($this->cart_details as $cart_key => $item) {
+                if ($item_id != $item['id']) {
                     continue;
                 }
 
-                if ( false !== $args['item_price'] ) {
-                    if ( isset( $item['item_price'] ) && (float) $args['item_price'] != (float) $item['item_price'] ) {
+                if (false !== $args['item_price']) {
+                    if (isset($item['item_price']) && (float) $args['item_price'] != (float) $item['item_price']) {
                         continue;
                     }
                 }
@@ -1845,13 +1845,13 @@ 
                 break;
             }
         } else {
-            $cart_index = absint( $args['cart_index'] );
+            $cart_index = absint($args['cart_index']);
 
-            if ( ! array_key_exists( $cart_index, $this->cart_details ) ) {
+            if (!array_key_exists($cart_index, $this->cart_details)) {
                 return false; // Invalid cart index passed.
             }
 
-            if ( (int) $this->cart_details[ $cart_index ]['id'] > 0 && (int) $this->cart_details[ $cart_index ]['id'] !== (int) $item_id ) {
+            if ((int) $this->cart_details[$cart_index]['id'] > 0 && (int) $this->cart_details[$cart_index]['id'] !== (int) $item_id) {
                 return false; // We still need the proper Item ID to be sure.
             }
 
@@ -1859,41 +1859,41 @@ 
         }
         
         $cart_item  = $this->cart_details[$found_cart_key];
-        $quantity   = !empty( $cart_item['quantity'] ) ? $cart_item['quantity'] : 1;
+        $quantity   = !empty($cart_item['quantity']) ? $cart_item['quantity'] : 1;
         
-        if ( count( $this->cart_details ) == 1 && ( $quantity - $args['quantity'] ) < 1 ) {
+        if (count($this->cart_details) == 1 && ($quantity - $args['quantity']) < 1) {
             //return false; // Invoice must contain at least one item.
         }
         
-        $discounts  = $this->get_discounts();
+        $discounts = $this->get_discounts();
         
-        if ( $quantity > $args['quantity'] ) {
+        if ($quantity > $args['quantity']) {
             $item_price         = $cart_item['item_price'];
-            $tax_rate           = !empty( $cart_item['vat_rate'] ) ? $cart_item['vat_rate'] : 0;
+            $tax_rate           = !empty($cart_item['vat_rate']) ? $cart_item['vat_rate'] : 0;
             
-            $new_quantity       = max( $quantity - $args['quantity'], 1);
+            $new_quantity       = max($quantity - $args['quantity'], 1);
             $subtotal           = $item_price * $new_quantity;
             
             $args['quantity']   = $new_quantity;
-            $discount           = !empty( $cart_item['discount'] ) ? $cart_item['discount'] : 0;
-            $tax                = $subtotal > 0 && $tax_rate > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+            $discount           = !empty($cart_item['discount']) ? $cart_item['discount'] : 0;
+            $tax                = $subtotal > 0 && $tax_rate > 0 ? (($subtotal - $discount) * 0.01 * (float) $tax_rate) : 0;
             
-            $discount_decrease  = (float)$cart_item['discount'] > 0 && $quantity > 0 ? wpinv_round_amount( ( (float)$cart_item['discount'] / $quantity ) ) : 0;
-            $discount_decrease  = $discount > 0 && $subtotal > 0 && (float)$cart_item['discount'] > $discount ? (float)$cart_item['discount'] - $discount : $discount_decrease; 
-            $tax_decrease       = (float)$cart_item['tax'] > 0 && $quantity > 0 ? wpinv_round_amount( ( (float)$cart_item['tax'] / $quantity ) ) : 0;
-            $tax_decrease       = $tax > 0 && $subtotal > 0 && (float)$cart_item['tax'] > $tax ? (float)$cart_item['tax'] - $tax : $tax_decrease;
+            $discount_decrease  = (float) $cart_item['discount'] > 0 && $quantity > 0 ? wpinv_round_amount(((float) $cart_item['discount'] / $quantity)) : 0;
+            $discount_decrease  = $discount > 0 && $subtotal > 0 && (float) $cart_item['discount'] > $discount ? (float) $cart_item['discount'] - $discount : $discount_decrease; 
+            $tax_decrease       = (float) $cart_item['tax'] > 0 && $quantity > 0 ? wpinv_round_amount(((float) $cart_item['tax'] / $quantity)) : 0;
+            $tax_decrease       = $tax > 0 && $subtotal > 0 && (float) $cart_item['tax'] > $tax ? (float) $cart_item['tax'] - $tax : $tax_decrease;
             
             // The total increase equals the number removed * the item_price
-            $total_decrease     = wpinv_round_amount( $item_price );
+            $total_decrease     = wpinv_round_amount($item_price);
             
-            if ( wpinv_prices_include_tax() ) {
-                $subtotal -= wpinv_round_amount( $tax );
+            if (wpinv_prices_include_tax()) {
+                $subtotal -= wpinv_round_amount($tax);
             }
 
-            $total              = $subtotal - $discount + $tax;
+            $total = $subtotal - $discount + $tax;
 
             // Do not allow totals to go negative
-            if( $total < 0 ) {
+            if ($total < 0) {
                 $total = 0;
             }
             
@@ -1912,16 +1912,16 @@ 
             
             $this->cart_details[$found_cart_key] = $cart_item;
             
-            $remove_item = end( $this->cart_details );
+            $remove_item = end($this->cart_details);
         } else {
             $item_price     = $cart_item['item_price'];
-            $discount       = !empty( $cart_item['discount'] ) ? $cart_item['discount'] : 0;
-            $tax            = !empty( $cart_item['tax'] ) ? $cart_item['tax'] : 0;
+            $discount       = !empty($cart_item['discount']) ? $cart_item['discount'] : 0;
+            $tax            = !empty($cart_item['tax']) ? $cart_item['tax'] : 0;
         
-            $subtotal_decrease  = ( $item_price * $quantity ) - $discount;
+            $subtotal_decrease  = ($item_price * $quantity) - $discount;
             $tax_decrease       = $tax;
 
-            unset( $this->cart_details[$found_cart_key] );
+            unset($this->cart_details[$found_cart_key]);
             
             $remove_item             = $args;
             $remove_item['id']       = $item_id;
@@ -1932,8 +1932,8 @@ 
         $remove_item['action']      = 'remove';
         $this->pending['items'][]   = $remove_item;
                
-        $this->decrease_subtotal( $subtotal_decrease );
-        $this->decrease_tax( $tax_decrease );
+        $this->decrease_subtotal($subtotal_decrease);
+        $this->decrease_tax($tax_decrease);
         
         return true;
     }
@@ -1941,7 +1941,7 @@ 
     public function update_items($temp = false) {
         global $wpinv_euvat, $wpi_current_id, $wpi_item_id, $wpi_nosave;
         
-        if ( !empty( $this->cart_details ) ) {
+        if (!empty($this->cart_details)) {
             $wpi_nosave             = $temp;
             $cart_subtotal          = 0;
             $cart_discount          = 0;
@@ -1951,65 +1951,65 @@ 
             $_POST['wpinv_country'] = $this->country;
             $_POST['wpinv_state']   = $this->state;
 
-            foreach ( $this->cart_details as $key => $item ) {
+            foreach ($this->cart_details as $key => $item) {
                 $item_price = $item['item_price'];
-                $quantity   = wpinv_item_quantities_enabled() && $item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
-                $amount     = wpinv_round_amount( $item_price * $quantity );
+                $quantity   = wpinv_item_quantities_enabled() && $item['quantity'] > 0 ? absint($item['quantity']) : 1;
+                $amount     = wpinv_round_amount($item_price * $quantity);
                 $subtotal   = $item_price * $quantity;
                 
                 $wpi_current_id         = $this->ID;
                 $wpi_item_id            = $item['id'];
                 
-                $discount   = wpinv_get_cart_item_discount_amount( $item, $this->get_discounts() );
+                $discount   = wpinv_get_cart_item_discount_amount($item, $this->get_discounts());
                 
-                $tax_rate   = wpinv_get_tax_rate( $this->country, $this->state, $wpi_item_id );
-                $tax_class  = $wpinv_euvat->get_item_class( $wpi_item_id );
-                $tax        = $item_price > 0 ? ( ( $subtotal - $discount ) * 0.01 * (float)$tax_rate ) : 0;
+                $tax_rate   = wpinv_get_tax_rate($this->country, $this->state, $wpi_item_id);
+                $tax_class  = $wpinv_euvat->get_item_class($wpi_item_id);
+                $tax        = $item_price > 0 ? (($subtotal - $discount) * 0.01 * (float) $tax_rate) : 0;
 
-                if ( ! $this->is_taxable() ) {
+                if (!$this->is_taxable()) {
                     $tax = 0;
                 }
 
-                if ( wpinv_prices_include_tax() ) {
-                    $subtotal -= wpinv_round_amount( $tax );
+                if (wpinv_prices_include_tax()) {
+                    $subtotal -= wpinv_round_amount($tax);
                 }
 
-                $total      = $subtotal - $discount + $tax;
+                $total = $subtotal - $discount + $tax;
 
                 // Do not allow totals to go negative
-                if( $total < 0 ) {
+                if ($total < 0) {
                     $total = 0;
                 }
 
                 $cart_details[] = array(
                     'id'          => $item['id'],
                     'name'        => $item['name'],
-                    'item_price'  => wpinv_round_amount( $item_price ),
-                    'custom_price'=> ( isset( $item['custom_price'] ) ? $item['custom_price'] : '' ),
+                    'item_price'  => wpinv_round_amount($item_price),
+                    'custom_price'=> (isset($item['custom_price']) ? $item['custom_price'] : ''),
                     'quantity'    => $quantity,
                     'discount'    => $discount,
-                    'subtotal'    => wpinv_round_amount( $subtotal ),
-                    'tax'         => wpinv_round_amount( $tax ),
-                    'price'       => wpinv_round_amount( $total ),
+                    'subtotal'    => wpinv_round_amount($subtotal),
+                    'tax'         => wpinv_round_amount($tax),
+                    'price'       => wpinv_round_amount($total),
                     'vat_rate'    => $tax_rate,
                     'vat_class'   => $tax_class,
                     'meta'        => isset($item['meta']) ? $item['meta'] : array(),
                     'fees'        => isset($item['fees']) ? $item['fees'] : array(),
                 );
 
-                $cart_subtotal  += (float)($subtotal - $discount); // TODO
-                $cart_discount  += (float)($discount);
-                $cart_tax       += (float)($tax);
+                $cart_subtotal  += (float) ($subtotal - $discount); // TODO
+                $cart_discount  += (float) ($discount);
+                $cart_tax       += (float) ($tax);
             }
-            if ( $cart_subtotal < 0 ) {
+            if ($cart_subtotal < 0) {
                 $cart_subtotal = 0;
             }
-            if ( $cart_tax < 0 ) {
+            if ($cart_tax < 0) {
                 $cart_tax = 0;
             }
-            $this->subtotal = wpinv_round_amount( $cart_subtotal );
-            $this->tax      = wpinv_round_amount( $cart_tax );
-            $this->discount = wpinv_round_amount( $cart_discount );
+            $this->subtotal = wpinv_round_amount($cart_subtotal);
+            $this->tax      = wpinv_round_amount($cart_tax);
+            $this->discount = wpinv_round_amount($cart_discount);
             
             $this->recalculate_total();
             
@@ -2021,177 +2021,177 @@ 
     
     public function recalculate_totals($temp = false) {        
         $this->update_items($temp);
-        $this->save( true );
+        $this->save(true);
         
         return $this;
     }
     
     public function needs_payment() {
-        $valid_invoice_statuses = apply_filters( 'wpinv_valid_invoice_statuses_for_payment', array( 'wpi-pending' ), $this );
+        $valid_invoice_statuses = apply_filters('wpinv_valid_invoice_statuses_for_payment', array('wpi-pending'), $this);
 
-        if ( $this->has_status( $valid_invoice_statuses ) && ( $this->get_total() > 0 || $this->is_free_trial() || $this->is_free() || $this->is_initial_free() ) ) {
+        if ($this->has_status($valid_invoice_statuses) && ($this->get_total() > 0 || $this->is_free_trial() || $this->is_free() || $this->is_initial_free())) {
             $needs_payment = true;
         } else {
             $needs_payment = false;
         }
 
-        return apply_filters( 'wpinv_needs_payment', $needs_payment, $this, $valid_invoice_statuses );
+        return apply_filters('wpinv_needs_payment', $needs_payment, $this, $valid_invoice_statuses);
     }
     
-    public function get_checkout_payment_url( $with_key = false, $secret = false ) {
+    public function get_checkout_payment_url($with_key = false, $secret = false) {
         $pay_url = wpinv_get_checkout_uri();
 
-        if ( is_ssl() ) {
-            $pay_url = str_replace( 'http:', 'https:', $pay_url );
+        if (is_ssl()) {
+            $pay_url = str_replace('http:', 'https:', $pay_url);
         }
         
         $key = $this->get_key();
 
-        if ( $with_key ) {
-            $pay_url = add_query_arg( 'invoice_key', $key, $pay_url );
+        if ($with_key) {
+            $pay_url = add_query_arg('invoice_key', $key, $pay_url);
         } else {
-            $pay_url = add_query_arg( array( 'wpi_action' => 'pay_for_invoice', 'invoice_key' => $key ), $pay_url );
+            $pay_url = add_query_arg(array('wpi_action' => 'pay_for_invoice', 'invoice_key' => $key), $pay_url);
         }
         
-        if ( $secret ) {
-            $pay_url = add_query_arg( array( '_wpipay' => md5( $this->get_user_id() . '::' . $this->get_email() . '::' . $key ) ), $pay_url );
+        if ($secret) {
+            $pay_url = add_query_arg(array('_wpipay' => md5($this->get_user_id() . '::' . $this->get_email() . '::' . $key)), $pay_url);
         }
 
-        return apply_filters( 'wpinv_get_checkout_payment_url', $pay_url, $this, $with_key, $secret );
+        return apply_filters('wpinv_get_checkout_payment_url', $pay_url, $this, $with_key, $secret);
     }
     
-    public function get_view_url( $with_key = false ) {
-        $invoice_url = get_permalink( $this->ID );
+    public function get_view_url($with_key = false) {
+        $invoice_url = get_permalink($this->ID);
 
-        if ( $with_key ) {
-            $invoice_url = add_query_arg( 'invoice_key', $this->get_key(), $invoice_url );
+        if ($with_key) {
+            $invoice_url = add_query_arg('invoice_key', $this->get_key(), $invoice_url);
         }
 
-        return apply_filters( 'wpinv_get_view_url', $invoice_url, $this, $with_key );
+        return apply_filters('wpinv_get_view_url', $invoice_url, $this, $with_key);
     }
     
-    public function generate_key( $string = '' ) {
-        $auth_key  = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
-        return strtolower( md5( $string . date( 'Y-m-d H:i:s' ) . $auth_key . uniqid( 'wpinv', true ) ) );  // Unique key
+    public function generate_key($string = '') {
+        $auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
+        return strtolower(md5($string . date('Y-m-d H:i:s') . $auth_key . uniqid('wpinv', true))); // Unique key
     }
     
     public function is_recurring() {
-        if ( empty( $this->cart_details ) ) {
+        if (empty($this->cart_details)) {
             return false;
         }
         
         $has_subscription = false;
-        foreach( $this->cart_details as $cart_item ) {
-            if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+        foreach ($this->cart_details as $cart_item) {
+            if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
                 $has_subscription = true;
                 break;
             }
         }
         
-        if ( count( $this->cart_details ) > 1 ) {
+        if (count($this->cart_details) > 1) {
             $has_subscription = false;
         }
 
-        return apply_filters( 'wpinv_invoice_has_recurring_item', $has_subscription, $this->cart_details );
+        return apply_filters('wpinv_invoice_has_recurring_item', $has_subscription, $this->cart_details);
     }
 
     public function is_free_trial() {
         $is_free_trial = false;
         
-        if ( $this->is_parent() && $item = $this->get_recurring( true ) ) {
-            if ( !empty( $item ) && $item->has_free_trial() ) {
+        if ($this->is_parent() && $item = $this->get_recurring(true)) {
+            if (!empty($item) && $item->has_free_trial()) {
                 $is_free_trial = true;
             }
         }
 
-        return apply_filters( 'wpinv_invoice_is_free_trial', $is_free_trial, $this->cart_details, $this );
+        return apply_filters('wpinv_invoice_is_free_trial', $is_free_trial, $this->cart_details, $this);
     }
 
     public function is_initial_free() {
         $is_initial_free = false;
         
-        if ( ! ( (float)wpinv_round_amount( $this->get_total() ) > 0 ) && $this->is_parent() && $this->is_recurring() && ! $this->is_free_trial() && ! $this->is_free() ) {
+        if (!((float) wpinv_round_amount($this->get_total()) > 0) && $this->is_parent() && $this->is_recurring() && !$this->is_free_trial() && !$this->is_free()) {
             $is_initial_free = true;
         }
 
-        return apply_filters( 'wpinv_invoice_is_initial_free', $is_initial_free, $this->cart_details );
+        return apply_filters('wpinv_invoice_is_initial_free', $is_initial_free, $this->cart_details);
     }
     
-    public function get_recurring( $object = false ) {
+    public function get_recurring($object = false) {
         $item = NULL;
         
-        if ( empty( $this->cart_details ) ) {
+        if (empty($this->cart_details)) {
             return $item;
         }
         
-        foreach( $this->cart_details as $cart_item ) {
-            if ( !empty( $cart_item['id'] ) && wpinv_is_recurring_item( $cart_item['id'] )  ) {
+        foreach ($this->cart_details as $cart_item) {
+            if (!empty($cart_item['id']) && wpinv_is_recurring_item($cart_item['id'])) {
                 $item = $cart_item['id'];
                 break;
             }
         }
         
-        if ( $object ) {
-            $item = $item ? new WPInv_Item( $item ) : NULL;
+        if ($object) {
+            $item = $item ? new WPInv_Item($item) : NULL;
             
-            apply_filters( 'wpinv_invoice_get_recurring_item', $item, $this );
+            apply_filters('wpinv_invoice_get_recurring_item', $item, $this);
         }
 
-        return apply_filters( 'wpinv_invoice_get_recurring_item_id', $item, $this );
+        return apply_filters('wpinv_invoice_get_recurring_item_id', $item, $this);
     }
     
     public function get_subscription_name() {
-        $item = $this->get_recurring( true );
+        $item = $this->get_recurring(true);
         
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             return NULL;
         }
         
-        if ( !($name = $item->get_name()) ) {
+        if (!($name = $item->get_name())) {
             $name = $item->post_name;
         }
 
-        return apply_filters( 'wpinv_invoice_get_subscription_name', $name, $this );
+        return apply_filters('wpinv_invoice_get_subscription_name', $name, $this);
     }
     
     public function get_subscription_id() {
-        $subscription_id = $this->get_meta( '_wpinv_subscr_profile_id', true );
+        $subscription_id = $this->get_meta('_wpinv_subscr_profile_id', true);
         
-        if ( empty( $subscription_id ) && !empty( $this->parent_invoice ) ) {
-            $parent_invoice = wpinv_get_invoice( $this->parent_invoice );
+        if (empty($subscription_id) && !empty($this->parent_invoice)) {
+            $parent_invoice = wpinv_get_invoice($this->parent_invoice);
             
-            $subscription_id = $parent_invoice->get_meta( '_wpinv_subscr_profile_id', true );
+            $subscription_id = $parent_invoice->get_meta('_wpinv_subscr_profile_id', true);
         }
         
         return $subscription_id;
     }
     
     public function is_parent() {
-        $is_parent = empty( $this->parent_invoice ) ? true : false;
+        $is_parent = empty($this->parent_invoice) ? true : false;
 
-        return apply_filters( 'wpinv_invoice_is_parent', $is_parent, $this );
+        return apply_filters('wpinv_invoice_is_parent', $is_parent, $this);
     }
     
     public function is_renewal() {
         $is_renewal = $this->parent_invoice && $this->parent_invoice != $this->ID ? true : false;
 
-        return apply_filters( 'wpinv_invoice_is_renewal', $is_renewal, $this );
+        return apply_filters('wpinv_invoice_is_renewal', $is_renewal, $this);
     }
     
     public function get_parent_payment() {
         $parent_payment = NULL;
         
-        if ( $this->is_renewal() ) {
-            $parent_payment = wpinv_get_invoice( $this->parent_invoice );
+        if ($this->is_renewal()) {
+            $parent_payment = wpinv_get_invoice($this->parent_invoice);
         }
         
         return $parent_payment;
     }
     
     public function is_paid() {
-        $is_paid = $this->has_status( array( 'publish', 'wpi-processing', 'wpi-renewal' ) );
+        $is_paid = $this->has_status(array('publish', 'wpi-processing', 'wpi-renewal'));
 
-        return apply_filters( 'wpinv_invoice_is_paid', $is_paid, $this );
+        return apply_filters('wpinv_invoice_is_paid', $is_paid, $this);
     }
 
     /**
@@ -2204,23 +2204,23 @@ 
     }
     
     public function is_refunded() {
-        $is_refunded = $this->has_status( array( 'wpi-refunded' ) );
+        $is_refunded = $this->has_status(array('wpi-refunded'));
 
-        return apply_filters( 'wpinv_invoice_is_refunded', $is_refunded, $this );
+        return apply_filters('wpinv_invoice_is_refunded', $is_refunded, $this);
     }
     
     public function is_free() {
         $is_free = false;
         
-        if ( !( (float)wpinv_round_amount( $this->get_total() ) > 0 ) ) {
-            if ( $this->is_parent() && $this->is_recurring() ) {
-                $is_free = (float)wpinv_round_amount( $this->get_recurring_details( 'total' ) ) > 0 ? false : true;
+        if (!((float) wpinv_round_amount($this->get_total()) > 0)) {
+            if ($this->is_parent() && $this->is_recurring()) {
+                $is_free = (float) wpinv_round_amount($this->get_recurring_details('total')) > 0 ? false : true;
             } else {
                 $is_free = true;
             }
         }
         
-        return apply_filters( 'wpinv_invoice_is_free', $is_free, $this );
+        return apply_filters('wpinv_invoice_is_free', $is_free, $this);
     }
     
     public function has_vat() {
@@ -2228,41 +2228,41 @@ 
         
         $requires_vat = false;
         
-        if ( $this->country ) {
+        if ($this->country) {
             $wpi_country        = $this->country;
             
-            $requires_vat       = $wpinv_euvat->requires_vat( $requires_vat, $this->get_user_id(), $wpinv_euvat->invoice_has_digital_rule( $this ) );
+            $requires_vat       = $wpinv_euvat->requires_vat($requires_vat, $this->get_user_id(), $wpinv_euvat->invoice_has_digital_rule($this));
         }
         
-        return apply_filters( 'wpinv_invoice_has_vat', $requires_vat, $this );
+        return apply_filters('wpinv_invoice_has_vat', $requires_vat, $this);
     }
     
     public function refresh_item_ids() {
         $item_ids = array();
         
-        if ( !empty( $this->cart_details ) ) {
-            foreach ( $this->cart_details as $key => $item ) {
-                if ( !empty( $item['id'] ) ) {
+        if (!empty($this->cart_details)) {
+            foreach ($this->cart_details as $key => $item) {
+                if (!empty($item['id'])) {
                     $item_ids[] = $item['id'];
                 }
             }
         }
         
-        $item_ids = !empty( $item_ids ) ? implode( ',', array_unique( $item_ids ) ) : '';
+        $item_ids = !empty($item_ids) ? implode(',', array_unique($item_ids)) : '';
         
-        update_post_meta( $this->ID, '_wpinv_item_ids', $item_ids );
+        update_post_meta($this->ID, '_wpinv_item_ids', $item_ids);
     }
     
-    public function get_invoice_quote_type( $post_id ) {
-        if ( empty( $post_id ) ) {
+    public function get_invoice_quote_type($post_id) {
+        if (empty($post_id)) {
             return '';
         }
 
-        $type = get_post_type( $post_id );
+        $type = get_post_type($post_id);
 
-        if ( 'wpi_invoice' === $type ) {
+        if ('wpi_invoice' === $type) {
             $post_type = __('Invoice', 'invoicing');
-        } else{
+        } else {
             $post_type = __('Quote', 'invoicing');
         }
 

includes/admin/admin-meta-boxes.php

Spacing +154 added lines, -154 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,97 +83,97 @@ 
             $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_shortcode', __( 'Shortcode', 'invoicing' ), 'WPInv_Meta_Box_Items::shortcode', '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' );
+    add_meta_box('wpinv_field_item_shortcode', __('Shortcode', 'invoicing'), 'WPInv_Meta_Box_Items::shortcode', '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';
@@ -183,207 +183,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-invoice-items.php

Spacing +185 added lines, -185 removed lines

@@ -1,47 +1,47 @@ 
 <?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_Items {
-    public static function output( $post ) {
+    public static function output($post) {
         global $wpinv_euvat, $ajax_cart_details;
 
-        $post_id            = !empty( $post->ID ) ? $post->ID : 0;
-        $invoice            = new WPInv_Invoice( $post_id );
+        $post_id            = !empty($post->ID) ? $post->ID : 0;
+        $invoice            = new WPInv_Invoice($post_id);
         $ajax_cart_details  = $invoice->get_cart_details();
-        $subtotal           = $invoice->get_subtotal( true );
+        $subtotal           = $invoice->get_subtotal(true);
         $discount_raw       = $invoice->get_discount();
-        $discount           = wpinv_price( $discount_raw, $invoice->get_currency() );
+        $discount           = wpinv_price($discount_raw, $invoice->get_currency());
         $discounts          = $discount_raw > 0 ? $invoice->get_discounts() : '';
-        $tax                = $invoice->get_tax( true );
-        $total              = $invoice->get_total( true );
+        $tax                = $invoice->get_tax(true);
+        $total              = $invoice->get_total(true);
         $item_quantities    = wpinv_item_quantities_enabled();
         $use_taxes          = wpinv_use_taxes();
-        if ( !$use_taxes && (float)$invoice->get_tax() > 0 ) {
+        if (!$use_taxes && (float) $invoice->get_tax() > 0) {
             $use_taxes = true;
         }
-        $item_types         = apply_filters( 'wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post );
+        $item_types         = apply_filters('wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post);
         $is_recurring       = $invoice->is_recurring();
         $post_type_object   = get_post_type_object($invoice->post_type);
         $type_title         = $post_type_object->labels->singular_name;
 
         $cols = 5;
-        if ( $item_quantities ) {
+        if ($item_quantities) {
             $cols++;
         }
-        if ( $use_taxes ) {
+        if ($use_taxes) {
             $cols++;
         }
         $class = '';
-        if ( $invoice->is_paid() ) {
+        if ($invoice->is_paid()) {
             $class .= ' wpinv-paid';
         }
-        if ( $invoice->is_refunded() ) {
+        if ($invoice->is_refunded()) {
             $class .= ' wpinv-refunded';
         }
-        if ( $is_recurring ) {
+        if ($is_recurring) {
             $class .= ' wpi-recurring';
         }
         ?>
@@ -49,21 +49,21 @@ 
             <table id="wpinv_items" class="wpinv-items" cellspacing="0" cellpadding="0">
                 <thead>
                     <tr>
-                        <th class="id"><?php _e( 'ID', 'invoicing' );?></th>
-                        <th class="title"><?php _e( 'Item', 'invoicing' );?></th>
-                        <th class="price"><?php _e( 'Price', 'invoicing' );?></th>
-                        <?php if ( $item_quantities ) { ?>
-                        <th class="qty"><?php _e( 'Qty', 'invoicing' );?></th>
+                        <th class="id"><?php _e('ID', 'invoicing'); ?></th>
+                        <th class="title"><?php _e('Item', 'invoicing'); ?></th>
+                        <th class="price"><?php _e('Price', 'invoicing'); ?></th>
+                        <?php if ($item_quantities) { ?>
+                        <th class="qty"><?php _e('Qty', 'invoicing'); ?></th>
                         <?php } ?>
-                        <th class="total"><?php _e( 'Total', 'invoicing' );?></th>
-                        <?php if ( $use_taxes ) { ?>
-                        <th class="tax"><?php _e( 'Tax (%)', 'invoicing' );?></th>
+                        <th class="total"><?php _e('Total', 'invoicing'); ?></th>
+                        <?php if ($use_taxes) { ?>
+                        <th class="tax"><?php _e('Tax (%)', 'invoicing'); ?></th>
                         <?php } ?>
                         <th class="action"></th>
                     </tr>
                 </thead>
                 <tbody class="wpinv-line-items">
-                    <?php echo wpinv_admin_get_line_items( $invoice ); ?>
+                    <?php echo wpinv_admin_get_line_items($invoice); ?>
                 </tbody>
                 <tfoot class="wpinv-totals">
                     <tr>
@@ -74,45 +74,45 @@ 
                                         <td class="id">
                                         </td>
                                         <td class="title">
-                                            <input type="text" class="regular-text" placeholder="<?php _e( 'Item Name', 'invoicing' ); ?>" value="" name="_wpinv_quick[name]">
-                                            <?php if ( $wpinv_euvat->allow_vat_rules() ) { ?>
+                                            <input type="text" class="regular-text" placeholder="<?php _e('Item Name', 'invoicing'); ?>" value="" name="_wpinv_quick[name]">
+                                            <?php if ($wpinv_euvat->allow_vat_rules()) { ?>
                                             <div class="wp-clearfix">
                                                 <label class="wpi-vat-rule">
-                                                    <span class="title"><?php _e( 'VAT rule type', 'invoicing' );?></span>
+                                                    <span class="title"><?php _e('VAT rule type', 'invoicing'); ?></span>
                                                     <span class="input-text-wrap">
-                                                        <?php echo wpinv_html_select( array(
+                                                        <?php echo wpinv_html_select(array(
                                                             'options'          => $wpinv_euvat->get_rules(),
                                                             'name'             => '_wpinv_quick[vat_rule]',
                                                             'id'               => '_wpinv_quick_vat_rule',
                                                             'show_option_all'  => false,
                                                             'show_option_none' => false,
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-vat-rule wpi_select2',
-                                                        ) ); ?>
+                                                        )); ?>
                                                     </span>
                                                 </label>
                                             </div>
-                                            <?php } if ( $wpinv_euvat->allow_vat_classes() ) { ?>
+                                            <?php } if ($wpinv_euvat->allow_vat_classes()) { ?>
                                             <div class="wp-clearfix">
                                                 <label class="wpi-vat-class">
-                                                    <span class="title"><?php _e( 'VAT class', 'invoicing' );?></span>
+                                                    <span class="title"><?php _e('VAT class', 'invoicing'); ?></span>
                                                     <span class="input-text-wrap">
-                                                        <?php echo wpinv_html_select( array(
+                                                        <?php echo wpinv_html_select(array(
                                                             'options'          => $wpinv_euvat->get_all_classes(),
                                                             'name'             => '_wpinv_quick[vat_class]',
                                                             'id'               => '_wpinv_quick_vat_class',
                                                             'show_option_all'  => false,
                                                             'show_option_none' => false,
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-vat-class wpi_select2',
-                                                        ) ); ?>
+                                                        )); ?>
                                                     </span>
                                                 </label>
                                             </div>
                                             <?php } ?>
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-type">
-                                                    <span class="title"><?php _e( 'Item type', 'invoicing' );?></span>
+                                                    <span class="title"><?php _e('Item type', 'invoicing'); ?></span>
                                                     <span class="input-text-wrap">
-                                                        <?php echo wpinv_html_select( array(
+                                                        <?php echo wpinv_html_select(array(
                                                             'options'          => $item_types,
                                                             'name'             => '_wpinv_quick[type]',
                                                             'id'               => '_wpinv_quick_type',
@@ -120,37 +120,37 @@ 
                                                             'show_option_all'  => false,
                                                             'show_option_none' => false,
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-type wpi_select2',
-                                                        ) ); ?>
+                                                        )); ?>
                                                     </span>
                                                 </label>
                                             </div>
 
                                             <div class="wp-clearfix">
                                                 <?php 
-                                                    echo wpinv_html_textarea( array(
+                                                    echo wpinv_html_textarea(array(
                                                         'name'  => '_wpinv_quick[excerpt]',
                                                         'id'    => '_wpinv_quick_excerpt',
                                                         'value' => '',
                                                         'class' => 'large-text',
-                                                        'label' => __( 'Item description', 'invoicing' ),
-                                                    ) ); 
+                                                        'label' => __('Item description', 'invoicing'),
+                                                    )); 
                                                 ?>
                                             </div>
 
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-actions">
                                                     <span class="input-text-wrap">
-                                                        <input type="button" value="<?php esc_attr_e( 'Add', 'invoicing' ); ?>" class="button button-primary" id="wpinv-save-item"><input type="button" value="Cancel" class="button button-secondary" id="wpinv-cancel-item">
+                                                        <input type="button" value="<?php esc_attr_e('Add', 'invoicing'); ?>" class="button button-primary" id="wpinv-save-item"><input type="button" value="Cancel" class="button button-secondary" id="wpinv-cancel-item">
                                                     </span>
                                                 </label>
                                             </div>
                                         </td>
                                         <td class="price"><input type="text" placeholder="0.00" class="wpi-field-price wpi-price" name="_wpinv_quick[price]" /></td>
-                                        <?php if ( $item_quantities ) { ?>
+                                        <?php if ($item_quantities) { ?>
                                         <td class="qty"><input type="number" class="small-text" step="1" min="1" value="1" name="_wpinv_quick[qty]" /></td>
                                         <?php } ?>
                                         <td class="total"></td>
-                                        <?php if ( $use_taxes ) { ?>
+                                        <?php if ($use_taxes) { ?>
                                         <td class="tax"></td>
                                         <?php } ?>
                                         <td class="action"></td>
@@ -163,29 +163,29 @@ 
                         <td colspan="<?php echo $cols; ?>"></td>
                     </tr>
                     <tr class="totals">
-                        <td colspan="<?php echo ( $cols - 4 ); ?>"></td>
+                        <td colspan="<?php echo ($cols - 4); ?>"></td>
                         <td colspan="4">
                             <table cellspacing="0" cellpadding="0">
                                 <tr class="subtotal">
-                                    <td class="name"><?php _e( 'Sub Total:', 'invoicing' );?></td>
-                                    <td class="total"><?php echo $subtotal;?></td>
+                                    <td class="name"><?php _e('Sub Total:', 'invoicing'); ?></td>
+                                    <td class="total"><?php echo $subtotal; ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <tr class="discount">
-                                    <td class="name"><?php wpinv_get_discount_label( wpinv_discount_code( $invoice->ID ) ); ?>:</td>
-                                    <td class="total"><?php echo wpinv_discount( $invoice->ID, true, true ); ?></td>
+                                    <td class="name"><?php wpinv_get_discount_label(wpinv_discount_code($invoice->ID)); ?>:</td>
+                                    <td class="total"><?php echo wpinv_discount($invoice->ID, true, true); ?></td>
                                     <td class="action"></td>
                                 </tr>
-                                <?php if ( $use_taxes ) { ?>
+                                <?php if ($use_taxes) { ?>
                                 <tr class="tax">
-                                    <td class="name"><?php _e( 'Tax:', 'invoicing' );?></td>
-                                    <td class="total"><?php echo $tax;?></td>
+                                    <td class="name"><?php _e('Tax:', 'invoicing'); ?></td>
+                                    <td class="total"><?php echo $tax; ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <?php } ?>
                                 <tr class="total">
-                                    <td class="name"><?php echo apply_filters( 'wpinv_invoice_items_total_label', __( 'Invoice Total:', 'invoicing' ), $invoice );?></td>
-                                    <td class="total"><?php echo $total;?></td>
+                                    <td class="name"><?php echo apply_filters('wpinv_invoice_items_total_label', __('Invoice Total:', 'invoicing'), $invoice); ?></td>
+                                    <td class="total"><?php echo $total; ?></td>
                                     <td class="action"></td>
                                 </tr>
                             </table>
@@ -196,90 +196,90 @@ 
             <div class="wpinv-actions">
                 <?php ob_start(); ?>
                 <?php
-                    if ( !$invoice->is_paid() && !$invoice->is_refunded() ) {
-                        if ( !$invoice->is_recurring() ) {
-                            echo wpinv_item_dropdown( array(
+                    if (!$invoice->is_paid() && !$invoice->is_refunded()) {
+                        if (!$invoice->is_recurring()) {
+                            echo wpinv_item_dropdown(array(
                                 'name'             => 'wpinv_invoice_item',
                                 'id'               => 'wpinv_invoice_item',
                                 'show_recurring'   => true,
                                 'class'            => 'wpi_select2',
-                            ) );
+                            ));
                     ?>
-                <input type="button" value="<?php echo sprintf(esc_attr__( 'Add item to %s', 'invoicing'), $type_title); ?>" class="button button-primary" id="wpinv-add-item"><input type="button" value="<?php esc_attr_e( 'Create new item', 'invoicing' );?>" class="button button-primary" id="wpinv-new-item"><?php } ?><input type="button" value="<?php esc_attr_e( 'Recalculate Totals', 'invoicing' );?>" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">
+                <input type="button" value="<?php echo sprintf(esc_attr__('Add item to %s', 'invoicing'), $type_title); ?>" class="button button-primary" id="wpinv-add-item"><input type="button" value="<?php esc_attr_e('Create new item', 'invoicing'); ?>" class="button button-primary" id="wpinv-new-item"><?php } ?><input type="button" value="<?php esc_attr_e('Recalculate Totals', 'invoicing'); ?>" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">
                     <?php } ?>
-                <?php do_action( 'wpinv_invoice_items_actions', $invoice ); ?>
-                <?php $item_actions = ob_get_clean(); echo apply_filters( 'wpinv_invoice_items_actions_content', $item_actions, $invoice, $post ); ?>
+                <?php do_action('wpinv_invoice_items_actions', $invoice); ?>
+                <?php $item_actions = ob_get_clean(); echo apply_filters('wpinv_invoice_items_actions_content', $item_actions, $invoice, $post); ?>
             </div>
         </div>
         <?php
     }
 
-    public static function prices( $post ) {        
+    public static function prices($post) {        
         $symbol         = wpinv_currency_symbol();
         $position       = wpinv_currency_position();
-        $item           = new WPInv_Item( $post->ID );
+        $item           = new WPInv_Item($post->ID);
 
         $price                = $item->get_price();
         $is_dynamic_pricing   = $item->get_is_dynamic_pricing();
         $minimum_price        = $item->get_minimum_price();
         $is_recurring         = $item->is_recurring();
         $period               = $item->get_recurring_period();
-        $interval             = absint( $item->get_recurring_interval() );
-        $times                = absint( $item->get_recurring_limit() );
+        $interval             = absint($item->get_recurring_interval());
+        $times                = absint($item->get_recurring_limit());
         $free_trial           = $item->has_free_trial();
         $trial_interval       = $item->get_trial_interval();
         $trial_period         = $item->get_trial_period();
 
         $intervals            = array();
-        for ( $i = 1; $i <= 90; $i++ ) {
+        for ($i = 1; $i <= 90; $i++) {
             $intervals[$i] = $i;
         }
 
-        $interval       = $interval > 0 ? $interval : 1;
+        $interval = $interval > 0 ? $interval : 1;
 
         $class = $is_recurring ? 'wpinv-recurring-y' : 'wpinv-recurring-n';
 
         $minimum_price_style = 'margin-left: 24px;';
-        if(! $is_dynamic_pricing ) {
+        if (!$is_dynamic_pricing) {
             $minimum_price_style .= 'display: none;';
         }
 
         ?>
-        <p class="wpinv-row-prices"><?php echo ( $position != 'right' ? $symbol . '&nbsp;' : '' );?><input type="text" maxlength="12" placeholder="<?php echo wpinv_sanitize_amount( 0 ); ?>" value="<?php echo $price;?>" id="wpinv_item_price" name="wpinv_item_price" class="medium-text wpi-field-price wpi-price" <?php disabled( $item->is_editable(), false ); ?> /><?php echo ( $position == 'right' ? '&nbsp;' . $symbol : '' );?><input type="hidden" name="wpinv_vat_meta_box_nonce" value="<?php echo wp_create_nonce( 'wpinv_item_meta_box_save' ) ;?>" />
-        <?php do_action( 'wpinv_prices_metabox_price', $item ); ?>
+        <p class="wpinv-row-prices"><?php echo ($position != 'right' ? $symbol . '&nbsp;' : ''); ?><input type="text" maxlength="12" placeholder="<?php echo wpinv_sanitize_amount(0); ?>" value="<?php echo $price; ?>" id="wpinv_item_price" name="wpinv_item_price" class="medium-text wpi-field-price wpi-price" <?php disabled($item->is_editable(), false); ?> /><?php echo ($position == 'right' ? '&nbsp;' . $symbol : ''); ?><input type="hidden" name="wpinv_vat_meta_box_nonce" value="<?php echo wp_create_nonce('wpinv_item_meta_box_save'); ?>" />
+        <?php do_action('wpinv_prices_metabox_price', $item); ?>
         </p>
 
-    <?php if( $item->supports_dynamic_pricing() ) { ?>
+    <?php if ($item->supports_dynamic_pricing()) { ?>
 
         <p class="wpinv-row-name-your-price">
             <label>
-                <input type="checkbox" name="wpinv_name_your_price" id="wpinv_name_your_price" value="1" <?php checked( 1, $is_dynamic_pricing ); ?> />
-                <?php echo apply_filters( 'wpinv_name_your_price_toggle_text', __( 'User can set a custom price', 'invoicing' ) ); ?>
+                <input type="checkbox" name="wpinv_name_your_price" id="wpinv_name_your_price" value="1" <?php checked(1, $is_dynamic_pricing); ?> />
+                <?php echo apply_filters('wpinv_name_your_price_toggle_text', __('User can set a custom price', 'invoicing')); ?>
             </label>
-            <?php do_action( 'wpinv_prices_metabox_name_your_price_field', $item ); ?>
+            <?php do_action('wpinv_prices_metabox_name_your_price_field', $item); ?>
         </p>
 
         <p class="wpinv-row-minimum-price" style="<?php echo $minimum_price_style; ?>">
             <label>
-                <?php _e( 'Minimum Price', 'invoicing' ); ?>
-                <?php echo ( $position != 'right' ? $symbol . '&nbsp;' : '' );?><input type="text" maxlength="12" placeholder="<?php echo wpinv_sanitize_amount( 0 ); ?>" value="<?php echo $minimum_price;?>" id="wpinv_minimum_price" name="wpinv_minimum_price" class="medium-text wpi-field-price" <?php disabled( $item->is_editable(), false ); ?> /><?php echo ( $position == 'right' ? '&nbsp;' . $symbol : '' );?>
+                <?php _e('Minimum Price', 'invoicing'); ?>
+                <?php echo ($position != 'right' ? $symbol . '&nbsp;' : ''); ?><input type="text" maxlength="12" placeholder="<?php echo wpinv_sanitize_amount(0); ?>" value="<?php echo $minimum_price; ?>" id="wpinv_minimum_price" name="wpinv_minimum_price" class="medium-text wpi-field-price" <?php disabled($item->is_editable(), false); ?> /><?php echo ($position == 'right' ? '&nbsp;' . $symbol : ''); ?>
             </label>
 
-            <?php do_action( 'wpinv_prices_metabox_minimum_price_field', $item ); ?>
+            <?php do_action('wpinv_prices_metabox_minimum_price_field', $item); ?>
         </p>
 
     <?php } ?>
 
         <p class="wpinv-row-is-recurring">
             <label for="wpinv_is_recurring">
-                <input type="checkbox" name="wpinv_is_recurring" id="wpinv_is_recurring" value="1" <?php checked( 1, $is_recurring ); ?> />
-                <?php echo apply_filters( 'wpinv_is_recurring_toggle_text', __( 'Is Recurring Item?', 'invoicing' ) ); ?>
+                <input type="checkbox" name="wpinv_is_recurring" id="wpinv_is_recurring" value="1" <?php checked(1, $is_recurring); ?> />
+                <?php echo apply_filters('wpinv_is_recurring_toggle_text', __('Is Recurring Item?', 'invoicing')); ?>
             </label>
-            <?php do_action( 'wpinv_prices_metabox_is_recurring_field', $item ); ?>
+            <?php do_action('wpinv_prices_metabox_is_recurring_field', $item); ?>
         </p>
-        <p class="wpinv-row-recurring-fields <?php echo $class;?>">
-            <label class="wpinv-period" for="wpinv_recurring_period"><?php _e( 'Recurring', 'invoicing' );?> <select class="wpinv-select wpi_select2" id="wpinv_recurring_period" name="wpinv_recurring_period"><option value="D" data-text="<?php esc_attr_e( 'day(s)', 'invoicing' ); ?>" <?php selected( 'D', $period );?>><?php _e( 'Daily', 'invoicing' ); ?></option><option value="W" data-text="<?php esc_attr_e( 'week(s)', 'invoicing' ); ?>" <?php selected( 'W', $period );?>><?php _e( 'Weekly', 'invoicing' ); ?></option><option value="M" data-text="<?php esc_attr_e( 'month(s)', 'invoicing' ); ?>" <?php selected( 'M', $period );?>><?php _e( 'Monthly', 'invoicing' ); ?></option><option value="Y" data-text="<?php esc_attr_e( 'year(s)', 'invoicing' ); ?>" <?php selected( 'Y', $period );?>><?php _e( 'Yearly', 'invoicing' ); ?></option></select></label>
-            <label class="wpinv-interval" for="wpinv_recurring_interval"> <?php _e( 'at every', 'invoicing' );?> <?php echo wpinv_html_select( array(
+        <p class="wpinv-row-recurring-fields <?php echo $class; ?>">
+            <label class="wpinv-period" for="wpinv_recurring_period"><?php _e('Recurring', 'invoicing'); ?> <select class="wpinv-select wpi_select2" id="wpinv_recurring_period" name="wpinv_recurring_period"><option value="D" data-text="<?php esc_attr_e('day(s)', 'invoicing'); ?>" <?php selected('D', $period); ?>><?php _e('Daily', 'invoicing'); ?></option><option value="W" data-text="<?php esc_attr_e('week(s)', 'invoicing'); ?>" <?php selected('W', $period); ?>><?php _e('Weekly', 'invoicing'); ?></option><option value="M" data-text="<?php esc_attr_e('month(s)', 'invoicing'); ?>" <?php selected('M', $period); ?>><?php _e('Monthly', 'invoicing'); ?></option><option value="Y" data-text="<?php esc_attr_e('year(s)', 'invoicing'); ?>" <?php selected('Y', $period); ?>><?php _e('Yearly', 'invoicing'); ?></option></select></label>
+            <label class="wpinv-interval" for="wpinv_recurring_interval"> <?php _e('at every', 'invoicing'); ?> <?php echo wpinv_html_select(array(
                 'options'          => $intervals,
                 'name'             => 'wpinv_recurring_interval',
                 'id'               => 'wpinv_recurring_interval',
@@ -287,30 +287,30 @@ 
                 'show_option_all'  => false,
                 'show_option_none' => false,
                 'class'            => 'wpi_select2',
-            ) ); ?> <span id="wpinv_interval_text"><?php _e( 'day(s)', 'invoicing' );?></span></label>
-            <label class="wpinv-times" for="wpinv_recurring_limit"> <?php _e( 'for', 'invoicing' );?> <input class="small-text" type="number" value="<?php echo $times;?>" size="4" id="wpinv_recurring_limit" name="wpinv_recurring_limit" step="1" min="0"> <?php _e( 'time(s) <i>(select 0 for recurring forever until cancelled</i>)', 'invoicing' );?></label>
+            )); ?> <span id="wpinv_interval_text"><?php _e('day(s)', 'invoicing'); ?></span></label>
+            <label class="wpinv-times" for="wpinv_recurring_limit"> <?php _e('for', 'invoicing'); ?> <input class="small-text" type="number" value="<?php echo $times; ?>" size="4" id="wpinv_recurring_limit" name="wpinv_recurring_limit" step="1" min="0"> <?php _e('time(s) <i>(select 0 for recurring forever until cancelled</i>)', 'invoicing'); ?></label>
             <span class="clear wpi-trial-clr"></span>
             <label class="wpinv-free-trial" for="wpinv_free_trial">
-                <input type="checkbox" name="wpinv_free_trial" id="wpinv_free_trial" value="1" <?php checked( true, (bool)$free_trial ); ?> /> 
-                <?php echo __( 'Offer free trial for', 'invoicing' ); ?>
+                <input type="checkbox" name="wpinv_free_trial" id="wpinv_free_trial" value="1" <?php checked(true, (bool) $free_trial); ?> /> 
+                <?php echo __('Offer free trial for', 'invoicing'); ?>
             </label>
             <label class="wpinv-trial-interval" for="wpinv_trial_interval">
-                <input class="small-text" type="number" value="<?php echo $trial_interval;?>" size="4" id="wpinv_trial_interval" name="wpinv_trial_interval" step="1" min="1"> <select class="wpinv-select wpi_select2" id="wpinv_trial_period" name="wpinv_trial_period"><option value="D" <?php selected( 'D', $trial_period );?>><?php _e( 'day(s)', 'invoicing' ); ?></option><option value="W" <?php selected( 'W', $trial_period );?>><?php _e( 'week(s)', 'invoicing' ); ?></option><option value="M" <?php selected( 'M', $trial_period );?>><?php _e( 'month(s)', 'invoicing' ); ?></option><option value="Y" <?php selected( 'Y', $trial_period );?>><?php _e( 'year(s)', 'invoicing' ); ?></option></select>
+                <input class="small-text" type="number" value="<?php echo $trial_interval; ?>" size="4" id="wpinv_trial_interval" name="wpinv_trial_interval" step="1" min="1"> <select class="wpinv-select wpi_select2" id="wpinv_trial_period" name="wpinv_trial_period"><option value="D" <?php selected('D', $trial_period); ?>><?php _e('day(s)', 'invoicing'); ?></option><option value="W" <?php selected('W', $trial_period); ?>><?php _e('week(s)', 'invoicing'); ?></option><option value="M" <?php selected('M', $trial_period); ?>><?php _e('month(s)', 'invoicing'); ?></option><option value="Y" <?php selected('Y', $trial_period); ?>><?php _e('year(s)', 'invoicing'); ?></option></select>
             </label>
-            <?php do_action( 'wpinv_prices_metabox_recurring_fields', $item ); ?>
+            <?php do_action('wpinv_prices_metabox_recurring_fields', $item); ?>
         </p>
-        <input type="hidden" id="_wpi_current_type" value="<?php echo wpinv_get_item_type( $post->ID ); ?>" />
-        <?php do_action( 'wpinv_item_price_field', $post->ID ); ?>
+        <input type="hidden" id="_wpi_current_type" value="<?php echo wpinv_get_item_type($post->ID); ?>" />
+        <?php do_action('wpinv_item_price_field', $post->ID); ?>
         <?php
     }
 
-    public static function vat_rules( $post ) {
+    public static function vat_rules($post) {
         global $wpinv_euvat;
 
-        $rule_type = $wpinv_euvat->get_item_rule( $post->ID );
+        $rule_type = $wpinv_euvat->get_item_rule($post->ID);
         ?>
-        <p><label for="wpinv_vat_rules"><strong><?php _e( 'Select how VAT rules will be applied:', 'invoicing' );?></strong></label>&nbsp;&nbsp;&nbsp;
-        <?php echo wpinv_html_select( array(
+        <p><label for="wpinv_vat_rules"><strong><?php _e('Select how VAT rules will be applied:', 'invoicing'); ?></strong></label>&nbsp;&nbsp;&nbsp;
+        <?php echo wpinv_html_select(array(
                     'options'          => $wpinv_euvat->get_rules(),
                     'name'             => 'wpinv_vat_rules',
                     'id'               => 'wpinv_vat_rules',
@@ -318,20 +318,20 @@ 
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpinv-vat-rules wpi_select2',
-                ) ); ?>
+                )); ?>
         </p>
-        <p class="wpi-m0"><?php _e( 'When you select physical product rules, only consumers and businesses in your country will be charged VAT.  The VAT rate used will be the rate in your country.', 'invoicing' ); ?></p>
-        <p class="wpi-m0"><?php _e( 'If you select Digital product rules, VAT will be charged at the rate that applies in the country of the consumer.  Only businesses in your country will be charged VAT.', 'invoicing' ); ?></p>
-        <p class="wpi-m0"><?php _e( 'Select "Tax-Free" if you do not want to charge VAT for this item.', 'invoicing' ); ?></p>
+        <p class="wpi-m0"><?php _e('When you select physical product rules, only consumers and businesses in your country will be charged VAT.  The VAT rate used will be the rate in your country.', 'invoicing'); ?></p>
+        <p class="wpi-m0"><?php _e('If you select Digital product rules, VAT will be charged at the rate that applies in the country of the consumer.  Only businesses in your country will be charged VAT.', 'invoicing'); ?></p>
+        <p class="wpi-m0"><?php _e('Select "Tax-Free" if you do not want to charge VAT for this item.', 'invoicing'); ?></p>
         <?php
     }
 
-    public static function vat_classes( $post ) {
+    public static function vat_classes($post) {
         global $wpinv_euvat;
         
-        $vat_class = $wpinv_euvat->get_item_class( $post->ID );
+        $vat_class = $wpinv_euvat->get_item_class($post->ID);
         ?>
-        <p><?php echo wpinv_html_select( array(
+        <p><?php echo wpinv_html_select(array(
                     'options'          => $wpinv_euvat->get_all_classes(),
                     'name'             => 'wpinv_vat_class',
                     'id'               => 'wpinv_vat_class',
@@ -339,18 +339,18 @@ 
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpinv-vat-class wpi_select2',
-                ) ); ?>
+                )); ?>
         </p>
-        <p class="wpi-m0"><?php _e( 'Select the VAT rate class to use for this invoice item.', 'invoicing' ); ?></p>
+        <p class="wpi-m0"><?php _e('Select the VAT rate class to use for this invoice item.', 'invoicing'); ?></p>
         <?php
     }
 
-    public static function item_info( $post ) {
-        $item_type = wpinv_get_item_type( $post->ID );
-        do_action( 'wpinv_item_info_metabox_before', $post );
+    public static function item_info($post) {
+        $item_type = wpinv_get_item_type($post->ID);
+        do_action('wpinv_item_info_metabox_before', $post);
         ?>
-        <p><label for="wpinv_item_type"><strong><?php _e( 'Type:', 'invoicing' );?></strong></label>&nbsp;&nbsp;&nbsp;
-        <?php echo wpinv_html_select( array(
+        <p><label for="wpinv_item_type"><strong><?php _e('Type:', 'invoicing'); ?></strong></label>&nbsp;&nbsp;&nbsp;
+        <?php echo wpinv_html_select(array(
                     'options'          => wpinv_get_item_types(),
                     'name'             => 'wpinv_item_type',
                     'id'               => 'wpinv_item_type',
@@ -358,123 +358,123 @@ 
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpinv-item-type',
-                ) ); ?>
+                )); ?>
         </p>
-        <p class="wpi-m0"><?php _e( 'Select item type.', 'invoicing' );?><br><?php _e( '<b>Standard:</b> Standard item type', 'invoicing' );?><br><?php _e( '<b>Fee:</b> Like Registration Fee, Sign up Fee etc.', 'invoicing' );?></p>
+        <p class="wpi-m0"><?php _e('Select item type.', 'invoicing'); ?><br><?php _e('<b>Standard:</b> Standard item type', 'invoicing'); ?><br><?php _e('<b>Fee:</b> Like Registration Fee, Sign up Fee etc.', 'invoicing'); ?></p>
         <?php
-        do_action( 'wpinv_item_info_metabox_after', $post );
+        do_action('wpinv_item_info_metabox_after', $post);
     }
 
-    public static function meta_values( $post ) {
-        $meta_keys = apply_filters( 'wpinv_show_meta_values_for_keys', array(
+    public static function meta_values($post) {
+        $meta_keys = apply_filters('wpinv_show_meta_values_for_keys', array(
             'type',
             'custom_id'
-        ) );
+        ));
 
-        if ( empty( $meta_keys ) ) {
+        if (empty($meta_keys)) {
             return;
         }
 
-        do_action( 'wpinv_meta_values_metabox_before', $post );
+        do_action('wpinv_meta_values_metabox_before', $post);
 
-        foreach ( $meta_keys as $meta_key ) {
+        foreach ($meta_keys as $meta_key) {
             ?>
-            <p class="wpi-mtb05"><label><strong><?php echo $meta_key; ?></strong>: <?php echo get_post_meta( $post->ID, '_wpinv_' . $meta_key, true ); ?></label></p>
+            <p class="wpi-mtb05"><label><strong><?php echo $meta_key; ?></strong>: <?php echo get_post_meta($post->ID, '_wpinv_' . $meta_key, true); ?></label></p>
             <?php 
         }
 
-        do_action( 'wpinv_meta_values_metabox_after', $post );
+        do_action('wpinv_meta_values_metabox_after', $post);
     }
 
     /**
      * Display the items buy now shortcode.
      */
-    public static function shortcode( $post ) {
+    public static function shortcode($post) {
 
-        if ( ! is_numeric( $post ) ) {
+        if (!is_numeric($post)) {
             $post = $post->ID;
         }
-        $label = '"' . __( 'Buy', 'invoicing' ) . '"';
+        $label = '"' . __('Buy', 'invoicing') . '"';
 
         echo "<input type='text' style='min-width: 100%; font-size: small;' value='[wpinv_buy items=$post label=$label]' disabled>";
-        echo "<p class='description'><a target='_blank' href='https://wpinvoicing.com/docs/core-plugin/core-shortcodes/#buy-button'>" . __( 'Learn More', 'invoicing' ) ."</a></p>";
+        echo "<p class='description'><a target='_blank' href='https://wpinvoicing.com/docs/core-plugin/core-shortcodes/#buy-button'>" . __('Learn More', 'invoicing') . "</a></p>";
     }
 
-    public static function save( $post_id, $data, $post ) {
-        $invoice        = new WPInv_Invoice( $post_id );
+    public static function save($post_id, $data, $post) {
+        $invoice        = new WPInv_Invoice($post_id);
 
         // Billing
-        $first_name     = sanitize_text_field( $data['wpinv_first_name'] );
-        $last_name      = sanitize_text_field( $data['wpinv_last_name'] );
-        $company        = sanitize_text_field( $data['wpinv_company'] );
-        $vat_number     = sanitize_text_field( $data['wpinv_vat_number'] );
-        $phone          = sanitize_text_field( $data['wpinv_phone'] );
-        $address        = sanitize_text_field( $data['wpinv_address'] );
-        $city           = sanitize_text_field( $data['wpinv_city'] );
-        $zip            = sanitize_text_field( $data['wpinv_zip'] );
-        $country        = sanitize_text_field( $data['wpinv_country'] );
-        $state          = sanitize_text_field( $data['wpinv_state'] );
+        $first_name     = sanitize_text_field($data['wpinv_first_name']);
+        $last_name      = sanitize_text_field($data['wpinv_last_name']);
+        $company        = sanitize_text_field($data['wpinv_company']);
+        $vat_number     = sanitize_text_field($data['wpinv_vat_number']);
+        $phone          = sanitize_text_field($data['wpinv_phone']);
+        $address        = sanitize_text_field($data['wpinv_address']);
+        $city           = sanitize_text_field($data['wpinv_city']);
+        $zip            = sanitize_text_field($data['wpinv_zip']);
+        $country        = sanitize_text_field($data['wpinv_country']);
+        $state          = sanitize_text_field($data['wpinv_state']);
 
         // Details
-        $status         = sanitize_text_field( $data['wpinv_status'] );
-        $old_status     = !empty( $data['original_post_status'] ) ? sanitize_text_field( $data['original_post_status'] ) : $status;
-        $number         = sanitize_text_field( $data['wpinv_number'] );
-        $due_date       = isset( $data['wpinv_due_date'] ) ? sanitize_text_field( $data['wpinv_due_date'] ) : '';
-        $date_created   = isset( $data['date_created'] ) ? sanitize_text_field( $data['date_created'] ) : '';
+        $status         = sanitize_text_field($data['wpinv_status']);
+        $old_status     = !empty($data['original_post_status']) ? sanitize_text_field($data['original_post_status']) : $status;
+        $number         = sanitize_text_field($data['wpinv_number']);
+        $due_date       = isset($data['wpinv_due_date']) ? sanitize_text_field($data['wpinv_due_date']) : '';
+        $date_created   = isset($data['date_created']) ? sanitize_text_field($data['date_created']) : '';
         //$discounts      = sanitize_text_field( $data['wpinv_discounts'] );
         //$discount       = sanitize_text_field( $data['wpinv_discount'] );
 
         $disable_taxes = 0;
 
-        if ( ! empty( $data['disable_taxes'] ) ) {
+        if (!empty($data['disable_taxes'])) {
             $disable_taxes = 1;
         }
 
-        $ip             = $invoice->get_ip() ? $invoice->get_ip() : wpinv_get_ip();
-
-        $invoice->set( 'due_date', $due_date );
-        $invoice->set( 'first_name', $first_name );
-        $invoice->set( 'last_name', $last_name );
-        $invoice->set( 'company', $company );
-        $invoice->set( 'vat_number', $vat_number );
-        $invoice->set( 'phone', $phone );
-        $invoice->set( 'address', $address );
-        $invoice->set( 'city', $city );
-        $invoice->set( 'zip', $zip );
-        $invoice->set( 'country', $country );
-        $invoice->set( 'state', $state );
-        $invoice->set( 'status', $status );
-        $invoice->set( 'set', $status );
+        $ip = $invoice->get_ip() ? $invoice->get_ip() : wpinv_get_ip();
+
+        $invoice->set('due_date', $due_date);
+        $invoice->set('first_name', $first_name);
+        $invoice->set('last_name', $last_name);
+        $invoice->set('company', $company);
+        $invoice->set('vat_number', $vat_number);
+        $invoice->set('phone', $phone);
+        $invoice->set('address', $address);
+        $invoice->set('city', $city);
+        $invoice->set('zip', $zip);
+        $invoice->set('country', $country);
+        $invoice->set('state', $state);
+        $invoice->set('status', $status);
+        $invoice->set('set', $status);
         //$invoice->set( 'number', $number );
         //$invoice->set( 'discounts', $discounts );
         //$invoice->set( 'discount', $discount );
-        $invoice->set( 'disable_taxes', $disable_taxes );
-        $invoice->set( 'ip', $ip );
+        $invoice->set('disable_taxes', $disable_taxes);
+        $invoice->set('ip', $ip);
         $invoice->old_status = $_POST['original_post_status'];
         
         $currency = $invoice->get_currency();
-        if ( ! empty( $data['wpinv_currency'] ) ) {
-            $currency = sanitize_text_field( $data['wpinv_currency'] );
+        if (!empty($data['wpinv_currency'])) {
+            $currency = sanitize_text_field($data['wpinv_currency']);
         }
 
-        if ( empty( $currency ) ) {
+        if (empty($currency)) {
             $currency = wpinv_get_currency();
         }
 
-        if ( ! $invoice->is_paid() ) {
+        if (!$invoice->is_paid()) {
             $invoice->currency = $currency;
         }
 
-        if ( !empty( $data['wpinv_gateway'] ) ) {
-            $invoice->set( 'gateway', sanitize_text_field( $data['wpinv_gateway'] ) );
+        if (!empty($data['wpinv_gateway'])) {
+            $invoice->set('gateway', sanitize_text_field($data['wpinv_gateway']));
         }
         $saved = $invoice->save();
 
-        if ( ! empty( $date_created ) && strtotime( $date_created, current_time( 'timestamp' ) ) ) {
+        if (!empty($date_created) && strtotime($date_created, current_time('timestamp'))) {
 
-            $time = strtotime( $date_created, current_time( 'timestamp' ) );
-            $date = date( 'Y-m-d H:i:s', $time );
-            $date_gmt = get_gmt_from_date( $date );
+            $time = strtotime($date_created, current_time('timestamp'));
+            $date = date('Y-m-d H:i:s', $time);
+            $date_gmt = get_gmt_from_date($date);
 
             wp_update_post(
                 array(
@@ -489,37 +489,37 @@ 
         }
 
         // Check for payment notes
-        if ( !empty( $data['invoice_note'] ) ) {
-            $note               = wp_kses( $data['invoice_note'], array() );
-            $note_type          = sanitize_text_field( $data['invoice_note_type'] );
+        if (!empty($data['invoice_note'])) {
+            $note               = wp_kses($data['invoice_note'], array());
+            $note_type          = sanitize_text_field($data['invoice_note_type']);
             $is_customer_note   = $note_type == 'customer' ? 1 : 0;
 
-            wpinv_insert_payment_note( $invoice->ID, $note, $is_customer_note );
+            wpinv_insert_payment_note($invoice->ID, $note, $is_customer_note);
         }
 
         // Update user address if empty.
-        if ( $saved && !empty( $invoice ) ) {
-            if ( $user_id = $invoice->get_user_id() ) {
-                $user_address = wpinv_get_user_address( $user_id, false );
+        if ($saved && !empty($invoice)) {
+            if ($user_id = $invoice->get_user_id()) {
+                $user_address = wpinv_get_user_address($user_id, false);
 
                 if (empty($user_address['first_name'])) {
-                    update_user_meta( $user_id, '_wpinv_first_name', $first_name );
-                    update_user_meta( $user_id, '_wpinv_last_name', $last_name );
+                    update_user_meta($user_id, '_wpinv_first_name', $first_name);
+                    update_user_meta($user_id, '_wpinv_last_name', $last_name);
                 } else if (empty($user_address['last_name']) && $user_address['first_name'] == $first_name) {
-                    update_user_meta( $user_id, '_wpinv_last_name', $last_name );
+                    update_user_meta($user_id, '_wpinv_last_name', $last_name);
                 }
 
                 if (empty($user_address['address']) || empty($user_address['city']) || empty($user_address['state']) || empty($user_address['country'])) {
-                    update_user_meta( $user_id, '_wpinv_address', $address );
-                    update_user_meta( $user_id, '_wpinv_city', $city );
-                    update_user_meta( $user_id, '_wpinv_state', $state );
-                    update_user_meta( $user_id, '_wpinv_country', $country );
-                    update_user_meta( $user_id, '_wpinv_zip', $zip );
-                    update_user_meta( $user_id, '_wpinv_phone', $phone );
+                    update_user_meta($user_id, '_wpinv_address', $address);
+                    update_user_meta($user_id, '_wpinv_city', $city);
+                    update_user_meta($user_id, '_wpinv_state', $state);
+                    update_user_meta($user_id, '_wpinv_country', $country);
+                    update_user_meta($user_id, '_wpinv_zip', $zip);
+                    update_user_meta($user_id, '_wpinv_phone', $phone);
                 }
             }
 
-            do_action( 'wpinv_invoice_metabox_saved', $invoice );
+            do_action('wpinv_invoice_metabox_saved', $invoice);
         }
 
         return $saved;

includes/wpinv-post-types.php

Spacing +117 added lines, -117 removed lines

@@ -7,41 +7,41 @@ 
  */
  
 // 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__));
 }
 
-add_action( 'init', 'wpinv_register_post_types', 1 );
+add_action('init', 'wpinv_register_post_types', 1);
 function wpinv_register_post_types() {
 
     $items_labels = array(
-        'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
-        'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
-        'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
-        'add_new'            => _x( 'Add New', 'wpi_item', 'invoicing' ),
-        'add_new_item'       => __( 'Add New Item', 'invoicing' ),
-        'new_item'           => __( 'New Item', 'invoicing' ),
-        'edit_item'          => __( 'Edit Item', 'invoicing' ),
-        'view_item'          => __( 'View Item', 'invoicing' ),
-        'all_items'          => __( 'Items', 'invoicing' ),
-        'search_items'       => __( 'Search Items', 'invoicing' ),
+        'name'               => _x('Items', 'post type general name', 'invoicing'),
+        'singular_name'      => _x('Item', 'post type singular name', 'invoicing'),
+        'menu_name'          => _x('Items', 'admin menu', 'invoicing'),
+        'add_new'            => _x('Add New', 'wpi_item', 'invoicing'),
+        'add_new_item'       => __('Add New Item', 'invoicing'),
+        'new_item'           => __('New Item', 'invoicing'),
+        'edit_item'          => __('Edit Item', 'invoicing'),
+        'view_item'          => __('View Item', 'invoicing'),
+        'all_items'          => __('Items', 'invoicing'),
+        'search_items'       => __('Search Items', 'invoicing'),
         'parent_item_colon'  => '',
-        'not_found'          => __( 'No items found.', 'invoicing' ),
-        'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' )
+        'not_found'          => __('No items found.', 'invoicing'),
+        'not_found_in_trash' => __('No items found in trash.', 'invoicing')
     );
-    $items_labels = apply_filters( 'wpinv_items_labels', $items_labels );
+    $items_labels = apply_filters('wpinv_items_labels', $items_labels);
 
     $cap_type          = 'wpi_item';
     $invoice_item_args = array(
         'labels'                => $items_labels,
-        'description'           => __( 'This is where you can add new invoice items.', 'invoicing' ),
+        'description'           => __('This is where you can add new invoice items.', 'invoicing'),
         'public'                => false,
         'has_archive'           => false,
         '_builtin'              => false,
         'show_ui'               => true,
         'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
         'show_in_nav_menus'     => false,
-        'supports'              => array( 'title', 'excerpt' ),
+        'supports'              => array('title', 'excerpt'),
         'register_meta_box_cb'  => 'wpinv_register_item_meta_boxes',
         'rewrite'               => false,
         'query_var'             => false,
@@ -68,9 +68,9 @@ 
         ),
         'can_export'            => true,
     );
-    $invoice_item_args = apply_filters( 'wpinv_register_post_type_invoice_item', $invoice_item_args );
+    $invoice_item_args = apply_filters('wpinv_register_post_type_invoice_item', $invoice_item_args);
 
-    register_post_type( 'wpi_item', $invoice_item_args );
+    register_post_type('wpi_item', $invoice_item_args);
 
     $cap_type = 'wpi_payment_form';
     register_post_type(
@@ -79,22 +79,22 @@ 
             'wpinv_register_post_type_payment_form',
             array(
                 'labels'             => array(
-                    'name'               => _x( 'Payment Forms', 'post type general name', 'invoicing' ),
-                    'singular_name'      => _x( 'Payment Form', 'post type singular name', 'invoicing' ),
-                    'menu_name'          => _x( 'Payment Forms', 'admin menu', 'invoicing' ),
-                    'name_admin_bar'     => _x( 'Payment Form', 'add new on admin bar', 'invoicing' ),
-                    'add_new'            => _x( 'Add New', 'Payment Form', 'invoicing' ),
-                    'add_new_item'       => __( 'Add New Payment Form', 'invoicing' ),
-                    'new_item'           => __( 'New Payment Form', 'invoicing' ),
-                    'edit_item'          => __( 'Edit Payment Form', 'invoicing' ),
-                    'view_item'          => __( 'View Payment Form', 'invoicing' ),
-                    'all_items'          => __( 'Payment Forms', 'invoicing' ),
-                    'search_items'       => __( 'Search Payment Forms', 'invoicing' ),
-                    'parent_item_colon'  => __( 'Parent Payment Forms:', 'invoicing' ),
-                    'not_found'          => __( 'No payment forms found.', 'invoicing' ),
-                    'not_found_in_trash' => __( 'No payment forms found in trash.', 'invoicing' )
+                    'name'               => _x('Payment Forms', 'post type general name', 'invoicing'),
+                    'singular_name'      => _x('Payment Form', 'post type singular name', 'invoicing'),
+                    'menu_name'          => _x('Payment Forms', 'admin menu', 'invoicing'),
+                    'name_admin_bar'     => _x('Payment Form', 'add new on admin bar', 'invoicing'),
+                    'add_new'            => _x('Add New', 'Payment Form', 'invoicing'),
+                    'add_new_item'       => __('Add New Payment Form', 'invoicing'),
+                    'new_item'           => __('New Payment Form', 'invoicing'),
+                    'edit_item'          => __('Edit Payment Form', 'invoicing'),
+                    'view_item'          => __('View Payment Form', 'invoicing'),
+                    'all_items'          => __('Payment Forms', 'invoicing'),
+                    'search_items'       => __('Search Payment Forms', 'invoicing'),
+                    'parent_item_colon'  => __('Parent Payment Forms:', 'invoicing'),
+                    'not_found'          => __('No payment forms found.', 'invoicing'),
+                    'not_found_in_trash' => __('No payment forms found in trash.', 'invoicing')
                 ),
-                'description'        => __( 'Stores payment forms.', 'invoicing' ),
+                'description'        => __('Stores payment forms.', 'invoicing'),
                 'public'             => false,
                 'show_ui'            => true,
                 'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : true,
@@ -105,37 +105,37 @@ 
                 'has_archive'        => false,
                 'hierarchical'       => false,
                 'menu_position'      => null,
-                'supports'           => array( 'title' ),
+                'supports'           => array('title'),
                 'menu_icon'          => 'dashicons-media-form',
             )
         )
     );
 
     $labels = array(
-        'name'               => _x( 'Invoices', 'post type general name', 'invoicing' ),
-        'singular_name'      => _x( 'Invoice', 'post type singular name', 'invoicing' ),
-        'menu_name'          => _x( 'Invoices', 'admin menu', 'invoicing' ),
-        'name_admin_bar'     => _x( 'Invoice', 'add new on admin bar', 'invoicing' ),
-        'add_new'            => _x( 'Add New', 'book', 'invoicing' ),
-        'add_new_item'       => __( 'Add New Invoice', 'invoicing' ),
-        'new_item'           => __( 'New Invoice', 'invoicing' ),
-        'edit_item'          => __( 'Edit Invoice', 'invoicing' ),
-        'view_item'          => __( 'View Invoice', 'invoicing' ),
-        'all_items'          => __( 'Invoices', 'invoicing' ),
-        'search_items'       => __( 'Search Invoices', 'invoicing' ),
-        'parent_item_colon'  => __( 'Parent Invoices:', 'invoicing' ),
-        'not_found'          => __( 'No invoices found.', 'invoicing' ),
-        'not_found_in_trash' => __( 'No invoices found in trash.', 'invoicing' )
+        'name'               => _x('Invoices', 'post type general name', 'invoicing'),
+        'singular_name'      => _x('Invoice', 'post type singular name', 'invoicing'),
+        'menu_name'          => _x('Invoices', 'admin menu', 'invoicing'),
+        'name_admin_bar'     => _x('Invoice', 'add new on admin bar', 'invoicing'),
+        'add_new'            => _x('Add New', 'book', 'invoicing'),
+        'add_new_item'       => __('Add New Invoice', 'invoicing'),
+        'new_item'           => __('New Invoice', 'invoicing'),
+        'edit_item'          => __('Edit Invoice', 'invoicing'),
+        'view_item'          => __('View Invoice', 'invoicing'),
+        'all_items'          => __('Invoices', 'invoicing'),
+        'search_items'       => __('Search Invoices', 'invoicing'),
+        'parent_item_colon'  => __('Parent Invoices:', 'invoicing'),
+        'not_found'          => __('No invoices found.', 'invoicing'),
+        'not_found_in_trash' => __('No invoices found in trash.', 'invoicing')
     );
-    $labels = apply_filters( 'wpinv_labels', $labels );
+    $labels = apply_filters('wpinv_labels', $labels);
     
     $menu_icon = WPINV_PLUGIN_URL . '/assets/images/favicon.ico';
-    $menu_icon = apply_filters( 'wpinv_menu_icon_invoice', $menu_icon );
+    $menu_icon = apply_filters('wpinv_menu_icon_invoice', $menu_icon);
 
     $cap_type = 'wpi_invoice';
     $args = array(
         'labels'             => $labels,
-        'description'        => __( 'This is where invoices are stored.', 'invoicing' ),
+        'description'        => __('This is where invoices are stored.', 'invoicing'),
         'public'             => true,
         'can_export'         => true,
         '_builtin'           => false,
@@ -168,37 +168,37 @@ 
         'has_archive'        => false,
         'hierarchical'       => false,
         'menu_position'      => null,
-        'supports'           => array( 'title', 'author' ),
+        'supports'           => array('title', 'author'),
         'menu_icon'          => 'dashicons-media-spreadsheet',
     );
             
-    $args = apply_filters( 'wpinv_register_post_type_invoice', $args );
+    $args = apply_filters('wpinv_register_post_type_invoice', $args);
     
-    register_post_type( 'wpi_invoice', $args );
+    register_post_type('wpi_invoice', $args);
 
     $labels = array(
-        'name'               => _x( 'Discounts', 'post type general name', 'invoicing' ),
-        'singular_name'      => _x( 'Discount', 'post type singular name', 'invoicing' ),
-        'menu_name'          => _x( 'Discounts', 'admin menu', 'invoicing' ),
-        'name_admin_bar'     => _x( 'Discount', 'add new on admin bar', 'invoicing' ),
-        'add_new'            => _x( 'Add New', 'book', 'invoicing' ),
-        'add_new_item'       => __( 'Add New Discount', 'invoicing' ),
-        'new_item'           => __( 'New Discount', 'invoicing' ),
-        'edit_item'          => __( 'Edit Discount', 'invoicing' ),
-        'view_item'          => __( 'View Discount', 'invoicing' ),
-        'all_items'          => __( 'Discounts', 'invoicing' ),
-        'search_items'       => __( 'Search Discounts', 'invoicing' ),
-        'parent_item_colon'  => __( 'Parent Discounts:', 'invoicing' ),
-        'not_found'          => __( 'No discounts found.', 'invoicing' ),
-        'not_found_in_trash' => __( 'No discounts found in trash.', 'invoicing' )
+        'name'               => _x('Discounts', 'post type general name', 'invoicing'),
+        'singular_name'      => _x('Discount', 'post type singular name', 'invoicing'),
+        'menu_name'          => _x('Discounts', 'admin menu', 'invoicing'),
+        'name_admin_bar'     => _x('Discount', 'add new on admin bar', 'invoicing'),
+        'add_new'            => _x('Add New', 'book', 'invoicing'),
+        'add_new_item'       => __('Add New Discount', 'invoicing'),
+        'new_item'           => __('New Discount', 'invoicing'),
+        'edit_item'          => __('Edit Discount', 'invoicing'),
+        'view_item'          => __('View Discount', 'invoicing'),
+        'all_items'          => __('Discounts', 'invoicing'),
+        'search_items'       => __('Search Discounts', 'invoicing'),
+        'parent_item_colon'  => __('Parent Discounts:', 'invoicing'),
+        'not_found'          => __('No discounts found.', 'invoicing'),
+        'not_found_in_trash' => __('No discounts found in trash.', 'invoicing')
     );
-    $labels = apply_filters( 'wpinv_discounts_labels', $labels );
+    $labels = apply_filters('wpinv_discounts_labels', $labels);
 
     $cap_type = 'wpi_discount';
     
     $args = array(
         'labels'             => $labels,
-        'description'        => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
+        'description'        => __('This is where you can add new discounts that users can use in invoices.', 'invoicing'),
         'public'             => false,
         'can_export'         => true,
         '_builtin'           => false,
@@ -229,7 +229,7 @@ 
         ),
         'has_archive'        => false,
         'hierarchical'       => false,
-        'supports'           => array( 'title', 'excerpt' ),
+        'supports'           => array('title', 'excerpt'),
         'register_meta_box_cb'  => 'wpinv_register_discount_meta_boxes',
         'show_in_nav_menus'  => false,
         'show_in_admin_bar'  => true,
@@ -237,106 +237,106 @@ 
         'menu_position'      => null,
     );
             
-    $args = apply_filters( 'wpinv_register_post_type_discount', $args );
+    $args = apply_filters('wpinv_register_post_type_discount', $args);
     
-    register_post_type( 'wpi_discount', $args );
+    register_post_type('wpi_discount', $args);
 }
 
 function wpinv_get_default_labels() {
     $defaults = array(
-       'singular' => __( 'Invoice', 'invoicing' ),
-       'plural'   => __( 'Invoices', 'invoicing' )
+       'singular' => __('Invoice', 'invoicing'),
+       'plural'   => __('Invoices', 'invoicing')
     );
     
-    return apply_filters( 'wpinv_default_invoices_name', $defaults );
+    return apply_filters('wpinv_default_invoices_name', $defaults);
 }
 
-function wpinv_get_label_singular( $lowercase = false ) {
+function wpinv_get_label_singular($lowercase = false) {
     $defaults = wpinv_get_default_labels();
     
-    return ($lowercase) ? strtolower( $defaults['singular'] ) : $defaults['singular'];
+    return ($lowercase) ? strtolower($defaults['singular']) : $defaults['singular'];
 }
 
-function wpinv_get_label_plural( $lowercase = false ) {
+function wpinv_get_label_plural($lowercase = false) {
     $defaults = wpinv_get_default_labels();
     
-    return ( $lowercase ) ? strtolower( $defaults['plural'] ) : $defaults['plural'];
+    return ($lowercase) ? strtolower($defaults['plural']) : $defaults['plural'];
 }
 
-function wpinv_change_default_title( $title ) {
-     if ( !is_admin() ) {
+function wpinv_change_default_title($title) {
+     if (!is_admin()) {
         $label = wpinv_get_label_singular();
-        $title = sprintf( __( 'Enter %s name here', 'invoicing' ), $label );
+        $title = sprintf(__('Enter %s name here', 'invoicing'), $label);
         return $title;
      }
 
      $screen = get_current_screen();
 
-     if ( 'wpi_invoice' == $screen->post_type ) {
+     if ('wpi_invoice' == $screen->post_type) {
         $label = wpinv_get_label_singular();
-        $title = sprintf( __( 'Enter %s name here', 'invoicing' ), $label );
+        $title = sprintf(__('Enter %s name here', 'invoicing'), $label);
      }
 
      return $title;
 }
-add_filter( 'enter_title_here', 'wpinv_change_default_title' );
+add_filter('enter_title_here', 'wpinv_change_default_title');
 
 function wpinv_register_post_status() {
-    register_post_status( 'wpi-pending', array(
-        'label'                     => _x( 'Pending', 'Invoice status', 'invoicing' ),
+    register_post_status('wpi-pending', array(
+        'label'                     => _x('Pending', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-processing', array(
-        'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-processing', array(
+        'label'                     => _x('Processing', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-onhold', array(
-        'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-onhold', array(
+        'label'                     => _x('On Hold', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-cancelled', array(
-        'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-cancelled', array(
+        'label'                     => _x('Cancelled', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-refunded', array(
-        'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-refunded', array(
+        'label'                     => _x('Refunded', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-failed', array(
-        'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-failed', array(
+        'label'                     => _x('Failed', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' )
-    ) );
-    register_post_status( 'wpi-renewal', array(
-        'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
+        'label_count'               => _n_noop('Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing')
+    ));
+    register_post_status('wpi-renewal', array(
+        'label'                     => _x('Renewal', 'Invoice status', 'invoicing'),
         'public'                    => true,
         'exclude_from_search'       => true,
         'show_in_admin_all_list'    => true,
         'show_in_admin_status_list' => true,
-        'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' )
-    ) );
+        'label_count'               => _n_noop('Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing')
+    ));
 }
-add_action( 'init', 'wpinv_register_post_status', 10 );
+add_action('init', 'wpinv_register_post_status', 10);