AyeCode / invoicing

includes/admin/meta-boxes/class-getpaid-meta-box-invoice-address.php

Indentation +277 added lines, -277 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -16,85 +16,85 @@ 
  */
 class GetPaid_Meta_Box_Invoice_Address {
 
-	/**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
-	public static function output( $post ) {
-
-		// Prepare the invoice.
-		$invoice  = new WPInv_Invoice( $post );
-		$customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
-		$customer = new WP_User( $customer );
-		$display  = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
-		wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
-
-		// Address fields.
-		$address_fields = array(
-			'first_name' => array(
-				'label' => __( 'First Name', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'last_name'  => array(
-				'label' => __( 'Last Name', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'company'    => array(
-				'label' => __( 'Company', 'invoicing' ),
-				'type'  => 'text',
-				'class' => 'getpaid-recalculate-prices-on-change',
-			),
-			'vat_number' => array(
-				'label' => __( 'VAT Number', 'invoicing' ),
-				'type'  => 'text',
-				'class' => 'getpaid-recalculate-prices-on-change',
-			),
-			'address'    => array(
-				'label' => __( 'Address', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'city'       => array(
-				'label' => __( 'City', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'country'    => array(
-				'label'       => __( 'Country', 'invoicing' ),
-				'type'        => 'select',
-				'class'       => 'getpaid-recalculate-prices-on-change',
-				'options'     => wpinv_get_country_list(),
-				'placeholder' => __( 'Choose a country', 'invoicing' ),
-			),
-			'state'      => array(
-				'label' => __( 'State', 'invoicing' ),
-				'type'  => 'text',
-				'class' => 'getpaid-recalculate-prices-on-change',
-			),
-			'zip'        => array(
-				'label' => __( 'Zip', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'phone'      => array(
-				'label' => __( 'Phone', 'invoicing' ),
-				'type'  => 'text',
-			),
-		);
-
-		$states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
-
-		if ( ! empty( $states ) ) {
-			$address_fields['state']['type']        = 'select';
-			$address_fields['state']['options']     = $states;
-			$address_fields['state']['placeholder'] = __( 'Choose a state', 'invoicing' );
-		}
-
-		// Maybe remove the VAT field.
-		if ( ! wpinv_use_taxes() ) {
-			unset( $address_fields['vat_number'] );
-		}
-
-		$address_fields = apply_filters( 'getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice );
-		?>
+    /**
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
+    public static function output( $post ) {
+
+        // Prepare the invoice.
+        $invoice  = new WPInv_Invoice( $post );
+        $customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
+        $customer = new WP_User( $customer );
+        $display  = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
+        wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+
+        // Address fields.
+        $address_fields = array(
+            'first_name' => array(
+                'label' => __( 'First Name', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'last_name'  => array(
+                'label' => __( 'Last Name', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'company'    => array(
+                'label' => __( 'Company', 'invoicing' ),
+                'type'  => 'text',
+                'class' => 'getpaid-recalculate-prices-on-change',
+            ),
+            'vat_number' => array(
+                'label' => __( 'VAT Number', 'invoicing' ),
+                'type'  => 'text',
+                'class' => 'getpaid-recalculate-prices-on-change',
+            ),
+            'address'    => array(
+                'label' => __( 'Address', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'city'       => array(
+                'label' => __( 'City', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'country'    => array(
+                'label'       => __( 'Country', 'invoicing' ),
+                'type'        => 'select',
+                'class'       => 'getpaid-recalculate-prices-on-change',
+                'options'     => wpinv_get_country_list(),
+                'placeholder' => __( 'Choose a country', 'invoicing' ),
+            ),
+            'state'      => array(
+                'label' => __( 'State', 'invoicing' ),
+                'type'  => 'text',
+                'class' => 'getpaid-recalculate-prices-on-change',
+            ),
+            'zip'        => array(
+                'label' => __( 'Zip', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'phone'      => array(
+                'label' => __( 'Phone', 'invoicing' ),
+                'type'  => 'text',
+            ),
+        );
+
+        $states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
+
+        if ( ! empty( $states ) ) {
+            $address_fields['state']['type']        = 'select';
+            $address_fields['state']['options']     = $states;
+            $address_fields['state']['placeholder'] = __( 'Choose a state', 'invoicing' );
+        }
+
+        // Maybe remove the VAT field.
+        if ( ! wpinv_use_taxes() ) {
+            unset( $address_fields['vat_number'] );
+        }
+
+        $address_fields = apply_filters( 'getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice );
+        ?>
 
 		<style>
 			#wpinv-address label {
@@ -119,19 +119,19 @@ 
 							<div id="getpaid-invoice-email-wrapper" class="d-none">
 								<input type="hidden" id="getpaid-invoice-create-new-user" name="wpinv_new_user" value="" />
 								<?php
-									aui()->input(
-										array(
-											'type'        => 'text',
-											'id'          => 'getpaid-invoice-new-user-email',
-											'name'        => 'wpinv_email',
-											'label'       => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
-											'label_type'  => 'vertical',
-											'placeholder' => 'john@doe.com',
-											'class'       => 'form-control-sm',
-										),
-										true
-									);
-								?>
+                                    aui()->input(
+                                        array(
+                                            'type'        => 'text',
+                                            'id'          => 'getpaid-invoice-new-user-email',
+                                            'name'        => 'wpinv_email',
+                                            'label'       => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
+                                            'label_type'  => 'vertical',
+                                            'placeholder' => 'john@doe.com',
+                                            'class'       => 'form-control-sm',
+                                        ),
+                                        true
+                                    );
+                                ?>
 							</div>
 						</div>
 						<div class="col-12 col-sm-6 form-group mb-3 mt-sm-4">
@@ -155,39 +155,39 @@ 
 							<div class="col-12 col-sm-6 getpaid-invoice-address-field__<?php echo esc_attr( $key ); ?>--wrapper">
 								<?php
 
-									if ( 'select' === $field['type'] ) {
-										aui()->select(
-											array(
-												'id'               => 'wpinv_' . $key,
-												'name'             => 'wpinv_' . $key,
-												'label'            => $field['label'],
-												'label_type'       => 'vertical',
-												'placeholder'      => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'            => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'            => $invoice->get( $key, 'edit' ),
-												'options'          => $field['options'],
-												'data-allow-clear' => 'false',
-												'select2'          => true,
-											),
-											true
-										);
-									} else {
-										aui()->input(
-											array(
-												'type'        => $field['type'],
-												'id'          => 'wpinv_' . $key,
-												'name'        => 'wpinv_' . $key,
-												'label'       => $field['label'],
-												'label_type'  => 'vertical',
-												'placeholder' => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'       => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'       => $invoice->get( $key, 'edit' ),
-											),
-											true
-										);
-									}
-
-								?>
+                                    if ( 'select' === $field['type'] ) {
+                                        aui()->select(
+                                            array(
+                                                'id'               => 'wpinv_' . $key,
+                                                'name'             => 'wpinv_' . $key,
+                                                'label'            => $field['label'],
+                                                'label_type'       => 'vertical',
+                                                'placeholder'      => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
+                                                'class'            => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
+                                                'value'            => $invoice->get( $key, 'edit' ),
+                                                'options'          => $field['options'],
+                                                'data-allow-clear' => 'false',
+                                                'select2'          => true,
+                                            ),
+                                            true
+                                        );
+                                    } else {
+                                        aui()->input(
+                                            array(
+                                                'type'        => $field['type'],
+                                                'id'          => 'wpinv_' . $key,
+                                                'name'        => 'wpinv_' . $key,
+                                                'label'       => $field['label'],
+                                                'label_type'  => 'vertical',
+                                                'placeholder' => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
+                                                'class'       => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
+                                                'value'       => $invoice->get( $key, 'edit' ),
+                                            ),
+                                            true
+                                        );
+                                    }
+
+                                ?>
 							</div>
 						<?php endforeach; ?>
 					</div>
@@ -198,48 +198,48 @@ 
 						<div class="row">
 							<div class="col-12 col-sm-6">
 								<?php
-									aui()->select(
-										array(
-											'id'          => 'wpinv_template',
-											'name'        => 'wpinv_template',
-											'label'       => __( 'Template', 'invoicing' ),
-											'label_type'  => 'vertical',
-											'placeholder' => __( 'Choose a template', 'invoicing' ),
-											'class'       => 'form-control-sm',
-											'value'       => $invoice->get_template( 'edit' ),
-											'options'     => array(
-												'quantity' => __( 'Quantity', 'invoicing' ),
-												'hours'    => __( 'Hours', 'invoicing' ),
-											),
-											'data-allow-clear' => 'false',
-											'select2'     => true,
-										),
-										true
-									);
-								?>
+                                    aui()->select(
+                                        array(
+                                            'id'          => 'wpinv_template',
+                                            'name'        => 'wpinv_template',
+                                            'label'       => __( 'Template', 'invoicing' ),
+                                            'label_type'  => 'vertical',
+                                            'placeholder' => __( 'Choose a template', 'invoicing' ),
+                                            'class'       => 'form-control-sm',
+                                            'value'       => $invoice->get_template( 'edit' ),
+                                            'options'     => array(
+                                                'quantity' => __( 'Quantity', 'invoicing' ),
+                                                'hours'    => __( 'Hours', 'invoicing' ),
+                                            ),
+                                            'data-allow-clear' => 'false',
+                                            'select2'     => true,
+                                        ),
+                                        true
+                                    );
+                                ?>
 							</div>
 							<div class="col-12 col-sm-6">
 								<?php
 
-									// Set currency.
-									aui()->select(
-										array(
-											'id'          => 'wpinv_currency',
-											'name'        => 'wpinv_currency',
-											'label'       => __( 'Currency', 'invoicing' ),
-											'label_type'  => 'vertical',
-											'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
-											'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
-											'value'       => $invoice->get_currency( 'edit' ),
-											'required'    => false,
-											'data-allow-clear' => 'false',
-											'select2'     => true,
-											'options'     => wpinv_get_currencies(),
-										),
-										true
-									);
-
-								?>
+                                    // Set currency.
+                                    aui()->select(
+                                        array(
+                                            'id'          => 'wpinv_currency',
+                                            'name'        => 'wpinv_currency',
+                                            'label'       => __( 'Currency', 'invoicing' ),
+                                            'label_type'  => 'vertical',
+                                            'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
+                                            'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
+                                            'value'       => $invoice->get_currency( 'edit' ),
+                                            'required'    => false,
+                                            'data-allow-clear' => 'false',
+                                            'select2'     => true,
+                                            'options'     => wpinv_get_currencies(),
+                                        ),
+                                        true
+                                    );
+
+                                ?>
 							</div>
 						</div>
 
@@ -249,123 +249,123 @@ 
 					<div class="row">
 						<div class="col-12 col-sm-6">
 							<?php
-								aui()->input(
-									array(
-										'type'        => 'text',
-										'id'          => 'wpinv_company_id',
-										'name'        => 'wpinv_company_id',
-										'label'       => __( 'Company ID', 'invoicing' ),
-										'label_type'  => 'vertical',
-										'placeholder' => '',
-										'class'       => 'form-control-sm',
-										'value'       => $invoice->get_company_id( 'edit' ),
-									),
-									true
-								);
-							?>
+                                aui()->input(
+                                    array(
+                                        'type'        => 'text',
+                                        'id'          => 'wpinv_company_id',
+                                        'name'        => 'wpinv_company_id',
+                                        'label'       => __( 'Company ID', 'invoicing' ),
+                                        'label_type'  => 'vertical',
+                                        'placeholder' => '',
+                                        'class'       => 'form-control-sm',
+                                        'value'       => $invoice->get_company_id( 'edit' ),
+                                    ),
+                                    true
+                                );
+                            ?>
 						</div>
 					</div>
 
 					<?php do_action( 'getpaid_after_metabox_invoice_address', $invoice ); ?>
 			</div>
 		<?php
-	}
-
-	/**
-	 * Save meta box data.
-	 *
-	 * @param int $post_id
-	 * @param array $posted the posted data.
-	 */
-	public static function save( $post_id, $posted ) {
-
-		// Prepare the invoice.
-		$invoice = new WPInv_Invoice( $post_id );
-
-		// Load new data.
-		$invoice->set_props(
-			array(
-				'template'       => isset( $posted['wpinv_template'] ) ? wpinv_clean( $posted['wpinv_template'] ) : null,
-				'email_cc'       => isset( $posted['wpinv_cc'] ) ? wpinv_clean( $posted['wpinv_cc'] ) : null,
-				'disable_taxes'  => ! empty( $posted['disable_taxes'] ),
-				'currency'       => isset( $posted['wpinv_currency'] ) ? wpinv_clean( $posted['wpinv_currency'] ) : null,
-				'gateway'        => ( $invoice->needs_payment() && isset( $posted['wpinv_gateway'] ) ) ? wpinv_clean( $posted['wpinv_gateway'] ) : null,
-				'address'        => isset( $posted['wpinv_address'] ) ? wpinv_clean( $posted['wpinv_address'] ) : null,
-				'vat_number'     => isset( $posted['wpinv_vat_number'] ) ? wpinv_clean( $posted['wpinv_vat_number'] ) : null,
-				'company'        => isset( $posted['wpinv_company'] ) ? wpinv_clean( $posted['wpinv_company'] ) : null,
-				'company_id'     => isset( $posted['wpinv_company_id'] ) ? wpinv_clean( $posted['wpinv_company_id'] ) : null,
-				'zip'            => isset( $posted['wpinv_zip'] ) ? wpinv_clean( $posted['wpinv_zip'] ) : null,
-				'state'          => isset( $posted['wpinv_state'] ) ? wpinv_clean( $posted['wpinv_state'] ) : null,
-				'city'           => isset( $posted['wpinv_city'] ) ? wpinv_clean( $posted['wpinv_city'] ) : null,
-				'country'        => isset( $posted['wpinv_country'] ) ? wpinv_clean( $posted['wpinv_country'] ) : null,
-				'phone'          => isset( $posted['wpinv_phone'] ) ? wpinv_clean( $posted['wpinv_phone'] ) : null,
-				'first_name'     => isset( $posted['wpinv_first_name'] ) ? wpinv_clean( $posted['wpinv_first_name'] ) : null,
-				'last_name'      => isset( $posted['wpinv_last_name'] ) ? wpinv_clean( $posted['wpinv_last_name'] ) : null,
-				'author'         => isset( $posted['post_author_override'] ) ? wpinv_clean( $posted['post_author_override'] ) : null,
-				'date_created'   => isset( $posted['date_created'] ) ? wpinv_clean( $posted['date_created'] ) : null,
-				'date_completed' => isset( $posted['wpinv_date_completed'] ) ? wpinv_clean( $posted['wpinv_date_completed'] ) : null,
-				'due_date'       => isset( $posted['wpinv_due_date'] ) ? wpinv_clean( $posted['wpinv_due_date'] ) : null,
-				'number'         => isset( $posted['wpinv_number'] ) ? wpinv_clean( $posted['wpinv_number'] ) : null,
-				'status'         => isset( $posted['wpinv_status'] ) ? wpinv_clean( $posted['wpinv_status'] ) : null,
-			)
-		);
-
-		// Discount code.
-		if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
-
-			if ( isset( $posted['wpinv_discount_code'] ) ) {
-				$invoice->set_discount_code( wpinv_clean( $posted['wpinv_discount_code'] ) );
-			}
-
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( $discount->exists() ) {
-				$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
-			} else {
-				$invoice->remove_discount( 'discount_code' );
-			}
-
-			// Recalculate totals.
-			$invoice->recalculate_total();
-
-		}
-
-		// If we're creating a new user...
-		if ( ! empty( $posted['wpinv_new_user'] ) && is_email( stripslashes( $posted['wpinv_email'] ) ) ) {
-
-			// Attempt to create the user.
-			$user = wpinv_create_user( sanitize_email( stripslashes( $posted['wpinv_email'] ) ), $invoice->get_first_name() . $invoice->get_last_name() );
-
-			// If successful, update the invoice author.
-			if ( is_numeric( $user ) ) {
-				$invoice->set_author( $user );
-			} else {
-				wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
-			}
-		}
-
-		// Do not send new invoice notifications.
-		$GLOBALS['wpinv_skip_invoice_notification'] = true;
-
-		// Save the invoice.
-		$invoice->save();
-
-		// Save the user address.
-		getpaid_save_invoice_user_address( $invoice );
-
-		// Undo do not send new invoice notifications.
-		$GLOBALS['wpinv_skip_invoice_notification'] = false;
-
-		// (Maybe) send new user notification.
-		$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-		if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
-			wp_send_new_user_notifications( $user, 'user' );
-		}
-
-		if ( ! empty( $posted['send_to_customer'] ) && ! $invoice->is_draft() ) {
-			getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
-		}
-
-		// Fires after an invoice is saved.
-		do_action( 'wpinv_invoice_metabox_saved', $invoice );
-	}
+    }
+
+    /**
+     * Save meta box data.
+     *
+     * @param int $post_id
+     * @param array $posted the posted data.
+     */
+    public static function save( $post_id, $posted ) {
+
+        // Prepare the invoice.
+        $invoice = new WPInv_Invoice( $post_id );
+
+        // Load new data.
+        $invoice->set_props(
+            array(
+                'template'       => isset( $posted['wpinv_template'] ) ? wpinv_clean( $posted['wpinv_template'] ) : null,
+                'email_cc'       => isset( $posted['wpinv_cc'] ) ? wpinv_clean( $posted['wpinv_cc'] ) : null,
+                'disable_taxes'  => ! empty( $posted['disable_taxes'] ),
+                'currency'       => isset( $posted['wpinv_currency'] ) ? wpinv_clean( $posted['wpinv_currency'] ) : null,
+                'gateway'        => ( $invoice->needs_payment() && isset( $posted['wpinv_gateway'] ) ) ? wpinv_clean( $posted['wpinv_gateway'] ) : null,
+                'address'        => isset( $posted['wpinv_address'] ) ? wpinv_clean( $posted['wpinv_address'] ) : null,
+                'vat_number'     => isset( $posted['wpinv_vat_number'] ) ? wpinv_clean( $posted['wpinv_vat_number'] ) : null,
+                'company'        => isset( $posted['wpinv_company'] ) ? wpinv_clean( $posted['wpinv_company'] ) : null,
+                'company_id'     => isset( $posted['wpinv_company_id'] ) ? wpinv_clean( $posted['wpinv_company_id'] ) : null,
+                'zip'            => isset( $posted['wpinv_zip'] ) ? wpinv_clean( $posted['wpinv_zip'] ) : null,
+                'state'          => isset( $posted['wpinv_state'] ) ? wpinv_clean( $posted['wpinv_state'] ) : null,
+                'city'           => isset( $posted['wpinv_city'] ) ? wpinv_clean( $posted['wpinv_city'] ) : null,
+                'country'        => isset( $posted['wpinv_country'] ) ? wpinv_clean( $posted['wpinv_country'] ) : null,
+                'phone'          => isset( $posted['wpinv_phone'] ) ? wpinv_clean( $posted['wpinv_phone'] ) : null,
+                'first_name'     => isset( $posted['wpinv_first_name'] ) ? wpinv_clean( $posted['wpinv_first_name'] ) : null,
+                'last_name'      => isset( $posted['wpinv_last_name'] ) ? wpinv_clean( $posted['wpinv_last_name'] ) : null,
+                'author'         => isset( $posted['post_author_override'] ) ? wpinv_clean( $posted['post_author_override'] ) : null,
+                'date_created'   => isset( $posted['date_created'] ) ? wpinv_clean( $posted['date_created'] ) : null,
+                'date_completed' => isset( $posted['wpinv_date_completed'] ) ? wpinv_clean( $posted['wpinv_date_completed'] ) : null,
+                'due_date'       => isset( $posted['wpinv_due_date'] ) ? wpinv_clean( $posted['wpinv_due_date'] ) : null,
+                'number'         => isset( $posted['wpinv_number'] ) ? wpinv_clean( $posted['wpinv_number'] ) : null,
+                'status'         => isset( $posted['wpinv_status'] ) ? wpinv_clean( $posted['wpinv_status'] ) : null,
+            )
+        );
+
+        // Discount code.
+        if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+
+            if ( isset( $posted['wpinv_discount_code'] ) ) {
+                $invoice->set_discount_code( wpinv_clean( $posted['wpinv_discount_code'] ) );
+            }
+
+            $discount = new WPInv_Discount( $invoice->get_discount_code() );
+            if ( $discount->exists() ) {
+                $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+            } else {
+                $invoice->remove_discount( 'discount_code' );
+            }
+
+            // Recalculate totals.
+            $invoice->recalculate_total();
+
+        }
+
+        // If we're creating a new user...
+        if ( ! empty( $posted['wpinv_new_user'] ) && is_email( stripslashes( $posted['wpinv_email'] ) ) ) {
+
+            // Attempt to create the user.
+            $user = wpinv_create_user( sanitize_email( stripslashes( $posted['wpinv_email'] ) ), $invoice->get_first_name() . $invoice->get_last_name() );
+
+            // If successful, update the invoice author.
+            if ( is_numeric( $user ) ) {
+                $invoice->set_author( $user );
+            } else {
+                wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
+            }
+        }
+
+        // Do not send new invoice notifications.
+        $GLOBALS['wpinv_skip_invoice_notification'] = true;
+
+        // Save the invoice.
+        $invoice->save();
+
+        // Save the user address.
+        getpaid_save_invoice_user_address( $invoice );
+
+        // Undo do not send new invoice notifications.
+        $GLOBALS['wpinv_skip_invoice_notification'] = false;
+
+        // (Maybe) send new user notification.
+        $should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
+        if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
+            wp_send_new_user_notifications( $user, 'user' );
+        }
+
+        if ( ! empty( $posted['send_to_customer'] ) && ! $invoice->is_draft() ) {
+            getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
+        }
+
+        // Fires after an invoice is saved.
+        do_action( 'wpinv_invoice_metabox_saved', $invoice );
+    }
 }

Spacing +98 added lines, -98 removed lines

@@ -7,7 +7,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -21,79 +21,79 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-	public static function output( $post ) {
+	public static function output($post) {
 
 		// Prepare the invoice.
-		$invoice  = new WPInv_Invoice( $post );
-		$customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
-		$customer = new WP_User( $customer );
-		$display  = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
-		wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+		$invoice  = new WPInv_Invoice($post);
+		$customer = $invoice->exists() ? $invoice->get_user_id('edit') : get_current_user_id();
+		$customer = new WP_User($customer);
+		$display  = sprintf(_x('%1$s (%2$s)', 'user dropdown', 'invoicing'), $customer->display_name, $customer->user_email);
+		wp_nonce_field('getpaid_meta_nonce', 'getpaid_meta_nonce');
 
 		// Address fields.
 		$address_fields = array(
 			'first_name' => array(
-				'label' => __( 'First Name', 'invoicing' ),
+				'label' => __('First Name', 'invoicing'),
 				'type'  => 'text',
 			),
 			'last_name'  => array(
-				'label' => __( 'Last Name', 'invoicing' ),
+				'label' => __('Last Name', 'invoicing'),
 				'type'  => 'text',
 			),
 			'company'    => array(
-				'label' => __( 'Company', 'invoicing' ),
+				'label' => __('Company', 'invoicing'),
 				'type'  => 'text',
 				'class' => 'getpaid-recalculate-prices-on-change',
 			),
 			'vat_number' => array(
-				'label' => __( 'VAT Number', 'invoicing' ),
+				'label' => __('VAT Number', 'invoicing'),
 				'type'  => 'text',
 				'class' => 'getpaid-recalculate-prices-on-change',
 			),
 			'address'    => array(
-				'label' => __( 'Address', 'invoicing' ),
+				'label' => __('Address', 'invoicing'),
 				'type'  => 'text',
 			),
 			'city'       => array(
-				'label' => __( 'City', 'invoicing' ),
+				'label' => __('City', 'invoicing'),
 				'type'  => 'text',
 			),
 			'country'    => array(
-				'label'       => __( 'Country', 'invoicing' ),
+				'label'       => __('Country', 'invoicing'),
 				'type'        => 'select',
 				'class'       => 'getpaid-recalculate-prices-on-change',
 				'options'     => wpinv_get_country_list(),
-				'placeholder' => __( 'Choose a country', 'invoicing' ),
+				'placeholder' => __('Choose a country', 'invoicing'),
 			),
 			'state'      => array(
-				'label' => __( 'State', 'invoicing' ),
+				'label' => __('State', 'invoicing'),
 				'type'  => 'text',
 				'class' => 'getpaid-recalculate-prices-on-change',
 			),
 			'zip'        => array(
-				'label' => __( 'Zip', 'invoicing' ),
+				'label' => __('Zip', 'invoicing'),
 				'type'  => 'text',
 			),
 			'phone'      => array(
-				'label' => __( 'Phone', 'invoicing' ),
+				'label' => __('Phone', 'invoicing'),
 				'type'  => 'text',
 			),
 		);
 
-		$states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
+		$states = wpinv_get_country_states($invoice->get_country('edit'));
 
-		if ( ! empty( $states ) ) {
+		if (!empty($states)) {
 			$address_fields['state']['type']        = 'select';
 			$address_fields['state']['options']     = $states;
-			$address_fields['state']['placeholder'] = __( 'Choose a state', 'invoicing' );
+			$address_fields['state']['placeholder'] = __('Choose a state', 'invoicing');
 		}
 
 		// Maybe remove the VAT field.
-		if ( ! wpinv_use_taxes() ) {
-			unset( $address_fields['vat_number'] );
+		if (!wpinv_use_taxes()) {
+			unset($address_fields['vat_number']);
 		}
 
-		$address_fields = apply_filters( 'getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice );
+		$address_fields = apply_filters('getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice);
 		?>
 
 		<style>
@@ -107,11 +107,11 @@ 
 						<div class="col-12 col-sm-6">
 							<div id="getpaid-invoice-user-id-wrapper" class="form-group mb-3">
 								<div>
-									<label for="post_author_override"><?php esc_html_e( 'Customer', 'invoicing' ); ?></label>
+									<label for="post_author_override"><?php esc_html_e('Customer', 'invoicing'); ?></label>
 								</div>
 								<div>
-									<select name="post_author_override" id="wpinv_post_author_override" class="getpaid-customer-search form-control regular-text" data-placeholder="<?php esc_attr_e( 'Search for a customer by email or name', 'invoicing' ); ?>">
-										<option selected="selected" value="<?php echo (int) $customer->ID; ?>"><?php echo esc_html( $display ); ?> </option>)
+									<select name="post_author_override" id="wpinv_post_author_override" class="getpaid-customer-search form-control regular-text" data-placeholder="<?php esc_attr_e('Search for a customer by email or name', 'invoicing'); ?>">
+										<option selected="selected" value="<?php echo (int) $customer->ID; ?>"><?php echo esc_html($display); ?> </option>)
 									</select>
 								</div>
 							</div>
@@ -124,7 +124,7 @@ 
 											'type'        => 'text',
 											'id'          => 'getpaid-invoice-new-user-email',
 											'name'        => 'wpinv_email',
-											'label'       => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
+											'label'       => __('Email', 'invoicing') . '<span class="required">*</span>',
 											'label_type'  => 'vertical',
 											'placeholder' => 'john@doe.com',
 											'class'       => 'form-control-sm',
@@ -135,36 +135,36 @@ 
 							</div>
 						</div>
 						<div class="col-12 col-sm-6 form-group mb-3 mt-sm-4">
-							<?php if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) : ?>
+							<?php if (!$invoice->is_paid() && !$invoice->is_refunded()) : ?>
 								<a id="getpaid-invoice-fill-user-details" class="button button-small button-secondary" href="javascript:void(0)">
 									<i aria-hidden="true" class="fa fa-refresh"></i>
-									<?php esc_html_e( 'Fill User Details', 'invoicing' ); ?>
+									<?php esc_html_e('Fill User Details', 'invoicing'); ?>
 								</a>
 								<a id="getpaid-invoice-create-new-user-button" class="button button-small button-secondary" href="javascript:void(0)">
 									<i aria-hidden="true" class="fa fa-plus"></i>
-									<?php esc_html_e( 'Add New User', 'invoicing' ); ?>
+									<?php esc_html_e('Add New User', 'invoicing'); ?>
 								</a>
 								<a id="getpaid-invoice-cancel-create-new-user" class="button button-small button-secondary d-none" href="javascript:void(0)">
 									<i aria-hidden="true" class="fa fa-close"></i>
-									<?php esc_html_e( 'Cancel', 'invoicing' ); ?>
+									<?php esc_html_e('Cancel', 'invoicing'); ?>
 								</a>
 							<?php endif; ?>
 						</div>
 
-						<?php foreach ( $address_fields as $key => $field ) : ?>
-							<div class="col-12 col-sm-6 getpaid-invoice-address-field__<?php echo esc_attr( $key ); ?>--wrapper">
+						<?php foreach ($address_fields as $key => $field) : ?>
+							<div class="col-12 col-sm-6 getpaid-invoice-address-field__<?php echo esc_attr($key); ?>--wrapper">
 								<?php
 
-									if ( 'select' === $field['type'] ) {
+									if ('select' === $field['type']) {
 										aui()->select(
 											array(
 												'id'               => 'wpinv_' . $key,
 												'name'             => 'wpinv_' . $key,
 												'label'            => $field['label'],
 												'label_type'       => 'vertical',
-												'placeholder'      => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'            => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'            => $invoice->get( $key, 'edit' ),
+												'placeholder'      => isset($field['placeholder']) ? $field['placeholder'] : '',
+												'class'            => 'form-control-sm ' . (isset($field['class']) ? $field['class'] : ''),
+												'value'            => $invoice->get($key, 'edit'),
 												'options'          => $field['options'],
 												'data-allow-clear' => 'false',
 												'select2'          => true,
@@ -179,9 +179,9 @@ 
 												'name'        => 'wpinv_' . $key,
 												'label'       => $field['label'],
 												'label_type'  => 'vertical',
-												'placeholder' => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'       => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'       => $invoice->get( $key, 'edit' ),
+												'placeholder' => isset($field['placeholder']) ? $field['placeholder'] : '',
+												'class'       => 'form-control-sm ' . (isset($field['class']) ? $field['class'] : ''),
+												'value'       => $invoice->get($key, 'edit'),
 											),
 											true
 										);
@@ -192,8 +192,8 @@ 
 						<?php endforeach; ?>
 					</div>
 
-					<?php if ( ! apply_filters( 'getpaid_use_new_invoice_items_metabox', false ) ) : ?>
-						<?php do_action( 'wpinv_meta_box_before_invoice_template_row', $invoice->get_id() ); ?>
+					<?php if (!apply_filters('getpaid_use_new_invoice_items_metabox', false)) : ?>
+						<?php do_action('wpinv_meta_box_before_invoice_template_row', $invoice->get_id()); ?>
 
 						<div class="row">
 							<div class="col-12 col-sm-6">
@@ -202,14 +202,14 @@ 
 										array(
 											'id'          => 'wpinv_template',
 											'name'        => 'wpinv_template',
-											'label'       => __( 'Template', 'invoicing' ),
+											'label'       => __('Template', 'invoicing'),
 											'label_type'  => 'vertical',
-											'placeholder' => __( 'Choose a template', 'invoicing' ),
+											'placeholder' => __('Choose a template', 'invoicing'),
 											'class'       => 'form-control-sm',
-											'value'       => $invoice->get_template( 'edit' ),
+											'value'       => $invoice->get_template('edit'),
 											'options'     => array(
-												'quantity' => __( 'Quantity', 'invoicing' ),
-												'hours'    => __( 'Hours', 'invoicing' ),
+												'quantity' => __('Quantity', 'invoicing'),
+												'hours'    => __('Hours', 'invoicing'),
 											),
 											'data-allow-clear' => 'false',
 											'select2'     => true,
@@ -226,11 +226,11 @@ 
 										array(
 											'id'          => 'wpinv_currency',
 											'name'        => 'wpinv_currency',
-											'label'       => __( 'Currency', 'invoicing' ),
+											'label'       => __('Currency', 'invoicing'),
 											'label_type'  => 'vertical',
-											'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
+											'placeholder' => __('Select Invoice Currency', 'invoicing'),
 											'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
-											'value'       => $invoice->get_currency( 'edit' ),
+											'value'       => $invoice->get_currency('edit'),
 											'required'    => false,
 											'data-allow-clear' => 'false',
 											'select2'     => true,
@@ -243,7 +243,7 @@ 
 							</div>
 						</div>
 
-						<?php do_action( 'wpinv_meta_box_invoice_template_row', $invoice->get_id() ); ?>
+						<?php do_action('wpinv_meta_box_invoice_template_row', $invoice->get_id()); ?>
 					<?php endif; ?>
 
 					<div class="row">
@@ -254,11 +254,11 @@ 
 										'type'        => 'text',
 										'id'          => 'wpinv_company_id',
 										'name'        => 'wpinv_company_id',
-										'label'       => __( 'Company ID', 'invoicing' ),
+										'label'       => __('Company ID', 'invoicing'),
 										'label_type'  => 'vertical',
 										'placeholder' => '',
 										'class'       => 'form-control-sm',
-										'value'       => $invoice->get_company_id( 'edit' ),
+										'value'       => $invoice->get_company_id('edit'),
 									),
 									true
 								);
@@ -266,7 +266,7 @@ 
 						</div>
 					</div>
 
-					<?php do_action( 'getpaid_after_metabox_invoice_address', $invoice ); ?>
+					<?php do_action('getpaid_after_metabox_invoice_address', $invoice); ?>
 			</div>
 		<?php
 	}
@@ -277,51 +277,51 @@ 
 	 * @param int $post_id
 	 * @param array $posted the posted data.
 	 */
-	public static function save( $post_id, $posted ) {
+	public static function save($post_id, $posted) {
 
 		// Prepare the invoice.
-		$invoice = new WPInv_Invoice( $post_id );
+		$invoice = new WPInv_Invoice($post_id);
 
 		// Load new data.
 		$invoice->set_props(
 			array(
-				'template'       => isset( $posted['wpinv_template'] ) ? wpinv_clean( $posted['wpinv_template'] ) : null,
-				'email_cc'       => isset( $posted['wpinv_cc'] ) ? wpinv_clean( $posted['wpinv_cc'] ) : null,
-				'disable_taxes'  => ! empty( $posted['disable_taxes'] ),
-				'currency'       => isset( $posted['wpinv_currency'] ) ? wpinv_clean( $posted['wpinv_currency'] ) : null,
-				'gateway'        => ( $invoice->needs_payment() && isset( $posted['wpinv_gateway'] ) ) ? wpinv_clean( $posted['wpinv_gateway'] ) : null,
-				'address'        => isset( $posted['wpinv_address'] ) ? wpinv_clean( $posted['wpinv_address'] ) : null,
-				'vat_number'     => isset( $posted['wpinv_vat_number'] ) ? wpinv_clean( $posted['wpinv_vat_number'] ) : null,
-				'company'        => isset( $posted['wpinv_company'] ) ? wpinv_clean( $posted['wpinv_company'] ) : null,
-				'company_id'     => isset( $posted['wpinv_company_id'] ) ? wpinv_clean( $posted['wpinv_company_id'] ) : null,
-				'zip'            => isset( $posted['wpinv_zip'] ) ? wpinv_clean( $posted['wpinv_zip'] ) : null,
-				'state'          => isset( $posted['wpinv_state'] ) ? wpinv_clean( $posted['wpinv_state'] ) : null,
-				'city'           => isset( $posted['wpinv_city'] ) ? wpinv_clean( $posted['wpinv_city'] ) : null,
-				'country'        => isset( $posted['wpinv_country'] ) ? wpinv_clean( $posted['wpinv_country'] ) : null,
-				'phone'          => isset( $posted['wpinv_phone'] ) ? wpinv_clean( $posted['wpinv_phone'] ) : null,
-				'first_name'     => isset( $posted['wpinv_first_name'] ) ? wpinv_clean( $posted['wpinv_first_name'] ) : null,
-				'last_name'      => isset( $posted['wpinv_last_name'] ) ? wpinv_clean( $posted['wpinv_last_name'] ) : null,
-				'author'         => isset( $posted['post_author_override'] ) ? wpinv_clean( $posted['post_author_override'] ) : null,
-				'date_created'   => isset( $posted['date_created'] ) ? wpinv_clean( $posted['date_created'] ) : null,
-				'date_completed' => isset( $posted['wpinv_date_completed'] ) ? wpinv_clean( $posted['wpinv_date_completed'] ) : null,
-				'due_date'       => isset( $posted['wpinv_due_date'] ) ? wpinv_clean( $posted['wpinv_due_date'] ) : null,
-				'number'         => isset( $posted['wpinv_number'] ) ? wpinv_clean( $posted['wpinv_number'] ) : null,
-				'status'         => isset( $posted['wpinv_status'] ) ? wpinv_clean( $posted['wpinv_status'] ) : null,
+				'template'       => isset($posted['wpinv_template']) ? wpinv_clean($posted['wpinv_template']) : null,
+				'email_cc'       => isset($posted['wpinv_cc']) ? wpinv_clean($posted['wpinv_cc']) : null,
+				'disable_taxes'  => !empty($posted['disable_taxes']),
+				'currency'       => isset($posted['wpinv_currency']) ? wpinv_clean($posted['wpinv_currency']) : null,
+				'gateway'        => ($invoice->needs_payment() && isset($posted['wpinv_gateway'])) ? wpinv_clean($posted['wpinv_gateway']) : null,
+				'address'        => isset($posted['wpinv_address']) ? wpinv_clean($posted['wpinv_address']) : null,
+				'vat_number'     => isset($posted['wpinv_vat_number']) ? wpinv_clean($posted['wpinv_vat_number']) : null,
+				'company'        => isset($posted['wpinv_company']) ? wpinv_clean($posted['wpinv_company']) : null,
+				'company_id'     => isset($posted['wpinv_company_id']) ? wpinv_clean($posted['wpinv_company_id']) : null,
+				'zip'            => isset($posted['wpinv_zip']) ? wpinv_clean($posted['wpinv_zip']) : null,
+				'state'          => isset($posted['wpinv_state']) ? wpinv_clean($posted['wpinv_state']) : null,
+				'city'           => isset($posted['wpinv_city']) ? wpinv_clean($posted['wpinv_city']) : null,
+				'country'        => isset($posted['wpinv_country']) ? wpinv_clean($posted['wpinv_country']) : null,
+				'phone'          => isset($posted['wpinv_phone']) ? wpinv_clean($posted['wpinv_phone']) : null,
+				'first_name'     => isset($posted['wpinv_first_name']) ? wpinv_clean($posted['wpinv_first_name']) : null,
+				'last_name'      => isset($posted['wpinv_last_name']) ? wpinv_clean($posted['wpinv_last_name']) : null,
+				'author'         => isset($posted['post_author_override']) ? wpinv_clean($posted['post_author_override']) : null,
+				'date_created'   => isset($posted['date_created']) ? wpinv_clean($posted['date_created']) : null,
+				'date_completed' => isset($posted['wpinv_date_completed']) ? wpinv_clean($posted['wpinv_date_completed']) : null,
+				'due_date'       => isset($posted['wpinv_due_date']) ? wpinv_clean($posted['wpinv_due_date']) : null,
+				'number'         => isset($posted['wpinv_number']) ? wpinv_clean($posted['wpinv_number']) : null,
+				'status'         => isset($posted['wpinv_status']) ? wpinv_clean($posted['wpinv_status']) : null,
 			)
 		);
 
 		// Discount code.
-		if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+		if (!$invoice->is_paid() && !$invoice->is_refunded()) {
 
-			if ( isset( $posted['wpinv_discount_code'] ) ) {
-				$invoice->set_discount_code( wpinv_clean( $posted['wpinv_discount_code'] ) );
+			if (isset($posted['wpinv_discount_code'])) {
+				$invoice->set_discount_code(wpinv_clean($posted['wpinv_discount_code']));
 			}
 
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( $discount->exists() ) {
-				$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+			$discount = new WPInv_Discount($invoice->get_discount_code());
+			if ($discount->exists()) {
+				$invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
 			} else {
-				$invoice->remove_discount( 'discount_code' );
+				$invoice->remove_discount('discount_code');
 			}
 
 			// Recalculate totals.
@@ -330,16 +330,16 @@ 
 		}
 
 		// If we're creating a new user...
-		if ( ! empty( $posted['wpinv_new_user'] ) && is_email( stripslashes( $posted['wpinv_email'] ) ) ) {
+		if (!empty($posted['wpinv_new_user']) && is_email(stripslashes($posted['wpinv_email']))) {
 
 			// Attempt to create the user.
-			$user = wpinv_create_user( sanitize_email( stripslashes( $posted['wpinv_email'] ) ), $invoice->get_first_name() . $invoice->get_last_name() );
+			$user = wpinv_create_user(sanitize_email(stripslashes($posted['wpinv_email'])), $invoice->get_first_name() . $invoice->get_last_name());
 
 			// If successful, update the invoice author.
-			if ( is_numeric( $user ) ) {
-				$invoice->set_author( $user );
+			if (is_numeric($user)) {
+				$invoice->set_author($user);
 			} else {
-				wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
+				wpinv_error_log($user->get_error_message(), __('Invoice add new user', 'invoicing'), __FILE__, __LINE__);
 			}
 		}
 
@@ -350,22 +350,22 @@ 
 		$invoice->save();
 
 		// Save the user address.
-		getpaid_save_invoice_user_address( $invoice );
+		getpaid_save_invoice_user_address($invoice);
 
 		// Undo do not send new invoice notifications.
 		$GLOBALS['wpinv_skip_invoice_notification'] = false;
 
 		// (Maybe) send new user notification.
-		$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-		if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
-			wp_send_new_user_notifications( $user, 'user' );
+		$should_send_notification = wpinv_get_option('disable_new_user_emails');
+		if (!empty($user) && is_numeric($user) && apply_filters('getpaid_send_new_user_notification', empty($should_send_notification))) {
+			wp_send_new_user_notifications($user, 'user');
 		}
 
-		if ( ! empty( $posted['send_to_customer'] ) && ! $invoice->is_draft() ) {
-			getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
+		if (!empty($posted['send_to_customer']) && !$invoice->is_draft()) {
+			getpaid()->get('invoice_emails')->user_invoice($invoice, true);
 		}
 
 		// Fires after an invoice is saved.
-		do_action( 'wpinv_invoice_metabox_saved', $invoice );
+		do_action('wpinv_invoice_metabox_saved', $invoice);
 	}
 }

vendor/ayecode/wp-font-awesome-settings/wp-font-awesome-settings.php

Braces +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 
 				if( !$version || version_compare($version,'5.999','>')){
 					$url .= 'assets/js/fa-iconpicker-v6.min.js';
-				}else{
+				} else{
 					$url .= 'assets/js/fa-iconpicker-v5.min.js';
 				}
 

Indentation +821 added lines, -821 removed lines

@@ -13,7 +13,7 @@ 
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,406 +21,406 @@ 
  */
 if ( ! class_exists( 'WP_Font_Awesome_Settings' ) ) {
 
-	/**
-	 * A Class to be able to change settings for Font Awesome.
-	 *
-	 * Class WP_Font_Awesome_Settings
-	 */
-	class WP_Font_Awesome_Settings {
-
-		/**
-		 * Class version version.
-		 *
-		 * @var string
-		 */
-		public $version = '1.1.7';
-
-		/**
-		 * Class textdomain.
-		 *
-		 * @var string
-		 */
-		public $textdomain = 'font-awesome-settings';
-
-		/**
-		 * Latest version of Font Awesome at time of publish published.
-		 *
-		 * @var string
-		 */
-		public $latest = "6.4.2";
-
-		/**
-		 * The title.
-		 *
-		 * @var string
-		 */
-		public $name = 'Font Awesome';
-
-		/**
-		 * Holds the settings values.
-		 *
-		 * @var array
-		 */
-		private $settings;
-
-		/**
-		 * WP_Font_Awesome_Settings instance.
-		 *
-		 * @access private
-		 * @since  1.0.0
-		 * @var    WP_Font_Awesome_Settings There can be only one!
-		 */
-		private static $instance = null;
-
-		/**
-		 * Main WP_Font_Awesome_Settings Instance.
-		 *
-		 * Ensures only one instance of WP_Font_Awesome_Settings is loaded or can be loaded.
-		 *
-		 * @since 1.0.0
-		 * @static
-		 * @return WP_Font_Awesome_Settings - Main instance.
-		 */
-		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
-				self::$instance = new WP_Font_Awesome_Settings;
-
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
-
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
-					add_action( 'admin_init', array( self::$instance, 'constants' ) );
-					add_action( 'admin_notices', array( self::$instance, 'admin_notices' ) );
-				}
-
-				do_action( 'wp_font_awesome_settings_loaded' );
-			}
-
-			return self::$instance;
-		}
-
-		/**
+    /**
+     * A Class to be able to change settings for Font Awesome.
+     *
+     * Class WP_Font_Awesome_Settings
+     */
+    class WP_Font_Awesome_Settings {
+
+        /**
+         * Class version version.
+         *
+         * @var string
+         */
+        public $version = '1.1.7';
+
+        /**
+         * Class textdomain.
+         *
+         * @var string
+         */
+        public $textdomain = 'font-awesome-settings';
+
+        /**
+         * Latest version of Font Awesome at time of publish published.
+         *
+         * @var string
+         */
+        public $latest = "6.4.2";
+
+        /**
+         * The title.
+         *
+         * @var string
+         */
+        public $name = 'Font Awesome';
+
+        /**
+         * Holds the settings values.
+         *
+         * @var array
+         */
+        private $settings;
+
+        /**
+         * WP_Font_Awesome_Settings instance.
+         *
+         * @access private
+         * @since  1.0.0
+         * @var    WP_Font_Awesome_Settings There can be only one!
+         */
+        private static $instance = null;
+
+        /**
+         * Main WP_Font_Awesome_Settings Instance.
+         *
+         * Ensures only one instance of WP_Font_Awesome_Settings is loaded or can be loaded.
+         *
+         * @since 1.0.0
+         * @static
+         * @return WP_Font_Awesome_Settings - Main instance.
+         */
+        public static function instance() {
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
+                self::$instance = new WP_Font_Awesome_Settings;
+
+                add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+
+                if ( is_admin() ) {
+                    add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
+                    add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
+                    add_action( 'admin_init', array( self::$instance, 'constants' ) );
+                    add_action( 'admin_notices', array( self::$instance, 'admin_notices' ) );
+                }
+
+                do_action( 'wp_font_awesome_settings_loaded' );
+            }
+
+            return self::$instance;
+        }
+
+        /**
          * Define any constants that may be needed by other packages.
          *
-		 * @return void
-		 */
-		public function constants(){
+         * @return void
+         */
+        public function constants(){
 
-			// register iconpicker constant
-			if ( ! defined( 'FAS_ICONPICKER_JS_URL' ) ) {
-				$url = $this->get_path_url();
-				$version = $this->settings['version'];
+            // register iconpicker constant
+            if ( ! defined( 'FAS_ICONPICKER_JS_URL' ) ) {
+                $url = $this->get_path_url();
+                $version = $this->settings['version'];
 
-				if( !$version || version_compare($version,'5.999','>')){
-					$url .= 'assets/js/fa-iconpicker-v6.min.js';
-				}else{
-					$url .= 'assets/js/fa-iconpicker-v5.min.js';
-				}
+                if( !$version || version_compare($version,'5.999','>')){
+                    $url .= 'assets/js/fa-iconpicker-v6.min.js';
+                }else{
+                    $url .= 'assets/js/fa-iconpicker-v5.min.js';
+                }
 
-				define( 'FAS_ICONPICKER_JS_URL', $url );
+                define( 'FAS_ICONPICKER_JS_URL', $url );
 
-			}
+            }
 
             // Set a constant if pro enbaled
-			if ( ! defined( 'FAS_PRO' ) && $this->settings['pro'] ) {
-				define( 'FAS_PRO', true );
-			}
-		}
-
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_path_url() {
-			$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-			$content_url = untrailingslashit( WP_CONTENT_URL );
-
-			// Replace http:// to https://.
-			if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-				$content_url = str_replace( 'http://', 'https://', $content_url );
-			}
-
-			// Check if we are inside a plugin
-			$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-			$url = str_replace( $content_dir, $content_url, $file_dir );
-
-			return trailingslashit( $url );
-		}
-
-		/**
-		 * Initiate the settings and add the required action hooks.
-		 *
-		 * @since 1.0.8 Settings name wrong - FIXED
-		 */
-		public function init() {
-			// Download fontawesome locally.
-			add_action( 'add_option_wp-font-awesome-settings', array( $this, 'add_option_wp_font_awesome_settings' ), 10, 2 );
-			add_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
-
-			$this->settings = $this->get_settings();
-
-			// Check if the official plugin is active and use that instead if so.
-			if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-					add_action( 'admin_head', array( $this, 'add_generator' ), 99 );
-				}
-
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-					add_action( 'wp_head', array( $this, 'add_generator' ), 99 );
-				}
-
-				if ( $this->settings['type'] == 'CSS' ) {
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-						add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
-						//add_action( 'wp_footer', array( $this, 'enqueue_style' ), 5000 ); // not sure why this was added, seems to break frontend
-					}
-
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-						add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
-						add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_styles' ), 10, 2 );
-					}
-				} else {
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-						add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
-					}
-
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-						add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
-						add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_scripts' ), 10, 2 );
-					}
-				}
-
-				// remove font awesome if set to do so
-				if ( $this->settings['dequeue'] == '1' ) {
-					add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
-				}
-			}
-
-		}
-
-		/**
-		 * Add FA to the FSE.
-		 *
-		 * @param $editor_settings
-		 * @param $block_editor_context
-		 *
-		 * @return array
-		 */
-		public function enqueue_editor_styles( $editor_settings, $block_editor_context ){
-
-			if ( ! empty( $editor_settings['__unstableResolvedAssets']['styles'] ) ) {
-				$url = $this->get_url();
-				$editor_settings['__unstableResolvedAssets']['styles'] .= "<link rel='stylesheet' id='font-awesome-css'  href='$url' media='all' />";
-			}
-
-			return $editor_settings;
-		}
-
-		/**
-		 * Add FA to the FSE.
-		 *
-		 * @param $editor_settings
-		 * @param $block_editor_context
-		 *
-		 * @return array
-		 */
-		public function enqueue_editor_scripts( $editor_settings, $block_editor_context ){
-
-			$url = $this->get_url();
-			$editor_settings['__unstableResolvedAssets']['scripts'] .= "<script src='$url' id='font-awesome-js'></script>";
-
-			return $editor_settings;
-		}
-
-		/**
-		 * Adds the Font Awesome styles.
-		 */
-		public function enqueue_style() {
-			// build url
-			$url = $this->get_url();
-			$version = ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ? strip_tags( $this->settings['local_version'] ) : null;
-
-			wp_deregister_style( 'font-awesome' ); // deregister in case its already there
-			wp_register_style( 'font-awesome', $url, array(), $version );
-			wp_enqueue_style( 'font-awesome' );
-
-			// RTL language support CSS.
-			if ( is_rtl() ) {
-				wp_add_inline_style( 'font-awesome', $this->rtl_inline_css() );
-			}
-
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_style( 'font-awesome-shims', $url, array(), $version );
-				wp_enqueue_style( 'font-awesome-shims' );
-			}
-		}
-
-		/**
-		 * Adds the Font Awesome JS.
-		 */
-		public function enqueue_scripts() {
-			// build url
-			$url = $this->get_url();
-
-			$deregister_function = 'wp' . '_' . 'deregister' . '_' . 'script';
-			call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
-			wp_register_script( 'font-awesome', $url, array(), null );
-			wp_enqueue_script( 'font-awesome' );
-
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_script( 'font-awesome-shims', $url, array(), null );
-				wp_enqueue_script( 'font-awesome-shims' );
-			}
-		}
-
-		/**
-		 * Get the url of the Font Awesome files.
-		 *
-		 * @param bool $shims If this is a shim file or not.
-		 * @param bool $local Load locally if allowed.
-		 *
-		 * @return string The url to the file.
-		 */
-		public function get_url( $shims = false, $local = true ) {
-			$script  = $shims ? 'v4-shims' : 'all';
-			$sub     = $this->settings['pro'] ? 'pro' : 'use';
-			$type    = $this->settings['type'];
-			$version = $this->settings['version'];
-			$kit_url = $this->settings['kit-url'] ? esc_url( $this->settings['kit-url'] ) : '';
-			$url     = '';
-
-			if ( $type == 'KIT' && $kit_url ) {
-				if ( $shims ) {
-					// if its a kit then we don't add shims here
-					return '';
-				}
-				$url .= $kit_url; // CDN
-				$url .= "?wpfas=true"; // set our var so our version is not removed
-			} else {
-				$v = '';
-				// Check and load locally.
-				if ( $local && $this->has_local() ) {
-					$script .= ".min";
-					$v .= '&ver=' . strip_tags( $this->settings['local_version'] );
-					$url .= $this->get_fonts_url(); // Local fonts url.
-				} else {
-					$url .= "https://$sub.fontawesome.com/releases/"; // CDN
-					$url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
-				}
-				$url .= $type == 'CSS' ? 'css/' : 'js/'; // type
-				$url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
-				$url .= "?wpfas=true" . $v; // set our var so our version is not removed
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Try and remove any other versions of Font Awesome added by other plugins/themes.
-		 *
-		 * Uses the clean_url filter to try and remove any other Font Awesome files added, it can also add pseudo-elements flag for the JS version.
-		 *
-		 * @param $url
-		 * @param $original_url
-		 * @param $_context
-		 *
-		 * @return string The filtered url.
-		 */
-		public function remove_font_awesome( $url, $original_url, $_context ) {
-
-			if ( $_context == 'display'
-			     && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
-			     && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
-			) {// it's a font-awesome-url (probably)
-
-				if ( strstr( $url, "wpfas=true" ) !== false ) {
-					if ( $this->settings['type'] == 'JS' ) {
-						if ( $this->settings['js-pseudo'] ) {
-							$url .= "' data-search-pseudo-elements defer='defer";
-						} else {
-							$url .= "' defer='defer";
-						}
-					}
-				} else {
-					$url = ''; // removing the url removes the file
-				}
-
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Register the database settings with WordPress.
-		 */
-		public function register_settings() {
-			register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
-		}
-
-		/**
-		 * Add the WordPress settings menu item.
-		 * @since 1.0.10 Calling function name direct will fail theme check so we don't.
-		 */
-		public function menu_item() {
-			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
-				$this,
-				'settings_page'
-			) );
-		}
-
-		/**
-		 * Get the current Font Awesome output settings.
-		 *
-		 * @return array The array of settings.
-		 */
-		public function get_settings() {
-			$db_settings = get_option( 'wp-font-awesome-settings' );
-
-			$defaults = array(
-				'type'      => 'CSS', // type to use, CSS or JS or KIT
-				'version'   => '', // latest
-				'enqueue'   => '', // front and backend
-				'shims'     => '0', // default OFF now in 2020
-				'js-pseudo' => '0', // if the pseudo elements flag should be set (CPU intensive)
-				'dequeue'   => '0', // if we should try to remove other versions added by other plugins/themes
-				'pro'       => '0', // if pro CDN url should be used
-				'local'     => '0', // Store fonts locally.
-				'local_version' => '', // Local fonts version.
-				'kit-url'   => '', // the kit url
-			);
-
-			$settings = wp_parse_args( $db_settings, $defaults );
-
-			/**
-			 * Filter the Font Awesome settings.
-			 *
-			 * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
-			 */
-			return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
-		}
-
-		/**
-		 * The settings page html output.
-		 */
-		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
-			}
-
-			// a hidden way to force the update of the version number via api instead of waiting the 48 hours
-			if ( isset( $_REQUEST['force-version-check'] ) ) {
-				$this->get_latest_version( $force_api = true );
-			}
-
-			if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				?>
+            if ( ! defined( 'FAS_PRO' ) && $this->settings['pro'] ) {
+                define( 'FAS_PRO', true );
+            }
+        }
+
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_path_url() {
+            $content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
+            $content_url = untrailingslashit( WP_CONTENT_URL );
+
+            // Replace http:// to https://.
+            if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
+                $content_url = str_replace( 'http://', 'https://', $content_url );
+            }
+
+            // Check if we are inside a plugin
+            $file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
+            $url = str_replace( $content_dir, $content_url, $file_dir );
+
+            return trailingslashit( $url );
+        }
+
+        /**
+         * Initiate the settings and add the required action hooks.
+         *
+         * @since 1.0.8 Settings name wrong - FIXED
+         */
+        public function init() {
+            // Download fontawesome locally.
+            add_action( 'add_option_wp-font-awesome-settings', array( $this, 'add_option_wp_font_awesome_settings' ), 10, 2 );
+            add_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
+
+            $this->settings = $this->get_settings();
+
+            // Check if the official plugin is active and use that instead if so.
+            if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
+                    add_action( 'admin_head', array( $this, 'add_generator' ), 99 );
+                }
+
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
+                    add_action( 'wp_head', array( $this, 'add_generator' ), 99 );
+                }
+
+                if ( $this->settings['type'] == 'CSS' ) {
+                    if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
+                        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
+                        //add_action( 'wp_footer', array( $this, 'enqueue_style' ), 5000 ); // not sure why this was added, seems to break frontend
+                    }
+
+                    if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
+                        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
+                        add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_styles' ), 10, 2 );
+                    }
+                } else {
+                    if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
+                        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
+                    }
+
+                    if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
+                        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
+                        add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_scripts' ), 10, 2 );
+                    }
+                }
+
+                // remove font awesome if set to do so
+                if ( $this->settings['dequeue'] == '1' ) {
+                    add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
+                }
+            }
+
+        }
+
+        /**
+         * Add FA to the FSE.
+         *
+         * @param $editor_settings
+         * @param $block_editor_context
+         *
+         * @return array
+         */
+        public function enqueue_editor_styles( $editor_settings, $block_editor_context ){
+
+            if ( ! empty( $editor_settings['__unstableResolvedAssets']['styles'] ) ) {
+                $url = $this->get_url();
+                $editor_settings['__unstableResolvedAssets']['styles'] .= "<link rel='stylesheet' id='font-awesome-css'  href='$url' media='all' />";
+            }
+
+            return $editor_settings;
+        }
+
+        /**
+         * Add FA to the FSE.
+         *
+         * @param $editor_settings
+         * @param $block_editor_context
+         *
+         * @return array
+         */
+        public function enqueue_editor_scripts( $editor_settings, $block_editor_context ){
+
+            $url = $this->get_url();
+            $editor_settings['__unstableResolvedAssets']['scripts'] .= "<script src='$url' id='font-awesome-js'></script>";
+
+            return $editor_settings;
+        }
+
+        /**
+         * Adds the Font Awesome styles.
+         */
+        public function enqueue_style() {
+            // build url
+            $url = $this->get_url();
+            $version = ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ? strip_tags( $this->settings['local_version'] ) : null;
+
+            wp_deregister_style( 'font-awesome' ); // deregister in case its already there
+            wp_register_style( 'font-awesome', $url, array(), $version );
+            wp_enqueue_style( 'font-awesome' );
+
+            // RTL language support CSS.
+            if ( is_rtl() ) {
+                wp_add_inline_style( 'font-awesome', $this->rtl_inline_css() );
+            }
+
+            if ( $this->settings['shims'] ) {
+                $url = $this->get_url( true );
+                wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
+                wp_register_style( 'font-awesome-shims', $url, array(), $version );
+                wp_enqueue_style( 'font-awesome-shims' );
+            }
+        }
+
+        /**
+         * Adds the Font Awesome JS.
+         */
+        public function enqueue_scripts() {
+            // build url
+            $url = $this->get_url();
+
+            $deregister_function = 'wp' . '_' . 'deregister' . '_' . 'script';
+            call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
+            wp_register_script( 'font-awesome', $url, array(), null );
+            wp_enqueue_script( 'font-awesome' );
+
+            if ( $this->settings['shims'] ) {
+                $url = $this->get_url( true );
+                call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
+                wp_register_script( 'font-awesome-shims', $url, array(), null );
+                wp_enqueue_script( 'font-awesome-shims' );
+            }
+        }
+
+        /**
+         * Get the url of the Font Awesome files.
+         *
+         * @param bool $shims If this is a shim file or not.
+         * @param bool $local Load locally if allowed.
+         *
+         * @return string The url to the file.
+         */
+        public function get_url( $shims = false, $local = true ) {
+            $script  = $shims ? 'v4-shims' : 'all';
+            $sub     = $this->settings['pro'] ? 'pro' : 'use';
+            $type    = $this->settings['type'];
+            $version = $this->settings['version'];
+            $kit_url = $this->settings['kit-url'] ? esc_url( $this->settings['kit-url'] ) : '';
+            $url     = '';
+
+            if ( $type == 'KIT' && $kit_url ) {
+                if ( $shims ) {
+                    // if its a kit then we don't add shims here
+                    return '';
+                }
+                $url .= $kit_url; // CDN
+                $url .= "?wpfas=true"; // set our var so our version is not removed
+            } else {
+                $v = '';
+                // Check and load locally.
+                if ( $local && $this->has_local() ) {
+                    $script .= ".min";
+                    $v .= '&ver=' . strip_tags( $this->settings['local_version'] );
+                    $url .= $this->get_fonts_url(); // Local fonts url.
+                } else {
+                    $url .= "https://$sub.fontawesome.com/releases/"; // CDN
+                    $url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
+                }
+                $url .= $type == 'CSS' ? 'css/' : 'js/'; // type
+                $url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
+                $url .= "?wpfas=true" . $v; // set our var so our version is not removed
+            }
+
+            return $url;
+        }
+
+        /**
+         * Try and remove any other versions of Font Awesome added by other plugins/themes.
+         *
+         * Uses the clean_url filter to try and remove any other Font Awesome files added, it can also add pseudo-elements flag for the JS version.
+         *
+         * @param $url
+         * @param $original_url
+         * @param $_context
+         *
+         * @return string The filtered url.
+         */
+        public function remove_font_awesome( $url, $original_url, $_context ) {
+
+            if ( $_context == 'display'
+                 && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
+                 && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
+            ) {// it's a font-awesome-url (probably)
+
+                if ( strstr( $url, "wpfas=true" ) !== false ) {
+                    if ( $this->settings['type'] == 'JS' ) {
+                        if ( $this->settings['js-pseudo'] ) {
+                            $url .= "' data-search-pseudo-elements defer='defer";
+                        } else {
+                            $url .= "' defer='defer";
+                        }
+                    }
+                } else {
+                    $url = ''; // removing the url removes the file
+                }
+
+            }
+
+            return $url;
+        }
+
+        /**
+         * Register the database settings with WordPress.
+         */
+        public function register_settings() {
+            register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
+        }
+
+        /**
+         * Add the WordPress settings menu item.
+         * @since 1.0.10 Calling function name direct will fail theme check so we don't.
+         */
+        public function menu_item() {
+            $menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
+            call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
+                $this,
+                'settings_page'
+            ) );
+        }
+
+        /**
+         * Get the current Font Awesome output settings.
+         *
+         * @return array The array of settings.
+         */
+        public function get_settings() {
+            $db_settings = get_option( 'wp-font-awesome-settings' );
+
+            $defaults = array(
+                'type'      => 'CSS', // type to use, CSS or JS or KIT
+                'version'   => '', // latest
+                'enqueue'   => '', // front and backend
+                'shims'     => '0', // default OFF now in 2020
+                'js-pseudo' => '0', // if the pseudo elements flag should be set (CPU intensive)
+                'dequeue'   => '0', // if we should try to remove other versions added by other plugins/themes
+                'pro'       => '0', // if pro CDN url should be used
+                'local'     => '0', // Store fonts locally.
+                'local_version' => '', // Local fonts version.
+                'kit-url'   => '', // the kit url
+            );
+
+            $settings = wp_parse_args( $db_settings, $defaults );
+
+            /**
+             * Filter the Font Awesome settings.
+             *
+             * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
+             */
+            return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
+        }
+
+        /**
+         * The settings page html output.
+         */
+        public function settings_page() {
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die( __( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
+            }
+
+            // a hidden way to force the update of the version number via api instead of waiting the 48 hours
+            if ( isset( $_REQUEST['force-version-check'] ) ) {
+                $this->get_latest_version( $force_api = true );
+            }
+
+            if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
+                ?>
                 <style>
                     .wpfas-kit-show {
                         display: none;
@@ -446,16 +446,16 @@ 
                     <h1><?php echo $this->name; ?></h1>
                     <form method="post" action="options.php" class="fas-settings-form">
 						<?php
-						settings_fields( 'wp-font-awesome-settings' );
-						do_settings_sections( 'wp-font-awesome-settings' );
-						$table_class = '';
-						if ( $this->settings['type'] ) {
-							$table_class .= 'wpfas-' . sanitize_html_class( strtolower( $this->settings['type'] ) ) . '-set';
-						}
-						if ( ! empty( $this->settings['pro'] ) ) {
-							$table_class .= ' wpfas-has-pro';
-						}
-						?>
+                        settings_fields( 'wp-font-awesome-settings' );
+                        do_settings_sections( 'wp-font-awesome-settings' );
+                        $table_class = '';
+                        if ( $this->settings['type'] ) {
+                            $table_class .= 'wpfas-' . sanitize_html_class( strtolower( $this->settings['type'] ) ) . '-set';
+                        }
+                        if ( ! empty( $this->settings['pro'] ) ) {
+                            $table_class .= ' wpfas-has-pro';
+                        }
+                        ?>
 						<?php if ( $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ) { ?>
 							<?php if ( $this->has_local() ) { ?>
                                 <div class="notice notice-info"><p><strong><?php _e( 'Font Awesome fonts are loading locally.', 'ayecode-connect' ); ?></strong></p></div>
@@ -480,12 +480,12 @@ 
                                 <td>
                                     <input class="regular-text" id="wpfas-kit-url" type="url" name="wp-font-awesome-settings[kit-url]" value="<?php echo esc_attr( $this->settings['kit-url'] ); ?>" placeholder="<?php echo 'https://kit.font';echo 'awesome.com/123abc.js'; // this won't pass theme check :(?>"/>
                                     <span><?php
-										echo wp_sprintf(
-											__( 'Requires a free account with Font Awesome. %sGet kit url%s', 'ayecode-connect' ),
-											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/kits"><i class="fas fa-external-link-alt"></i>',
-											'</a>'
-										);
-										?></span>
+                                        echo wp_sprintf(
+                                            __( 'Requires a free account with Font Awesome. %sGet kit url%s', 'ayecode-connect' ),
+                                            '<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/kits"><i class="fas fa-external-link-alt"></i>',
+                                            '</a>'
+                                        );
+                                        ?></span>
                                 </td>
                             </tr>
 
@@ -526,14 +526,14 @@ 
                                     <input type="hidden" name="wp-font-awesome-settings[pro]" value="0"/>
                                     <input type="checkbox" name="wp-font-awesome-settings[pro]" value="1" <?php checked( $this->settings['pro'], '1' ); ?> id="wpfas-pro" onchange="if(jQuery(this).is(':checked')){jQuery('.wpfas-table-settings').addClass('wpfas-has-pro')}else{jQuery('.wpfas-table-settings').removeClass('wpfas-has-pro')}"/>
                                     <span><?php
-										echo wp_sprintf(
-											__( 'Requires a subscription. %sLearn more%s  %sManage my allowed domains%s', 'ayecode-connect' ),
-											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/referral?a=c9b89e1418">',
-											' <i class="fas fa-external-link-alt"></i></a>',
-											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/account/cdn">',
-											' <i class="fas fa-external-link-alt"></i></a>'
-										);
-										?></span>
+                                        echo wp_sprintf(
+                                            __( 'Requires a subscription. %sLearn more%s  %sManage my allowed domains%s', 'ayecode-connect' ),
+                                            '<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/referral?a=c9b89e1418">',
+                                            ' <i class="fas fa-external-link-alt"></i></a>',
+                                            '<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/account/cdn">',
+                                            ' <i class="fas fa-external-link-alt"></i></a>'
+                                        );
+                                        ?></span>
                                 </td>
                             </tr>
 
@@ -587,8 +587,8 @@ 
                         </table>
                         <div class="fas-buttons">
 							<?php
-							submit_button();
-							?>
+                            submit_button();
+                            ?>
                             <p class="submit"><a href="https://fontawesome.com/referral?a=c9b89e1418" class="button button-secondary"><?php _e('Get 24,000+ more icons with Font Awesome Pro','ayecode-connect'); ?> <i class="fas fa-external-link-alt"></i></a></p>
 
                         </div>
@@ -597,414 +597,414 @@ 
                     <div id="wpfas-version"><?php echo wp_sprintf(__( 'Version: %s (affiliate links provided)', 'ayecode-connect' ), $this->version ); ?></div>
                 </div>
 				<?php
-			}
-		}
-
-		/**
-		 * Check a version number is valid and if so return it or else return an empty string.
-		 *
-		 * @param $version string The version number to check.
-		 *
-		 * @since 1.0.6
-		 *
-		 * @return string Either a valid version number or an empty string.
-		 */
-		public function validate_version_number( $version ) {
-
-			if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
-				// valid
-			} else {
-				$version = '';// not validated
-			}
-
-			return $version;
-		}
-
-
-		/**
-		 * Get the latest version of Font Awesome.
-		 *
-		 * We check for a cached version and if none we will check for a live version via API and then cache it for 48 hours.
-		 *
-		 * @since 1.0.7
-		 * @return mixed|string The latest version number found.
-		 */
-		public function get_latest_version( $force_api = false ) {
-			$latest_version = $this->latest;
-
-			$cache = get_transient( 'wp-font-awesome-settings-version' );
-
-			if ( $cache === false || $force_api ) { // its not set
-				$api_ver = $this->get_latest_version_from_api();
-				if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
-					$latest_version = $api_ver;
-					set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
-				}
-			} elseif ( $this->validate_version_number( $cache ) ) {
-				if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
-					$latest_version = $cache;
-				}
-			}
-
-			// Check and auto download fonts locally.
-			if ( empty( $this->settings['pro'] ) && empty( $this->settings['version'] ) && $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && ! empty( $this->settings['local_version'] ) && ! empty( $latest_version ) ) {
-				if ( version_compare( $latest_version, $this->settings['local_version'], '>' ) && is_admin() && ! wp_doing_ajax() ) {
-					$this->download_package( $latest_version );
-				}
-			}
-
-			return $latest_version;
-		}
-
-		/**
-		 * Get the latest Font Awesome version from the github API.
-		 *
-		 * @since 1.0.7
-		 * @return string The latest version number or `0` on API fail.
-		 */
-		public function get_latest_version_from_api() {
-			$version  = "0";
-			$response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
-			if ( ! is_wp_error( $response ) && is_array( $response ) ) {
-				$api_response = json_decode( wp_remote_retrieve_body( $response ), true );
-				if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
-					$version = $api_response['tag_name'];
-				}
-			}
-
-			return $version;
-		}
-
-		/**
-		 * Inline CSS for RTL language support.
-		 *
-		 * @since 1.0.13
-		 * @return string Inline CSS.
-		 */
-		public function rtl_inline_css() {
-			$inline_css = '[dir=rtl] .fa-address,[dir=rtl] .fa-address-card,[dir=rtl] .fa-adjust,[dir=rtl] .fa-alarm-clock,[dir=rtl] .fa-align-left,[dir=rtl] .fa-align-right,[dir=rtl] .fa-analytics,[dir=rtl] .fa-angle-double-left,[dir=rtl] .fa-angle-double-right,[dir=rtl] .fa-angle-left,[dir=rtl] .fa-angle-right,[dir=rtl] .fa-arrow-alt-circle-left,[dir=rtl] .fa-arrow-alt-circle-right,[dir=rtl] .fa-arrow-alt-from-left,[dir=rtl] .fa-arrow-alt-from-right,[dir=rtl] .fa-arrow-alt-left,[dir=rtl] .fa-arrow-alt-right,[dir=rtl] .fa-arrow-alt-square-left,[dir=rtl] .fa-arrow-alt-square-right,[dir=rtl] .fa-arrow-alt-to-left,[dir=rtl] .fa-arrow-alt-to-right,[dir=rtl] .fa-arrow-circle-left,[dir=rtl] .fa-arrow-circle-right,[dir=rtl] .fa-arrow-from-left,[dir=rtl] .fa-arrow-from-right,[dir=rtl] .fa-arrow-left,[dir=rtl] .fa-arrow-right,[dir=rtl] .fa-arrow-square-left,[dir=rtl] .fa-arrow-square-right,[dir=rtl] .fa-arrow-to-left,[dir=rtl] .fa-arrow-to-right,[dir=rtl] .fa-balance-scale-left,[dir=rtl] .fa-balance-scale-right,[dir=rtl] .fa-bed,[dir=rtl] .fa-bed-bunk,[dir=rtl] .fa-bed-empty,[dir=rtl] .fa-border-left,[dir=rtl] .fa-border-right,[dir=rtl] .fa-calendar-check,[dir=rtl] .fa-caret-circle-left,[dir=rtl] .fa-caret-circle-right,[dir=rtl] .fa-caret-left,[dir=rtl] .fa-caret-right,[dir=rtl] .fa-caret-square-left,[dir=rtl] .fa-caret-square-right,[dir=rtl] .fa-cart-arrow-down,[dir=rtl] .fa-cart-plus,[dir=rtl] .fa-chart-area,[dir=rtl] .fa-chart-bar,[dir=rtl] .fa-chart-line,[dir=rtl] .fa-chart-line-down,[dir=rtl] .fa-chart-network,[dir=rtl] .fa-chart-pie,[dir=rtl] .fa-chart-pie-alt,[dir=rtl] .fa-chart-scatter,[dir=rtl] .fa-check-circle,[dir=rtl] .fa-check-square,[dir=rtl] .fa-chevron-circle-left,[dir=rtl] .fa-chevron-circle-right,[dir=rtl] .fa-chevron-double-left,[dir=rtl] .fa-chevron-double-right,[dir=rtl] .fa-chevron-left,[dir=rtl] .fa-chevron-right,[dir=rtl] .fa-chevron-square-left,[dir=rtl] .fa-chevron-square-right,[dir=rtl] .fa-clock,[dir=rtl] .fa-file,[dir=rtl] .fa-file-alt,[dir=rtl] .fa-file-archive,[dir=rtl] .fa-file-audio,[dir=rtl] .fa-file-chart-line,[dir=rtl] .fa-file-chart-pie,[dir=rtl] .fa-file-code,[dir=rtl] .fa-file-excel,[dir=rtl] .fa-file-image,[dir=rtl] .fa-file-pdf,[dir=rtl] .fa-file-powerpoint,[dir=rtl] .fa-file-video,[dir=rtl] .fa-file-word,[dir=rtl] .fa-flag,[dir=rtl] .fa-folder,[dir=rtl] .fa-folder-open,[dir=rtl] .fa-hand-lizard,[dir=rtl] .fa-hand-point-down,[dir=rtl] .fa-hand-point-left,[dir=rtl] .fa-hand-point-right,[dir=rtl] .fa-hand-point-up,[dir=rtl] .fa-hand-scissors,[dir=rtl] .fa-image,[dir=rtl] .fa-long-arrow-alt-left,[dir=rtl] .fa-long-arrow-alt-right,[dir=rtl] .fa-long-arrow-left,[dir=rtl] .fa-long-arrow-right,[dir=rtl] .fa-luggage-cart,[dir=rtl] .fa-moon,[dir=rtl] .fa-pencil,[dir=rtl] .fa-pencil-alt,[dir=rtl] .fa-play-circle,[dir=rtl] .fa-project-diagram,[dir=rtl] .fa-quote-left,[dir=rtl] .fa-quote-right,[dir=rtl] .fa-shopping-cart,[dir=rtl] .fa-thumbs-down,[dir=rtl] .fa-thumbs-up,[dir=rtl] .fa-user-chart{filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);transform:scale(-1,1)}[dir=rtl] .fa-spin{animation-direction:reverse}';
-
-			return $inline_css;
-		}
-
-		/**
-		 * Show any warnings as an admin notice.
-		 *
-		 * @return void
-		 */
-		public function admin_notices() {
-			$settings = $this->settings;
-
-			if ( defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				if ( ! empty( $_REQUEST['page'] ) && $_REQUEST['page'] == 'wp-font-awesome-settings' ) {
-					?>
+            }
+        }
+
+        /**
+         * Check a version number is valid and if so return it or else return an empty string.
+         *
+         * @param $version string The version number to check.
+         *
+         * @since 1.0.6
+         *
+         * @return string Either a valid version number or an empty string.
+         */
+        public function validate_version_number( $version ) {
+
+            if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
+                // valid
+            } else {
+                $version = '';// not validated
+            }
+
+            return $version;
+        }
+
+
+        /**
+         * Get the latest version of Font Awesome.
+         *
+         * We check for a cached version and if none we will check for a live version via API and then cache it for 48 hours.
+         *
+         * @since 1.0.7
+         * @return mixed|string The latest version number found.
+         */
+        public function get_latest_version( $force_api = false ) {
+            $latest_version = $this->latest;
+
+            $cache = get_transient( 'wp-font-awesome-settings-version' );
+
+            if ( $cache === false || $force_api ) { // its not set
+                $api_ver = $this->get_latest_version_from_api();
+                if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
+                    $latest_version = $api_ver;
+                    set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
+                }
+            } elseif ( $this->validate_version_number( $cache ) ) {
+                if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
+                    $latest_version = $cache;
+                }
+            }
+
+            // Check and auto download fonts locally.
+            if ( empty( $this->settings['pro'] ) && empty( $this->settings['version'] ) && $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && ! empty( $this->settings['local_version'] ) && ! empty( $latest_version ) ) {
+                if ( version_compare( $latest_version, $this->settings['local_version'], '>' ) && is_admin() && ! wp_doing_ajax() ) {
+                    $this->download_package( $latest_version );
+                }
+            }
+
+            return $latest_version;
+        }
+
+        /**
+         * Get the latest Font Awesome version from the github API.
+         *
+         * @since 1.0.7
+         * @return string The latest version number or `0` on API fail.
+         */
+        public function get_latest_version_from_api() {
+            $version  = "0";
+            $response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
+            if ( ! is_wp_error( $response ) && is_array( $response ) ) {
+                $api_response = json_decode( wp_remote_retrieve_body( $response ), true );
+                if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
+                    $version = $api_response['tag_name'];
+                }
+            }
+
+            return $version;
+        }
+
+        /**
+         * Inline CSS for RTL language support.
+         *
+         * @since 1.0.13
+         * @return string Inline CSS.
+         */
+        public function rtl_inline_css() {
+            $inline_css = '[dir=rtl] .fa-address,[dir=rtl] .fa-address-card,[dir=rtl] .fa-adjust,[dir=rtl] .fa-alarm-clock,[dir=rtl] .fa-align-left,[dir=rtl] .fa-align-right,[dir=rtl] .fa-analytics,[dir=rtl] .fa-angle-double-left,[dir=rtl] .fa-angle-double-right,[dir=rtl] .fa-angle-left,[dir=rtl] .fa-angle-right,[dir=rtl] .fa-arrow-alt-circle-left,[dir=rtl] .fa-arrow-alt-circle-right,[dir=rtl] .fa-arrow-alt-from-left,[dir=rtl] .fa-arrow-alt-from-right,[dir=rtl] .fa-arrow-alt-left,[dir=rtl] .fa-arrow-alt-right,[dir=rtl] .fa-arrow-alt-square-left,[dir=rtl] .fa-arrow-alt-square-right,[dir=rtl] .fa-arrow-alt-to-left,[dir=rtl] .fa-arrow-alt-to-right,[dir=rtl] .fa-arrow-circle-left,[dir=rtl] .fa-arrow-circle-right,[dir=rtl] .fa-arrow-from-left,[dir=rtl] .fa-arrow-from-right,[dir=rtl] .fa-arrow-left,[dir=rtl] .fa-arrow-right,[dir=rtl] .fa-arrow-square-left,[dir=rtl] .fa-arrow-square-right,[dir=rtl] .fa-arrow-to-left,[dir=rtl] .fa-arrow-to-right,[dir=rtl] .fa-balance-scale-left,[dir=rtl] .fa-balance-scale-right,[dir=rtl] .fa-bed,[dir=rtl] .fa-bed-bunk,[dir=rtl] .fa-bed-empty,[dir=rtl] .fa-border-left,[dir=rtl] .fa-border-right,[dir=rtl] .fa-calendar-check,[dir=rtl] .fa-caret-circle-left,[dir=rtl] .fa-caret-circle-right,[dir=rtl] .fa-caret-left,[dir=rtl] .fa-caret-right,[dir=rtl] .fa-caret-square-left,[dir=rtl] .fa-caret-square-right,[dir=rtl] .fa-cart-arrow-down,[dir=rtl] .fa-cart-plus,[dir=rtl] .fa-chart-area,[dir=rtl] .fa-chart-bar,[dir=rtl] .fa-chart-line,[dir=rtl] .fa-chart-line-down,[dir=rtl] .fa-chart-network,[dir=rtl] .fa-chart-pie,[dir=rtl] .fa-chart-pie-alt,[dir=rtl] .fa-chart-scatter,[dir=rtl] .fa-check-circle,[dir=rtl] .fa-check-square,[dir=rtl] .fa-chevron-circle-left,[dir=rtl] .fa-chevron-circle-right,[dir=rtl] .fa-chevron-double-left,[dir=rtl] .fa-chevron-double-right,[dir=rtl] .fa-chevron-left,[dir=rtl] .fa-chevron-right,[dir=rtl] .fa-chevron-square-left,[dir=rtl] .fa-chevron-square-right,[dir=rtl] .fa-clock,[dir=rtl] .fa-file,[dir=rtl] .fa-file-alt,[dir=rtl] .fa-file-archive,[dir=rtl] .fa-file-audio,[dir=rtl] .fa-file-chart-line,[dir=rtl] .fa-file-chart-pie,[dir=rtl] .fa-file-code,[dir=rtl] .fa-file-excel,[dir=rtl] .fa-file-image,[dir=rtl] .fa-file-pdf,[dir=rtl] .fa-file-powerpoint,[dir=rtl] .fa-file-video,[dir=rtl] .fa-file-word,[dir=rtl] .fa-flag,[dir=rtl] .fa-folder,[dir=rtl] .fa-folder-open,[dir=rtl] .fa-hand-lizard,[dir=rtl] .fa-hand-point-down,[dir=rtl] .fa-hand-point-left,[dir=rtl] .fa-hand-point-right,[dir=rtl] .fa-hand-point-up,[dir=rtl] .fa-hand-scissors,[dir=rtl] .fa-image,[dir=rtl] .fa-long-arrow-alt-left,[dir=rtl] .fa-long-arrow-alt-right,[dir=rtl] .fa-long-arrow-left,[dir=rtl] .fa-long-arrow-right,[dir=rtl] .fa-luggage-cart,[dir=rtl] .fa-moon,[dir=rtl] .fa-pencil,[dir=rtl] .fa-pencil-alt,[dir=rtl] .fa-play-circle,[dir=rtl] .fa-project-diagram,[dir=rtl] .fa-quote-left,[dir=rtl] .fa-quote-right,[dir=rtl] .fa-shopping-cart,[dir=rtl] .fa-thumbs-down,[dir=rtl] .fa-thumbs-up,[dir=rtl] .fa-user-chart{filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);transform:scale(-1,1)}[dir=rtl] .fa-spin{animation-direction:reverse}';
+
+            return $inline_css;
+        }
+
+        /**
+         * Show any warnings as an admin notice.
+         *
+         * @return void
+         */
+        public function admin_notices() {
+            $settings = $this->settings;
+
+            if ( defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
+                if ( ! empty( $_REQUEST['page'] ) && $_REQUEST['page'] == 'wp-font-awesome-settings' ) {
+                    ?>
                     <div class="notice  notice-error is-dismissible">
                         <p><?php _e( 'The Official Font Awesome Plugin is active, please adjust your settings there.', 'ayecode-connect' ); ?></p>
                     </div>
 					<?php
-				}
-			} else {
-				if ( ! empty( $settings ) ) {
-					if ( $settings['type'] != 'KIT' && $settings['pro'] && ( $settings['version'] == '' || version_compare( $settings['version'], '6', '>=' ) ) ) {
-						$link = admin_url('options-general.php?page=wp-font-awesome-settings');
-						?>
+                }
+            } else {
+                if ( ! empty( $settings ) ) {
+                    if ( $settings['type'] != 'KIT' && $settings['pro'] && ( $settings['version'] == '' || version_compare( $settings['version'], '6', '>=' ) ) ) {
+                        $link = admin_url('options-general.php?page=wp-font-awesome-settings');
+                        ?>
                         <div class="notice  notice-error is-dismissible">
                             <p><?php echo wp_sprintf( __( 'Font Awesome Pro v6 requires the use of a kit, please setup your kit in %ssettings.%s', 'ayecode-connect' ),"<a href='". esc_url_raw( $link )."'>","</a>" ); ?></p>
                         </div>
 						<?php
-					}
-				}
-			}
-		}
-
-		/**
-		 * Handle fontawesome add settings to download fontawesome to store locally.
-		 *
-		 * @since 1.1.1
-		 *
-		 * @param string $option The option name.
-		 * @param mixed  $value  The option value.
-		 */
-		public function add_option_wp_font_awesome_settings( $option, $value ) {
-			// Do nothing if WordPress is being installed.
-			if ( wp_installing() ) {
-				return;
-			}
-
-			if ( ! empty( $value['local'] ) && empty( $value['pro'] ) && ! ( ! empty( $value['type'] ) && $value['type'] == 'KIT' ) ) {
-				$version = isset( $value['version'] ) && $value['version'] ? $value['version'] : $this->get_latest_version();
-
-				if ( ! empty( $version ) ) {
-					$response = $this->download_package( $version, $value );
-
-					if ( is_wp_error( $response ) ) {
-						add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
-					}
-				}
-			}
-		}
-
-		/**
-		 * Handle fontawesome update settings to download fontawesome to store locally.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param mixed $old_value The old option value.
-		 * @param mixed $value     The new option value.
-		 */
-		public function update_option_wp_font_awesome_settings( $old_value, $new_value ) {
-			// Do nothing if WordPress is being installed.
-			if ( wp_installing() ) {
-				return;
-			}
-
-			if ( ! empty( $new_value['local'] ) && empty( $new_value['pro'] ) && ! ( ! empty( $new_value['type'] ) && $new_value['type'] == 'KIT' ) ) {
-				// Old values
-				$old_version = isset( $old_value['version'] ) && $old_value['version'] ? $old_value['version'] : ( isset( $old_value['local_version'] ) ? $old_value['local_version'] : '' );
-				$old_local = isset( $old_value['local'] ) ? (int) $old_value['local'] : 0;
-
-				// New values
-				$new_version = isset( $new_value['version'] ) && $new_value['version'] ? $new_value['version'] : $this->get_latest_version();
-
-				if ( empty( $old_local ) || $old_version !== $new_version || ! file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
-					$response = $this->download_package( $new_version, $new_value );
-
-					if ( is_wp_error( $response ) ) {
-						add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
-					}
-				}
-			}
-		}
-
-		/**
-		 * Get the fonts directory local path.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param string Fonts directory local path.
-		 */
-		public function get_fonts_dir() {
-			$upload_dir = wp_upload_dir( null, false );
-
-			return $upload_dir['basedir'] . DIRECTORY_SEPARATOR .  'ayefonts' . DIRECTORY_SEPARATOR . 'fa' . DIRECTORY_SEPARATOR;
-		}
-
-		/**
-		 * Get the fonts directory local url.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param string Fonts directory local url.
-		 */
-		public function get_fonts_url() {
-			$upload_dir = wp_upload_dir( null, false );
-
-			return $upload_dir['baseurl'] .  '/ayefonts/fa/';
-		}
-
-		/**
-		 * Check whether load locally active.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @return bool True if active else false.
-		 */
-		public function has_local() {
-			if ( ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) && file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
-				return true;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Get the WP Filesystem access.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @return object The WP Filesystem.
-		 */
-		public function get_wp_filesystem() {
-			if ( ! function_exists( 'get_filesystem_method' ) ) {
-				require_once( ABSPATH . "/wp-admin/includes/file.php" );
-			}
-
-			$access_type = get_filesystem_method();
-
-			if ( $access_type === 'direct' ) {
-				/* You can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
-				$creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
-
-				/* Initialize the API */
-				if ( ! WP_Filesystem( $creds ) ) {
-					/* Any problems and we exit */
-					return false;
-				}
-
-				global $wp_filesystem;
-
-				return $wp_filesystem;
-				/* Do our file manipulations below */
-			} else if ( defined( 'FTP_USER' ) ) {
-				$creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
-
-				/* Initialize the API */
-				if ( ! WP_Filesystem( $creds ) ) {
-					/* Any problems and we exit */
-					return false;
-				}
-
-				global $wp_filesystem;
-
-				return $wp_filesystem;
-			} else {
-				/* Don't have direct write access. Prompt user with our notice */
-				return false;
-			}
-		}
-
-		/**
-		 * Download the fontawesome package file.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param mixed $version The font awesome.
-		 * @param array $option Fontawesome settings.
-		 * @return WP_ERROR|bool Error on fail and true on success.
-		 */
-		public function download_package( $version, $option = array() ) {
-			$filename = 'fontawesome-free-' . $version . '-web';
-			$url = 'https://use.fontawesome.com/releases/v' . $version . '/' . $filename . '.zip';
-
-			if ( ! function_exists( 'wp_handle_upload' ) ) {
-				require_once ABSPATH . 'wp-admin/includes/file.php';
-			}
-
-			$download_file = download_url( esc_url_raw( $url ) );
-
-			if ( is_wp_error( $download_file ) ) {
-				return new WP_Error( 'fontawesome_download_failed', __( $download_file->get_error_message(), 'ayecode-connect' ) );
-			} else if ( empty( $download_file ) ) {
-				return new WP_Error( 'fontawesome_download_failed', __( 'Something went wrong in downloading the font awesome to store locally.', 'ayecode-connect' ) );
-			}
-
-			$response = $this->extract_package( $download_file, $filename, true );
-
-			// Update local version.
-			if ( is_wp_error( $response ) ) {
-				return $response;
-			} else if ( $response ) {
-				if ( empty( $option ) ) {
-					$option = get_option( 'wp-font-awesome-settings' );
-				}
-
-				$option['local_version'] = $version;
-
-				// Remove action to prevent looping.
-				remove_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
-
-				update_option( 'wp-font-awesome-settings', $option );
-
-				return true;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Extract the fontawesome package file.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param string $package The package file path.
-		 * @param string $dirname Package file name.
-		 * @param bool   $delete_package Delete temp file or not.
-		 * @return WP_Error|bool True on success WP_Error on fail.
-		 */
-		public function extract_package( $package, $dirname = '', $delete_package = false ) {
-			global $wp_filesystem;
-
-			$wp_filesystem = $this->get_wp_filesystem();
-
-			if ( empty( $wp_filesystem ) && isset( $wp_filesystem->errors ) && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
-				return new WP_Error( 'fontawesome_filesystem_error', __( $wp_filesystem->errors->get_error_message(), 'ayecode-connect' ) );
-			} else if ( empty( $wp_filesystem ) ) {
-				return new WP_Error( 'fontawesome_filesystem_error', __( 'Failed to initialise WP_Filesystem while trying to download the Font Awesome package.', 'ayecode-connect' ) );
-			}
-
-			$fonts_dir = $this->get_fonts_dir();
-			$fonts_tmp_dir = dirname( $fonts_dir ) . DIRECTORY_SEPARATOR . 'fa-tmp' . DIRECTORY_SEPARATOR;
-
-			if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
-			}
-
-			// Unzip package to working directory.
-			$result = unzip_file( $package, $fonts_tmp_dir );
-
-			if ( is_wp_error( $result ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
-
-				if ( 'incompatible_archive' === $result->get_error_code() ) {
-					return new WP_Error( 'fontawesome_incompatible_archive', __( $result->get_error_message(), 'ayecode-connect' ) );
-				}
-
-				return $result;
-			}
-
-			if ( $wp_filesystem->is_dir( $fonts_dir ) ) {
-				$wp_filesystem->delete( $fonts_dir, true );
-			}
-
-			$extract_dir = $fonts_tmp_dir;
-
-			if ( $dirname && $wp_filesystem->is_dir( $extract_dir . $dirname . DIRECTORY_SEPARATOR ) ) {
-				$extract_dir .= $dirname . DIRECTORY_SEPARATOR;
-			}
-
-			try {
-				$return = $wp_filesystem->move( $extract_dir, $fonts_dir, true );
-			} catch ( Exception $e ) {
-				$return = new WP_Error( 'fontawesome_move_package', __( 'Fail to move font awesome package!', 'ayecode-connect' ) );
-			}
-
-			if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
-			}
-
-			// Once extracted, delete the package if required.
-			if ( $delete_package ) {
-				unlink( $package );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Output the version in the header.
-		 */
-		public function add_generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
-
-			// Find source plugin/theme.
-			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
-
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
-				}
-			}
-
-			echo '<meta name="generator" content="WP Font Awesome Settings v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-ac-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
-		}
-	}
-
-	/**
-	 * Run the class if found.
-	 */
-	WP_Font_Awesome_Settings::instance();
+                    }
+                }
+            }
+        }
+
+        /**
+         * Handle fontawesome add settings to download fontawesome to store locally.
+         *
+         * @since 1.1.1
+         *
+         * @param string $option The option name.
+         * @param mixed  $value  The option value.
+         */
+        public function add_option_wp_font_awesome_settings( $option, $value ) {
+            // Do nothing if WordPress is being installed.
+            if ( wp_installing() ) {
+                return;
+            }
+
+            if ( ! empty( $value['local'] ) && empty( $value['pro'] ) && ! ( ! empty( $value['type'] ) && $value['type'] == 'KIT' ) ) {
+                $version = isset( $value['version'] ) && $value['version'] ? $value['version'] : $this->get_latest_version();
+
+                if ( ! empty( $version ) ) {
+                    $response = $this->download_package( $version, $value );
+
+                    if ( is_wp_error( $response ) ) {
+                        add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
+                    }
+                }
+            }
+        }
+
+        /**
+         * Handle fontawesome update settings to download fontawesome to store locally.
+         *
+         * @since 1.1.0
+         *
+         * @param mixed $old_value The old option value.
+         * @param mixed $value     The new option value.
+         */
+        public function update_option_wp_font_awesome_settings( $old_value, $new_value ) {
+            // Do nothing if WordPress is being installed.
+            if ( wp_installing() ) {
+                return;
+            }
+
+            if ( ! empty( $new_value['local'] ) && empty( $new_value['pro'] ) && ! ( ! empty( $new_value['type'] ) && $new_value['type'] == 'KIT' ) ) {
+                // Old values
+                $old_version = isset( $old_value['version'] ) && $old_value['version'] ? $old_value['version'] : ( isset( $old_value['local_version'] ) ? $old_value['local_version'] : '' );
+                $old_local = isset( $old_value['local'] ) ? (int) $old_value['local'] : 0;
+
+                // New values
+                $new_version = isset( $new_value['version'] ) && $new_value['version'] ? $new_value['version'] : $this->get_latest_version();
+
+                if ( empty( $old_local ) || $old_version !== $new_version || ! file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
+                    $response = $this->download_package( $new_version, $new_value );
+
+                    if ( is_wp_error( $response ) ) {
+                        add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
+                    }
+                }
+            }
+        }
+
+        /**
+         * Get the fonts directory local path.
+         *
+         * @since 1.1.0
+         *
+         * @param string Fonts directory local path.
+         */
+        public function get_fonts_dir() {
+            $upload_dir = wp_upload_dir( null, false );
+
+            return $upload_dir['basedir'] . DIRECTORY_SEPARATOR .  'ayefonts' . DIRECTORY_SEPARATOR . 'fa' . DIRECTORY_SEPARATOR;
+        }
+
+        /**
+         * Get the fonts directory local url.
+         *
+         * @since 1.1.0
+         *
+         * @param string Fonts directory local url.
+         */
+        public function get_fonts_url() {
+            $upload_dir = wp_upload_dir( null, false );
+
+            return $upload_dir['baseurl'] .  '/ayefonts/fa/';
+        }
+
+        /**
+         * Check whether load locally active.
+         *
+         * @since 1.1.0
+         *
+         * @return bool True if active else false.
+         */
+        public function has_local() {
+            if ( ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) && file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
+                return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * Get the WP Filesystem access.
+         *
+         * @since 1.1.0
+         *
+         * @return object The WP Filesystem.
+         */
+        public function get_wp_filesystem() {
+            if ( ! function_exists( 'get_filesystem_method' ) ) {
+                require_once( ABSPATH . "/wp-admin/includes/file.php" );
+            }
+
+            $access_type = get_filesystem_method();
+
+            if ( $access_type === 'direct' ) {
+                /* You can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
+                $creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
+
+                /* Initialize the API */
+                if ( ! WP_Filesystem( $creds ) ) {
+                    /* Any problems and we exit */
+                    return false;
+                }
+
+                global $wp_filesystem;
+
+                return $wp_filesystem;
+                /* Do our file manipulations below */
+            } else if ( defined( 'FTP_USER' ) ) {
+                $creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
+
+                /* Initialize the API */
+                if ( ! WP_Filesystem( $creds ) ) {
+                    /* Any problems and we exit */
+                    return false;
+                }
+
+                global $wp_filesystem;
+
+                return $wp_filesystem;
+            } else {
+                /* Don't have direct write access. Prompt user with our notice */
+                return false;
+            }
+        }
+
+        /**
+         * Download the fontawesome package file.
+         *
+         * @since 1.1.0
+         *
+         * @param mixed $version The font awesome.
+         * @param array $option Fontawesome settings.
+         * @return WP_ERROR|bool Error on fail and true on success.
+         */
+        public function download_package( $version, $option = array() ) {
+            $filename = 'fontawesome-free-' . $version . '-web';
+            $url = 'https://use.fontawesome.com/releases/v' . $version . '/' . $filename . '.zip';
+
+            if ( ! function_exists( 'wp_handle_upload' ) ) {
+                require_once ABSPATH . 'wp-admin/includes/file.php';
+            }
+
+            $download_file = download_url( esc_url_raw( $url ) );
+
+            if ( is_wp_error( $download_file ) ) {
+                return new WP_Error( 'fontawesome_download_failed', __( $download_file->get_error_message(), 'ayecode-connect' ) );
+            } else if ( empty( $download_file ) ) {
+                return new WP_Error( 'fontawesome_download_failed', __( 'Something went wrong in downloading the font awesome to store locally.', 'ayecode-connect' ) );
+            }
+
+            $response = $this->extract_package( $download_file, $filename, true );
+
+            // Update local version.
+            if ( is_wp_error( $response ) ) {
+                return $response;
+            } else if ( $response ) {
+                if ( empty( $option ) ) {
+                    $option = get_option( 'wp-font-awesome-settings' );
+                }
+
+                $option['local_version'] = $version;
+
+                // Remove action to prevent looping.
+                remove_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
+
+                update_option( 'wp-font-awesome-settings', $option );
+
+                return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * Extract the fontawesome package file.
+         *
+         * @since 1.1.0
+         *
+         * @param string $package The package file path.
+         * @param string $dirname Package file name.
+         * @param bool   $delete_package Delete temp file or not.
+         * @return WP_Error|bool True on success WP_Error on fail.
+         */
+        public function extract_package( $package, $dirname = '', $delete_package = false ) {
+            global $wp_filesystem;
+
+            $wp_filesystem = $this->get_wp_filesystem();
+
+            if ( empty( $wp_filesystem ) && isset( $wp_filesystem->errors ) && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
+                return new WP_Error( 'fontawesome_filesystem_error', __( $wp_filesystem->errors->get_error_message(), 'ayecode-connect' ) );
+            } else if ( empty( $wp_filesystem ) ) {
+                return new WP_Error( 'fontawesome_filesystem_error', __( 'Failed to initialise WP_Filesystem while trying to download the Font Awesome package.', 'ayecode-connect' ) );
+            }
+
+            $fonts_dir = $this->get_fonts_dir();
+            $fonts_tmp_dir = dirname( $fonts_dir ) . DIRECTORY_SEPARATOR . 'fa-tmp' . DIRECTORY_SEPARATOR;
+
+            if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
+                $wp_filesystem->delete( $fonts_tmp_dir, true );
+            }
+
+            // Unzip package to working directory.
+            $result = unzip_file( $package, $fonts_tmp_dir );
+
+            if ( is_wp_error( $result ) ) {
+                $wp_filesystem->delete( $fonts_tmp_dir, true );
+
+                if ( 'incompatible_archive' === $result->get_error_code() ) {
+                    return new WP_Error( 'fontawesome_incompatible_archive', __( $result->get_error_message(), 'ayecode-connect' ) );
+                }
+
+                return $result;
+            }
+
+            if ( $wp_filesystem->is_dir( $fonts_dir ) ) {
+                $wp_filesystem->delete( $fonts_dir, true );
+            }
+
+            $extract_dir = $fonts_tmp_dir;
+
+            if ( $dirname && $wp_filesystem->is_dir( $extract_dir . $dirname . DIRECTORY_SEPARATOR ) ) {
+                $extract_dir .= $dirname . DIRECTORY_SEPARATOR;
+            }
+
+            try {
+                $return = $wp_filesystem->move( $extract_dir, $fonts_dir, true );
+            } catch ( Exception $e ) {
+                $return = new WP_Error( 'fontawesome_move_package', __( 'Fail to move font awesome package!', 'ayecode-connect' ) );
+            }
+
+            if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
+                $wp_filesystem->delete( $fonts_tmp_dir, true );
+            }
+
+            // Once extracted, delete the package if required.
+            if ( $delete_package ) {
+                unlink( $package );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Output the version in the header.
+         */
+        public function add_generator() {
+            $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
+            $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+
+            // Find source plugin/theme.
+            $source = array();
+            if ( strpos( $file, $plugins_dir ) !== false ) {
+                $source = explode( "/", plugin_basename( $file ) );
+            } else if ( function_exists( 'get_theme_root' ) ) {
+                $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+
+                if ( strpos( $file, $themes_dir ) !== false ) {
+                    $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+                }
+            }
+
+            echo '<meta name="generator" content="WP Font Awesome Settings v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-ac-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+        }
+    }
+
+    /**
+     * Run the class if found.
+     */
+    WP_Font_Awesome_Settings::instance();
 }

Spacing +242 added lines, -242 removed lines

@@ -12,14 +12,14 @@ 
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 /**
  * Only add if the class does not already exist.
  */
-if ( ! class_exists( 'WP_Font_Awesome_Settings' ) ) {
+if (!class_exists('WP_Font_Awesome_Settings')) {
 
 	/**
 	 * A Class to be able to change settings for Font Awesome.
@@ -82,19 +82,19 @@ 
 		 * @return WP_Font_Awesome_Settings - Main instance.
 		 */
 		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
+			if (!isset(self::$instance) && !(self::$instance instanceof WP_Font_Awesome_Settings)) {
 				self::$instance = new WP_Font_Awesome_Settings;
 
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+				add_action('init', array(self::$instance, 'init')); // set settings
 
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
-					add_action( 'admin_init', array( self::$instance, 'constants' ) );
-					add_action( 'admin_notices', array( self::$instance, 'admin_notices' ) );
+				if (is_admin()) {
+					add_action('admin_menu', array(self::$instance, 'menu_item'));
+					add_action('admin_init', array(self::$instance, 'register_settings'));
+					add_action('admin_init', array(self::$instance, 'constants'));
+					add_action('admin_notices', array(self::$instance, 'admin_notices'));
 				}
 
-				do_action( 'wp_font_awesome_settings_loaded' );
+				do_action('wp_font_awesome_settings_loaded');
 			}
 
 			return self::$instance;
@@ -105,26 +105,26 @@ 
          *
 		 * @return void
 		 */
-		public function constants(){
+		public function constants() {
 
 			// register iconpicker constant
-			if ( ! defined( 'FAS_ICONPICKER_JS_URL' ) ) {
+			if (!defined('FAS_ICONPICKER_JS_URL')) {
 				$url = $this->get_path_url();
 				$version = $this->settings['version'];
 
-				if( !$version || version_compare($version,'5.999','>')){
+				if (!$version || version_compare($version, '5.999', '>')) {
 					$url .= 'assets/js/fa-iconpicker-v6.min.js';
-				}else{
+				} else {
 					$url .= 'assets/js/fa-iconpicker-v5.min.js';
 				}
 
-				define( 'FAS_ICONPICKER_JS_URL', $url );
+				define('FAS_ICONPICKER_JS_URL', $url);
 
 			}
 
             // Set a constant if pro enbaled
-			if ( ! defined( 'FAS_PRO' ) && $this->settings['pro'] ) {
-				define( 'FAS_PRO', true );
+			if (!defined('FAS_PRO') && $this->settings['pro']) {
+				define('FAS_PRO', true);
 			}
 		}
 
@@ -134,19 +134,19 @@ 
 		 * @return string
 		 */
 		public function get_path_url() {
-			$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-			$content_url = untrailingslashit( WP_CONTENT_URL );
+			$content_dir = wp_normalize_path(untrailingslashit(WP_CONTENT_DIR));
+			$content_url = untrailingslashit(WP_CONTENT_URL);
 
 			// Replace http:// to https://.
-			if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-				$content_url = str_replace( 'http://', 'https://', $content_url );
+			if (strpos($content_url, 'http://') === 0 && strpos(plugins_url(), 'https://') === 0) {
+				$content_url = str_replace('http://', 'https://', $content_url);
 			}
 
 			// Check if we are inside a plugin
-			$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-			$url = str_replace( $content_dir, $content_url, $file_dir );
+			$file_dir = str_replace("/includes", "", wp_normalize_path(dirname(__FILE__)));
+			$url = str_replace($content_dir, $content_url, $file_dir);
 
-			return trailingslashit( $url );
+			return trailingslashit($url);
 		}
 
 		/**
@@ -156,45 +156,45 @@ 
 		 */
 		public function init() {
 			// Download fontawesome locally.
-			add_action( 'add_option_wp-font-awesome-settings', array( $this, 'add_option_wp_font_awesome_settings' ), 10, 2 );
-			add_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
+			add_action('add_option_wp-font-awesome-settings', array($this, 'add_option_wp_font_awesome_settings'), 10, 2);
+			add_action('update_option_wp-font-awesome-settings', array($this, 'update_option_wp_font_awesome_settings'), 10, 2);
 
 			$this->settings = $this->get_settings();
 
 			// Check if the official plugin is active and use that instead if so.
-			if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-					add_action( 'admin_head', array( $this, 'add_generator' ), 99 );
+			if (!defined('FONTAWESOME_PLUGIN_FILE')) {
+				if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend') {
+					add_action('admin_head', array($this, 'add_generator'), 99);
 				}
 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-					add_action( 'wp_head', array( $this, 'add_generator' ), 99 );
+				if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend') {
+					add_action('wp_head', array($this, 'add_generator'), 99);
 				}
 
-				if ( $this->settings['type'] == 'CSS' ) {
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-						add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
+				if ($this->settings['type'] == 'CSS') {
+					if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend') {
+						add_action('wp_enqueue_scripts', array($this, 'enqueue_style'), 5000);
 						//add_action( 'wp_footer', array( $this, 'enqueue_style' ), 5000 ); // not sure why this was added, seems to break frontend
 					}
 
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-						add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
-						add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_styles' ), 10, 2 );
+					if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend') {
+						add_action('admin_enqueue_scripts', array($this, 'enqueue_style'), 5000);
+						add_filter('block_editor_settings_all', array($this, 'enqueue_editor_styles'), 10, 2);
 					}
 				} else {
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-						add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
+					if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend') {
+						add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), 5000);
 					}
 
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-						add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
-						add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_scripts' ), 10, 2 );
+					if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend') {
+						add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'), 5000);
+						add_filter('block_editor_settings_all', array($this, 'enqueue_editor_scripts'), 10, 2);
 					}
 				}
 
 				// remove font awesome if set to do so
-				if ( $this->settings['dequeue'] == '1' ) {
-					add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
+				if ($this->settings['dequeue'] == '1') {
+					add_action('clean_url', array($this, 'remove_font_awesome'), 5000, 3);
 				}
 			}
 
@@ -208,9 +208,9 @@ 
 		 *
 		 * @return array
 		 */
-		public function enqueue_editor_styles( $editor_settings, $block_editor_context ){
+		public function enqueue_editor_styles($editor_settings, $block_editor_context) {
 
-			if ( ! empty( $editor_settings['__unstableResolvedAssets']['styles'] ) ) {
+			if (!empty($editor_settings['__unstableResolvedAssets']['styles'])) {
 				$url = $this->get_url();
 				$editor_settings['__unstableResolvedAssets']['styles'] .= "<link rel='stylesheet' id='font-awesome-css'  href='$url' media='all' />";
 			}
@@ -226,7 +226,7 @@ 
 		 *
 		 * @return array
 		 */
-		public function enqueue_editor_scripts( $editor_settings, $block_editor_context ){
+		public function enqueue_editor_scripts($editor_settings, $block_editor_context) {
 
 			$url = $this->get_url();
 			$editor_settings['__unstableResolvedAssets']['scripts'] .= "<script src='$url' id='font-awesome-js'></script>";
@@ -240,22 +240,22 @@ 
 		public function enqueue_style() {
 			// build url
 			$url = $this->get_url();
-			$version = ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ? strip_tags( $this->settings['local_version'] ) : null;
+			$version = !empty($this->settings['local']) && empty($this->settings['pro']) ? strip_tags($this->settings['local_version']) : null;
 
-			wp_deregister_style( 'font-awesome' ); // deregister in case its already there
-			wp_register_style( 'font-awesome', $url, array(), $version );
-			wp_enqueue_style( 'font-awesome' );
+			wp_deregister_style('font-awesome'); // deregister in case its already there
+			wp_register_style('font-awesome', $url, array(), $version);
+			wp_enqueue_style('font-awesome');
 
 			// RTL language support CSS.
-			if ( is_rtl() ) {
-				wp_add_inline_style( 'font-awesome', $this->rtl_inline_css() );
+			if (is_rtl()) {
+				wp_add_inline_style('font-awesome', $this->rtl_inline_css());
 			}
 
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_style( 'font-awesome-shims', $url, array(), $version );
-				wp_enqueue_style( 'font-awesome-shims' );
+			if ($this->settings['shims']) {
+				$url = $this->get_url(true);
+				wp_deregister_style('font-awesome-shims'); // deregister in case its already there
+				wp_register_style('font-awesome-shims', $url, array(), $version);
+				wp_enqueue_style('font-awesome-shims');
 			}
 		}
 
@@ -267,15 +267,15 @@ 
 			$url = $this->get_url();
 
 			$deregister_function = 'wp' . '_' . 'deregister' . '_' . 'script';
-			call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
-			wp_register_script( 'font-awesome', $url, array(), null );
-			wp_enqueue_script( 'font-awesome' );
+			call_user_func($deregister_function, 'font-awesome'); // deregister in case its already there
+			wp_register_script('font-awesome', $url, array(), null);
+			wp_enqueue_script('font-awesome');
 
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_script( 'font-awesome-shims', $url, array(), null );
-				wp_enqueue_script( 'font-awesome-shims' );
+			if ($this->settings['shims']) {
+				$url = $this->get_url(true);
+				call_user_func($deregister_function, 'font-awesome-shims'); // deregister in case its already there
+				wp_register_script('font-awesome-shims', $url, array(), null);
+				wp_enqueue_script('font-awesome-shims');
 			}
 		}
 
@@ -287,16 +287,16 @@ 
 		 *
 		 * @return string The url to the file.
 		 */
-		public function get_url( $shims = false, $local = true ) {
+		public function get_url($shims = false, $local = true) {
 			$script  = $shims ? 'v4-shims' : 'all';
 			$sub     = $this->settings['pro'] ? 'pro' : 'use';
 			$type    = $this->settings['type'];
 			$version = $this->settings['version'];
-			$kit_url = $this->settings['kit-url'] ? esc_url( $this->settings['kit-url'] ) : '';
+			$kit_url = $this->settings['kit-url'] ? esc_url($this->settings['kit-url']) : '';
 			$url     = '';
 
-			if ( $type == 'KIT' && $kit_url ) {
-				if ( $shims ) {
+			if ($type == 'KIT' && $kit_url) {
+				if ($shims) {
 					// if its a kit then we don't add shims here
 					return '';
 				}
@@ -305,13 +305,13 @@ 
 			} else {
 				$v = '';
 				// Check and load locally.
-				if ( $local && $this->has_local() ) {
+				if ($local && $this->has_local()) {
 					$script .= ".min";
-					$v .= '&ver=' . strip_tags( $this->settings['local_version'] );
+					$v .= '&ver=' . strip_tags($this->settings['local_version']);
 					$url .= $this->get_fonts_url(); // Local fonts url.
 				} else {
 					$url .= "https://$sub.fontawesome.com/releases/"; // CDN
-					$url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
+					$url .= !empty($version) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
 				}
 				$url .= $type == 'CSS' ? 'css/' : 'js/'; // type
 				$url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
@@ -332,16 +332,16 @@ 
 		 *
 		 * @return string The filtered url.
 		 */
-		public function remove_font_awesome( $url, $original_url, $_context ) {
+		public function remove_font_awesome($url, $original_url, $_context) {
 
-			if ( $_context == 'display'
-			     && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
-			     && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
+			if ($_context == 'display'
+			     && (strstr($url, "fontawesome") !== false || strstr($url, "font-awesome") !== false)
+			     && (strstr($url, ".js") !== false || strstr($url, ".css") !== false)
 			) {// it's a font-awesome-url (probably)
 
-				if ( strstr( $url, "wpfas=true" ) !== false ) {
-					if ( $this->settings['type'] == 'JS' ) {
-						if ( $this->settings['js-pseudo'] ) {
+				if (strstr($url, "wpfas=true") !== false) {
+					if ($this->settings['type'] == 'JS') {
+						if ($this->settings['js-pseudo']) {
 							$url .= "' data-search-pseudo-elements defer='defer";
 						} else {
 							$url .= "' defer='defer";
@@ -360,7 +360,7 @@ 
 		 * Register the database settings with WordPress.
 		 */
 		public function register_settings() {
-			register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
+			register_setting('wp-font-awesome-settings', 'wp-font-awesome-settings');
 		}
 
 		/**
@@ -369,10 +369,10 @@ 
 		 */
 		public function menu_item() {
 			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
+			call_user_func($menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
 				$this,
 				'settings_page'
-			) );
+			));
 		}
 
 		/**
@@ -381,7 +381,7 @@ 
 		 * @return array The array of settings.
 		 */
 		public function get_settings() {
-			$db_settings = get_option( 'wp-font-awesome-settings' );
+			$db_settings = get_option('wp-font-awesome-settings');
 
 			$defaults = array(
 				'type'      => 'CSS', // type to use, CSS or JS or KIT
@@ -396,30 +396,30 @@ 
 				'kit-url'   => '', // the kit url
 			);
 
-			$settings = wp_parse_args( $db_settings, $defaults );
+			$settings = wp_parse_args($db_settings, $defaults);
 
 			/**
 			 * Filter the Font Awesome settings.
 			 *
 			 * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
 			 */
-			return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
+			return $this->settings = apply_filters('wp-font-awesome-settings', $settings, $db_settings, $defaults);
 		}
 
 		/**
 		 * The settings page html output.
 		 */
 		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
+			if (!current_user_can('manage_options')) {
+				wp_die(__('You do not have sufficient permissions to access this page.', 'ayecode-connect'));
 			}
 
 			// a hidden way to force the update of the version number via api instead of waiting the 48 hours
-			if ( isset( $_REQUEST['force-version-check'] ) ) {
-				$this->get_latest_version( $force_api = true );
+			if (isset($_REQUEST['force-version-check'])) {
+				$this->get_latest_version($force_api = true);
 			}
 
-			if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
+			if (!defined('FONTAWESOME_PLUGIN_FILE')) {
 				?>
                 <style>
                     .wpfas-kit-show {
@@ -446,42 +446,42 @@ 
                     <h1><?php echo $this->name; ?></h1>
                     <form method="post" action="options.php" class="fas-settings-form">
 						<?php
-						settings_fields( 'wp-font-awesome-settings' );
-						do_settings_sections( 'wp-font-awesome-settings' );
+						settings_fields('wp-font-awesome-settings');
+						do_settings_sections('wp-font-awesome-settings');
 						$table_class = '';
-						if ( $this->settings['type'] ) {
-							$table_class .= 'wpfas-' . sanitize_html_class( strtolower( $this->settings['type'] ) ) . '-set';
+						if ($this->settings['type']) {
+							$table_class .= 'wpfas-' . sanitize_html_class(strtolower($this->settings['type'])) . '-set';
 						}
-						if ( ! empty( $this->settings['pro'] ) ) {
+						if (!empty($this->settings['pro'])) {
 							$table_class .= ' wpfas-has-pro';
 						}
 						?>
-						<?php if ( $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ) { ?>
-							<?php if ( $this->has_local() ) { ?>
-                                <div class="notice notice-info"><p><strong><?php _e( 'Font Awesome fonts are loading locally.', 'ayecode-connect' ); ?></strong></p></div>
+						<?php if ($this->settings['type'] != 'KIT' && !empty($this->settings['local']) && empty($this->settings['pro'])) { ?>
+							<?php if ($this->has_local()) { ?>
+                                <div class="notice notice-info"><p><strong><?php _e('Font Awesome fonts are loading locally.', 'ayecode-connect'); ?></strong></p></div>
 							<?php } else { ?>
-                                <div class="notice notice-error"><p><strong><?php _e( 'Font Awesome fonts are not loading locally!', 'ayecode-connect' ); ?></strong></p></div>
+                                <div class="notice notice-error"><p><strong><?php _e('Font Awesome fonts are not loading locally!', 'ayecode-connect'); ?></strong></p></div>
 							<?php } ?>
 						<?php } ?>
-                        <table class="form-table wpfas-table-settings <?php echo esc_attr( $table_class ); ?>">
+                        <table class="form-table wpfas-table-settings <?php echo esc_attr($table_class); ?>">
                             <tr valign="top">
-                                <th scope="row"><label for="wpfas-type"><?php _e( 'Type', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-type"><?php _e('Type', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <select name="wp-font-awesome-settings[type]" id="wpfas-type" onchange="if(this.value=='KIT'){jQuery('.wpfas-table-settings').addClass('wpfas-kit-set');}else{jQuery('.wpfas-table-settings').removeClass('wpfas-kit-set');}">
-                                        <option value="CSS" <?php selected( $this->settings['type'], 'CSS' ); ?>><?php _e( 'CSS (default)', 'ayecode-connect' ); ?></option>
-                                        <option value="JS" <?php selected( $this->settings['type'], 'JS' ); ?>>JS</option>
-                                        <option value="KIT" <?php selected( $this->settings['type'], 'KIT' ); ?>><?php _e( 'Kits (settings managed on fontawesome.com)', 'ayecode-connect' ); ?></option>
+                                        <option value="CSS" <?php selected($this->settings['type'], 'CSS'); ?>><?php _e('CSS (default)', 'ayecode-connect'); ?></option>
+                                        <option value="JS" <?php selected($this->settings['type'], 'JS'); ?>>JS</option>
+                                        <option value="KIT" <?php selected($this->settings['type'], 'KIT'); ?>><?php _e('Kits (settings managed on fontawesome.com)', 'ayecode-connect'); ?></option>
                                     </select>
                                 </td>
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-show">
-                                <th scope="row"><label for="wpfas-kit-url"><?php _e( 'Kit URL', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-kit-url"><?php _e('Kit URL', 'ayecode-connect'); ?></label></th>
                                 <td>
-                                    <input class="regular-text" id="wpfas-kit-url" type="url" name="wp-font-awesome-settings[kit-url]" value="<?php echo esc_attr( $this->settings['kit-url'] ); ?>" placeholder="<?php echo 'https://kit.font';echo 'awesome.com/123abc.js'; // this won't pass theme check :(?>"/>
+                                    <input class="regular-text" id="wpfas-kit-url" type="url" name="wp-font-awesome-settings[kit-url]" value="<?php echo esc_attr($this->settings['kit-url']); ?>" placeholder="<?php echo 'https://kit.font'; echo 'awesome.com/123abc.js'; // this won't pass theme check :(?>"/>
                                     <span><?php
 										echo wp_sprintf(
-											__( 'Requires a free account with Font Awesome. %sGet kit url%s', 'ayecode-connect' ),
+											__('Requires a free account with Font Awesome. %sGet kit url%s', 'ayecode-connect'),
 											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/kits"><i class="fas fa-external-link-alt"></i>',
 											'</a>'
 										);
@@ -490,44 +490,44 @@ 
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide">
-                                <th scope="row"><label for="wpfas-version"><?php _e( 'Version', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-version"><?php _e('Version', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <select name="wp-font-awesome-settings[version]" id="wpfas-version">
-                                        <option value="" <?php selected( $this->settings['version'], '' ); ?>><?php echo wp_sprintf( __( 'Latest - %s (default)', 'ayecode-connect' ), $this->get_latest_version() ); ?></option>
-                                        <option value="6.1.0" <?php selected( $this->settings['version'], '6.1.0' ); ?>>6.1.0</option>
-                                        <option value="6.0.0" <?php selected( $this->settings['version'], '6.0.0' ); ?>>6.0.0</option>
-                                        <option value="5.15.4" <?php selected( $this->settings['version'], '5.15.4' ); ?>>5.15.4</option>
-                                        <option value="5.6.0" <?php selected( $this->settings['version'], '5.6.0' ); ?>>5.6.0</option>
-                                        <option value="5.5.0" <?php selected( $this->settings['version'], '5.5.0' ); ?>>5.5.0</option>
-                                        <option value="5.4.0" <?php selected( $this->settings['version'], '5.4.0' ); ?>>5.4.0</option>
-                                        <option value="5.3.0" <?php selected( $this->settings['version'], '5.3.0' ); ?>>5.3.0</option>
-                                        <option value="5.2.0" <?php selected( $this->settings['version'], '5.2.0' ); ?>>5.2.0</option>
-                                        <option value="5.1.0" <?php selected( $this->settings['version'], '5.1.0' ); ?>>5.1.0</option>
-                                        <option value="4.7.0" <?php selected( $this->settings['version'], '4.7.0' ); ?>>4.7.1 (CSS only)</option>
+                                        <option value="" <?php selected($this->settings['version'], ''); ?>><?php echo wp_sprintf(__('Latest - %s (default)', 'ayecode-connect'), $this->get_latest_version()); ?></option>
+                                        <option value="6.1.0" <?php selected($this->settings['version'], '6.1.0'); ?>>6.1.0</option>
+                                        <option value="6.0.0" <?php selected($this->settings['version'], '6.0.0'); ?>>6.0.0</option>
+                                        <option value="5.15.4" <?php selected($this->settings['version'], '5.15.4'); ?>>5.15.4</option>
+                                        <option value="5.6.0" <?php selected($this->settings['version'], '5.6.0'); ?>>5.6.0</option>
+                                        <option value="5.5.0" <?php selected($this->settings['version'], '5.5.0'); ?>>5.5.0</option>
+                                        <option value="5.4.0" <?php selected($this->settings['version'], '5.4.0'); ?>>5.4.0</option>
+                                        <option value="5.3.0" <?php selected($this->settings['version'], '5.3.0'); ?>>5.3.0</option>
+                                        <option value="5.2.0" <?php selected($this->settings['version'], '5.2.0'); ?>>5.2.0</option>
+                                        <option value="5.1.0" <?php selected($this->settings['version'], '5.1.0'); ?>>5.1.0</option>
+                                        <option value="4.7.0" <?php selected($this->settings['version'], '4.7.0'); ?>>4.7.1 (CSS only)</option>
                                     </select>
                                 </td>
                             </tr>
 
                             <tr valign="top">
-                                <th scope="row"><label for="wpfas-enqueue"><?php _e( 'Enqueue', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-enqueue"><?php _e('Enqueue', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <select name="wp-font-awesome-settings[enqueue]" id="wpfas-enqueue">
-                                        <option value="" <?php selected( $this->settings['enqueue'], '' ); ?>><?php _e( 'Frontend + Backend (default)', 'ayecode-connect' ); ?></option>
-                                        <option value="frontend" <?php selected( $this->settings['enqueue'], 'frontend' ); ?>><?php _e( 'Frontend', 'ayecode-connect' ); ?></option>
-                                        <option value="backend" <?php selected( $this->settings['enqueue'], 'backend' ); ?>><?php _e( 'Backend', 'ayecode-connect' ); ?></option>
+                                        <option value="" <?php selected($this->settings['enqueue'], ''); ?>><?php _e('Frontend + Backend (default)', 'ayecode-connect'); ?></option>
+                                        <option value="frontend" <?php selected($this->settings['enqueue'], 'frontend'); ?>><?php _e('Frontend', 'ayecode-connect'); ?></option>
+                                        <option value="backend" <?php selected($this->settings['enqueue'], 'backend'); ?>><?php _e('Backend', 'ayecode-connect'); ?></option>
                                     </select>
                                 </td>
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide">
                                 <th scope="row"><label
-                                            for="wpfas-pro"><?php _e( 'Enable pro', 'ayecode-connect' ); ?></label></th>
+                                            for="wpfas-pro"><?php _e('Enable pro', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[pro]" value="0"/>
-                                    <input type="checkbox" name="wp-font-awesome-settings[pro]" value="1" <?php checked( $this->settings['pro'], '1' ); ?> id="wpfas-pro" onchange="if(jQuery(this).is(':checked')){jQuery('.wpfas-table-settings').addClass('wpfas-has-pro')}else{jQuery('.wpfas-table-settings').removeClass('wpfas-has-pro')}"/>
+                                    <input type="checkbox" name="wp-font-awesome-settings[pro]" value="1" <?php checked($this->settings['pro'], '1'); ?> id="wpfas-pro" onchange="if(jQuery(this).is(':checked')){jQuery('.wpfas-table-settings').addClass('wpfas-has-pro')}else{jQuery('.wpfas-table-settings').removeClass('wpfas-has-pro')}"/>
                                     <span><?php
 										echo wp_sprintf(
-											__( 'Requires a subscription. %sLearn more%s  %sManage my allowed domains%s', 'ayecode-connect' ),
+											__('Requires a subscription. %sLearn more%s  %sManage my allowed domains%s', 'ayecode-connect'),
 											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/referral?a=c9b89e1418">',
 											' <i class="fas fa-external-link-alt"></i></a>',
 											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/account/cdn">',
@@ -538,49 +538,49 @@ 
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide wpfas-hide-pro">
-                                <th scope="row"><label for="wpfas-local"><?php _e( 'Load Fonts Locally', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-local"><?php _e('Load Fonts Locally', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[local]" value="0"/>
-                                    <input type="hidden" name="wp-font-awesome-settings[local_version]" value="<?php echo esc_attr( $this->settings['local_version'] ); ?>"/>
-                                    <input type="checkbox" name="wp-font-awesome-settings[local]" value="1" <?php checked( $this->settings['local'], '1' ); ?> id="wpfas-local"/>
-                                    <span><?php _e( '(For free version only) Load FontAwesome fonts from locally. This downloads FontAwesome fonts from fontawesome.com & stores at the local site.', 'ayecode-connect' ); ?></span>
+                                    <input type="hidden" name="wp-font-awesome-settings[local_version]" value="<?php echo esc_attr($this->settings['local_version']); ?>"/>
+                                    <input type="checkbox" name="wp-font-awesome-settings[local]" value="1" <?php checked($this->settings['local'], '1'); ?> id="wpfas-local"/>
+                                    <span><?php _e('(For free version only) Load FontAwesome fonts from locally. This downloads FontAwesome fonts from fontawesome.com & stores at the local site.', 'ayecode-connect'); ?></span>
                                 </td>
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide">
                                 <th scope="row"><label
-                                            for="wpfas-shims"><?php _e( 'Enable v4 shims compatibility', 'ayecode-connect' ); ?></label>
+                                            for="wpfas-shims"><?php _e('Enable v4 shims compatibility', 'ayecode-connect'); ?></label>
                                 </th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[shims]" value="0"/>
                                     <input type="checkbox" name="wp-font-awesome-settings[shims]"
-                                           value="1" <?php checked( $this->settings['shims'], '1' ); ?> id="wpfas-shims"/>
-                                    <span><?php _e( 'This enables v4 classes to work with v5, sort of like a band-aid until everyone has updated everything to v5.', 'ayecode-connect' ); ?></span>
+                                           value="1" <?php checked($this->settings['shims'], '1'); ?> id="wpfas-shims"/>
+                                    <span><?php _e('This enables v4 classes to work with v5, sort of like a band-aid until everyone has updated everything to v5.', 'ayecode-connect'); ?></span>
                                 </td>
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide">
                                 <th scope="row"><label
-                                            for="wpfas-js-pseudo"><?php _e( 'Enable JS pseudo elements (not recommended)', 'ayecode-connect' ); ?></label>
+                                            for="wpfas-js-pseudo"><?php _e('Enable JS pseudo elements (not recommended)', 'ayecode-connect'); ?></label>
                                 </th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[js-pseudo]" value="0"/>
                                     <input type="checkbox" name="wp-font-awesome-settings[js-pseudo]"
-                                           value="1" <?php checked( $this->settings['js-pseudo'], '1' ); ?>
+                                           value="1" <?php checked($this->settings['js-pseudo'], '1'); ?>
                                            id="wpfas-js-pseudo"/>
-                                    <span><?php _e( 'Used only with the JS version, this will make pseudo-elements work but can be CPU intensive on some sites.', 'ayecode-connect' ); ?></span>
+                                    <span><?php _e('Used only with the JS version, this will make pseudo-elements work but can be CPU intensive on some sites.', 'ayecode-connect'); ?></span>
                                 </td>
                             </tr>
 
                             <tr valign="top">
                                 <th scope="row"><label
-                                            for="wpfas-dequeue"><?php _e( 'Dequeue', 'ayecode-connect' ); ?></label></th>
+                                            for="wpfas-dequeue"><?php _e('Dequeue', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[dequeue]" value="0"/>
                                     <input type="checkbox" name="wp-font-awesome-settings[dequeue]"
-                                           value="1" <?php checked( $this->settings['dequeue'], '1' ); ?>
+                                           value="1" <?php checked($this->settings['dequeue'], '1'); ?>
                                            id="wpfas-dequeue"/>
-                                    <span><?php _e( 'This will try to dequeue any other Font Awesome versions loaded by other sources if they are added with `font-awesome` or `fontawesome` in the name.', 'ayecode-connect' ); ?></span>
+                                    <span><?php _e('This will try to dequeue any other Font Awesome versions loaded by other sources if they are added with `font-awesome` or `fontawesome` in the name.', 'ayecode-connect'); ?></span>
                                 </td>
                             </tr>
 
@@ -589,12 +589,12 @@ 
 							<?php
 							submit_button();
 							?>
-                            <p class="submit"><a href="https://fontawesome.com/referral?a=c9b89e1418" class="button button-secondary"><?php _e('Get 24,000+ more icons with Font Awesome Pro','ayecode-connect'); ?> <i class="fas fa-external-link-alt"></i></a></p>
+                            <p class="submit"><a href="https://fontawesome.com/referral?a=c9b89e1418" class="button button-secondary"><?php _e('Get 24,000+ more icons with Font Awesome Pro', 'ayecode-connect'); ?> <i class="fas fa-external-link-alt"></i></a></p>
 
                         </div>
                     </form>
 
-                    <div id="wpfas-version"><?php echo wp_sprintf(__( 'Version: %s (affiliate links provided)', 'ayecode-connect' ), $this->version ); ?></div>
+                    <div id="wpfas-version"><?php echo wp_sprintf(__('Version: %s (affiliate links provided)', 'ayecode-connect'), $this->version); ?></div>
                 </div>
 				<?php
 			}
@@ -609,12 +609,12 @@ 
 		 *
 		 * @return string Either a valid version number or an empty string.
 		 */
-		public function validate_version_number( $version ) {
+		public function validate_version_number($version) {
 
-			if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
+			if (version_compare($version, '0.0.1', '>=') >= 0) {
 				// valid
 			} else {
-				$version = '';// not validated
+				$version = ''; // not validated
 			}
 
 			return $version;
@@ -629,27 +629,27 @@ 
 		 * @since 1.0.7
 		 * @return mixed|string The latest version number found.
 		 */
-		public function get_latest_version( $force_api = false ) {
+		public function get_latest_version($force_api = false) {
 			$latest_version = $this->latest;
 
-			$cache = get_transient( 'wp-font-awesome-settings-version' );
+			$cache = get_transient('wp-font-awesome-settings-version');
 
-			if ( $cache === false || $force_api ) { // its not set
+			if ($cache === false || $force_api) { // its not set
 				$api_ver = $this->get_latest_version_from_api();
-				if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
+				if (version_compare($api_ver, $this->latest, '>=') >= 0) {
 					$latest_version = $api_ver;
-					set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
+					set_transient('wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS);
 				}
-			} elseif ( $this->validate_version_number( $cache ) ) {
-				if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
+			} elseif ($this->validate_version_number($cache)) {
+				if (version_compare($cache, $this->latest, '>=') >= 0) {
 					$latest_version = $cache;
 				}
 			}
 
 			// Check and auto download fonts locally.
-			if ( empty( $this->settings['pro'] ) && empty( $this->settings['version'] ) && $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && ! empty( $this->settings['local_version'] ) && ! empty( $latest_version ) ) {
-				if ( version_compare( $latest_version, $this->settings['local_version'], '>' ) && is_admin() && ! wp_doing_ajax() ) {
-					$this->download_package( $latest_version );
+			if (empty($this->settings['pro']) && empty($this->settings['version']) && $this->settings['type'] != 'KIT' && !empty($this->settings['local']) && !empty($this->settings['local_version']) && !empty($latest_version)) {
+				if (version_compare($latest_version, $this->settings['local_version'], '>') && is_admin() && !wp_doing_ajax()) {
+					$this->download_package($latest_version);
 				}
 			}
 
@@ -664,10 +664,10 @@ 
 		 */
 		public function get_latest_version_from_api() {
 			$version  = "0";
-			$response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
-			if ( ! is_wp_error( $response ) && is_array( $response ) ) {
-				$api_response = json_decode( wp_remote_retrieve_body( $response ), true );
-				if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
+			$response = wp_remote_get("https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest");
+			if (!is_wp_error($response) && is_array($response)) {
+				$api_response = json_decode(wp_remote_retrieve_body($response), true);
+				if (isset($api_response['tag_name']) && version_compare($api_response['tag_name'], $this->latest, '>=') >= 0 && empty($api_response['prerelease'])) {
 					$version = $api_response['tag_name'];
 				}
 			}
@@ -695,21 +695,21 @@ 
 		public function admin_notices() {
 			$settings = $this->settings;
 
-			if ( defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				if ( ! empty( $_REQUEST['page'] ) && $_REQUEST['page'] == 'wp-font-awesome-settings' ) {
+			if (defined('FONTAWESOME_PLUGIN_FILE')) {
+				if (!empty($_REQUEST['page']) && $_REQUEST['page'] == 'wp-font-awesome-settings') {
 					?>
                     <div class="notice  notice-error is-dismissible">
-                        <p><?php _e( 'The Official Font Awesome Plugin is active, please adjust your settings there.', 'ayecode-connect' ); ?></p>
+                        <p><?php _e('The Official Font Awesome Plugin is active, please adjust your settings there.', 'ayecode-connect'); ?></p>
                     </div>
 					<?php
 				}
 			} else {
-				if ( ! empty( $settings ) ) {
-					if ( $settings['type'] != 'KIT' && $settings['pro'] && ( $settings['version'] == '' || version_compare( $settings['version'], '6', '>=' ) ) ) {
+				if (!empty($settings)) {
+					if ($settings['type'] != 'KIT' && $settings['pro'] && ($settings['version'] == '' || version_compare($settings['version'], '6', '>='))) {
 						$link = admin_url('options-general.php?page=wp-font-awesome-settings');
 						?>
                         <div class="notice  notice-error is-dismissible">
-                            <p><?php echo wp_sprintf( __( 'Font Awesome Pro v6 requires the use of a kit, please setup your kit in %ssettings.%s', 'ayecode-connect' ),"<a href='". esc_url_raw( $link )."'>","</a>" ); ?></p>
+                            <p><?php echo wp_sprintf(__('Font Awesome Pro v6 requires the use of a kit, please setup your kit in %ssettings.%s', 'ayecode-connect'), "<a href='" . esc_url_raw($link) . "'>", "</a>"); ?></p>
                         </div>
 						<?php
 					}
@@ -725,20 +725,20 @@ 
 		 * @param string $option The option name.
 		 * @param mixed  $value  The option value.
 		 */
-		public function add_option_wp_font_awesome_settings( $option, $value ) {
+		public function add_option_wp_font_awesome_settings($option, $value) {
 			// Do nothing if WordPress is being installed.
-			if ( wp_installing() ) {
+			if (wp_installing()) {
 				return;
 			}
 
-			if ( ! empty( $value['local'] ) && empty( $value['pro'] ) && ! ( ! empty( $value['type'] ) && $value['type'] == 'KIT' ) ) {
-				$version = isset( $value['version'] ) && $value['version'] ? $value['version'] : $this->get_latest_version();
+			if (!empty($value['local']) && empty($value['pro']) && !(!empty($value['type']) && $value['type'] == 'KIT')) {
+				$version = isset($value['version']) && $value['version'] ? $value['version'] : $this->get_latest_version();
 
-				if ( ! empty( $version ) ) {
-					$response = $this->download_package( $version, $value );
+				if (!empty($version)) {
+					$response = $this->download_package($version, $value);
 
-					if ( is_wp_error( $response ) ) {
-						add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
+					if (is_wp_error($response)) {
+						add_settings_error('general', 'fontawesome_download', __('ERROR:', 'ayecode-connect') . ' ' . $response->get_error_message(), 'error');
 					}
 				}
 			}
@@ -752,25 +752,25 @@ 
 		 * @param mixed $old_value The old option value.
 		 * @param mixed $value     The new option value.
 		 */
-		public function update_option_wp_font_awesome_settings( $old_value, $new_value ) {
+		public function update_option_wp_font_awesome_settings($old_value, $new_value) {
 			// Do nothing if WordPress is being installed.
-			if ( wp_installing() ) {
+			if (wp_installing()) {
 				return;
 			}
 
-			if ( ! empty( $new_value['local'] ) && empty( $new_value['pro'] ) && ! ( ! empty( $new_value['type'] ) && $new_value['type'] == 'KIT' ) ) {
+			if (!empty($new_value['local']) && empty($new_value['pro']) && !(!empty($new_value['type']) && $new_value['type'] == 'KIT')) {
 				// Old values
-				$old_version = isset( $old_value['version'] ) && $old_value['version'] ? $old_value['version'] : ( isset( $old_value['local_version'] ) ? $old_value['local_version'] : '' );
-				$old_local = isset( $old_value['local'] ) ? (int) $old_value['local'] : 0;
+				$old_version = isset($old_value['version']) && $old_value['version'] ? $old_value['version'] : (isset($old_value['local_version']) ? $old_value['local_version'] : '');
+				$old_local = isset($old_value['local']) ? (int) $old_value['local'] : 0;
 
 				// New values
-				$new_version = isset( $new_value['version'] ) && $new_value['version'] ? $new_value['version'] : $this->get_latest_version();
+				$new_version = isset($new_value['version']) && $new_value['version'] ? $new_value['version'] : $this->get_latest_version();
 
-				if ( empty( $old_local ) || $old_version !== $new_version || ! file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
-					$response = $this->download_package( $new_version, $new_value );
+				if (empty($old_local) || $old_version !== $new_version || !file_exists($this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css')) {
+					$response = $this->download_package($new_version, $new_value);
 
-					if ( is_wp_error( $response ) ) {
-						add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
+					if (is_wp_error($response)) {
+						add_settings_error('general', 'fontawesome_download', __('ERROR:', 'ayecode-connect') . ' ' . $response->get_error_message(), 'error');
 					}
 				}
 			}
@@ -784,9 +784,9 @@ 
 		 * @param string Fonts directory local path.
 		 */
 		public function get_fonts_dir() {
-			$upload_dir = wp_upload_dir( null, false );
+			$upload_dir = wp_upload_dir(null, false);
 
-			return $upload_dir['basedir'] . DIRECTORY_SEPARATOR .  'ayefonts' . DIRECTORY_SEPARATOR . 'fa' . DIRECTORY_SEPARATOR;
+			return $upload_dir['basedir'] . DIRECTORY_SEPARATOR . 'ayefonts' . DIRECTORY_SEPARATOR . 'fa' . DIRECTORY_SEPARATOR;
 		}
 
 		/**
@@ -797,9 +797,9 @@ 
 		 * @param string Fonts directory local url.
 		 */
 		public function get_fonts_url() {
-			$upload_dir = wp_upload_dir( null, false );
+			$upload_dir = wp_upload_dir(null, false);
 
-			return $upload_dir['baseurl'] .  '/ayefonts/fa/';
+			return $upload_dir['baseurl'] . '/ayefonts/fa/';
 		}
 
 		/**
@@ -810,7 +810,7 @@ 
 		 * @return bool True if active else false.
 		 */
 		public function has_local() {
-			if ( ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) && file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
+			if (!empty($this->settings['local']) && empty($this->settings['pro']) && file_exists($this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css')) {
 				return true;
 			}
 
@@ -825,18 +825,18 @@ 
 		 * @return object The WP Filesystem.
 		 */
 		public function get_wp_filesystem() {
-			if ( ! function_exists( 'get_filesystem_method' ) ) {
-				require_once( ABSPATH . "/wp-admin/includes/file.php" );
+			if (!function_exists('get_filesystem_method')) {
+				require_once(ABSPATH . "/wp-admin/includes/file.php");
 			}
 
 			$access_type = get_filesystem_method();
 
-			if ( $access_type === 'direct' ) {
+			if ($access_type === 'direct') {
 				/* You can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
-				$creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
+				$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());
 
 				/* Initialize the API */
-				if ( ! WP_Filesystem( $creds ) ) {
+				if (!WP_Filesystem($creds)) {
 					/* Any problems and we exit */
 					return false;
 				}
@@ -845,11 +845,11 @@ 
 
 				return $wp_filesystem;
 				/* Do our file manipulations below */
-			} else if ( defined( 'FTP_USER' ) ) {
-				$creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
+			} else if (defined('FTP_USER')) {
+				$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());
 
 				/* Initialize the API */
-				if ( ! WP_Filesystem( $creds ) ) {
+				if (!WP_Filesystem($creds)) {
 					/* Any problems and we exit */
 					return false;
 				}
@@ -872,38 +872,38 @@ 
 		 * @param array $option Fontawesome settings.
 		 * @return WP_ERROR|bool Error on fail and true on success.
 		 */
-		public function download_package( $version, $option = array() ) {
+		public function download_package($version, $option = array()) {
 			$filename = 'fontawesome-free-' . $version . '-web';
 			$url = 'https://use.fontawesome.com/releases/v' . $version . '/' . $filename . '.zip';
 
-			if ( ! function_exists( 'wp_handle_upload' ) ) {
+			if (!function_exists('wp_handle_upload')) {
 				require_once ABSPATH . 'wp-admin/includes/file.php';
 			}
 
-			$download_file = download_url( esc_url_raw( $url ) );
+			$download_file = download_url(esc_url_raw($url));
 
-			if ( is_wp_error( $download_file ) ) {
-				return new WP_Error( 'fontawesome_download_failed', __( $download_file->get_error_message(), 'ayecode-connect' ) );
-			} else if ( empty( $download_file ) ) {
-				return new WP_Error( 'fontawesome_download_failed', __( 'Something went wrong in downloading the font awesome to store locally.', 'ayecode-connect' ) );
+			if (is_wp_error($download_file)) {
+				return new WP_Error('fontawesome_download_failed', __($download_file->get_error_message(), 'ayecode-connect'));
+			} else if (empty($download_file)) {
+				return new WP_Error('fontawesome_download_failed', __('Something went wrong in downloading the font awesome to store locally.', 'ayecode-connect'));
 			}
 
-			$response = $this->extract_package( $download_file, $filename, true );
+			$response = $this->extract_package($download_file, $filename, true);
 
 			// Update local version.
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				return $response;
-			} else if ( $response ) {
-				if ( empty( $option ) ) {
-					$option = get_option( 'wp-font-awesome-settings' );
+			} else if ($response) {
+				if (empty($option)) {
+					$option = get_option('wp-font-awesome-settings');
 				}
 
 				$option['local_version'] = $version;
 
 				// Remove action to prevent looping.
-				remove_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
+				remove_action('update_option_wp-font-awesome-settings', array($this, 'update_option_wp_font_awesome_settings'), 10, 2);
 
-				update_option( 'wp-font-awesome-settings', $option );
+				update_option('wp-font-awesome-settings', $option);
 
 				return true;
 			}
@@ -921,60 +921,60 @@ 
 		 * @param bool   $delete_package Delete temp file or not.
 		 * @return WP_Error|bool True on success WP_Error on fail.
 		 */
-		public function extract_package( $package, $dirname = '', $delete_package = false ) {
+		public function extract_package($package, $dirname = '', $delete_package = false) {
 			global $wp_filesystem;
 
 			$wp_filesystem = $this->get_wp_filesystem();
 
-			if ( empty( $wp_filesystem ) && isset( $wp_filesystem->errors ) && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
-				return new WP_Error( 'fontawesome_filesystem_error', __( $wp_filesystem->errors->get_error_message(), 'ayecode-connect' ) );
-			} else if ( empty( $wp_filesystem ) ) {
-				return new WP_Error( 'fontawesome_filesystem_error', __( 'Failed to initialise WP_Filesystem while trying to download the Font Awesome package.', 'ayecode-connect' ) );
+			if (empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
+				return new WP_Error('fontawesome_filesystem_error', __($wp_filesystem->errors->get_error_message(), 'ayecode-connect'));
+			} else if (empty($wp_filesystem)) {
+				return new WP_Error('fontawesome_filesystem_error', __('Failed to initialise WP_Filesystem while trying to download the Font Awesome package.', 'ayecode-connect'));
 			}
 
 			$fonts_dir = $this->get_fonts_dir();
-			$fonts_tmp_dir = dirname( $fonts_dir ) . DIRECTORY_SEPARATOR . 'fa-tmp' . DIRECTORY_SEPARATOR;
+			$fonts_tmp_dir = dirname($fonts_dir) . DIRECTORY_SEPARATOR . 'fa-tmp' . DIRECTORY_SEPARATOR;
 
-			if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
+			if ($wp_filesystem->is_dir($fonts_tmp_dir)) {
+				$wp_filesystem->delete($fonts_tmp_dir, true);
 			}
 
 			// Unzip package to working directory.
-			$result = unzip_file( $package, $fonts_tmp_dir );
+			$result = unzip_file($package, $fonts_tmp_dir);
 
-			if ( is_wp_error( $result ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
+			if (is_wp_error($result)) {
+				$wp_filesystem->delete($fonts_tmp_dir, true);
 
-				if ( 'incompatible_archive' === $result->get_error_code() ) {
-					return new WP_Error( 'fontawesome_incompatible_archive', __( $result->get_error_message(), 'ayecode-connect' ) );
+				if ('incompatible_archive' === $result->get_error_code()) {
+					return new WP_Error('fontawesome_incompatible_archive', __($result->get_error_message(), 'ayecode-connect'));
 				}
 
 				return $result;
 			}
 
-			if ( $wp_filesystem->is_dir( $fonts_dir ) ) {
-				$wp_filesystem->delete( $fonts_dir, true );
+			if ($wp_filesystem->is_dir($fonts_dir)) {
+				$wp_filesystem->delete($fonts_dir, true);
 			}
 
 			$extract_dir = $fonts_tmp_dir;
 
-			if ( $dirname && $wp_filesystem->is_dir( $extract_dir . $dirname . DIRECTORY_SEPARATOR ) ) {
+			if ($dirname && $wp_filesystem->is_dir($extract_dir . $dirname . DIRECTORY_SEPARATOR)) {
 				$extract_dir .= $dirname . DIRECTORY_SEPARATOR;
 			}
 
 			try {
-				$return = $wp_filesystem->move( $extract_dir, $fonts_dir, true );
-			} catch ( Exception $e ) {
-				$return = new WP_Error( 'fontawesome_move_package', __( 'Fail to move font awesome package!', 'ayecode-connect' ) );
+				$return = $wp_filesystem->move($extract_dir, $fonts_dir, true);
+			} catch (Exception $e) {
+				$return = new WP_Error('fontawesome_move_package', __('Fail to move font awesome package!', 'ayecode-connect'));
 			}
 
-			if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
+			if ($wp_filesystem->is_dir($fonts_tmp_dir)) {
+				$wp_filesystem->delete($fonts_tmp_dir, true);
 			}
 
 			// Once extracted, delete the package if required.
-			if ( $delete_package ) {
-				unlink( $package );
+			if ($delete_package) {
+				unlink($package);
 			}
 
 			return $return;
@@ -984,22 +984,22 @@ 
 		 * Output the version in the header.
 		 */
 		public function add_generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+			$file = str_replace(array("/", "\\"), "/", realpath(__FILE__));
+			$plugins_dir = str_replace(array("/", "\\"), "/", realpath(WP_PLUGIN_DIR));
 
 			// Find source plugin/theme.
 			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+			if (strpos($file, $plugins_dir) !== false) {
+				$source = explode("/", plugin_basename($file));
+			} else if (function_exists('get_theme_root')) {
+				$themes_dir = str_replace(array("/", "\\"), "/", realpath(get_theme_root()));
 
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+				if (strpos($file, $themes_dir) !== false) {
+					$source = explode("/", ltrim(str_replace($themes_dir, "", $file), "/"));
 				}
 			}
 
-			echo '<meta name="generator" content="WP Font Awesome Settings v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-ac-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+			echo '<meta name="generator" content="WP Font Awesome Settings v' . esc_attr($this->version) . '"' . (!empty($source[0]) ? ' data-ac-source="' . esc_attr($source[0]) . '"' : '') . ' />';
 		}
 	}
 

includes/admin/admin-pages.php

Indentation +14 added lines, -14 removed lines

@@ -57,8 +57,8 @@ 
             'getpaid-nonce',
             'getpaid-nonce'
         );
-		$anchor = __( 'Deactivate', 'invoicing' );
-		$title  = esc_attr__( 'Are you sure you want to deactivate this discount?', 'invoicing' );
+        $anchor = __( 'Deactivate', 'invoicing' );
+        $title  = esc_attr__( 'Are you sure you want to deactivate this discount?', 'invoicing' );
         $row_actions['deactivate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
     } elseif ( in_array( strtolower( $discount->post_status ), array( 'pending', 'draft' ) ) && wpinv_current_user_can( 'activate_discount', array( 'discount' => (int) $discount->ID ) ) ) {
@@ -73,8 +73,8 @@ 
             'getpaid-nonce',
             'getpaid-nonce'
         );
-		$anchor = __( 'Activate', 'invoicing' );
-		$title  = esc_attr__( 'Are you sure you want to activate this discount?', 'invoicing' );
+        $anchor = __( 'Activate', 'invoicing' );
+        $title  = esc_attr__( 'Are you sure you want to activate this discount?', 'invoicing' );
         $row_actions['activate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
     }
@@ -121,13 +121,13 @@ 
             $types = wpinv_get_discount_types();
 
             foreach ( $types as $name => $type ) {
-			echo '<option value="' . esc_attr( $name ) . '"';
+            echo '<option value="' . esc_attr( $name ) . '"';
 
-			if ( isset( $_GET['discount_type'] ) ) {
-				selected( $name, sanitize_text_field( $_GET['discount_type'] ) );
+            if ( isset( $_GET['discount_type'] ) ) {
+                selected( $name, sanitize_text_field( $_GET['discount_type'] ) );
                 }
 
-			echo '>' . esc_html__( $type, 'invoicing' ) . '</option>';
+            echo '>' . esc_html__( $type, 'invoicing' ) . '</option>';
             }
         ?>
     </select>
@@ -154,15 +154,15 @@ 
         // Filter vat rule type
         if ( isset( $_GET['discount_type'] ) && $_GET['discount_type'] !== '' ) {
             $meta_query[] = array(
-				'key'     => '_wpi_discount_type',
-				'value'   => sanitize_key( urldecode( $_GET['discount_type'] ) ),
-				'compare' => '=',
-			);
-			}
+                'key'     => '_wpi_discount_type',
+                'value'   => sanitize_key( urldecode( $_GET['discount_type'] ) ),
+                'compare' => '=',
+            );
+            }
 
         if ( ! empty( $meta_query ) ) {
             $vars['meta_query'] = $meta_query;
-			}
+            }
     }
 
     return $vars;

Spacing +78 added lines, -78 removed lines

@@ -1,51 +1,51 @@ 
 <?php
 // MUST have WordPress.
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     exit;
 }
 
-add_action( 'manage_wpi_discount_posts_custom_column', 'wpinv_discount_custom_column' );
-function wpinv_discount_custom_column( $column ) {
+add_action('manage_wpi_discount_posts_custom_column', 'wpinv_discount_custom_column');
+function wpinv_discount_custom_column($column) {
     global $post;
 
-    $discount = new WPInv_Discount( $post );
+    $discount = new WPInv_Discount($post);
 
-    switch ( $column ) {
+    switch ($column) {
         case 'code':
-            echo esc_html( $discount->get_code() );
+            echo esc_html($discount->get_code());
             break;
         case 'amount':
-            echo wp_kses_post( $discount->get_formatted_amount() );
+            echo wp_kses_post($discount->get_formatted_amount());
             break;
         case 'usage':
-            echo wp_kses_post( $discount->get_usage() );
+            echo wp_kses_post($discount->get_usage());
             break;
         case 'start_date':
-            echo wp_kses_post( getpaid_format_date_value( $discount->get_start_date() ) );
+            echo wp_kses_post(getpaid_format_date_value($discount->get_start_date()));
             break;
         case 'expiry_date':
-            echo wp_kses_post( getpaid_format_date_value( $discount->get_expiration_date(), __( 'Never', 'invoicing' ) ) );
+            echo wp_kses_post(getpaid_format_date_value($discount->get_expiration_date(), __('Never', 'invoicing')));
             break;
     }
 }
 
-add_filter( 'post_row_actions', 'wpinv_post_row_actions', 90, 2 );
-function wpinv_post_row_actions( $actions, $post ) {
-    $post_type = ! empty( $post->post_type ) ? $post->post_type : '';
+add_filter('post_row_actions', 'wpinv_post_row_actions', 90, 2);
+function wpinv_post_row_actions($actions, $post) {
+    $post_type = !empty($post->post_type) ? $post->post_type : '';
 
-    if ( $post_type == 'wpi_discount' ) {
-        $actions = wpinv_discount_row_actions( $post, $actions );
+    if ($post_type == 'wpi_discount') {
+        $actions = wpinv_discount_row_actions($post, $actions);
     }
 
     return $actions;
 }
 
-function wpinv_discount_row_actions( $discount, $row_actions ) {
-    $row_actions  = array();
-    $edit_link = get_edit_post_link( $discount->ID );
-    $row_actions['edit'] = '<a href="' . esc_url( $edit_link ) . '">' . __( 'Edit', 'invoicing' ) . '</a>';
+function wpinv_discount_row_actions($discount, $row_actions) {
+    $row_actions = array();
+    $edit_link = get_edit_post_link($discount->ID);
+    $row_actions['edit'] = '<a href="' . esc_url($edit_link) . '">' . __('Edit', 'invoicing') . '</a>';
 
-    if ( in_array( strtolower( $discount->post_status ), array( 'publish' ) ) && wpinv_current_user_can( 'deactivate_discount', array( 'discount' => (int) $discount->ID ) ) ) {
+    if (in_array(strtolower($discount->post_status), array('publish')) && wpinv_current_user_can('deactivate_discount', array('discount' => (int) $discount->ID))) {
 
         $url = wp_nonce_url(
             add_query_arg(
@@ -57,13 +57,13 @@ 
             'getpaid-nonce',
             'getpaid-nonce'
         );
-		$anchor = __( 'Deactivate', 'invoicing' );
-		$title  = esc_attr__( 'Are you sure you want to deactivate this discount?', 'invoicing' );
+		$anchor = __('Deactivate', 'invoicing');
+		$title  = esc_attr__('Are you sure you want to deactivate this discount?', 'invoicing');
         $row_actions['deactivate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
-    } elseif ( in_array( strtolower( $discount->post_status ), array( 'pending', 'draft' ) ) && wpinv_current_user_can( 'activate_discount', array( 'discount' => (int) $discount->ID ) ) ) {
+    } elseif (in_array(strtolower($discount->post_status), array('pending', 'draft')) && wpinv_current_user_can('activate_discount', array('discount' => (int) $discount->ID))) {
 
-        $url    = wp_nonce_url(
+        $url = wp_nonce_url(
             add_query_arg(
                 array(
                     'getpaid-admin-action' => 'activate_discount',
@@ -73,14 +73,14 @@ 
             'getpaid-nonce',
             'getpaid-nonce'
         );
-		$anchor = __( 'Activate', 'invoicing' );
-		$title  = esc_attr__( 'Are you sure you want to activate this discount?', 'invoicing' );
+		$anchor = __('Activate', 'invoicing');
+		$title  = esc_attr__('Are you sure you want to activate this discount?', 'invoicing');
         $row_actions['activate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
     }
 
-    if ( wpinv_current_user_can( 'delete_discount', array( 'discount' => (int) $discount->ID ) ) ) {
-        $url    = esc_url(
+    if (wpinv_current_user_can('delete_discount', array('discount' => (int) $discount->ID))) {
+        $url = esc_url(
             wp_nonce_url(
                 add_query_arg(
                     array(
@@ -93,12 +93,12 @@ 
             )
     );
 
-        $anchor = __( 'Delete', 'invoicing' );
-        $title  = esc_attr__( 'Are you sure you want to delete this discount?', 'invoicing' );
+        $anchor = __('Delete', 'invoicing');
+        $title  = esc_attr__('Are you sure you want to delete this discount?', 'invoicing');
         $row_actions['delete'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
     }
 
-    $row_actions = apply_filters( 'wpinv_discount_row_actions', $row_actions, $discount );
+    $row_actions = apply_filters('wpinv_discount_row_actions', $row_actions, $discount);
 
     return $row_actions;
 }
@@ -106,68 +106,68 @@ 
 function wpinv_restrict_manage_posts() {
     global $typenow;
 
-    if ( 'wpi_discount' == $typenow ) {
+    if ('wpi_discount' == $typenow) {
         wpinv_discount_filters();
     }
 }
-add_action( 'restrict_manage_posts', 'wpinv_restrict_manage_posts', 10 );
+add_action('restrict_manage_posts', 'wpinv_restrict_manage_posts', 10);
 
 function wpinv_discount_filters() {
 
     ?>
     <select name="discount_type" id="dropdown_wpinv_discount_type">
-        <option value=""><?php esc_html_e( 'Show all types', 'invoicing' ); ?></option>
+        <option value=""><?php esc_html_e('Show all types', 'invoicing'); ?></option>
         <?php
             $types = wpinv_get_discount_types();
 
-            foreach ( $types as $name => $type ) {
-			echo '<option value="' . esc_attr( $name ) . '"';
+            foreach ($types as $name => $type) {
+			echo '<option value="' . esc_attr($name) . '"';
 
-			if ( isset( $_GET['discount_type'] ) ) {
-				selected( $name, sanitize_text_field( $_GET['discount_type'] ) );
+			if (isset($_GET['discount_type'])) {
+				selected($name, sanitize_text_field($_GET['discount_type']));
                 }
 
-			echo '>' . esc_html__( $type, 'invoicing' ) . '</option>';
+			echo '>' . esc_html__($type, 'invoicing') . '</option>';
             }
         ?>
     </select>
     <?php
 }
 
-function wpinv_request( $vars ) {
+function wpinv_request($vars) {
     global $typenow, $wp_post_statuses;
 
-    if ( getpaid_is_invoice_post_type( $typenow ) ) {
-        if ( ! isset( $vars['post_status'] ) ) {
-            $post_statuses = wpinv_get_invoice_statuses( false, false, $typenow );
+    if (getpaid_is_invoice_post_type($typenow)) {
+        if (!isset($vars['post_status'])) {
+            $post_statuses = wpinv_get_invoice_statuses(false, false, $typenow);
 
-            foreach ( $post_statuses as $status => $value ) {
-                if ( isset( $wp_post_statuses[ $status ] ) && false === $wp_post_statuses[ $status ]->show_in_admin_all_list ) {
-                    unset( $post_statuses[ $status ] );
+            foreach ($post_statuses as $status => $value) {
+                if (isset($wp_post_statuses[$status]) && false === $wp_post_statuses[$status]->show_in_admin_all_list) {
+                    unset($post_statuses[$status]);
                 }
             }
 
-            $vars['post_status'] = array_keys( $post_statuses );
+            $vars['post_status'] = array_keys($post_statuses);
         }
-} elseif ( 'wpi_discount' == $typenow ) {
-        $meta_query = ! empty( $vars['meta_query'] ) ? $vars['meta_query'] : array();
+} elseif ('wpi_discount' == $typenow) {
+        $meta_query = !empty($vars['meta_query']) ? $vars['meta_query'] : array();
         // Filter vat rule type
-        if ( isset( $_GET['discount_type'] ) && $_GET['discount_type'] !== '' ) {
+        if (isset($_GET['discount_type']) && $_GET['discount_type'] !== '') {
             $meta_query[] = array(
 				'key'     => '_wpi_discount_type',
-				'value'   => sanitize_key( urldecode( $_GET['discount_type'] ) ),
+				'value'   => sanitize_key(urldecode($_GET['discount_type'])),
 				'compare' => '=',
 			);
 			}
 
-        if ( ! empty( $meta_query ) ) {
+        if (!empty($meta_query)) {
             $vars['meta_query'] = $meta_query;
 			}
     }
 
     return $vars;
 }
-add_filter( 'request', 'wpinv_request' );
+add_filter('request', 'wpinv_request');
 
 /**
  * Create a page and store the ID in an option.
@@ -179,61 +179,61 @@ 
  * @param int $post_parent (default: 0) Parent for the new page
  * @return int page ID
  */
-function wpinv_create_page( $slug, $option = '', $page_title = '', $page_content = '', $post_parent = 0 ) {
+function wpinv_create_page($slug, $option = '', $page_title = '', $page_content = '', $post_parent = 0) {
     global $wpdb;
 
-    $option_value = wpinv_get_option( $option );
+    $option_value = wpinv_get_option($option);
 
-    if ( ! empty( $option_value ) && ( $page_object = get_post( $option_value ) ) ) {
-        if ( 'page' === $page_object->post_type && ! in_array( $page_object->post_status, array( 'pending', 'trash', 'future', 'auto-draft' ) ) ) {
+    if (!empty($option_value) && ($page_object = get_post($option_value))) {
+        if ('page' === $page_object->post_type && !in_array($page_object->post_status, array('pending', 'trash', 'future', 'auto-draft'))) {
             // Valid page is already in place
             return $page_object->ID;
         }
     }
 
-    if ( ! empty( $post_parent ) ) {
-        $page = get_page_by_path( $post_parent );
-        if ( $page ) {
+    if (!empty($post_parent)) {
+        $page = get_page_by_path($post_parent);
+        if ($page) {
             $post_parent = $page->ID;
         } else {
             $post_parent = '';
         }
     }
 
-    if ( strlen( $page_content ) > 0 ) {
+    if (strlen($page_content) > 0) {
         // Search for an existing page with the specified page content (typically a shortcode)
-        $valid_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_content LIKE %s LIMIT 1;", "%{$page_content}%" ) );
+        $valid_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_content LIKE %s LIMIT 1;", "%{$page_content}%"));
     } else {
         // Search for an existing page with the specified page slug
-        $valid_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' )  AND post_name = %s LIMIT 1;", $slug ) );
+        $valid_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' )  AND post_name = %s LIMIT 1;", $slug));
     }
 
-    $valid_page_found = apply_filters( 'wpinv_create_page_id', $valid_page_found, $slug, $page_content );
+    $valid_page_found = apply_filters('wpinv_create_page_id', $valid_page_found, $slug, $page_content);
 
-    if ( $valid_page_found ) {
-        if ( $option ) {
-            wpinv_update_option( $option, $valid_page_found );
+    if ($valid_page_found) {
+        if ($option) {
+            wpinv_update_option($option, $valid_page_found);
         }
         return $valid_page_found;
     }
 
     // Search for a matching valid trashed page
-    if ( strlen( $page_content ) > 0 ) {
+    if (strlen($page_content) > 0) {
         // Search for an existing page with the specified page content (typically a shortcode)
-        $trashed_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_content LIKE %s LIMIT 1;", "%{$page_content}%" ) );
+        $trashed_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_content LIKE %s LIMIT 1;", "%{$page_content}%"));
     } else {
         // Search for an existing page with the specified page slug
-        $trashed_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_name = %s LIMIT 1;", $slug ) );
+        $trashed_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_name = %s LIMIT 1;", $slug));
     }
 
-    if ( $trashed_page_found ) {
+    if ($trashed_page_found) {
         $page_id   = $trashed_page_found;
         $page_data = array(
             'ID'          => $page_id,
             'post_status' => 'publish',
             'post_parent' => $post_parent,
         );
-        wp_update_post( $page_data );
+        wp_update_post($page_data);
     } else {
         $page_data = array(
             'post_status'    => 'publish',
@@ -245,11 +245,11 @@ 
             'post_parent'    => $post_parent,
             'comment_status' => 'closed',
         );
-        $page_id = wp_insert_post( $page_data );
+        $page_id = wp_insert_post($page_data);
     }
 
-    if ( $option ) {
-        wpinv_update_option( $option, (int) $page_id );
+    if ($option) {
+        wpinv_update_option($option, (int) $page_id);
     }
 
     return $page_id;
@@ -262,11 +262,11 @@ 
  *
  * @return array
  */
-function wpinv_add_aui_screens( $screen_ids ) {
+function wpinv_add_aui_screens($screen_ids) {
 
     // load on these pages if set
-    $screen_ids = array_merge( $screen_ids, wpinv_get_screen_ids() );
+    $screen_ids = array_merge($screen_ids, wpinv_get_screen_ids());
 
     return $screen_ids;
 }
-add_filter( 'aui_screen_ids', 'wpinv_add_aui_screens' );
+add_filter('aui_screen_ids', 'wpinv_add_aui_screens');

includes/data-stores/class-getpaid-customer-data-store.php

Indentation +184 added lines, -184 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -15,196 +15,196 @@ 
  */
 class GetPaid_Customer_Data_Store {
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Method to create a new customer in the database.
-	 *
-	 * @param GetPaid_Customer $customer customer object.
-	 */
-	public function create( &$customer ) {
-		global $wpdb;
-
-		$values  = array();
-		$formats = array();
-
-		$fields = self::get_database_fields();
-		unset( $fields['id'] );
-
-		foreach ( $fields as $key => $format ) {
-			$values[ $key ] = $customer->get( $key, 'edit' );
-			$formats[]      = $format;
-		}
-
-		$result = $wpdb->insert( $wpdb->prefix . 'getpaid_customers', $values, $formats );
-
-		if ( $result ) {
-			$customer->set_id( $wpdb->insert_id );
-			$customer->apply_changes();
-			$customer->clear_cache();
-			do_action( 'getpaid_new_customer', $customer );
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Method to read a customer from the database.
-	 *
-	 * @param GetPaid_Customer $customer customer object.
-	 *
-	 */
-	public function read( &$customer ) {
-		global $wpdb;
-
-		$customer->set_defaults();
-
-		if ( ! $customer->get_id() ) {
-			$customer->last_error = 'Invalid customer.';
-			$customer->set_id( 0 );
-			return false;
-		}
-
-		// Maybe retrieve from the cache.
-		$raw_customer = wp_cache_get( $customer->get_id(), 'getpaid_customers' );
-
-		// If not found, retrieve from the db.
-		if ( false === $raw_customer ) {
-
-			$raw_customer = $wpdb->get_row(
-				$wpdb->prepare(
-					"SELECT * FROM {$wpdb->prefix}getpaid_customers WHERE id = %d",
-					$customer->get_id()
-				)
-			);
-
-			// Update the cache with our data
-			wp_cache_set( $customer->get_id(), $raw_customer, 'getpaid_customers' );
-
-		}
-
-		if ( ! $raw_customer ) {
-			$raw_customer->last_error = 'Invalid customer.';
-			return false;
-		}
-
-		// Loop through raw customer fields.
-		foreach ( (array) $raw_customer as $key => $value ) {
-			$customer->set( $key, $value );
-		}
-
-		$customer->set_object_read( true );
-		do_action( 'getpaid_read_customer', $customer );
-
-	}
-
-	/**
-	 * Method to update a customer in the database.
-	 *
-	 * @param GetPaid_Customer $customer Customer object.
-	 */
-	public function update( &$customer ) {
-		global $wpdb;
-
-		do_action( 'getpaid_before_update_customer', $customer, $customer->get_changes() );
-
-		$changes = $customer->get_changes();
-		$values  = array();
-		$format  = array();
-
-		foreach ( self::get_database_fields() as $key => $format ) {
-			if ( array_key_exists( $key, $changes ) ) {
-				$values[ $key ] = $customer->get( $key, 'edit' );
-				$formats[]      = $format;
-			}
-		}
-
-		if ( empty( $values ) ) {
-			return;
-		}
-
-		$wpdb->update(
-			$wpdb->prefix . 'getpaid_customers',
-			$values,
-			array(
-				'id' => $customer->get_id(),
-			),
-			$formats,
-			'%d'
-		);
-
-		// Apply the changes.
-		$customer->apply_changes();
-
-		// Delete cache.
-		$customer->clear_cache();
-
-		// Fire a hook.
-		do_action( 'getpaid_update_customer', $customer );
-
-	}
-
-	/**
-	 * Method to delete a customer from the database.
-	 *
-	 * @param GetPaid_Customer $customer
-	 */
-	public function delete( &$customer ) {
-		global $wpdb;
-
-		do_action( 'getpaid_before_delete_customer', $customer );
-
-		$wpdb->delete(
-			$wpdb->prefix . 'getpaid_customers',
-			array(
-				'id' => $customer->get_id(),
-			),
-			'%d'
-		);
-
-		// Delete cache.
-		$customer->clear_cache();
-
-		// Fire a hook.
-		do_action( 'getpaid_delete_customer', $customer );
-
-		$customer->set_id( 0 );
-	}
-
-	/*
+    /**
+     * Method to create a new customer in the database.
+     *
+     * @param GetPaid_Customer $customer customer object.
+     */
+    public function create( &$customer ) {
+        global $wpdb;
+
+        $values  = array();
+        $formats = array();
+
+        $fields = self::get_database_fields();
+        unset( $fields['id'] );
+
+        foreach ( $fields as $key => $format ) {
+            $values[ $key ] = $customer->get( $key, 'edit' );
+            $formats[]      = $format;
+        }
+
+        $result = $wpdb->insert( $wpdb->prefix . 'getpaid_customers', $values, $formats );
+
+        if ( $result ) {
+            $customer->set_id( $wpdb->insert_id );
+            $customer->apply_changes();
+            $customer->clear_cache();
+            do_action( 'getpaid_new_customer', $customer );
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Method to read a customer from the database.
+     *
+     * @param GetPaid_Customer $customer customer object.
+     *
+     */
+    public function read( &$customer ) {
+        global $wpdb;
+
+        $customer->set_defaults();
+
+        if ( ! $customer->get_id() ) {
+            $customer->last_error = 'Invalid customer.';
+            $customer->set_id( 0 );
+            return false;
+        }
+
+        // Maybe retrieve from the cache.
+        $raw_customer = wp_cache_get( $customer->get_id(), 'getpaid_customers' );
+
+        // If not found, retrieve from the db.
+        if ( false === $raw_customer ) {
+
+            $raw_customer = $wpdb->get_row(
+                $wpdb->prepare(
+                    "SELECT * FROM {$wpdb->prefix}getpaid_customers WHERE id = %d",
+                    $customer->get_id()
+                )
+            );
+
+            // Update the cache with our data
+            wp_cache_set( $customer->get_id(), $raw_customer, 'getpaid_customers' );
+
+        }
+
+        if ( ! $raw_customer ) {
+            $raw_customer->last_error = 'Invalid customer.';
+            return false;
+        }
+
+        // Loop through raw customer fields.
+        foreach ( (array) $raw_customer as $key => $value ) {
+            $customer->set( $key, $value );
+        }
+
+        $customer->set_object_read( true );
+        do_action( 'getpaid_read_customer', $customer );
+
+    }
+
+    /**
+     * Method to update a customer in the database.
+     *
+     * @param GetPaid_Customer $customer Customer object.
+     */
+    public function update( &$customer ) {
+        global $wpdb;
+
+        do_action( 'getpaid_before_update_customer', $customer, $customer->get_changes() );
+
+        $changes = $customer->get_changes();
+        $values  = array();
+        $format  = array();
+
+        foreach ( self::get_database_fields() as $key => $format ) {
+            if ( array_key_exists( $key, $changes ) ) {
+                $values[ $key ] = $customer->get( $key, 'edit' );
+                $formats[]      = $format;
+            }
+        }
+
+        if ( empty( $values ) ) {
+            return;
+        }
+
+        $wpdb->update(
+            $wpdb->prefix . 'getpaid_customers',
+            $values,
+            array(
+                'id' => $customer->get_id(),
+            ),
+            $formats,
+            '%d'
+        );
+
+        // Apply the changes.
+        $customer->apply_changes();
+
+        // Delete cache.
+        $customer->clear_cache();
+
+        // Fire a hook.
+        do_action( 'getpaid_update_customer', $customer );
+
+    }
+
+    /**
+     * Method to delete a customer from the database.
+     *
+     * @param GetPaid_Customer $customer
+     */
+    public function delete( &$customer ) {
+        global $wpdb;
+
+        do_action( 'getpaid_before_delete_customer', $customer );
+
+        $wpdb->delete(
+            $wpdb->prefix . 'getpaid_customers',
+            array(
+                'id' => $customer->get_id(),
+            ),
+            '%d'
+        );
+
+        // Delete cache.
+        $customer->clear_cache();
+
+        // Fire a hook.
+        do_action( 'getpaid_delete_customer', $customer );
+
+        $customer->set_id( 0 );
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Additional Methods
 	|--------------------------------------------------------------------------
 	*/
-	public static function get_database_fields() {
-
-		$fields = array(
-			'id'             => '%d',
-			'user_id'        => '%d',
-			'email'          => '%s',
-			'email_cc'       => '%s',
-			'status'         => '%s',
-			'purchase_value' => '%f',
-			'purchase_count' => '%d',
-			'date_created'   => '%s',
-			'date_modified'  => '%s',
-			'uuid'           => '%s',
-		);
-
-		// Add address fields.
-		foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
-
-			// Skip id, user_id and email.
-			if ( ! in_array( $field, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid' ), true ) ) {
-				$fields[ $field ] = '%s';
-			}
-		}
-
-		return $fields;
-	}
+    public static function get_database_fields() {
+
+        $fields = array(
+            'id'             => '%d',
+            'user_id'        => '%d',
+            'email'          => '%s',
+            'email_cc'       => '%s',
+            'status'         => '%s',
+            'purchase_value' => '%f',
+            'purchase_count' => '%d',
+            'date_created'   => '%s',
+            'date_modified'  => '%s',
+            'uuid'           => '%s',
+        );
+
+        // Add address fields.
+        foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+
+            // Skip id, user_id and email.
+            if ( ! in_array( $field, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid' ), true ) ) {
+                $fields[ $field ] = '%s';
+            }
+        }
+
+        return $fields;
+    }
 }

Spacing +34 added lines, -34 removed lines

@@ -4,7 +4,7 @@ 
  * GetPaid_Customer_Data_Store class file.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,27 +26,27 @@ 
 	 *
 	 * @param GetPaid_Customer $customer customer object.
 	 */
-	public function create( &$customer ) {
+	public function create(&$customer) {
 		global $wpdb;
 
 		$values  = array();
 		$formats = array();
 
 		$fields = self::get_database_fields();
-		unset( $fields['id'] );
+		unset($fields['id']);
 
-		foreach ( $fields as $key => $format ) {
-			$values[ $key ] = $customer->get( $key, 'edit' );
+		foreach ($fields as $key => $format) {
+			$values[$key] = $customer->get($key, 'edit');
 			$formats[]      = $format;
 		}
 
-		$result = $wpdb->insert( $wpdb->prefix . 'getpaid_customers', $values, $formats );
+		$result = $wpdb->insert($wpdb->prefix . 'getpaid_customers', $values, $formats);
 
-		if ( $result ) {
-			$customer->set_id( $wpdb->insert_id );
+		if ($result) {
+			$customer->set_id($wpdb->insert_id);
 			$customer->apply_changes();
 			$customer->clear_cache();
-			do_action( 'getpaid_new_customer', $customer );
+			do_action('getpaid_new_customer', $customer);
 			return true;
 		}
 
@@ -59,22 +59,22 @@ 
 	 * @param GetPaid_Customer $customer customer object.
 	 *
 	 */
-	public function read( &$customer ) {
+	public function read(&$customer) {
 		global $wpdb;
 
 		$customer->set_defaults();
 
-		if ( ! $customer->get_id() ) {
+		if (!$customer->get_id()) {
 			$customer->last_error = 'Invalid customer.';
-			$customer->set_id( 0 );
+			$customer->set_id(0);
 			return false;
 		}
 
 		// Maybe retrieve from the cache.
-		$raw_customer = wp_cache_get( $customer->get_id(), 'getpaid_customers' );
+		$raw_customer = wp_cache_get($customer->get_id(), 'getpaid_customers');
 
 		// If not found, retrieve from the db.
-		if ( false === $raw_customer ) {
+		if (false === $raw_customer) {
 
 			$raw_customer = $wpdb->get_row(
 				$wpdb->prepare(
@@ -84,22 +84,22 @@ 
 			);
 
 			// Update the cache with our data
-			wp_cache_set( $customer->get_id(), $raw_customer, 'getpaid_customers' );
+			wp_cache_set($customer->get_id(), $raw_customer, 'getpaid_customers');
 
 		}
 
-		if ( ! $raw_customer ) {
+		if (!$raw_customer) {
 			$raw_customer->last_error = 'Invalid customer.';
 			return false;
 		}
 
 		// Loop through raw customer fields.
-		foreach ( (array) $raw_customer as $key => $value ) {
-			$customer->set( $key, $value );
+		foreach ((array) $raw_customer as $key => $value) {
+			$customer->set($key, $value);
 		}
 
-		$customer->set_object_read( true );
-		do_action( 'getpaid_read_customer', $customer );
+		$customer->set_object_read(true);
+		do_action('getpaid_read_customer', $customer);
 
 	}
 
@@ -108,23 +108,23 @@ 
 	 *
 	 * @param GetPaid_Customer $customer Customer object.
 	 */
-	public function update( &$customer ) {
+	public function update(&$customer) {
 		global $wpdb;
 
-		do_action( 'getpaid_before_update_customer', $customer, $customer->get_changes() );
+		do_action('getpaid_before_update_customer', $customer, $customer->get_changes());
 
 		$changes = $customer->get_changes();
 		$values  = array();
 		$format  = array();
 
-		foreach ( self::get_database_fields() as $key => $format ) {
-			if ( array_key_exists( $key, $changes ) ) {
-				$values[ $key ] = $customer->get( $key, 'edit' );
+		foreach (self::get_database_fields() as $key => $format) {
+			if (array_key_exists($key, $changes)) {
+				$values[$key] = $customer->get($key, 'edit');
 				$formats[]      = $format;
 			}
 		}
 
-		if ( empty( $values ) ) {
+		if (empty($values)) {
 			return;
 		}
 
@@ -145,7 +145,7 @@ 
 		$customer->clear_cache();
 
 		// Fire a hook.
-		do_action( 'getpaid_update_customer', $customer );
+		do_action('getpaid_update_customer', $customer);
 
 	}
 
@@ -154,10 +154,10 @@ 
 	 *
 	 * @param GetPaid_Customer $customer
 	 */
-	public function delete( &$customer ) {
+	public function delete(&$customer) {
 		global $wpdb;
 
-		do_action( 'getpaid_before_delete_customer', $customer );
+		do_action('getpaid_before_delete_customer', $customer);
 
 		$wpdb->delete(
 			$wpdb->prefix . 'getpaid_customers',
@@ -171,9 +171,9 @@ 
 		$customer->clear_cache();
 
 		// Fire a hook.
-		do_action( 'getpaid_delete_customer', $customer );
+		do_action('getpaid_delete_customer', $customer);
 
-		$customer->set_id( 0 );
+		$customer->set_id(0);
 	}
 
 	/*
@@ -197,11 +197,11 @@ 
 		);
 
 		// Add address fields.
-		foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+		foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
 			// Skip id, user_id and email.
-			if ( ! in_array( $field, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid' ), true ) ) {
-				$fields[ $field ] = '%s';
+			if (!in_array($field, array('id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid'), true)) {
+				$fields[$field] = '%s';
 			}
 		}
 

includes/class-getpaid-customer.php

Indentation +176 added lines, -176 removed lines

@@ -15,69 +15,69 @@ 
  */
 class GetPaid_Customer extends GetPaid_Data {
 
-	/**
-	 * Which data store to load.
-	 *
-	 * @var string
-	 */
+    /**
+     * Which data store to load.
+     *
+     * @var string
+     */
     protected $data_store_name = 'customer';
 
     /**
-	 * This is the name of this object type.
-	 *
-	 * @var string
-	 */
-	protected $object_type = 'customer';
-
-	/**
-	 * Get the customer if ID is passed, otherwise the customer is new and empty.
-	 *
-	 * @param int|string|GetPaid_Customer|object $customer customer id, object, or email.
-	 */
-	public function __construct( $customer = 0 ) {
+     * This is the name of this object type.
+     *
+     * @var string
+     */
+    protected $object_type = 'customer';
+
+    /**
+     * Get the customer if ID is passed, otherwise the customer is new and empty.
+     *
+     * @param int|string|GetPaid_Customer|object $customer customer id, object, or email.
+     */
+    public function __construct( $customer = 0 ) {
 
         // Setup default customer data.
         $this->setup_default_data();
 
-		if ( is_numeric( $customer ) ) {
-			$this->set_id( $customer );
-		} elseif ( $customer instanceof self ) {
-			$this->set_id( $customer->get_id() );
-		} elseif ( is_string( $customer ) && $customer_id = self::get_customer_id_by( $customer, 'email' ) ) {
-			$this->set_id( $customer_id );
-		} elseif ( ! empty( $customer->id ) ) {
-			$this->set_id( $customer->id );
-		}
+        if ( is_numeric( $customer ) ) {
+            $this->set_id( $customer );
+        } elseif ( $customer instanceof self ) {
+            $this->set_id( $customer->get_id() );
+        } elseif ( is_string( $customer ) && $customer_id = self::get_customer_id_by( $customer, 'email' ) ) {
+            $this->set_id( $customer_id );
+        } elseif ( ! empty( $customer->id ) ) {
+            $this->set_id( $customer->id );
+        }
 
         // Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+        $this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
 
-		if ( $this->get_id() > 0 ) {
-			$this->data_store->read( $this );
+        if ( $this->get_id() > 0 ) {
+            $this->data_store->read( $this );
         }
 
         $this->set_object_read( true );
-	}
+    }
 
     /**
-	 * Sets up default customer data.
-	 */
-	private function setup_default_data() {
+     * Sets up default customer data.
+     */
+    private function setup_default_data() {
 
         $this->data = array(
-			'user_id'        => 0,
-			'email'          => '',
-			'email_cc'       => '',
-			'status'         => 'active',
-			'purchase_value' => 0,
-			'purchase_count' => 0,
-			'date_created'   => current_time( 'mysql' ),
-			'date_modified'  => current_time( 'mysql' ),
-			'uuid'           => wp_generate_uuid4(),
-		);
+            'user_id'        => 0,
+            'email'          => '',
+            'email_cc'       => '',
+            'status'         => 'active',
+            'purchase_value' => 0,
+            'purchase_count' => 0,
+            'date_created'   => current_time( 'mysql' ),
+            'date_modified'  => current_time( 'mysql' ),
+            'uuid'           => wp_generate_uuid4(),
+        );
 
         // Add address fields.
-		foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+        foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
 
             if ( isset( $this->data[ $field ] ) ) {
                 continue;
@@ -95,22 +95,22 @@ 
                 continue;
             }
 
-			$this->data[ $field ] = '';
-		}
+            $this->data[ $field ] = '';
+        }
 
         $this->default_data = $this->data;
-	}
-
-	/**
-	 * Given a customer email or user id, it returns a customer id.
-	 *
-	 * @static
-	 * @param string $value
-	 * @since 1.0.15
-	 * @return int
-	 */
-	public static function get_customer_id_by( $value, $by = 'email' ) {
-		global $wpdb;
+    }
+
+    /**
+     * Given a customer email or user id, it returns a customer id.
+     *
+     * @static
+     * @param string $value
+     * @since 1.0.15
+     * @return int
+     */
+    public static function get_customer_id_by( $value, $by = 'email' ) {
+        global $wpdb;
 
         // Prepare value.
         if ( 'email' === $by ) {
@@ -125,12 +125,12 @@ 
             return 0;
         }
 
-		// Maybe retrieve from the cache.
+        // Maybe retrieve from the cache.
         $cache_key   = 'getpaid_customer_ids_by_' . $by;
-		$customer_id = wp_cache_get( $value, $cache_key );
-		if ( false !== $customer_id ) {
-			return $customer_id;
-		}
+        $customer_id = wp_cache_get( $value, $cache_key );
+        if ( false !== $customer_id ) {
+            return $customer_id;
+        }
 
         if ( 'email' === $by ) {
             $customer_id = (int) $wpdb->get_var(
@@ -142,23 +142,23 @@ 
             );
         }
 
-		// Update the cache with our data
-		wp_cache_set( $value, $customer_id, $cache_key );
+        // Update the cache with our data
+        wp_cache_set( $value, $customer_id, $cache_key );
 
-		return $customer_id;
+        return $customer_id;
 
-	}
+    }
 
-	/**
+    /**
      * Clears the customer's cache.
      */
     public function clear_cache() {
         wp_cache_delete( $this->get( 'email' ), 'getpaid_customer_ids_by_email' );
         wp_cache_delete( $this->get( 'user_id' ), 'getpaid_customer_ids_by_user_id' );
-		wp_cache_delete( $this->get_id(), 'getpaid_customers' );
-	}
+        wp_cache_delete( $this->get_id(), 'getpaid_customers' );
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD methods
 	|--------------------------------------------------------------------------
@@ -189,11 +189,11 @@ 
             return call_user_func( array( $this, 'get_' . $key ), $context );
         }
 
-		return $this->get_prop( $key, $context );
+        return $this->get_prop( $key, $context );
 
     }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Setters
 	|--------------------------------------------------------------------------
@@ -216,114 +216,114 @@ 
             return call_user_func( array( $this, 'set_' . $key ), $value );
         }
 
-		return $this->set_prop( $key, $value );
+        return $this->set_prop( $key, $value );
 
     }
 
-	/**
-	 * Sets customer status.
-	 *
-	 * @since 1.0.0
-	 * @param  string $status New status.
-	 */
-	public function set_status( $status ) {
-
-		if ( in_array( $status, array( 'active', 'inactive', 'blocked' ), true ) ) {
-			return $this->set_prop( 'status', $status );
-		}
-
-		$this->set_prop( 'status', 'inactive' );
-	}
-
-	/**
-	 * Sets the purchase value.
-	 *
-	 * @since 1.0.0
-	 * @param float $purchase_value.
-	 */
-	public function set_purchase_value( $purchase_value ) {
-		$this->set_prop( 'purchase_value', (float) $purchase_value );
-	}
+    /**
+     * Sets customer status.
+     *
+     * @since 1.0.0
+     * @param  string $status New status.
+     */
+    public function set_status( $status ) {
+
+        if ( in_array( $status, array( 'active', 'inactive', 'blocked' ), true ) ) {
+            return $this->set_prop( 'status', $status );
+        }
+
+        $this->set_prop( 'status', 'inactive' );
+    }
+
+    /**
+     * Sets the purchase value.
+     *
+     * @since 1.0.0
+     * @param float $purchase_value.
+     */
+    public function set_purchase_value( $purchase_value ) {
+        $this->set_prop( 'purchase_value', (float) $purchase_value );
+    }
 
     /**
-	 * Sets the purchase count.
-	 *
-	 * @since 1.0.0
-	 * @param int $purchase_count.
-	 */
-	public function set_purchase_count( $purchase_count ) {
-		$this->set_prop( 'purchase_count', absint( $purchase_count ) );
-	}
+     * Sets the purchase count.
+     *
+     * @since 1.0.0
+     * @param int $purchase_count.
+     */
+    public function set_purchase_count( $purchase_count ) {
+        $this->set_prop( 'purchase_count', absint( $purchase_count ) );
+    }
 
     /**
-	 * Sets the user id.
-	 *
-	 * @since 1.0.0
-	 * @param int $user_id.
-	 */
-	public function set_user_id( $user_id ) {
-		$this->set_prop( 'user_id', absint( $user_id ) );
-	}
+     * Sets the user id.
+     *
+     * @since 1.0.0
+     * @param int $user_id.
+     */
+    public function set_user_id( $user_id ) {
+        $this->set_prop( 'user_id', absint( $user_id ) );
+    }
 
     /**
-	 * Sets the email.
-	 *
-	 * @since 1.0.0
-	 * @param string $email.
-	 */
-	public function set_email( $email ) {
+     * Sets the email.
+     *
+     * @since 1.0.0
+     * @param string $email.
+     */
+    public function set_email( $email ) {
         $email = is_string( $email ) ? sanitize_email( $email ) : '';
-		$this->set_prop( 'email', $email );
-	}
+        $this->set_prop( 'email', $email );
+    }
 
     /**
-	 * Sets the email cc.
-	 *
-	 * @since 1.0.0
-	 * @param string $email_cc.
-	 */
-	public function set_email_cc( $email_cc ) {
+     * Sets the email cc.
+     *
+     * @since 1.0.0
+     * @param string $email_cc.
+     */
+    public function set_email_cc( $email_cc ) {
         $email_cc = implode( ', ', wp_parse_list( $email_cc ) );
-		$this->set_prop( 'email_cc', $email_cc );
-	}
+        $this->set_prop( 'email_cc', $email_cc );
+    }
 
     /**
-	 * Sets the created date.
-	 *
-	 * @since 1.0.0
-	 * @param  string $date_created date created.
-	 */
-	public function set_date_created( $date_created ) {
+     * Sets the created date.
+     *
+     * @since 1.0.0
+     * @param  string $date_created date created.
+     */
+    public function set_date_created( $date_created ) {
 
-		$date = strtotime( $date_created );
+        $date = strtotime( $date_created );
 
         if ( $date && $date_created !== '0000-00-00 00:00:00'  && $date_created !== '0000-00-00 00:00' ) {
             $this->set_prop( 'date_created', gmdate( 'Y-m-d H:i:s', $date ) );
             return;
-		}
+        }
 
-		$this->set_prop( 'date_created', null );
-	}
+        $this->set_prop( 'date_created', null );
+    }
 
     /**
-	 * Sets the created date.
-	 *
-	 * @since 1.0.0
-	 * @param  string $date_modified date created.
-	 */
-	public function set_date_modified( $date_modified ) {
+     * Sets the created date.
+     *
+     * @since 1.0.0
+     * @param  string $date_modified date created.
+     */
+    public function set_date_modified( $date_modified ) {
 
-		$date = strtotime( $date_modified );
+        $date = strtotime( $date_modified );
 
         if ( $date && $date_modified !== '0000-00-00 00:00:00'  && $date_modified !== '0000-00-00 00:00' ) {
             $this->set_prop( 'date_modified', gmdate( 'Y-m-d H:i:s', $date ) );
             return;
-		}
+        }
 
-		$this->set_prop( 'date_modified', null );
-	}
+        $this->set_prop( 'date_modified', null );
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Additional methods
 	|--------------------------------------------------------------------------
@@ -332,12 +332,12 @@ 
 	|
 	*/
 
-	/**
-	 * Saves the customer.
-	 *
-	 * @since 1.0.0
-	 */
-	public function save() {
+    /**
+     * Saves the customer.
+     *
+     * @since 1.0.0
+     */
+    public function save() {
 
         $maybe_set = array(
             'uuid'         => wp_generate_uuid4(),
@@ -354,29 +354,29 @@ 
 
         $this->set( 'date_modified', current_time( 'mysql' ) );
 
-		return parent::save();
-	}
+        return parent::save();
+    }
 
     /**
-	 * Helper method to clone a customer from a user ID.
-	 *
-	 * @since 1.0.0
-	 * @param int $user_id.
-	 */
-	public function clone_user( $user_id ) {
+     * Helper method to clone a customer from a user ID.
+     *
+     * @since 1.0.0
+     * @param int $user_id.
+     */
+    public function clone_user( $user_id ) {
         $user = get_userdata( $user_id );
 
         if ( empty( $user ) ) {
             return;
         }
 
-		$this->set_user_id( $user->ID );
+        $this->set_user_id( $user->ID );
         $this->set_email( $user->user_email );
         $this->set_purchase_value( getpaid_get_user_total_spend( $user->ID ) );
         $this->set_purchase_count( getpaid_count_user_invoices( $user->ID ) );
         $this->set( 'first_name', $user->first_name );
         $this->set( 'last_name', $user->last_name );
-		$this->set_date_created( $user->user_registered );
+        $this->set_date_created( $user->user_registered );
 
         // Fetch extra data from WC or old GetPaid.
         $prefixes = array(
@@ -400,18 +400,18 @@ 
                     continue;
                 }
             }
-		}
-	}
+        }
+    }
 
     /**
-	 * Helper method to migrate an existing user ID to the new customers table.
-	 *
-	 * @since 1.0.0
-	 * @param int $user_id.
-	 */
-	public function migrate_from_user( $user_id ) {
+     * Helper method to migrate an existing user ID to the new customers table.
+     *
+     * @since 1.0.0
+     * @param int $user_id.
+     */
+    public function migrate_from_user( $user_id ) {
         $this->clone_user( $user_id );
         do_action( 'getpaid_customer_migrated_from_user', $this, $user_id );
         $this->save();
-	}
+    }
 }

Spacing +100 added lines, -100 removed lines

@@ -5,7 +5,7 @@ 
  * @since   1.0.15
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Customer class.
@@ -34,29 +34,29 @@ 
 	 *
 	 * @param int|string|GetPaid_Customer|object $customer customer id, object, or email.
 	 */
-	public function __construct( $customer = 0 ) {
+	public function __construct($customer = 0) {
 
         // Setup default customer data.
         $this->setup_default_data();
 
-		if ( is_numeric( $customer ) ) {
-			$this->set_id( $customer );
-		} elseif ( $customer instanceof self ) {
-			$this->set_id( $customer->get_id() );
-		} elseif ( is_string( $customer ) && $customer_id = self::get_customer_id_by( $customer, 'email' ) ) {
-			$this->set_id( $customer_id );
-		} elseif ( ! empty( $customer->id ) ) {
-			$this->set_id( $customer->id );
+		if (is_numeric($customer)) {
+			$this->set_id($customer);
+		} elseif ($customer instanceof self) {
+			$this->set_id($customer->get_id());
+		} elseif (is_string($customer) && $customer_id = self::get_customer_id_by($customer, 'email')) {
+			$this->set_id($customer_id);
+		} elseif (!empty($customer->id)) {
+			$this->set_id($customer->id);
 		}
 
         // Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+		$this->data_store = GetPaid_Data_Store::load($this->data_store_name);
 
-		if ( $this->get_id() > 0 ) {
-			$this->data_store->read( $this );
+		if ($this->get_id() > 0) {
+			$this->data_store->read($this);
         }
 
-        $this->set_object_read( true );
+        $this->set_object_read(true);
 	}
 
     /**
@@ -71,31 +71,31 @@ 
 			'status'         => 'active',
 			'purchase_value' => 0,
 			'purchase_count' => 0,
-			'date_created'   => current_time( 'mysql' ),
-			'date_modified'  => current_time( 'mysql' ),
+			'date_created'   => current_time('mysql'),
+			'date_modified'  => current_time('mysql'),
 			'uuid'           => wp_generate_uuid4(),
 		);
 
         // Add address fields.
-		foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+		foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-            if ( isset( $this->data[ $field ] ) ) {
+            if (isset($this->data[$field])) {
                 continue;
             }
 
             // Country.
-            if ( 'country' === $field ) {
-                $this->data[ $field ] = wpinv_get_default_country();
+            if ('country' === $field) {
+                $this->data[$field] = wpinv_get_default_country();
                 continue;
             }
 
             // State.
-            if ( 'state' === $field ) {
-                $this->data[ $field ] = wpinv_get_default_state();
+            if ('state' === $field) {
+                $this->data[$field] = wpinv_get_default_state();
                 continue;
             }
 
-			$this->data[ $field ] = '';
+			$this->data[$field] = '';
 		}
 
         $this->default_data = $this->data;
@@ -109,41 +109,41 @@ 
 	 * @since 1.0.15
 	 * @return int
 	 */
-	public static function get_customer_id_by( $value, $by = 'email' ) {
+	public static function get_customer_id_by($value, $by = 'email') {
 		global $wpdb;
 
         // Prepare value.
-        if ( 'email' === $by ) {
-            $value = sanitize_email( $value );
-        } elseif ( 'user_id' === $by ) {
-            $value = absint( $value );
+        if ('email' === $by) {
+            $value = sanitize_email($value);
+        } elseif ('user_id' === $by) {
+            $value = absint($value);
         } else {
             return 0;
         }
 
-        if ( empty( $value ) ) {
+        if (empty($value)) {
             return 0;
         }
 
 		// Maybe retrieve from the cache.
-        $cache_key   = 'getpaid_customer_ids_by_' . $by;
-		$customer_id = wp_cache_get( $value, $cache_key );
-		if ( false !== $customer_id ) {
+        $cache_key = 'getpaid_customer_ids_by_' . $by;
+		$customer_id = wp_cache_get($value, $cache_key);
+		if (false !== $customer_id) {
 			return $customer_id;
 		}
 
-        if ( 'email' === $by ) {
+        if ('email' === $by) {
             $customer_id = (int) $wpdb->get_var(
-                $wpdb->prepare( "SELECT id FROM {$wpdb->prefix}getpaid_customers WHERE email=%s LIMIT 1", $value )
+                $wpdb->prepare("SELECT id FROM {$wpdb->prefix}getpaid_customers WHERE email=%s LIMIT 1", $value)
             );
-        } elseif ( 'user_id' === $by ) {
+        } elseif ('user_id' === $by) {
             $customer_id = (int) $wpdb->get_var(
-                $wpdb->prepare( "SELECT id FROM {$wpdb->prefix}getpaid_customers WHERE user_id=%d LIMIT 1", $value )
+                $wpdb->prepare("SELECT id FROM {$wpdb->prefix}getpaid_customers WHERE user_id=%d LIMIT 1", $value)
             );
         }
 
 		// Update the cache with our data
-		wp_cache_set( $value, $customer_id, $cache_key );
+		wp_cache_set($value, $customer_id, $cache_key);
 
 		return $customer_id;
 
@@ -153,9 +153,9 @@ 
      * Clears the customer's cache.
      */
     public function clear_cache() {
-        wp_cache_delete( $this->get( 'email' ), 'getpaid_customer_ids_by_email' );
-        wp_cache_delete( $this->get( 'user_id' ), 'getpaid_customer_ids_by_user_id' );
-		wp_cache_delete( $this->get_id(), 'getpaid_customers' );
+        wp_cache_delete($this->get('email'), 'getpaid_customer_ids_by_email');
+        wp_cache_delete($this->get('user_id'), 'getpaid_customer_ids_by_user_id');
+		wp_cache_delete($this->get_id(), 'getpaid_customers');
 	}
 
 	/*
@@ -179,17 +179,17 @@ 
      * @param  string $key The key to fetch.
      * @param  string $context View or edit context.
      */
-    public function get( $key, $context = 'view' ) {
+    public function get($key, $context = 'view') {
 
         // Maybe strip _wpinv_ prefix from key.
-        $key = str_replace( '_wpinv_', '', $key );
+        $key = str_replace('_wpinv_', '', $key);
 
         // Check if we have a helper method for that.
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            return call_user_func( array( $this, 'get_' . $key ), $context );
+        if (method_exists($this, 'get_' . $key)) {
+            return call_user_func(array($this, 'get_' . $key), $context);
         }
 
-		return $this->get_prop( $key, $context );
+		return $this->get_prop($key, $context);
 
     }
 
@@ -209,14 +209,14 @@ 
      * @param string $key The key to fetch.
      * @param mixed $value The new value.
      */
-    public function set( $key, $value ) {
+    public function set($key, $value) {
 
         // Check if we have a helper method for that.
-        if ( method_exists( $this, 'set_' . $key ) ) {
-            return call_user_func( array( $this, 'set_' . $key ), $value );
+        if (method_exists($this, 'set_' . $key)) {
+            return call_user_func(array($this, 'set_' . $key), $value);
         }
 
-		return $this->set_prop( $key, $value );
+		return $this->set_prop($key, $value);
 
     }
 
@@ -226,13 +226,13 @@ 
 	 * @since 1.0.0
 	 * @param  string $status New status.
 	 */
-	public function set_status( $status ) {
+	public function set_status($status) {
 
-		if ( in_array( $status, array( 'active', 'inactive', 'blocked' ), true ) ) {
-			return $this->set_prop( 'status', $status );
+		if (in_array($status, array('active', 'inactive', 'blocked'), true)) {
+			return $this->set_prop('status', $status);
 		}
 
-		$this->set_prop( 'status', 'inactive' );
+		$this->set_prop('status', 'inactive');
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
 	 * @since 1.0.0
 	 * @param float $purchase_value.
 	 */
-	public function set_purchase_value( $purchase_value ) {
-		$this->set_prop( 'purchase_value', (float) $purchase_value );
+	public function set_purchase_value($purchase_value) {
+		$this->set_prop('purchase_value', (float) $purchase_value);
 	}
 
     /**
@@ -251,8 +251,8 @@ 
 	 * @since 1.0.0
 	 * @param int $purchase_count.
 	 */
-	public function set_purchase_count( $purchase_count ) {
-		$this->set_prop( 'purchase_count', absint( $purchase_count ) );
+	public function set_purchase_count($purchase_count) {
+		$this->set_prop('purchase_count', absint($purchase_count));
 	}
 
     /**
@@ -261,8 +261,8 @@ 
 	 * @since 1.0.0
 	 * @param int $user_id.
 	 */
-	public function set_user_id( $user_id ) {
-		$this->set_prop( 'user_id', absint( $user_id ) );
+	public function set_user_id($user_id) {
+		$this->set_prop('user_id', absint($user_id));
 	}
 
     /**
@@ -271,9 +271,9 @@ 
 	 * @since 1.0.0
 	 * @param string $email.
 	 */
-	public function set_email( $email ) {
-        $email = is_string( $email ) ? sanitize_email( $email ) : '';
-		$this->set_prop( 'email', $email );
+	public function set_email($email) {
+        $email = is_string($email) ? sanitize_email($email) : '';
+		$this->set_prop('email', $email);
 	}
 
     /**
@@ -282,9 +282,9 @@ 
 	 * @since 1.0.0
 	 * @param string $email_cc.
 	 */
-	public function set_email_cc( $email_cc ) {
-        $email_cc = implode( ', ', wp_parse_list( $email_cc ) );
-		$this->set_prop( 'email_cc', $email_cc );
+	public function set_email_cc($email_cc) {
+        $email_cc = implode(', ', wp_parse_list($email_cc));
+		$this->set_prop('email_cc', $email_cc);
 	}
 
     /**
@@ -293,16 +293,16 @@ 
 	 * @since 1.0.0
 	 * @param  string $date_created date created.
 	 */
-	public function set_date_created( $date_created ) {
+	public function set_date_created($date_created) {
 
-		$date = strtotime( $date_created );
+		$date = strtotime($date_created);
 
-        if ( $date && $date_created !== '0000-00-00 00:00:00'  && $date_created !== '0000-00-00 00:00' ) {
-            $this->set_prop( 'date_created', gmdate( 'Y-m-d H:i:s', $date ) );
+        if ($date && $date_created !== '0000-00-00 00:00:00' && $date_created !== '0000-00-00 00:00') {
+            $this->set_prop('date_created', gmdate('Y-m-d H:i:s', $date));
             return;
 		}
 
-		$this->set_prop( 'date_created', null );
+		$this->set_prop('date_created', null);
 	}
 
     /**
@@ -311,16 +311,16 @@ 
 	 * @since 1.0.0
 	 * @param  string $date_modified date created.
 	 */
-	public function set_date_modified( $date_modified ) {
+	public function set_date_modified($date_modified) {
 
-		$date = strtotime( $date_modified );
+		$date = strtotime($date_modified);
 
-        if ( $date && $date_modified !== '0000-00-00 00:00:00'  && $date_modified !== '0000-00-00 00:00' ) {
-            $this->set_prop( 'date_modified', gmdate( 'Y-m-d H:i:s', $date ) );
+        if ($date && $date_modified !== '0000-00-00 00:00:00' && $date_modified !== '0000-00-00 00:00') {
+            $this->set_prop('date_modified', gmdate('Y-m-d H:i:s', $date));
             return;
 		}
 
-		$this->set_prop( 'date_modified', null );
+		$this->set_prop('date_modified', null);
 	}
 
 	/*
@@ -341,18 +341,18 @@ 
 
         $maybe_set = array(
             'uuid'         => wp_generate_uuid4(),
-            'date_created' => current_time( 'mysql' ),
+            'date_created' => current_time('mysql'),
         );
 
-        foreach ( $maybe_set as $key => $value ) {
-            $current_value = $this->get( $key );
+        foreach ($maybe_set as $key => $value) {
+            $current_value = $this->get($key);
 
-            if ( empty( $current_value ) ) {
-                $this->set( $key, $value );
+            if (empty($current_value)) {
+                $this->set($key, $value);
             }
         }
 
-        $this->set( 'date_modified', current_time( 'mysql' ) );
+        $this->set('date_modified', current_time('mysql'));
 
 		return parent::save();
 	}
@@ -363,20 +363,20 @@ 
 	 * @since 1.0.0
 	 * @param int $user_id.
 	 */
-	public function clone_user( $user_id ) {
-        $user = get_userdata( $user_id );
+	public function clone_user($user_id) {
+        $user = get_userdata($user_id);
 
-        if ( empty( $user ) ) {
+        if (empty($user)) {
             return;
         }
 
-		$this->set_user_id( $user->ID );
-        $this->set_email( $user->user_email );
-        $this->set_purchase_value( getpaid_get_user_total_spend( $user->ID ) );
-        $this->set_purchase_count( getpaid_count_user_invoices( $user->ID ) );
-        $this->set( 'first_name', $user->first_name );
-        $this->set( 'last_name', $user->last_name );
-		$this->set_date_created( $user->user_registered );
+		$this->set_user_id($user->ID);
+        $this->set_email($user->user_email);
+        $this->set_purchase_value(getpaid_get_user_total_spend($user->ID));
+        $this->set_purchase_count(getpaid_count_user_invoices($user->ID));
+        $this->set('first_name', $user->first_name);
+        $this->set('last_name', $user->last_name);
+		$this->set_date_created($user->user_registered);
 
         // Fetch extra data from WC or old GetPaid.
         $prefixes = array(
@@ -385,18 +385,18 @@ 
             '',
         );
 
-        foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+        foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-            foreach ( $prefixes as $prefix ) {
+            foreach ($prefixes as $prefix) {
 
                 // Meta table.
-                $value = get_user_meta( $user_id, $prefix . $field, true );
+                $value = get_user_meta($user_id, $prefix . $field, true);
 
                 // UWP table.
-                $value = ( empty( $value ) && function_exists( 'uwp_get_usermeta' ) ) ? uwp_get_usermeta( $user_id, $prefix . $field ) : $value;
+                $value = (empty($value) && function_exists('uwp_get_usermeta')) ? uwp_get_usermeta($user_id, $prefix . $field) : $value;
 
-                if ( ! empty( $value ) ) {
-                    $this->set( $field, $value );
+                if (!empty($value)) {
+                    $this->set($field, $value);
                     continue;
                 }
             }
@@ -409,9 +409,9 @@ 
 	 * @since 1.0.0
 	 * @param int $user_id.
 	 */
-	public function migrate_from_user( $user_id ) {
-        $this->clone_user( $user_id );
-        do_action( 'getpaid_customer_migrated_from_user', $this, $user_id );
+	public function migrate_from_user($user_id) {
+        $this->clone_user($user_id);
+        do_action('getpaid_customer_migrated_from_user', $this, $user_id);
         $this->save();
 	}
 }

includes/admin/meta-boxes/class-getpaid-meta-box-invoice-items.php

Indentation +150 added lines, -150 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -75,16 +75,16 @@ 
             $class .= ' wpi-recurring';
         }
 
-		$refund_url = wp_nonce_url(
-			add_query_arg(
-				array(
-					'getpaid-admin-action' => 'refund_invoice',
-					'invoice_id'           => $invoice->get_id(),
-				)
-			),
-			'getpaid-nonce',
-			'getpaid-nonce'
-		);
+        $refund_url = wp_nonce_url(
+            add_query_arg(
+                array(
+                    'getpaid-admin-action' => 'refund_invoice',
+                    'invoice_id'           => $invoice->get_id(),
+                )
+            ),
+            'getpaid-nonce',
+            'getpaid-nonce'
+        );
     ?>
 
         <div class="wpinv-items-wrap<?php echo esc_attr( $class ); ?>" id="wpinv_items_wrap" data-status="<?php echo esc_attr( $invoice->get_status() ); ?>">
@@ -96,8 +96,8 @@ 
                             <th class="
                             <?php
                             echo esc_attr( $key );
-							echo 'total' == $key || 'qty' == $key ? ' hide-if-amount' : '';
-							?>
+                            echo 'total' == $key || 'qty' == $key ? ' hide-if-amount' : '';
+                            ?>
 							"><?php echo wp_kses_post( $label ); ?></th>
                         <?php endforeach; ?>
                     </tr>
@@ -106,7 +106,7 @@ 
                 <tbody class="wpinv-line-items">
                     <?php
                         foreach ( $invoice->get_items() as $int => $item ) {
-						self::output_row( $columns, $item, $invoice, $int % 2 == 0 ? 'even' : 'odd' );
+                        self::output_row( $columns, $item, $invoice, $int % 2 == 0 ? 'even' : 'odd' );
                         }
                     ?>
                 </tbody>
@@ -151,13 +151,13 @@ 
                                                         <?php
                                                         wpinv_html_select(
                                                             array(
-																'options'          => $item_types,
-																'name'             => '_wpinv_quick[type]',
-																'id'               => '_wpinv_quick_type',
-																'selected'         => 'custom',
-																'show_option_all'  => false,
-																'show_option_none' => false,
-																'class'            => 'gdmbx2-text-medium wpinv-quick-type',
+                                                                'options'          => $item_types,
+                                                                'name'             => '_wpinv_quick[type]',
+                                                                'id'               => '_wpinv_quick_type',
+                                                                'selected'         => 'custom',
+                                                                'show_option_all'  => false,
+                                                                'show_option_none' => false,
+                                                                'class'            => 'gdmbx2-text-medium wpinv-quick-type',
                                                             )
                                                         );
                                                             ?>
@@ -172,16 +172,16 @@ 
                                                             <?php
                                                                 wpinv_html_select(
                                                                     array(
-																		'options'          => array_merge(
-																			array( '' => __( 'Select VAT Rule', 'invoicing' ) ),
-																			getpaid_get_tax_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',
-																		'selected'         => 'digital',
+                                                                        'options'          => array_merge(
+                                                                            array( '' => __( 'Select VAT Rule', 'invoicing' ) ),
+                                                                            getpaid_get_tax_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',
+                                                                        'selected'         => 'digital',
                                                                     )
                                                                 );
                                                             ?>
@@ -194,16 +194,16 @@ 
                                                             <?php
                                                                 wpinv_html_select(
                                                                     array(
-																		'options'          => array_merge(
-																			array( '' => __( 'Select VAT Class', 'invoicing' ) ),
-																			getpaid_get_tax_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',
-																		'selected'         => '_standard',
+                                                                        'options'          => array_merge(
+                                                                            array( '' => __( 'Select VAT Class', 'invoicing' ) ),
+                                                                            getpaid_get_tax_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',
+                                                                        'selected'         => '_standard',
                                                                     )
                                                                 );
                                                             ?>
@@ -294,37 +294,37 @@ 
 								</p>
 								<?php if ( getpaid_payment_gateway_supports( $invoice->get_gateway(), 'refunds' ) ) : ?>
 									<?php
-										aui()->input(
-											array(
-												'type'  => 'checkbox',
-												'name'  => 'getpaid_refund_remote',
-												'id'    => 'getpaid_refund_remote',
-												'label' => sprintf(
-													'Refund payment in %s',
-													wpinv_get_gateway_admin_label( $invoice->get_gateway() )
-												),
-												'value' => 1,
-												'class' => 'getpaid-refund-field',
-											),
-											true
-										);
-									?>
+                                        aui()->input(
+                                            array(
+                                                'type'  => 'checkbox',
+                                                'name'  => 'getpaid_refund_remote',
+                                                'id'    => 'getpaid_refund_remote',
+                                                'label' => sprintf(
+                                                    'Refund payment in %s',
+                                                    wpinv_get_gateway_admin_label( $invoice->get_gateway() )
+                                                ),
+                                                'value' => 1,
+                                                'class' => 'getpaid-refund-field',
+                                            ),
+                                            true
+                                        );
+                                    ?>
 								<?php endif; ?>
 
 								<?php if ( getpaid_get_invoice_subscriptions( $invoice ) ) : ?>
 									<?php
-										aui()->input(
-											array(
-												'type'  => 'checkbox',
-												'name'  => 'getpaid_cancel_subscription',
-												'id'    => 'getpaid_cancel_subscription',
-												'label' => __( 'Cancel subscription', 'invoicing' ),
-												'value' => 1,
-												'class' => 'getpaid-refund-field',
-											),
-											true
-										);
-									?>
+                                        aui()->input(
+                                            array(
+                                                'type'  => 'checkbox',
+                                                'name'  => 'getpaid_cancel_subscription',
+                                                'id'    => 'getpaid_cancel_subscription',
+                                                'label' => __( 'Cancel subscription', 'invoicing' ),
+                                                'value' => 1,
+                                                'class' => 'getpaid-refund-field',
+                                            ),
+                                            true
+                                        );
+                                    ?>
 								<?php endif; ?>
                             </div>
                             <div class="modal-footer">
@@ -364,23 +364,23 @@ 
                 <?php
                     if ( $invoice->is_paid() ) {
 
-						printf(
-							'<span class="bsui"><button type="button" class="button button-primary" data-toggle="modal" data-bs-toggle="modal" data-bs-target="#getpaid-refund-invoice-modal" data-target="#getpaid-refund-invoice-modal">%s</button></span>',
-							esc_html__( 'Refund', 'invoicing' )
-						);
+                        printf(
+                            '<span class="bsui"><button type="button" class="button button-primary" data-toggle="modal" data-bs-toggle="modal" data-bs-target="#getpaid-refund-invoice-modal" data-target="#getpaid-refund-invoice-modal">%s</button></span>',
+                            esc_html__( 'Refund', 'invoicing' )
+                        );
                     } elseif ( ! $invoice->is_refunded() ) {
-						wpinv_item_dropdown(
-							array(
-								'name'           => 'wpinv_invoice_item',
-								'id'             => 'wpinv_invoice_item',
-								'show_recurring' => true,
-								'class'          => 'wpi_select2',
-							)
-						);
-
-						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-add-item">' . sprintf( esc_html__( 'Add item to %s', 'invoicing' ), esc_html( $invoice->get_label() ) ) . '</button>';
-						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-new-item">' . esc_html__( 'Create new item', 'invoicing' ) . '</button>';
-						echo '&nbsp;' . '<button type="button" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">' . esc_html__( 'Recalculate Totals', 'invoicing' ) . '</button>';
+                        wpinv_item_dropdown(
+                            array(
+                                'name'           => 'wpinv_invoice_item',
+                                'id'             => 'wpinv_invoice_item',
+                                'show_recurring' => true,
+                                'class'          => 'wpi_select2',
+                            )
+                        );
+
+                        echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-add-item">' . sprintf( esc_html__( 'Add item to %s', 'invoicing' ), esc_html( $invoice->get_label() ) ) . '</button>';
+                        echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-new-item">' . esc_html__( 'Create new item', 'invoicing' ) . '</button>';
+                        echo '&nbsp;' . '<button type="button" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">' . esc_html__( 'Recalculate Totals', 'invoicing' ) . '</button>';
 
                     }
                 ?>
@@ -397,72 +397,72 @@ 
             <?php foreach ( array_keys( $columns ) as $column ) : ?>
                 <td class="
 					<?php
-						echo esc_attr( $column );
-						echo 'total' == $column || 'qty' == $column ? ' hide-if-amount' : '';
-					?>
+                        echo esc_attr( $column );
+                        echo 'total' == $column || 'qty' == $column ? ' hide-if-amount' : '';
+                    ?>
 				">
                     <?php
                         switch ( $column ) {
-						case 'id':
-							echo (int) $item->get_id();
-							break;
-						case 'title':
-							printf(
-								'<a href="%s" target="_blank">%s</a>',
-								esc_url( get_edit_post_link( $item->get_id() ) ),
-								esc_html( $item->get_raw_name() )
-							);
-
-							$summary = apply_filters( 'getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice );
-							if ( $summary !== '' ) {
-								printf(
-									'<span class="meta">%s</span>',
-									wp_kses_post( wpautop( $summary ) )
-								);
-							}
-
-							printf(
-								'<input type="hidden" value="%s" name="getpaid_items[%s][name]" class="getpaid-recalculate-prices-on-change" />',
-								esc_attr( $item->get_raw_name() ),
-								(int) $item->get_id()
-							);
-
-							printf(
-								'<textarea style="display: none;" name="getpaid_items[%s][description]" class="getpaid-recalculate-prices-on-change">%s</textarea>',
-								(int) $item->get_id(),
-								esc_attr( $item->get_description() )
-							);
-
-							break;
-						case 'price':
-							printf(
-								'<input type="text" value="%s" name="getpaid_items[%s][price]" style="width: 100px;" class="getpaid-admin-invoice-item-price getpaid-recalculate-prices-on-change" />',
-								esc_attr( getpaid_unstandardize_amount( $item->get_price() ) ),
-								(int) $item->get_id()
-							);
-
-							break;
-						case 'qty':
-							printf(
-								'<input type="text" style="width: 100px;" value="%s" name="getpaid_items[%s][quantity]" class="getpaid-admin-invoice-item-quantity getpaid-recalculate-prices-on-change" />',
-								floatval( $item->get_quantity() ),
-								(int) $item->get_id()
-							);
-
-							break;
-						case 'total':
-							wpinv_the_price( $item->get_sub_total(), $invoice->get_currency() );
-
-							break;
-						case 'tax':
-							echo floatval( wpinv_round_amount( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
-
-							break;
-						case 'action':
-							if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
-								echo '<i class="fa fa-trash wpinv-item-remove"></i>';
+                        case 'id':
+                            echo (int) $item->get_id();
+                            break;
+                        case 'title':
+                            printf(
+                                '<a href="%s" target="_blank">%s</a>',
+                                esc_url( get_edit_post_link( $item->get_id() ) ),
+                                esc_html( $item->get_raw_name() )
+                            );
+
+                            $summary = apply_filters( 'getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice );
+                            if ( $summary !== '' ) {
+                                printf(
+                                    '<span class="meta">%s</span>',
+                                    wp_kses_post( wpautop( $summary ) )
+                                );
+                            }
+
+                            printf(
+                                '<input type="hidden" value="%s" name="getpaid_items[%s][name]" class="getpaid-recalculate-prices-on-change" />',
+                                esc_attr( $item->get_raw_name() ),
+                                (int) $item->get_id()
+                            );
+
+                            printf(
+                                '<textarea style="display: none;" name="getpaid_items[%s][description]" class="getpaid-recalculate-prices-on-change">%s</textarea>',
+                                (int) $item->get_id(),
+                                esc_attr( $item->get_description() )
+                            );
+
+                            break;
+                        case 'price':
+                            printf(
+                                '<input type="text" value="%s" name="getpaid_items[%s][price]" style="width: 100px;" class="getpaid-admin-invoice-item-price getpaid-recalculate-prices-on-change" />',
+                                esc_attr( getpaid_unstandardize_amount( $item->get_price() ) ),
+                                (int) $item->get_id()
+                            );
+
+                            break;
+                        case 'qty':
+                            printf(
+                                '<input type="text" style="width: 100px;" value="%s" name="getpaid_items[%s][quantity]" class="getpaid-admin-invoice-item-quantity getpaid-recalculate-prices-on-change" />',
+                                floatval( $item->get_quantity() ),
+                                (int) $item->get_id()
+                            );
+
+                            break;
+                        case 'total':
+                            wpinv_the_price( $item->get_sub_total(), $invoice->get_currency() );
+
+                            break;
+                        case 'tax':
+                            echo floatval( wpinv_round_amount( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
+
+                            break;
+                        case 'action':
+                            if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+                                echo '<i class="fa fa-trash wpinv-item-remove"></i>';
                                 }
-							break;
+                            break;
                         }
                         do_action( 'getpaid_admin_edit_invoice_item_' . $column, $item, $invoice );
                     ?>
@@ -473,10 +473,10 @@ 
     }
 
     /**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
     public static function output2( $post ) {
 
         // Prepare the invoice.

Spacing +171 added lines, -171 removed lines

@@ -7,7 +7,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -16,62 +16,62 @@ 
  */
 class GetPaid_Meta_Box_Invoice_Items {
 
-    public static function get_columns( $invoice ) {
+    public static function get_columns($invoice) {
         $use_taxes = $invoice->is_taxable() && wpinv_use_taxes();
         $columns   = array(
-            'id'     => __( 'ID', 'invoicing' ),
-            'title'  => __( 'Item', 'invoicing' ),
+            'id'     => __('ID', 'invoicing'),
+            'title'  => __('Item', 'invoicing'),
             'price'  => sprintf(
                 '<span class="getpaid-hide-if-hours getpaid-hide-if-quantity">%s</span>
                 <span class="getpaid-hide-if-hours hide-if-amount">%s</span>
                 <span class="getpaid-hide-if-quantity hide-if-amount">%s</span>',
-                __( 'Amount', 'invoicing' ),
-                __( 'Price', 'invoicing' ),
-                __( 'Rate', 'invoicing' )
+                __('Amount', 'invoicing'),
+                __('Price', 'invoicing'),
+                __('Rate', 'invoicing')
             ),
             'qty'    => sprintf(
                 '<span class="getpaid-hide-if-hours">%s</span><span class="getpaid-hide-if-quantity">%s</span>',
-                __( 'Quantity', 'invoicing' ),
-                __( 'Hours', 'invoicing' )
+                __('Quantity', 'invoicing'),
+                __('Hours', 'invoicing')
             ),
-            'total'  => __( 'Total', 'invoicing' ),
+            'total'  => __('Total', 'invoicing'),
             'tax'    => $invoice->get_item_tax_name(),
             'action' => '',
         );
 
-        if ( ! $use_taxes ) {
-            unset( $columns['tax'] );
+        if (!$use_taxes) {
+            unset($columns['tax']);
         }
 
         return $columns;
     }
 
-    public static function output( $post, $invoice = false ) {
+    public static function output($post, $invoice = false) {
 
-        if ( apply_filters( 'getpaid_use_new_invoice_items_metabox', false ) ) {
-            return self::output2( $post );
+        if (apply_filters('getpaid_use_new_invoice_items_metabox', false)) {
+            return self::output2($post);
         }
 
-        $post_id    = ! empty( $post->ID ) ? $post->ID : 0;
-        $invoice    = $invoice instanceof WPInv_Invoice ? $invoice : new WPInv_Invoice( $post_id );
+        $post_id    = !empty($post->ID) ? $post->ID : 0;
+        $invoice    = $invoice instanceof WPInv_Invoice ? $invoice : new WPInv_Invoice($post_id);
         $use_taxes  = $invoice->is_taxable() && wpinv_use_taxes();
-        $item_types = apply_filters( 'wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post );
-        $columns    = self::get_columns( $invoice );
-        $cols       = count( $columns );
+        $item_types = apply_filters('wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post);
+        $columns    = self::get_columns($invoice);
+        $cols       = count($columns);
         $class      = '';
 
-        unset( $item_types['adv'] );
-        unset( $item_types['package'] );
+        unset($item_types['adv']);
+        unset($item_types['package']);
 
-        if ( $invoice->is_paid() ) {
+        if ($invoice->is_paid()) {
             $class .= ' wpinv-paid';
         }
 
-        if ( $invoice->is_refunded() ) {
+        if ($invoice->is_refunded()) {
             $class .= ' wpinv-refunded';
         }
 
-        if ( $invoice->is_recurring() ) {
+        if ($invoice->is_recurring()) {
             $class .= ' wpi-recurring';
         }
 
@@ -87,26 +87,26 @@ 
 		);
     ?>
 
-        <div class="wpinv-items-wrap<?php echo esc_attr( $class ); ?>" id="wpinv_items_wrap" data-status="<?php echo esc_attr( $invoice->get_status() ); ?>">
+        <div class="wpinv-items-wrap<?php echo esc_attr($class); ?>" id="wpinv_items_wrap" data-status="<?php echo esc_attr($invoice->get_status()); ?>">
             <table id="wpinv_items" class="wpinv-items" cellspacing="0" cellpadding="0">
 
                 <thead>
                     <tr>
-                        <?php foreach ( $columns as $key => $label ) : ?>
+                        <?php foreach ($columns as $key => $label) : ?>
                             <th class="
                             <?php
-                            echo esc_attr( $key );
+                            echo esc_attr($key);
 							echo 'total' == $key || 'qty' == $key ? ' hide-if-amount' : '';
 							?>
-							"><?php echo wp_kses_post( $label ); ?></th>
+							"><?php echo wp_kses_post($label); ?></th>
                         <?php endforeach; ?>
                     </tr>
                 </thead>
 
                 <tbody class="wpinv-line-items">
                     <?php
-                        foreach ( $invoice->get_items() as $int => $item ) {
-						self::output_row( $columns, $item, $invoice, $int % 2 == 0 ? 'even' : 'odd' );
+                        foreach ($invoice->get_items() as $int => $item) {
+						self::output_row($columns, $item, $invoice, $int % 2 == 0 ? 'even' : 'odd');
                         }
                     ?>
                 </tbody>
@@ -123,7 +123,7 @@ 
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-name">
                                                     <span class="input-text-wrap">
-                                                        <input type="text" style="width: 100%" placeholder="<?php esc_attr_e( 'Item Name', 'invoicing' ); ?>" class="wpinv-quick-item-name" name="_wpinv_quick[name]">
+                                                        <input type="text" style="width: 100%" placeholder="<?php esc_attr_e('Item Name', 'invoicing'); ?>" class="wpinv-quick-item-name" name="_wpinv_quick[name]">
                                                     </span>
                                                 </label>
                                             </div>
@@ -131,8 +131,8 @@ 
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-price">
                                                     <span class="input-text-wrap">
-                                                    <input type="text" style="width: 200px" placeholder="<?php esc_attr_e( 'Item Price', 'invoicing' ); ?>" class="wpinv-quick-item-price" name="_wpinv_quick[price]">
-                                                        &times; <input type="text" style="width: 140px" placeholder="<?php esc_attr_e( 'Item Quantity', 'invoicing' ); ?>" class="wpinv-quick-item-qty" name="_wpinv_quick[qty]">
+                                                    <input type="text" style="width: 200px" placeholder="<?php esc_attr_e('Item Price', 'invoicing'); ?>" class="wpinv-quick-item-price" name="_wpinv_quick[price]">
+                                                        &times; <input type="text" style="width: 140px" placeholder="<?php esc_attr_e('Item Quantity', 'invoicing'); ?>" class="wpinv-quick-item-qty" name="_wpinv_quick[qty]">
                                                     </span>
                                                 </label>
                                             </div>
@@ -140,7 +140,7 @@ 
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-name">
                                                     <span class="input-text-wrap">
-                                                        <textarea rows="4" style="width: 100%" placeholder="<?php esc_attr_e( 'Item Description', 'invoicing' ); ?>" class="wpinv-quick-item-description" name="_wpinv_quick[description]"></textarea>
+                                                        <textarea rows="4" style="width: 100%" placeholder="<?php esc_attr_e('Item Description', 'invoicing'); ?>" class="wpinv-quick-item-description" name="_wpinv_quick[description]"></textarea>
                                                     </span>
                                                 </label>
                                             </div>
@@ -165,7 +165,7 @@ 
                                                 </label>
                                             </div>
 
-                                            <?php if ( $use_taxes ) : ?>
+                                            <?php if ($use_taxes) : ?>
                                                 <div class="wp-clearfix">
                                                     <label class="wpi-vat-rule">
                                                         <span class="input-text-wrap">
@@ -173,7 +173,7 @@ 
                                                                 wpinv_html_select(
                                                                     array(
 																		'options'          => array_merge(
-																			array( '' => __( 'Select VAT Rule', 'invoicing' ) ),
+																			array('' => __('Select VAT Rule', 'invoicing')),
 																			getpaid_get_tax_rules()
 																		),
 																		'name'             => '_wpinv_quick[vat_rule]',
@@ -195,7 +195,7 @@ 
                                                                 wpinv_html_select(
                                                                     array(
 																		'options'          => array_merge(
-																			array( '' => __( 'Select VAT Class', 'invoicing' ) ),
+																			array('' => __('Select VAT Class', 'invoicing')),
 																			getpaid_get_tax_classes()
 																		),
 																		'name'             => '_wpinv_quick[vat_class]',
@@ -219,7 +219,7 @@ 
                                                             'type'    => 'checkbox',
                                                             'name'    => '_wpinv_quick[one-time]',
                                                             'id'      => '_wpinv_quick-one-time',
-                                                            'label'   => __( "One time item (won't be saved to regular items list)", 'invoicing' ),
+                                                            'label'   => __("One time item (won't be saved to regular items list)", 'invoicing'),
                                                             'value'   => 1,
                                                             'no_wrap' => true,
                                                             'checked' => false,
@@ -243,39 +243,39 @@ 
                         </td>
                     </tr>
                     <tr class="totals">
-                        <td colspan="<?php echo ( (int) $cols - 4 ); ?>"></td>
+                        <td colspan="<?php echo ((int) $cols - 4); ?>"></td>
                         <td colspan="4">
                             <table cellspacing="0" cellpadding="0">
                                 <tr class="subtotal">
-                                    <td class="name"><?php esc_html_e( 'Sub Total:', 'invoicing' ); ?></td>
-                                    <td class="total"><?php wpinv_the_price( $invoice->get_subtotal(), $invoice->get_currency() ); ?></td>
+                                    <td class="name"><?php esc_html_e('Sub Total:', 'invoicing'); ?></td>
+                                    <td class="total"><?php wpinv_the_price($invoice->get_subtotal(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <tr class="discount">
-                                    <td class="name"><?php esc_html_e( 'Discount:', 'invoicing' ); ?></td>
-                                    <td class="total"><?php wpinv_the_price( $invoice->get_total_discount(), $invoice->get_currency() ); ?></td>
+                                    <td class="name"><?php esc_html_e('Discount:', 'invoicing'); ?></td>
+                                    <td class="total"><?php wpinv_the_price($invoice->get_total_discount(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
-                                <?php if ( $use_taxes ) : ?>
-                                <?php if ( is_array( $taxes = $invoice->get_taxes() ) && wpinv_display_individual_tax_rates() ) { ?>
-                                <?php foreach ( $taxes as $tax_key => $tax_item ) { ?>
+                                <?php if ($use_taxes) : ?>
+                                <?php if (is_array($taxes = $invoice->get_taxes()) && wpinv_display_individual_tax_rates()) { ?>
+                                <?php foreach ($taxes as $tax_key => $tax_item) { ?>
                                 <tr class="tax">
-                                    <td class="name"><?php echo esc_html( $invoice->get_tax_item_name( $tax_key, $tax_item, ':' ) ); ?></td>
-                                    <td class="total"><?php wpinv_the_price( $invoice->get_tax_item_amount( $tax_key, $tax_item ), $invoice->get_currency() ); ?></td>
+                                    <td class="name"><?php echo esc_html($invoice->get_tax_item_name($tax_key, $tax_item, ':')); ?></td>
+                                    <td class="total"><?php wpinv_the_price($invoice->get_tax_item_amount($tax_key, $tax_item), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <?php } ?>
                                 <?php } else { ?>
                                 <tr class="tax">
-                                    <td class="name"><?php esc_html_e( 'Tax:', 'invoicing' ); ?></td>
-                                    <td class="total"><?php wpinv_the_price( $invoice->get_total_tax(), $invoice->get_currency() ); ?></td>
+                                    <td class="name"><?php esc_html_e('Tax:', 'invoicing'); ?></td>
+                                    <td class="total"><?php wpinv_the_price($invoice->get_total_tax(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <?php } ?>
                                 <?php endif; ?>
                                 <tr class="total">
-                                    <td class="name"><?php esc_html_e( 'Total:', 'invoicing' ); ?></td>
-                                    <td class="total"><?php wpinv_the_price( $invoice->get_total(), $invoice->get_currency() ); ?></td>
+                                    <td class="name"><?php esc_html_e('Total:', 'invoicing'); ?></td>
+                                    <td class="total"><?php wpinv_the_price($invoice->get_total(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
                             </table>
@@ -291,18 +291,18 @@ 
                      <div class="modal-dialog modal-dialog-centered" role="document">
                         <div class="modal-content">
                             <div class="modal-header">
-                                <h5 class="modal-title" id="getpaid-refund-invoice-modal-label"><?php esc_html_e( 'Refund Payment', 'invoicing' ); ?></h5>
-                                <button type="button" class="close btn-close" data-bs-dismiss="modal" data-dismiss="modal" aria-label="<?php esc_html_e( 'Close', 'invoicing' ); ?>">
-                                    <?php if ( empty( $GLOBALS['aui_bs5'] ) ) : ?>
+                                <h5 class="modal-title" id="getpaid-refund-invoice-modal-label"><?php esc_html_e('Refund Payment', 'invoicing'); ?></h5>
+                                <button type="button" class="close btn-close" data-bs-dismiss="modal" data-dismiss="modal" aria-label="<?php esc_html_e('Close', 'invoicing'); ?>">
+                                    <?php if (empty($GLOBALS['aui_bs5'])) : ?>
                                         <span aria-hidden="true">×</span>
                                     <?php endif; ?>
                                 </button>
                             </div>
                             <div class="modal-body">
 								<p>
-									<?php esc_html_e( 'Are you sure you want to refund this payment?', 'invoicing' ); ?>
+									<?php esc_html_e('Are you sure you want to refund this payment?', 'invoicing'); ?>
 								</p>
-								<?php if ( getpaid_payment_gateway_supports( $invoice->get_gateway(), 'refunds' ) ) : ?>
+								<?php if (getpaid_payment_gateway_supports($invoice->get_gateway(), 'refunds')) : ?>
 									<?php
 										aui()->input(
 											array(
@@ -311,7 +311,7 @@ 
 												'id'    => 'getpaid_refund_remote',
 												'label' => sprintf(
 													'Refund payment in %s',
-													wpinv_get_gateway_admin_label( $invoice->get_gateway() )
+													wpinv_get_gateway_admin_label($invoice->get_gateway())
 												),
 												'value' => 1,
 												'class' => 'getpaid-refund-field',
@@ -321,14 +321,14 @@ 
 									?>
 								<?php endif; ?>
 
-								<?php if ( getpaid_get_invoice_subscriptions( $invoice ) ) : ?>
+								<?php if (getpaid_get_invoice_subscriptions($invoice)) : ?>
 									<?php
 										aui()->input(
 											array(
 												'type'  => 'checkbox',
 												'name'  => 'getpaid_cancel_subscription',
 												'id'    => 'getpaid_cancel_subscription',
-												'label' => __( 'Cancel subscription', 'invoicing' ),
+												'label' => __('Cancel subscription', 'invoicing'),
 												'value' => 1,
 												'class' => 'getpaid-refund-field',
 											),
@@ -338,12 +338,12 @@ 
 								<?php endif; ?>
                             </div>
                             <div class="modal-footer">
-                                <button type="button" class="btn btn-secondary getpaid-cancel" data-bs-dismiss="modal" data-dismiss="modal"><?php esc_html_e( 'Cancel', 'invoicing' ); ?></button>
+                                <button type="button" class="btn btn-secondary getpaid-cancel" data-bs-dismiss="modal" data-dismiss="modal"><?php esc_html_e('Cancel', 'invoicing'); ?></button>
                                 <a
-									href="<?php echo esc_url_raw( $refund_url ); ?>"
-									data-href="<?php echo esc_url_raw( $refund_url ); ?>"
+									href="<?php echo esc_url_raw($refund_url); ?>"
+									data-href="<?php echo esc_url_raw($refund_url); ?>"
 									class="btn btn-primary getpaid-refund-payment-button"
-								><?php esc_html_e( 'Refund', 'invoicing' ); ?></a>
+								><?php esc_html_e('Refund', 'invoicing'); ?></a>
 								<script>
 									// Update the refund URL when the user changes the refund options.
 									jQuery( function( $ ) {
@@ -369,13 +369,13 @@ 
 
             <div class="wpinv-actions">
                 <?php
-                    if ( $invoice->is_paid() ) {
+                    if ($invoice->is_paid()) {
 
 						printf(
 							'<span class="bsui"><button type="button" class="button button-primary" data-toggle="modal" data-bs-toggle="modal" data-bs-target="#getpaid-refund-invoice-modal" data-target="#getpaid-refund-invoice-modal">%s</button></span>',
-							esc_html__( 'Refund', 'invoicing' )
+							esc_html__('Refund', 'invoicing')
 						);
-                    } elseif ( ! $invoice->is_refunded() ) {
+                    } elseif (!$invoice->is_refunded()) {
 						wpinv_item_dropdown(
 							array(
 								'name'           => 'wpinv_invoice_item',
@@ -385,66 +385,66 @@ 
 							)
 						);
 
-						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-add-item">' . sprintf( esc_html__( 'Add item to %s', 'invoicing' ), esc_html( $invoice->get_label() ) ) . '</button>';
-						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-new-item">' . esc_html__( 'Create new item', 'invoicing' ) . '</button>';
-						echo '&nbsp;' . '<button type="button" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">' . esc_html__( 'Recalculate Totals', 'invoicing' ) . '</button>';
+						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-add-item">' . sprintf(esc_html__('Add item to %s', 'invoicing'), esc_html($invoice->get_label())) . '</button>';
+						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-new-item">' . esc_html__('Create new item', 'invoicing') . '</button>';
+						echo '&nbsp;' . '<button type="button" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">' . esc_html__('Recalculate Totals', 'invoicing') . '</button>';
 
                     }
                 ?>
-                <?php do_action( 'wpinv_invoice_items_actions', $invoice ); ?>
+                <?php do_action('wpinv_invoice_items_actions', $invoice); ?>
             </div>
         </div>
         <?php
     }
 
-    public static function output_row( $columns, $item, $invoice, $class = 'even' ) {
+    public static function output_row($columns, $item, $invoice, $class = 'even') {
 
     ?>
-        <tr class="item item-<?php echo esc_attr( $class ); ?>" data-item-id="<?php echo esc_attr( $item->get_id() ); ?>">
-            <?php foreach ( array_keys( $columns ) as $column ) : ?>
+        <tr class="item item-<?php echo esc_attr($class); ?>" data-item-id="<?php echo esc_attr($item->get_id()); ?>">
+            <?php foreach (array_keys($columns) as $column) : ?>
                 <td class="
 					<?php
-						echo esc_attr( $column );
+						echo esc_attr($column);
 						echo 'total' == $column || 'qty' == $column ? ' hide-if-amount' : '';
 					?>
 				">
                     <?php
-                        switch ( $column ) {
+                        switch ($column) {
 						case 'id':
 							echo (int) $item->get_id();
 							break;
 						case 'title':
 							printf(
 								'<a href="%s" target="_blank">%s</a>',
-								esc_url( get_edit_post_link( $item->get_id() ) ),
-								esc_html( $item->get_raw_name() )
+								esc_url(get_edit_post_link($item->get_id())),
+								esc_html($item->get_raw_name())
 							);
 
-							$summary = apply_filters( 'getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice );
-							if ( $summary !== '' ) {
+							$summary = apply_filters('getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice);
+							if ($summary !== '') {
 								printf(
 									'<span class="meta">%s</span>',
-									wp_kses_post( wpautop( $summary ) )
+									wp_kses_post(wpautop($summary))
 								);
 							}
 
 							printf(
 								'<input type="hidden" value="%s" name="getpaid_items[%s][name]" class="getpaid-recalculate-prices-on-change" />',
-								esc_attr( $item->get_raw_name() ),
+								esc_attr($item->get_raw_name()),
 								(int) $item->get_id()
 							);
 
 							printf(
 								'<textarea style="display: none;" name="getpaid_items[%s][description]" class="getpaid-recalculate-prices-on-change">%s</textarea>',
 								(int) $item->get_id(),
-								esc_attr( $item->get_description() )
+								esc_attr($item->get_description())
 							);
 
 							break;
 						case 'price':
 							printf(
 								'<input type="text" value="%s" name="getpaid_items[%s][price]" style="width: 100px;" class="getpaid-admin-invoice-item-price getpaid-recalculate-prices-on-change" />',
-								esc_attr( getpaid_unstandardize_amount( $item->get_price() ) ),
+								esc_attr(getpaid_unstandardize_amount($item->get_price())),
 								(int) $item->get_id()
 							);
 
@@ -452,26 +452,26 @@ 
 						case 'qty':
 							printf(
 								'<input type="text" style="width: 100px;" value="%s" name="getpaid_items[%s][quantity]" class="getpaid-admin-invoice-item-quantity getpaid-recalculate-prices-on-change" />',
-								floatval( $item->get_quantity() ),
+								floatval($item->get_quantity()),
 								(int) $item->get_id()
 							);
 
 							break;
 						case 'total':
-							wpinv_the_price( $item->get_sub_total(), $invoice->get_currency() );
+							wpinv_the_price($item->get_sub_total(), $invoice->get_currency());
 
 							break;
 						case 'tax':
-							echo floatval( wpinv_round_amount( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
+							echo floatval(wpinv_round_amount(getpaid_get_invoice_tax_rate($invoice, $item), 2)) . '%';
 
 							break;
 						case 'action':
-							if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+							if (!$invoice->is_paid() && !$invoice->is_refunded()) {
 								echo '<i class="fa fa-trash wpinv-item-remove"></i>';
                                 }
 							break;
                         }
-                        do_action( 'getpaid_admin_edit_invoice_item_' . $column, $item, $invoice );
+                        do_action('getpaid_admin_edit_invoice_item_' . $column, $item, $invoice);
                     ?>
                 </td>
             <?php endforeach; ?>
@@ -484,10 +484,10 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output2( $post ) {
+    public static function output2($post) {
 
         // Prepare the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Invoice items.
         $items = $invoice->get_items();
@@ -495,28 +495,28 @@ 
         $totals = array(
 
             'subtotal' => array(
-                'label' => __( 'Items Subtotal', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_subtotal(), $invoice->get_currency() ),
+                'label' => __('Items Subtotal', 'invoicing'),
+                'value' => wpinv_price($invoice->get_subtotal(), $invoice->get_currency()),
             ),
 
             'discount' => array(
-                'label' => __( 'Total Discount', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total_discount(), $invoice->get_currency() ),
+                'label' => __('Total Discount', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total_discount(), $invoice->get_currency()),
             ),
 
             'tax'      => array(
-                'label' => __( 'Total Tax', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total_tax(), $invoice->get_currency() ),
+                'label' => __('Total Tax', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total_tax(), $invoice->get_currency()),
             ),
 
             'total'    => array(
-                'label' => __( 'Invoice Total', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total(), $invoice->get_currency() ),
+                'label' => __('Invoice Total', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total(), $invoice->get_currency()),
             ),
         );
 
-        if ( ! wpinv_use_taxes() ) {
-            unset( $totals['tax'] );
+        if (!wpinv_use_taxes()) {
+            unset($totals['tax']);
         }
 
         $item_args = array(
@@ -524,7 +524,7 @@ 
             'orderby'        => 'title',
             'order'          => 'ASC',
             'posts_per_page' => -1,
-            'post_status'    => array( 'publish' ),
+            'post_status'    => array('publish'),
             'meta_query'     => array(
                 array(
                     'key'     => '_wpinv_type',
@@ -552,10 +552,10 @@ 
             }
         </style>
 
-                <div class="bsui getpaid-invoice-items-inner <?php echo empty( $items ) ? 'no-items' : 'has-items'; ?> <?php echo $invoice->is_paid() || $invoice->is_refunded() ? 'not-editable' : 'editable'; ?>" style="margin-top: 1.5rem; padding: 0 12px 12px;">
+                <div class="bsui getpaid-invoice-items-inner <?php echo empty($items) ? 'no-items' : 'has-items'; ?> <?php echo $invoice->is_paid() || $invoice->is_refunded() ? 'not-editable' : 'editable'; ?>" style="margin-top: 1.5rem; padding: 0 12px 12px;">
 
-                    <?php if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) : ?>
-                        <?php do_action( 'wpinv_meta_box_before_invoice_template_row', $invoice->get_id() ); ?>
+                    <?php if (!$invoice->is_paid() && !$invoice->is_refunded()) : ?>
+                        <?php do_action('wpinv_meta_box_before_invoice_template_row', $invoice->get_id()); ?>
 
                         <div class="row">
                             <div class="col-12 col-sm-6">
@@ -564,15 +564,15 @@ 
                                         array(
                                             'id'          => 'wpinv_template',
                                             'name'        => 'wpinv_template',
-                                            'label'       => __( 'Template', 'invoicing' ),
+                                            'label'       => __('Template', 'invoicing'),
                                             'label_type'  => 'vertical',
-                                            'placeholder' => __( 'Choose a template', 'invoicing' ),
+                                            'placeholder' => __('Choose a template', 'invoicing'),
                                             'class'       => 'form-control-sm',
-                                            'value'       => $invoice->get_template( 'edit' ),
+                                            'value'       => $invoice->get_template('edit'),
                                             'options'     => array(
-                                                'quantity' => __( 'Quantity', 'invoicing' ),
-                                                'hours'    => __( 'Hours', 'invoicing' ),
-                                                'amount'   => __( 'Amount Only', 'invoicing' ),
+                                                'quantity' => __('Quantity', 'invoicing'),
+                                                'hours'    => __('Hours', 'invoicing'),
+                                                'amount'   => __('Amount Only', 'invoicing'),
                                             ),
                                             'data-allow-clear' => 'false',
                                             'select2'     => true,
@@ -589,11 +589,11 @@ 
                                         array(
                                             'id'          => 'wpinv_currency',
                                             'name'        => 'wpinv_currency',
-                                            'label'       => __( 'Currency', 'invoicing' ),
+                                            'label'       => __('Currency', 'invoicing'),
                                             'label_type'  => 'vertical',
-                                            'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
+                                            'placeholder' => __('Select Invoice Currency', 'invoicing'),
                                             'class'       => 'form-control-sm',
-                                            'value'       => $invoice->get_currency( 'edit' ),
+                                            'value'       => $invoice->get_currency('edit'),
                                             'required'    => false,
                                             'data-allow-clear' => 'false',
                                             'select2'     => true,
@@ -606,24 +606,24 @@ 
                             </div>
                         </div>
 
-                        <?php do_action( 'wpinv_meta_box_invoice_template_row', $invoice->get_id() ); ?>
+                        <?php do_action('wpinv_meta_box_invoice_template_row', $invoice->get_id()); ?>
                     <?php endif; ?>
 
                     <table cellpadding="0" cellspacing="0" class="getpaid_invoice_items">
                         <thead>
                             <tr>
-                                <th class="getpaid-item" colspan="2"><?php esc_html_e( 'Item', 'invoicing' ); ?></th>
+                                <th class="getpaid-item" colspan="2"><?php esc_html_e('Item', 'invoicing'); ?></th>
                                 <th class="getpaid-quantity hide-if-amount text-right">
-                                    <span class="getpaid-hide-if-hours"><?php esc_html_e( 'Quantity', 'invoicing' ); ?></span>
-                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e( 'Hours', 'invoicing' ); ?></span>
+                                    <span class="getpaid-hide-if-hours"><?php esc_html_e('Quantity', 'invoicing'); ?></span>
+                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e('Hours', 'invoicing'); ?></span>
                                 </th>
                                 <th class="getpaid-price hide-if-amount text-right">
-                                    <span class="getpaid-hide-if-hours"><?php esc_html_e( 'Price', 'invoicing' ); ?></span>
-                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e( 'Rate', 'invoicing' ); ?></span>
+                                    <span class="getpaid-hide-if-hours"><?php esc_html_e('Price', 'invoicing'); ?></span>
+                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e('Rate', 'invoicing'); ?></span>
                                 </th>
                                 <th class="getpaid-item-subtotal text-right">
-                                    <span class="getpaid-hide-if-hours getpaid-hide-if-quantity"><?php esc_html_e( 'Amount', 'invoicing' ); ?></span>
-                                    <span class="hide-if-amount"><?php esc_html_e( 'Total', 'invoicing' ); ?></span>
+                                    <span class="getpaid-hide-if-hours getpaid-hide-if-quantity"><?php esc_html_e('Amount', 'invoicing'); ?></span>
+                                    <span class="hide-if-amount"><?php esc_html_e('Total', 'invoicing'); ?></span>
                                 </th>
                                 <th class="getpaid-item-actions hide-if-not-editable" width="70px">&nbsp;</th>
                             </tr>
@@ -631,8 +631,8 @@ 
 		                <tbody class="getpaid_invoice_line_items">
                             <tr class="hide-if-has-items hide-if-not-editable">
                                 <td colspan="2" class="pt-4 pb-4">
-                                    <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php esc_html_e( 'Add Existing Items', 'invoicing' ); ?></button>
-                                    <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php esc_html_e( 'Create New Item', 'invoicing' ); ?></button>
+                                    <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php esc_html_e('Add Existing Items', 'invoicing'); ?></button>
+                                    <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php esc_html_e('Create New Item', 'invoicing'); ?></button>
                                 </td>
                                 <td class="hide-if-amount">&nbsp;</th>
                                 <td class="hide-if-amount">&nbsp;</th>
@@ -664,11 +664,11 @@ 
                             <div class="col-12 col-sm-6 offset-sm-6">
                                 <table class="getpaid-invoice-totals text-right w-100">
                                     <tbody>
-                                        <?php foreach ( apply_filters( 'getpaid_invoice_subtotal_rows', $totals, $invoice ) as $key => $data ) : ?>
-                                            <tr class="getpaid-totals-<?php echo esc_attr( $key ); ?>">
-                                                <td class="label"><?php echo esc_html( $data['label'] ); ?>:</td>
+                                        <?php foreach (apply_filters('getpaid_invoice_subtotal_rows', $totals, $invoice) as $key => $data) : ?>
+                                            <tr class="getpaid-totals-<?php echo esc_attr($key); ?>">
+                                                <td class="label"><?php echo esc_html($data['label']); ?>:</td>
                                                 <td width="1%"></td>
-                                                <td class="value"><?php echo wp_kses_post( $data['value'] ); ?></td>
+                                                <td class="value"><?php echo wp_kses_post($data['value']); ?></td>
                                             </tr>
                                         <?php endforeach; ?>
                                     </tbody>
@@ -681,18 +681,18 @@ 
                     <div class="getpaid-invoice-item-actions hide-if-no-items hide-if-not-editable">
                         <div class="row">
                             <div class="text-left col-12 col-sm-8">
-                                <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php esc_html_e( 'Add Existing Item', 'invoicing' ); ?></button>
-                                <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php esc_html_e( 'Create New Item', 'invoicing' ); ?></button>
-                                <?php do_action( 'getpaid-invoice-items-actions', $invoice ); ?>
+                                <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php esc_html_e('Add Existing Item', 'invoicing'); ?></button>
+                                <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php esc_html_e('Create New Item', 'invoicing'); ?></button>
+                                <?php do_action('getpaid-invoice-items-actions', $invoice); ?>
                             </div>
                             <div class="text-right col-12 col-sm-4">
-                                <button type="button" class="button button-primary recalculate-totals-button"><?php esc_html_e( 'Recalculate Totals', 'invoicing' ); ?></button>
+                                <button type="button" class="button button-primary recalculate-totals-button"><?php esc_html_e('Recalculate Totals', 'invoicing'); ?></button>
                             </div>
                         </div>
                     </div>
 
                     <div class="getpaid-invoice-item-actions hide-if-editable">
-                        <p class="description m-2 text-right text-muted"><?php esc_html_e( 'This invoice is no longer editable', 'invoicing' ); ?></p>
+                        <p class="description m-2 text-right text-muted"><?php esc_html_e('This invoice is no longer editable', 'invoicing'); ?></p>
                     </div>
 
                     <!-- Add items to an invoice -->
@@ -700,9 +700,9 @@ 
                         <div class="modal-dialog modal-dialog-centered" role="document">
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <h5 class="modal-title" id="getpaid-add-item-to-invoice-label"><?php esc_html_e( 'Add Item(s)', 'invoicing' ); ?></h5>
-                                    <button type="button" class="close btn-close" data-dismiss="modal" aria-label="<?php esc_html_e( 'Close', 'invoicing' ); ?>">
-                                        <?php if ( empty( $GLOBALS['aui_bs5'] ) ) : ?>
+                                    <h5 class="modal-title" id="getpaid-add-item-to-invoice-label"><?php esc_html_e('Add Item(s)', 'invoicing'); ?></h5>
+                                    <button type="button" class="close btn-close" data-dismiss="modal" aria-label="<?php esc_html_e('Close', 'invoicing'); ?>">
+                                        <?php if (empty($GLOBALS['aui_bs5'])) : ?>
                                             <span aria-hidden="true">×</span>
                                         <?php endif; ?>
                                     </button>
@@ -711,10 +711,10 @@ 
                                     <table class="widefat">
                                         <thead>
                                             <tr>
-                                                <th class="pl-0 text-left"><?php esc_html_e( 'Item', 'invoicing' ); ?></th>
+                                                <th class="pl-0 text-left"><?php esc_html_e('Item', 'invoicing'); ?></th>
                                                 <th class="pr-0 text-right hide-if-amount">
-                                                    <span class="getpaid-hide-if-hours"><?php esc_html_e( 'Quantity', 'invoicing' ); ?></span>
-                                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e( 'Hours', 'invoicing' ); ?></span>
+                                                    <span class="getpaid-hide-if-hours"><?php esc_html_e('Quantity', 'invoicing'); ?></span>
+                                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e('Hours', 'invoicing'); ?></span>
                                                 </th>
                                             </tr>
                                         </thead>
@@ -722,9 +722,9 @@ 
 								            <tr>
 									            <td class="pl-0 text-left">
                                                     <select class="regular-text getpaid-add-invoice-item-select">
-                                                        <option value="" selected="selected" disabled><?php esc_html_e( 'Select an item…', 'invoicing' ); ?></option>
-                                                        <?php foreach ( get_posts( $item_args ) as $item ) : ?>
-                                                        <option value="<?php echo (int) $item->ID; ?>"><?php echo esc_html( $item->post_title ); ?></option>
+                                                        <option value="" selected="selected" disabled><?php esc_html_e('Select an item…', 'invoicing'); ?></option>
+                                                        <?php foreach (get_posts($item_args) as $item) : ?>
+                                                        <option value="<?php echo (int) $item->ID; ?>"><?php echo esc_html($item->post_title); ?></option>
                                                         <?php endforeach; ?>
                                                     </select>
                                                 </td>
@@ -736,8 +736,8 @@ 
 						            </table>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e( 'Cancel', 'invoicing' ); ?></button>
-                                    <button type="button" class="btn btn-primary getpaid-add" data-dismiss="modal"><?php esc_html_e( 'Add', 'invoicing' ); ?></button>
+                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e('Cancel', 'invoicing'); ?></button>
+                                    <button type="button" class="btn btn-primary getpaid-add" data-dismiss="modal"><?php esc_html_e('Add', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>
@@ -748,9 +748,9 @@ 
                         <div class="modal-dialog modal-dialog-centered" role="document">
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <h5 class="modal-title" id="getpaid-create-invoice-item-label"><?php esc_html_e( 'Create Item', 'invoicing' ); ?></h5>
-                                    <button type="button" class="close btn-close" data-dismiss="modal" aria-label="<?php esc_html_e( 'Close', 'invoicing' ); ?>">
-                                        <?php if ( empty( $GLOBALS['aui_bs5'] ) ) : ?>
+                                    <h5 class="modal-title" id="getpaid-create-invoice-item-label"><?php esc_html_e('Create Item', 'invoicing'); ?></h5>
+                                    <button type="button" class="close btn-close" data-dismiss="modal" aria-label="<?php esc_html_e('Close', 'invoicing'); ?>">
+                                        <?php if (empty($GLOBALS['aui_bs5'])) : ?>
                                             <span aria-hidden="true">×</span>
                                         <?php endif; ?>
                                     </button>
@@ -759,27 +759,27 @@ 
                                     <div class="getpaid-create-item-div">
                                         <input type="hidden" name="id" value="new" class="form-control form-control-sm item-id">
                                         <label class="form-group mb-3 w-100">
-                                            <span><?php esc_html_e( 'Name', 'invoicing' ); ?></span>
-                                            <input type="text" name="name" placeholder="<?php esc_attr_e( 'Item Name', 'invoicing' ); ?>" class="form-control form-control-sm item-name">
+                                            <span><?php esc_html_e('Name', 'invoicing'); ?></span>
+                                            <input type="text" name="name" placeholder="<?php esc_attr_e('Item Name', 'invoicing'); ?>" class="form-control form-control-sm item-name">
                                         </label>
                                         <label class="form-group mb-3 w-100">
-                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php esc_html_e( 'Amount', 'invoicing' ); ?></span>
-                                            <span class="hide-if-amount"><?php esc_html_e( 'Price', 'invoicing' ); ?></span>
-                                            <input type="text" name="price" placeholder="<?php echo esc_attr( wpinv_sanitize_amount( 0 ) ); ?>" class="form-control form-control-sm item-price">
+                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php esc_html_e('Amount', 'invoicing'); ?></span>
+                                            <span class="hide-if-amount"><?php esc_html_e('Price', 'invoicing'); ?></span>
+                                            <input type="text" name="price" placeholder="<?php echo esc_attr(wpinv_sanitize_amount(0)); ?>" class="form-control form-control-sm item-price">
                                         </label>
                                         <label class="form-group mb-3 w-100 hide-if-amount">
-                                            <span><?php esc_html_e( 'Quantity', 'invoicing' ); ?></span>
+                                            <span><?php esc_html_e('Quantity', 'invoicing'); ?></span>
                                             <input type="text" name="quantity" placeholder="1" class="form-control form-control-sm item-quantity">
                                         </label>
                                         <label class="form-group mb-3 w-100">
-                                            <span><?php esc_html_e( 'Item Description', 'invoicing' ); ?></span>
-                                            <textarea name="description" placeholder="<?php esc_attr_e( 'Enter a description for this item', 'invoicing' ); ?>" class="form-control item-description"></textarea>
+                                            <span><?php esc_html_e('Item Description', 'invoicing'); ?></span>
+                                            <textarea name="description" placeholder="<?php esc_attr_e('Enter a description for this item', 'invoicing'); ?>" class="form-control item-description"></textarea>
                                         </label>
                                     </div>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e( 'Cancel', 'invoicing' ); ?></button>
-                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php esc_html_e( 'Create', 'invoicing' ); ?></button>
+                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e('Cancel', 'invoicing'); ?></button>
+                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php esc_html_e('Create', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>
@@ -790,9 +790,9 @@ 
                         <div class="modal-dialog modal-dialog-centered" role="document">
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <h5 class="modal-title" id="getpaid-edit-invoice-item-label"><?php esc_html_e( 'Edit Item', 'invoicing' ); ?></h5>
-                                    <button type="button" class="close close" data-dismiss="modal" aria-label="<?php esc_html_e( 'Close', 'invoicing' ); ?>">
-                                        <?php if ( empty( $GLOBALS['aui_bs5'] ) ) : ?>
+                                    <h5 class="modal-title" id="getpaid-edit-invoice-item-label"><?php esc_html_e('Edit Item', 'invoicing'); ?></h5>
+                                    <button type="button" class="close close" data-dismiss="modal" aria-label="<?php esc_html_e('Close', 'invoicing'); ?>">
+                                        <?php if (empty($GLOBALS['aui_bs5'])) : ?>
                                             <span aria-hidden="true">×</span>
                                         <?php endif; ?>
                                     </button>
@@ -801,27 +801,27 @@ 
                                     <div class="getpaid-edit-item-div">
                                         <input type="hidden" name="id" class="form-control form-control-sm item-id">
                                         <label class="form-group mb-3 w-100">
-                                            <span><?php esc_html_e( 'Name', 'invoicing' ); ?></span>
-                                            <input type="text" name="name" placeholder="<?php esc_attr_e( 'Item Name', 'invoicing' ); ?>" class="form-control form-control-sm item-name">
+                                            <span><?php esc_html_e('Name', 'invoicing'); ?></span>
+                                            <input type="text" name="name" placeholder="<?php esc_attr_e('Item Name', 'invoicing'); ?>" class="form-control form-control-sm item-name">
                                         </label>
                                         <label class="form-group mb-3 w-100">
-                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php esc_html_e( 'Amount', 'invoicing' ); ?></span>
-                                            <span class="hide-if-amount"><?php esc_html_e( 'Price', 'invoicing' ); ?></span>
-                                            <input type="text" name="price" placeholder="<?php wpinv_sanitize_amount( 0 ); ?>" class="form-control form-control-sm item-price">
+                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php esc_html_e('Amount', 'invoicing'); ?></span>
+                                            <span class="hide-if-amount"><?php esc_html_e('Price', 'invoicing'); ?></span>
+                                            <input type="text" name="price" placeholder="<?php wpinv_sanitize_amount(0); ?>" class="form-control form-control-sm item-price">
                                         </label>
                                         <label class="form-group mb-3 w-100 hide-if-amount">
-                                            <span><?php esc_html_e( 'Quantity', 'invoicing' ); ?></span>
+                                            <span><?php esc_html_e('Quantity', 'invoicing'); ?></span>
                                             <input type="text" name="quantity" placeholder="1" class="form-control form-control-sm item-quantity">
                                         </label>
                                         <label class="form-group mb-3 w-100">
-                                            <span><?php esc_html_e( 'Item Description', 'invoicing' ); ?></span>
-                                            <textarea name="description" placeholder="<?php esc_attr_e( 'Enter a description for this item', 'invoicing' ); ?>" class="form-control item-description"></textarea>
+                                            <span><?php esc_html_e('Item Description', 'invoicing'); ?></span>
+                                            <textarea name="description" placeholder="<?php esc_attr_e('Enter a description for this item', 'invoicing'); ?>" class="form-control item-description"></textarea>
                                         </label>
                                     </div>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e( 'Cancel', 'invoicing' ); ?></button>
-                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php esc_html_e( 'Save', 'invoicing' ); ?></button>
+                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e('Cancel', 'invoicing'); ?></button>
+                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php esc_html_e('Save', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>

includes/class-getpaid-tax.php

Indentation +192 added lines, -192 removed lines

@@ -13,199 +13,199 @@
  */
 class GetPaid_Tax {
 
-	/**
-	 * Calculates tax for a line item.
-	 *
-	 * @param  float   $price              The price to calc tax on.
-	 * @param  array   $rates              The rates to apply.
-	 * @param  boolean $price_includes_tax Whether the passed price has taxes included.
-	 * @return array                       Array of tax name => tax amount.
-	 */
-	public static function calc_tax( $price, $rates, $price_includes_tax = false ) {
-
-		if ( $price_includes_tax ) {
-			$taxes = self::calc_inclusive_tax( $price, $rates );
-		} else {
-			$taxes = self::calc_exclusive_tax( $price, $rates );
-		}
-
-		return apply_filters( 'getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax );
-
-	}
-
-	/**
-	 * Calc tax from inclusive price.
-	 *
-	 * @param  float $price Price to calculate tax for.
-	 * @param  array $rates Array of tax rates.
-	 * @return array
-	 */
-	public static function calc_inclusive_tax( $price, $rates ) {
-		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
-
-		// Add tax rates.
-		$tax_rate  = 1 + ( array_sum( $tax_rates ) / 100 );
-
-		foreach ( $tax_rates as $name => $rate ) {
-			$the_rate       = ( $rate / 100 ) / $tax_rate;
-			$net_price      = $price - ( $the_rate * $price );
-			$tax_amount     = apply_filters( 'getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price );
-			$taxes[ $name ] = $tax_amount;
-		}
-
-		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
-
-		return $taxes;
-	}
-
-	/**
-	 * Calc tax from exclusive price.
-	 *
-	 * @param  float $price Price to calculate tax for.
-	 * @param  array $rates Array of tax rates.
-	 * @return array
-	 */
-	public static function calc_exclusive_tax( $price, $rates ) {
-		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
-
-		foreach ( $tax_rates as $name => $rate ) {
-
-			$tax_amount     = $price * ( $rate / 100 );
-			$taxes[ $name ] = apply_filters( 'getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price );
-
-		}
-
-		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
-
-		return $taxes;
-	}
-
-	/**
-	 * Get's an array of all tax rates.
-	 *
-	 * @return array
-	 */
-	public static function get_all_tax_rates() {
-
-		$rates = get_option( 'wpinv_tax_rates', array() );
-
-		return apply_filters(
-			'getpaid_get_all_tax_rates',
-			array_filter( wpinv_parse_list( $rates ) )
-		);
-
-	}
-
-	/**
-	 * Get's an array of default tax rates.
-	 *
-	 * @return array
-	 */
-	public static function get_default_tax_rates() {
-
-		return apply_filters(
-			'getpaid_get_default_tax_rates',
-			array(
-				array(
-					'country' => wpinv_get_default_country(),
-					'state'   => wpinv_get_default_state(),
-					'global'  => true,
-					'rate'    => wpinv_get_default_tax_rate(),
-					'name'    => __( 'Tax', 'invoicing' ),
-				),
-			)
-		);
-
-	}
-
-	/**
-	 * Get's an array of all tax rules.
-	 *
-	 * @return array
-	 */
-	public static function get_all_tax_rules() {
-
-		$rules = get_option(
-			'wpinv_tax_rules',
-			array(
-				array(
-					'key'               => 'physical',
-					'label'             => __( 'Physical Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
-				),
-				array(
-					'key'               => 'digital',
-					'label'             => __( 'Digital Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
-				),
-        	)
-		);
-
-		return apply_filters(
-			'getpaid_tax_rules',
-			array_filter( array_values( wpinv_parse_list( $rules ) ) )
-		);
-
-	}
-
-	/**
-	 * Get's an array of tax rates for a given address.
-	 *
-	 * @param string $country
-	 * @param string $state
-	 * @return array
-	 */
-	public static function get_address_tax_rates( $country, $state ) {
-
-		$all_tax_rates  = self::get_all_tax_rates();
-		$matching_rates = array_merge(
-			wp_list_filter( $all_tax_rates, array( 'country' => $country ) ),
-			wp_list_filter( $all_tax_rates, array( 'country' => '' ) )
-		);
-
-		foreach ( $matching_rates as $i => $rate ) {
-
-			$states = array_filter( wpinv_clean( explode( ',', strtolower( $rate['state'] ) ) ) );
-			if ( empty( $rate['global'] ) && ! in_array( strtolower( $state ), $states ) ) {
-				unset( $matching_rates[ $i ] );
-			}
+    /**
+     * Calculates tax for a line item.
+     *
+     * @param  float   $price              The price to calc tax on.
+     * @param  array   $rates              The rates to apply.
+     * @param  boolean $price_includes_tax Whether the passed price has taxes included.
+     * @return array                       Array of tax name => tax amount.
+     */
+    public static function calc_tax( $price, $rates, $price_includes_tax = false ) {
+
+        if ( $price_includes_tax ) {
+            $taxes = self::calc_inclusive_tax( $price, $rates );
+        } else {
+            $taxes = self::calc_exclusive_tax( $price, $rates );
+        }
+
+        return apply_filters( 'getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax );
+
+    }
+
+    /**
+     * Calc tax from inclusive price.
+     *
+     * @param  float $price Price to calculate tax for.
+     * @param  array $rates Array of tax rates.
+     * @return array
+     */
+    public static function calc_inclusive_tax( $price, $rates ) {
+        $taxes     = array();
+        $tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+
+        // Add tax rates.
+        $tax_rate  = 1 + ( array_sum( $tax_rates ) / 100 );
+
+        foreach ( $tax_rates as $name => $rate ) {
+            $the_rate       = ( $rate / 100 ) / $tax_rate;
+            $net_price      = $price - ( $the_rate * $price );
+            $tax_amount     = apply_filters( 'getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price );
+            $taxes[ $name ] = $tax_amount;
+        }
+
+        // Round all taxes to precision (4DP) before passing them back.
+        $taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+
+        return $taxes;
+    }
+
+    /**
+     * Calc tax from exclusive price.
+     *
+     * @param  float $price Price to calculate tax for.
+     * @param  array $rates Array of tax rates.
+     * @return array
+     */
+    public static function calc_exclusive_tax( $price, $rates ) {
+        $taxes     = array();
+        $tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+
+        foreach ( $tax_rates as $name => $rate ) {
+
+            $tax_amount     = $price * ( $rate / 100 );
+            $taxes[ $name ] = apply_filters( 'getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price );
+
+        }
+
+        // Round all taxes to precision (4DP) before passing them back.
+        $taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+
+        return $taxes;
+    }
+
+    /**
+     * Get's an array of all tax rates.
+     *
+     * @return array
+     */
+    public static function get_all_tax_rates() {
+
+        $rates = get_option( 'wpinv_tax_rates', array() );
+
+        return apply_filters(
+            'getpaid_get_all_tax_rates',
+            array_filter( wpinv_parse_list( $rates ) )
+        );
+
+    }
+
+    /**
+     * Get's an array of default tax rates.
+     *
+     * @return array
+     */
+    public static function get_default_tax_rates() {
+
+        return apply_filters(
+            'getpaid_get_default_tax_rates',
+            array(
+                array(
+                    'country' => wpinv_get_default_country(),
+                    'state'   => wpinv_get_default_state(),
+                    'global'  => true,
+                    'rate'    => wpinv_get_default_tax_rate(),
+                    'name'    => __( 'Tax', 'invoicing' ),
+                ),
+            )
+        );
+
+    }
+
+    /**
+     * Get's an array of all tax rules.
+     *
+     * @return array
+     */
+    public static function get_all_tax_rules() {
+
+        $rules = get_option(
+            'wpinv_tax_rules',
+            array(
+                array(
+                    'key'               => 'physical',
+                    'label'             => __( 'Physical Item', 'invoicing' ),
+                    'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
+                    'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+                ),
+                array(
+                    'key'               => 'digital',
+                    'label'             => __( 'Digital Item', 'invoicing' ),
+                    'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
+                    'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+                ),
+            )
+        );
+
+        return apply_filters(
+            'getpaid_tax_rules',
+            array_filter( array_values( wpinv_parse_list( $rules ) ) )
+        );
+
+    }
+
+    /**
+     * Get's an array of tax rates for a given address.
+     *
+     * @param string $country
+     * @param string $state
+     * @return array
+     */
+    public static function get_address_tax_rates( $country, $state ) {
+
+        $all_tax_rates  = self::get_all_tax_rates();
+        $matching_rates = array_merge(
+            wp_list_filter( $all_tax_rates, array( 'country' => $country ) ),
+            wp_list_filter( $all_tax_rates, array( 'country' => '' ) )
+        );
+
+        foreach ( $matching_rates as $i => $rate ) {
+
+            $states = array_filter( wpinv_clean( explode( ',', strtolower( $rate['state'] ) ) ) );
+            if ( empty( $rate['global'] ) && ! in_array( strtolower( $state ), $states ) ) {
+                unset( $matching_rates[ $i ] );
+            }
 }
 
-		return apply_filters( 'getpaid_get_address_tax_rates', $matching_rates, $country, $state );
-
-	}
-
-	/**
-	 * Sums a set of taxes to form a single total. Result is rounded to precision.
-	 *
-	 * @param  array $taxes Array of taxes.
-	 * @return float
-	 */
-	public static function get_tax_total( $taxes ) {
-		return self::round( array_sum( $taxes ) );
-	}
-
-	/**
-	 * Round to precision.
-	 *
-	 * Filter example: to return rounding to .5 cents you'd use:
-	 *
-	 * function euro_5cent_rounding( $in ) {
-	 *      return round( $in / 5, 2 ) * 5;
-	 * }
-	 * add_filter( 'getpaid_tax_round', 'euro_5cent_rounding' );
-	 *
-	 * @param float|int $in Value to round.
-	 * @return float
-	 */
-	public static function round( $in ) {
-		return apply_filters( 'getpaid_tax_round', round( $in, 4 ), $in );
-	}
+        return apply_filters( 'getpaid_get_address_tax_rates', $matching_rates, $country, $state );
+
+    }
+
+    /**
+     * Sums a set of taxes to form a single total. Result is rounded to precision.
+     *
+     * @param  array $taxes Array of taxes.
+     * @return float
+     */
+    public static function get_tax_total( $taxes ) {
+        return self::round( array_sum( $taxes ) );
+    }
+
+    /**
+     * Round to precision.
+     *
+     * Filter example: to return rounding to .5 cents you'd use:
+     *
+     * function euro_5cent_rounding( $in ) {
+     *      return round( $in / 5, 2 ) * 5;
+     * }
+     * add_filter( 'getpaid_tax_round', 'euro_5cent_rounding' );
+     *
+     * @param float|int $in Value to round.
+     * @return float
+     */
+    public static function round( $in ) {
+        return apply_filters( 'getpaid_tax_round', round( $in, 4 ), $in );
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Class GetPaid_Tax
@@ -21,15 +21,15 @@ 
 	 * @param  boolean $price_includes_tax Whether the passed price has taxes included.
 	 * @return array                       Array of tax name => tax amount.
 	 */
-	public static function calc_tax( $price, $rates, $price_includes_tax = false ) {
+	public static function calc_tax($price, $rates, $price_includes_tax = false) {
 
-		if ( $price_includes_tax ) {
-			$taxes = self::calc_inclusive_tax( $price, $rates );
+		if ($price_includes_tax) {
+			$taxes = self::calc_inclusive_tax($price, $rates);
 		} else {
-			$taxes = self::calc_exclusive_tax( $price, $rates );
+			$taxes = self::calc_exclusive_tax($price, $rates);
 		}
 
-		return apply_filters( 'getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax );
+		return apply_filters('getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax);
 
 	}
 
@@ -40,22 +40,22 @@ 
 	 * @param  array $rates Array of tax rates.
 	 * @return array
 	 */
-	public static function calc_inclusive_tax( $price, $rates ) {
+	public static function calc_inclusive_tax($price, $rates) {
 		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+		$tax_rates = wp_list_pluck($rates, 'rate', 'name');
 
 		// Add tax rates.
-		$tax_rate  = 1 + ( array_sum( $tax_rates ) / 100 );
+		$tax_rate  = 1 + (array_sum($tax_rates) / 100);
 
-		foreach ( $tax_rates as $name => $rate ) {
-			$the_rate       = ( $rate / 100 ) / $tax_rate;
-			$net_price      = $price - ( $the_rate * $price );
-			$tax_amount     = apply_filters( 'getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price );
-			$taxes[ $name ] = $tax_amount;
+		foreach ($tax_rates as $name => $rate) {
+			$the_rate       = ($rate / 100) / $tax_rate;
+			$net_price      = $price - ($the_rate * $price);
+			$tax_amount     = apply_filters('getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price);
+			$taxes[$name] = $tax_amount;
 		}
 
 		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+		$taxes = array_map(array(__CLASS__, 'round'), $taxes);
 
 		return $taxes;
 	}
@@ -67,19 +67,19 @@ 
 	 * @param  array $rates Array of tax rates.
 	 * @return array
 	 */
-	public static function calc_exclusive_tax( $price, $rates ) {
+	public static function calc_exclusive_tax($price, $rates) {
 		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+		$tax_rates = wp_list_pluck($rates, 'rate', 'name');
 
-		foreach ( $tax_rates as $name => $rate ) {
+		foreach ($tax_rates as $name => $rate) {
 
-			$tax_amount     = $price * ( $rate / 100 );
-			$taxes[ $name ] = apply_filters( 'getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price );
+			$tax_amount     = $price * ($rate / 100);
+			$taxes[$name] = apply_filters('getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price);
 
 		}
 
 		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+		$taxes = array_map(array(__CLASS__, 'round'), $taxes);
 
 		return $taxes;
 	}
@@ -91,11 +91,11 @@ 
 	 */
 	public static function get_all_tax_rates() {
 
-		$rates = get_option( 'wpinv_tax_rates', array() );
+		$rates = get_option('wpinv_tax_rates', array());
 
 		return apply_filters(
 			'getpaid_get_all_tax_rates',
-			array_filter( wpinv_parse_list( $rates ) )
+			array_filter(wpinv_parse_list($rates))
 		);
 
 	}
@@ -115,7 +115,7 @@ 
 					'state'   => wpinv_get_default_state(),
 					'global'  => true,
 					'rate'    => wpinv_get_default_tax_rate(),
-					'name'    => __( 'Tax', 'invoicing' ),
+					'name'    => __('Tax', 'invoicing'),
 				),
 			)
 		);
@@ -134,22 +134,22 @@ 
 			array(
 				array(
 					'key'               => 'physical',
-					'label'             => __( 'Physical Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+					'label'             => __('Physical Item', 'invoicing'),
+					'tax_base'          => wpinv_get_option('tax_base', 'billing'),
+					'same_country_rule' => wpinv_get_option('vat_same_country_rule', 'vat_too'),
 				),
 				array(
 					'key'               => 'digital',
-					'label'             => __( 'Digital Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+					'label'             => __('Digital Item', 'invoicing'),
+					'tax_base'          => wpinv_get_option('tax_base', 'billing'),
+					'same_country_rule' => wpinv_get_option('vat_same_country_rule', 'vat_too'),
 				),
         	)
 		);
 
 		return apply_filters(
 			'getpaid_tax_rules',
-			array_filter( array_values( wpinv_parse_list( $rules ) ) )
+			array_filter(array_values(wpinv_parse_list($rules)))
 		);
 
 	}
@@ -161,23 +161,23 @@ 
 	 * @param string $state
 	 * @return array
 	 */
-	public static function get_address_tax_rates( $country, $state ) {
+	public static function get_address_tax_rates($country, $state) {
 
 		$all_tax_rates  = self::get_all_tax_rates();
 		$matching_rates = array_merge(
-			wp_list_filter( $all_tax_rates, array( 'country' => $country ) ),
-			wp_list_filter( $all_tax_rates, array( 'country' => '' ) )
+			wp_list_filter($all_tax_rates, array('country' => $country)),
+			wp_list_filter($all_tax_rates, array('country' => ''))
 		);
 
-		foreach ( $matching_rates as $i => $rate ) {
+		foreach ($matching_rates as $i => $rate) {
 
-			$states = array_filter( wpinv_clean( explode( ',', strtolower( $rate['state'] ) ) ) );
-			if ( empty( $rate['global'] ) && ! in_array( strtolower( $state ), $states ) ) {
-				unset( $matching_rates[ $i ] );
+			$states = array_filter(wpinv_clean(explode(',', strtolower($rate['state']))));
+			if (empty($rate['global']) && !in_array(strtolower($state), $states)) {
+				unset($matching_rates[$i]);
 			}
 }
 
-		return apply_filters( 'getpaid_get_address_tax_rates', $matching_rates, $country, $state );
+		return apply_filters('getpaid_get_address_tax_rates', $matching_rates, $country, $state);
 
 	}
 
@@ -187,8 +187,8 @@ 
 	 * @param  array $taxes Array of taxes.
 	 * @return float
 	 */
-	public static function get_tax_total( $taxes ) {
-		return self::round( array_sum( $taxes ) );
+	public static function get_tax_total($taxes) {
+		return self::round(array_sum($taxes));
 	}
 
 	/**
@@ -204,8 +204,8 @@ 
 	 * @param float|int $in Value to round.
 	 * @return float
 	 */
-	public static function round( $in ) {
-		return apply_filters( 'getpaid_tax_round', round( $in, 4 ), $in );
+	public static function round($in) {
+		return apply_filters('getpaid_tax_round', round($in, 4), $in);
 	}
 
 }

templates/emails/invoice-totals.php

Spacing +25 added lines, -25 removed lines

@@ -8,22 +8,22 @@ 
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Totals rows.
-$totals = getpaid_invoice_totals_rows( $invoice );
+$totals = getpaid_invoice_totals_rows($invoice);
 
-do_action( 'getpaid_before_email_line_totals', $invoice, $totals );
+do_action('getpaid_before_email_line_totals', $invoice, $totals);
 
 ?>
 
 
-<?php if ( has_action( 'wpinv_email_footer_buttons' ) ) : ?>
+<?php if (has_action('wpinv_email_footer_buttons')) : ?>
 
     <tr class="wpinv_cart_footer_row">
 
-        <td colspan="<?php echo ( (int) $column_count ); ?>">
-            <?php do_action( 'wpinv_email_footer_buttons' ); ?>
+        <td colspan="<?php echo ((int) $column_count); ?>">
+            <?php do_action('wpinv_email_footer_buttons'); ?>
         </td>
 
     </tr>
@@ -31,49 +31,49 @@ 
 <?php endif; ?>
 
 
-<?php foreach ( $totals as $key => $label ) : ?>
+<?php foreach ($totals as $key => $label) : ?>
 
-    <tr class="wpinv_cart_footer_row wpinv_cart_<?php echo esc_html( $key ); ?>_row">
+    <tr class="wpinv_cart_footer_row wpinv_cart_<?php echo esc_html($key); ?>_row">
 
-        <td colspan="<?php echo absint( ( $column_count - 1 ) ); ?>" class="wpinv_cart_<?php echo esc_html( $key ); ?>_label text-right">
-            <strong><?php echo esc_html( $label ); ?>:</strong>
+        <td colspan="<?php echo absint(($column_count - 1)); ?>" class="wpinv_cart_<?php echo esc_html($key); ?>_label text-right">
+            <strong><?php echo esc_html($label); ?>:</strong>
         </td>
 
-        <td class="wpinv_cart_<?php echo esc_html( $key ); ?> text-right">
+        <td class="wpinv_cart_<?php echo esc_html($key); ?> text-right">
 
             <?php
 
                 // Total tax.
-                if ( 'tax' == $key ) {
-                    wpinv_the_price( $invoice->get_total_tax(), $invoice->get_currency() );
+                if ('tax' == $key) {
+                    wpinv_the_price($invoice->get_total_tax(), $invoice->get_currency());
                 }
 
                 // Individual taxes.
-                if ( 0 === strpos( $key, 'tax__' ) ) {
-                    wpinv_the_price( $invoice->get_tax_total_by_name( str_replace( 'tax__', '', $key ) ), $invoice->get_currency() );
+                if (0 === strpos($key, 'tax__')) {
+                    wpinv_the_price($invoice->get_tax_total_by_name(str_replace('tax__', '', $key)), $invoice->get_currency());
                 }
 
-                if ( 'fee' == $key ) {
-                    wpinv_the_price( $invoice->get_total_fees(), $invoice->get_currency() );
+                if ('fee' == $key) {
+                    wpinv_the_price($invoice->get_total_fees(), $invoice->get_currency());
                 }
 
                 // Total discount.
-                if ( 'discount' == $key ) {
-                    wpinv_the_price( $invoice->get_total_discount(), $invoice->get_currency() );
+                if ('discount' == $key) {
+                    wpinv_the_price($invoice->get_total_discount(), $invoice->get_currency());
                 }
 
                 // Sub total.
-                if ( 'subtotal' == $key ) {
-                    wpinv_the_price( $invoice->get_subtotal(), $invoice->get_currency() );
+                if ('subtotal' == $key) {
+                    wpinv_the_price($invoice->get_subtotal(), $invoice->get_currency());
                 }
 
                 // Total.
-                if ( 'total' == $key ) {
-                    wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
+                if ('total' == $key) {
+                    wpinv_the_price($invoice->get_total(), $invoice->get_currency());
                 }
 
                 // Fires when printing a cart total in an email.
-                do_action( "getpaid_email_cart_totals_$key", $invoice );
+                do_action("getpaid_email_cart_totals_$key", $invoice);
 
             ?>
 
@@ -85,4 +85,4 @@ 
 
 <?php
 
-    do_action( 'getpaid_after_email_line_totals', $invoice, $totals );
+    do_action('getpaid_after_email_line_totals', $invoice, $totals);

includes/invoice-functions.php

Spacing +373 added lines, -373 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Retrieves the current invoice.
@@ -14,15 +14,15 @@ 
 function getpaid_get_current_invoice_id() {
 
     // Ensure that we have an invoice key.
-    if ( empty( $_GET['invoice_key'] ) ) {
+    if (empty($_GET['invoice_key'])) {
         return 0;
     }
 
     // Retrieve an invoice using the key.
-    $invoice = new WPInv_Invoice( sanitize_text_field( $_GET['invoice_key'] ) );
+    $invoice = new WPInv_Invoice(sanitize_text_field($_GET['invoice_key']));
 
     // Compare the invoice key and the parsed key.
-    if ( $invoice->get_id() != 0 && $invoice->get_key() == sanitize_text_field( $_GET['invoice_key'] ) ) {
+    if ($invoice->get_id() != 0 && $invoice->get_key() == sanitize_text_field($_GET['invoice_key'])) {
         return $invoice->get_id();
     }
 
@@ -32,42 +32,42 @@ 
 /**
  * Checks if the current user cna view an invoice.
  */
-function wpinv_user_can_view_invoice( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_user_can_view_invoice($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if the invoice does not exist.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return false;
     }
 
     // Don't allow trash, draft status
-    if ( $invoice->is_draft() ) {
+    if ($invoice->is_draft()) {
         return false;
     }
 
     // If users are not required to login to check out, compare the invoice keys.
-    if ( ! wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && sanitize_text_field( $_GET['invoice_key'] ) == $invoice->get_key() ) {
+    if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && sanitize_text_field($_GET['invoice_key']) == $invoice->get_key()) {
         return true;
     }
 
     // Always enable for admins..
-    if ( wpinv_current_user_can( 'view_invoice', array( 'invoice' => $invoice ) ) || current_user_can( 'view_invoices', $invoice->get_id() ) ) { // Admin user
+    if (wpinv_current_user_can('view_invoice', array('invoice' => $invoice)) || current_user_can('view_invoices', $invoice->get_id())) { // Admin user
         return true;
     }
 
     // Else, ensure that this is their invoice.
-    if ( is_user_logged_in() && $invoice->get_user_id() == get_current_user_id() ) {
+    if (is_user_logged_in() && $invoice->get_user_id() == get_current_user_id()) {
         return true;
     }
 
-    return apply_filters( 'wpinv_current_user_can_view_invoice', false, $invoice );
+    return apply_filters('wpinv_current_user_can_view_invoice', false, $invoice);
 }
 
 /**
  * Checks if the current user cna view an invoice receipt.
  */
-function wpinv_can_view_receipt( $invoice ) {
-	return (bool) apply_filters( 'wpinv_can_view_receipt', wpinv_user_can_view_invoice( $invoice ), $invoice );
+function wpinv_can_view_receipt($invoice) {
+	return (bool) apply_filters('wpinv_can_view_receipt', wpinv_user_can_view_invoice($invoice), $invoice);
 }
 
 /**
@@ -77,16 +77,16 @@ 
  */
 function getpaid_get_invoice_post_types() {
     $post_types = array(
-        'wpi_quote'   => __( 'Quote', 'invoicing' ),
-        'wpi_invoice' => __( 'Invoice', 'invoicing' ),
+        'wpi_quote'   => __('Quote', 'invoicing'),
+        'wpi_invoice' => __('Invoice', 'invoicing'),
     );
 
     // Ensure the quotes addon is installed.
-    if ( ! defined( 'WPINV_QUOTES_VERSION' ) ) {
-        unset( $post_types['wpi_quote'] );
+    if (!defined('WPINV_QUOTES_VERSION')) {
+        unset($post_types['wpi_quote']);
     }
 
-    return apply_filters( 'getpaid_invoice_post_types', $post_types );
+    return apply_filters('getpaid_invoice_post_types', $post_types);
 }
 
 /**
@@ -95,8 +95,8 @@ 
  *
  * @param string $post_type The post type to check for.
  */
-function getpaid_is_invoice_post_type( $post_type ) {
-    return is_scalar( $post_type ) && ! empty( $post_type ) && array_key_exists( $post_type, getpaid_get_invoice_post_types() );
+function getpaid_is_invoice_post_type($post_type) {
+    return is_scalar($post_type) && !empty($post_type) && array_key_exists($post_type, getpaid_get_invoice_post_types());
 }
 
 /**
@@ -106,9 +106,9 @@ 
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_create_invoice( $data = array(), $deprecated = null, $wp_error = false ) {
+function wpinv_create_invoice($data = array(), $deprecated = null, $wp_error = false) {
     $data['invoice_id'] = 0;
-    return wpinv_insert_invoice( $data, $wp_error );
+    return wpinv_insert_invoice($data, $wp_error);
 }
 
 /**
@@ -118,35 +118,35 @@ 
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_update_invoice( $data = array(), $wp_error = false ) {
+function wpinv_update_invoice($data = array(), $wp_error = false) {
 
     // Backwards compatibility.
-    if ( ! empty( $data['ID'] ) ) {
+    if (!empty($data['ID'])) {
         $data['invoice_id'] = $data['ID'];
     }
 
     // Do we have an invoice id?
-    if ( empty( $data['invoice_id'] ) ) {
-        return $wp_error ? new WP_Error( 'invalid_invoice_id', __( 'Invalid invoice ID.', 'invoicing' ) ) : 0;
+    if (empty($data['invoice_id'])) {
+        return $wp_error ? new WP_Error('invalid_invoice_id', __('Invalid invoice ID.', 'invoicing')) : 0;
     }
 
     // Retrieve the invoice.
-    $invoice = wpinv_get_invoice( $data['invoice_id'] );
+    $invoice = wpinv_get_invoice($data['invoice_id']);
 
     // And abort if it does not exist.
-    if ( empty( $invoice ) ) {
-        return $wp_error ? new WP_Error( 'missing_invoice', __( 'Invoice not found.', 'invoicing' ) ) : 0;
+    if (empty($invoice)) {
+        return $wp_error ? new WP_Error('missing_invoice', __('Invoice not found.', 'invoicing')) : 0;
     }
 
     // Do not update totals for paid / refunded invoices.
-    if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+    if ($invoice->is_paid() || $invoice->is_refunded()) {
 
-        if ( ! empty( $data['items'] ) || ! empty( $data['cart_details'] ) ) {
-            return $wp_error ? new WP_Error( 'paid_invoice', __( 'You can not update cart items for invoices that have already been paid for.', 'invoicing' ) ) : 0;
+        if (!empty($data['items']) || !empty($data['cart_details'])) {
+            return $wp_error ? new WP_Error('paid_invoice', __('You can not update cart items for invoices that have already been paid for.', 'invoicing')) : 0;
         }
 }
 
-    return wpinv_insert_invoice( $data, $wp_error );
+    return wpinv_insert_invoice($data, $wp_error);
 
 }
 
@@ -157,62 +157,62 @@ 
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_insert_invoice( $data = array(), $wp_error = false ) {
+function wpinv_insert_invoice($data = array(), $wp_error = false) {
 
     // Ensure that we have invoice data.
-    if ( empty( $data ) ) {
+    if (empty($data)) {
         return false;
     }
 
     // The invoice id will be provided when updating an invoice.
-    $data['invoice_id'] = ! empty( $data['invoice_id'] ) ? (int) $data['invoice_id'] : false;
+    $data['invoice_id'] = !empty($data['invoice_id']) ? (int) $data['invoice_id'] : false;
 
     // Retrieve the invoice.
-    $invoice = new WPInv_Invoice( $data['invoice_id'] );
+    $invoice = new WPInv_Invoice($data['invoice_id']);
 
     // Do we have an error?
-    if ( ! empty( $invoice->last_error ) ) {
-        return $wp_error ? new WP_Error( 'invalid_invoice_id', $invoice->last_error ) : 0;
+    if (!empty($invoice->last_error)) {
+        return $wp_error ? new WP_Error('invalid_invoice_id', $invoice->last_error) : 0;
     }
 
     // Backwards compatibility (billing address).
-    if ( ! empty( $data['user_info'] ) ) {
+    if (!empty($data['user_info'])) {
 
-        foreach ( $data['user_info'] as $key => $value ) {
+        foreach ($data['user_info'] as $key => $value) {
 
-            if ( $key == 'discounts' ) {
+            if ($key == 'discounts') {
                 $value = (array) $value;
-                $data['discount_code'] = empty( $value ) ? null : $value[0];
+                $data['discount_code'] = empty($value) ? null : $value[0];
             } else {
-                $data[ $key ] = $value;
+                $data[$key] = $value;
             }
 }
 }
 
     // Backwards compatibility.
-    if ( ! empty( $data['payment_details'] ) ) {
+    if (!empty($data['payment_details'])) {
 
-        foreach ( $data['payment_details'] as $key => $value ) {
-            $data[ $key ] = $value;
+        foreach ($data['payment_details'] as $key => $value) {
+            $data[$key] = $value;
         }
 }
 
     // Set up the owner of the invoice.
-    $user_id = ! empty( $data['user_id'] ) ? wpinv_clean( $data['user_id'] ) : get_current_user_id();
+    $user_id = !empty($data['user_id']) ? wpinv_clean($data['user_id']) : get_current_user_id();
 
     // Make sure the user exists.
-    if ( ! get_userdata( $user_id ) ) {
-        return $wp_error ? new WP_Error( 'wpinv_invalid_user', __( 'There is no user with that ID.', 'invoicing' ) ) : 0;
+    if (!get_userdata($user_id)) {
+        return $wp_error ? new WP_Error('wpinv_invalid_user', __('There is no user with that ID.', 'invoicing')) : 0;
     }
 
-    $address = wpinv_get_user_address( $user_id );
+    $address = wpinv_get_user_address($user_id);
 
-    foreach ( $address as $key => $value ) {
+    foreach ($address as $key => $value) {
 
-        if ( $value == '' ) {
-            $address[ $key ] = null;
+        if ($value == '') {
+            $address[$key] = null;
         } else {
-            $address[ $key ] = wpinv_clean( $value );
+            $address[$key] = wpinv_clean($value);
         }
 }
 
@@ -221,101 +221,101 @@ 
         array(
 
             // Basic info.
-            'template'          => isset( $data['template'] ) ? wpinv_clean( $data['template'] ) : null,
-            'email_cc'          => isset( $data['email_cc'] ) ? wpinv_clean( $data['email_cc'] ) : null,
-            'date_created'      => isset( $data['created_date'] ) ? wpinv_clean( $data['created_date'] ) : null,
-            'due_date'          => isset( $data['due_date'] ) ? wpinv_clean( $data['due_date'] ) : null,
-            'date_completed'    => isset( $data['date_completed'] ) ? wpinv_clean( $data['date_completed'] ) : null,
-            'number'            => isset( $data['number'] ) ? wpinv_clean( $data['number'] ) : null,
-            'key'               => isset( $data['key'] ) ? wpinv_clean( $data['key'] ) : null,
-            'status'            => isset( $data['status'] ) ? wpinv_clean( $data['status'] ) : null,
-            'post_type'         => isset( $data['post_type'] ) ? wpinv_clean( $data['post_type'] ) : null,
-            'user_ip'           => isset( $data['ip'] ) ? wpinv_clean( $data['ip'] ) : wpinv_get_ip(),
-            'parent_id'         => isset( $data['parent'] ) ? intval( $data['parent'] ) : null,
-            'mode'              => isset( $data['mode'] ) ? wpinv_clean( $data['mode'] ) : null,
-            'description'       => isset( $data['description'] ) ? wp_kses_post( $data['description'] ) : null,
+            'template'          => isset($data['template']) ? wpinv_clean($data['template']) : null,
+            'email_cc'          => isset($data['email_cc']) ? wpinv_clean($data['email_cc']) : null,
+            'date_created'      => isset($data['created_date']) ? wpinv_clean($data['created_date']) : null,
+            'due_date'          => isset($data['due_date']) ? wpinv_clean($data['due_date']) : null,
+            'date_completed'    => isset($data['date_completed']) ? wpinv_clean($data['date_completed']) : null,
+            'number'            => isset($data['number']) ? wpinv_clean($data['number']) : null,
+            'key'               => isset($data['key']) ? wpinv_clean($data['key']) : null,
+            'status'            => isset($data['status']) ? wpinv_clean($data['status']) : null,
+            'post_type'         => isset($data['post_type']) ? wpinv_clean($data['post_type']) : null,
+            'user_ip'           => isset($data['ip']) ? wpinv_clean($data['ip']) : wpinv_get_ip(),
+            'parent_id'         => isset($data['parent']) ? intval($data['parent']) : null,
+            'mode'              => isset($data['mode']) ? wpinv_clean($data['mode']) : null,
+            'description'       => isset($data['description']) ? wp_kses_post($data['description']) : null,
 
             // Payment info.
-            'disable_taxes'     => ! empty( $data['disable_taxes'] ),
-            'currency'          => isset( $data['currency'] ) ? wpinv_clean( $data['currency'] ) : wpinv_get_currency(),
-            'gateway'           => isset( $data['gateway'] ) ? wpinv_clean( $data['gateway'] ) : null,
-            'transaction_id'    => isset( $data['transaction_id'] ) ? wpinv_clean( $data['transaction_id'] ) : null,
-            'discount_code'     => isset( $data['discount_code'] ) ? wpinv_clean( $data['discount_code'] ) : null,
-            'payment_form'      => isset( $data['payment_form'] ) ? intval( $data['payment_form'] ) : null,
-            'submission_id'     => isset( $data['submission_id'] ) ? wpinv_clean( $data['submission_id'] ) : null,
-            'subscription_id'   => isset( $data['subscription_id'] ) ? wpinv_clean( $data['subscription_id'] ) : null,
-            'is_viewed'         => isset( $data['is_viewed'] ) ? wpinv_clean( $data['is_viewed'] ) : null,
-            'fees'              => isset( $data['fees'] ) ? wpinv_clean( $data['fees'] ) : null,
-            'discounts'         => isset( $data['discounts'] ) ? wpinv_clean( $data['discounts'] ) : null,
-            'taxes'             => isset( $data['taxes'] ) ? wpinv_clean( $data['taxes'] ) : null,
+            'disable_taxes'     => !empty($data['disable_taxes']),
+            'currency'          => isset($data['currency']) ? wpinv_clean($data['currency']) : wpinv_get_currency(),
+            'gateway'           => isset($data['gateway']) ? wpinv_clean($data['gateway']) : null,
+            'transaction_id'    => isset($data['transaction_id']) ? wpinv_clean($data['transaction_id']) : null,
+            'discount_code'     => isset($data['discount_code']) ? wpinv_clean($data['discount_code']) : null,
+            'payment_form'      => isset($data['payment_form']) ? intval($data['payment_form']) : null,
+            'submission_id'     => isset($data['submission_id']) ? wpinv_clean($data['submission_id']) : null,
+            'subscription_id'   => isset($data['subscription_id']) ? wpinv_clean($data['subscription_id']) : null,
+            'is_viewed'         => isset($data['is_viewed']) ? wpinv_clean($data['is_viewed']) : null,
+            'fees'              => isset($data['fees']) ? wpinv_clean($data['fees']) : null,
+            'discounts'         => isset($data['discounts']) ? wpinv_clean($data['discounts']) : null,
+            'taxes'             => isset($data['taxes']) ? wpinv_clean($data['taxes']) : null,
 
             // Billing details.
             'user_id'           => $data['user_id'],
-            'first_name'        => isset( $data['first_name'] ) ? wpinv_clean( $data['first_name'] ) : $address['first_name'],
-            'last_name'         => isset( $data['last_name'] ) ? wpinv_clean( $data['last_name'] ) : $address['last_name'],
-            'address'           => isset( $data['address'] ) ? wpinv_clean( $data['address'] ) : $address['address'],
-            'vat_number'        => isset( $data['vat_number'] ) ? wpinv_clean( $data['vat_number'] ) : $address['vat_number'],
-            'company'           => isset( $data['company'] ) ? wpinv_clean( $data['company'] ) : $address['company'],
-            'zip'               => isset( $data['zip'] ) ? wpinv_clean( $data['zip'] ) : $address['zip'],
-            'state'             => isset( $data['state'] ) ? wpinv_clean( $data['state'] ) : $address['state'],
-            'city'              => isset( $data['city'] ) ? wpinv_clean( $data['city'] ) : $address['city'],
-            'country'           => isset( $data['country'] ) ? wpinv_clean( $data['country'] ) : $address['country'],
-            'phone'             => isset( $data['phone'] ) ? wpinv_clean( $data['phone'] ) : $address['phone'],
-            'address_confirmed' => ! empty( $data['address_confirmed'] ),
+            'first_name'        => isset($data['first_name']) ? wpinv_clean($data['first_name']) : $address['first_name'],
+            'last_name'         => isset($data['last_name']) ? wpinv_clean($data['last_name']) : $address['last_name'],
+            'address'           => isset($data['address']) ? wpinv_clean($data['address']) : $address['address'],
+            'vat_number'        => isset($data['vat_number']) ? wpinv_clean($data['vat_number']) : $address['vat_number'],
+            'company'           => isset($data['company']) ? wpinv_clean($data['company']) : $address['company'],
+            'zip'               => isset($data['zip']) ? wpinv_clean($data['zip']) : $address['zip'],
+            'state'             => isset($data['state']) ? wpinv_clean($data['state']) : $address['state'],
+            'city'              => isset($data['city']) ? wpinv_clean($data['city']) : $address['city'],
+            'country'           => isset($data['country']) ? wpinv_clean($data['country']) : $address['country'],
+            'phone'             => isset($data['phone']) ? wpinv_clean($data['phone']) : $address['phone'],
+            'address_confirmed' => !empty($data['address_confirmed']),
 
         )
     );
 
     // Backwards compatibililty.
-    if ( ! empty( $data['cart_details'] ) && is_array( $data['cart_details'] ) ) {
+    if (!empty($data['cart_details']) && is_array($data['cart_details'])) {
         $data['items'] = array();
 
-        foreach ( $data['cart_details'] as $_item ) {
+        foreach ($data['cart_details'] as $_item) {
 
             // Ensure that we have an item id.
-            if ( empty( $_item['id'] ) ) {
+            if (empty($_item['id'])) {
                 continue;
             }
 
             // Retrieve the item.
-            $item = new GetPaid_Form_Item( $_item['id'] );
+            $item = new GetPaid_Form_Item($_item['id']);
 
             // Ensure that it is purchasable.
-            if ( ! $item->can_purchase() ) {
+            if (!$item->can_purchase()) {
                 continue;
             }
 
             // Set quantity.
-            if ( ! empty( $_item['quantity'] ) && is_numeric( $_item['quantity'] ) ) {
-                $item->set_quantity( $_item['quantity'] );
+            if (!empty($_item['quantity']) && is_numeric($_item['quantity'])) {
+                $item->set_quantity($_item['quantity']);
             }
 
             // Set price.
-            if ( isset( $_item['item_price'] ) ) {
-                $item->set_price( $_item['item_price'] );
+            if (isset($_item['item_price'])) {
+                $item->set_price($_item['item_price']);
             }
 
-            if ( isset( $_item['custom_price'] ) ) {
-                $item->set_price( $_item['custom_price'] );
+            if (isset($_item['custom_price'])) {
+                $item->set_price($_item['custom_price']);
             }
 
             // Set name.
-            if ( ! empty( $_item['name'] ) ) {
-                $item->set_name( $_item['name'] );
+            if (!empty($_item['name'])) {
+                $item->set_name($_item['name']);
             }
 
             // Set description.
-            if ( isset( $_item['description'] ) ) {
-                $item->set_custom_description( $_item['description'] );
+            if (isset($_item['description'])) {
+                $item->set_custom_description($_item['description']);
             }
 
             // Set meta.
-            if ( isset( $_item['meta'] ) && is_array( $_item['meta'] ) ) {
+            if (isset($_item['meta']) && is_array($_item['meta'])) {
 
-                $item->set_item_meta( $_item['meta'] );
+                $item->set_item_meta($_item['meta']);
 
-                if ( isset( $_item['meta']['description'] ) ) {
-                    $item->set_custom_description( $_item['meta']['description'] );
+                if (isset($_item['meta']['description'])) {
+                    $item->set_custom_description($_item['meta']['description']);
                 }
             }
 
@@ -325,14 +325,14 @@ 
     }
 
     // Add invoice items.
-    if ( ! empty( $data['items'] ) && is_array( $data['items'] ) ) {
+    if (!empty($data['items']) && is_array($data['items'])) {
 
-        $invoice->set_items( array() );
+        $invoice->set_items(array());
 
-        foreach ( $data['items'] as $item ) {
+        foreach ($data['items'] as $item) {
 
-            if ( is_object( $item ) && is_a( $item, 'GetPaid_Form_Item' ) && $item->can_purchase() ) {
-                $invoice->add_item( $item );
+            if (is_object($item) && is_a($item, 'GetPaid_Form_Item') && $item->can_purchase()) {
+                $invoice->add_item($item);
             }
 }
 }
@@ -341,30 +341,30 @@ 
     $invoice->recalculate_total();
     $invoice->save();
 
-    if ( ! $invoice->get_id() ) {
-        return $wp_error ? new WP_Error( 'wpinv_insert_invoice_error', __( 'An error occured when saving your invoice.', 'invoicing' ) ) : 0;
+    if (!$invoice->get_id()) {
+        return $wp_error ? new WP_Error('wpinv_insert_invoice_error', __('An error occured when saving your invoice.', 'invoicing')) : 0;
     }
 
     // Add private note.
-    if ( ! empty( $data['private_note'] ) ) {
-        $invoice->add_note( $data['private_note'] );
+    if (!empty($data['private_note'])) {
+        $invoice->add_note($data['private_note']);
     }
 
     // User notes.
-    if ( ! empty( $data['user_note'] ) ) {
-        $invoice->add_note( $data['user_note'], true );
+    if (!empty($data['user_note'])) {
+        $invoice->add_note($data['user_note'], true);
     }
 
     // Created via.
-    if ( isset( $data['created_via'] ) ) {
-        update_post_meta( $invoice->get_id(), 'wpinv_created_via', $data['created_via'] );
+    if (isset($data['created_via'])) {
+        update_post_meta($invoice->get_id(), 'wpinv_created_via', $data['created_via']);
     }
 
     // Backwards compatiblity.
-    if ( $invoice->is_quote() ) {
+    if ($invoice->is_quote()) {
 
-        if ( isset( $data['valid_until'] ) ) {
-            update_post_meta( $invoice->get_id(), 'wpinv_quote_valid_until', $data['valid_until'] );
+        if (isset($data['valid_until'])) {
+            update_post_meta($invoice->get_id(), 'wpinv_quote_valid_until', $data['valid_until']);
         }
 }
 
@@ -378,20 +378,20 @@ 
  * @param $bool $deprecated
  * @return WPInv_Invoice|null
  */
-function wpinv_get_invoice( $invoice = 0, $deprecated = false ) {
+function wpinv_get_invoice($invoice = 0, $deprecated = false) {
 
     // If we are retrieving the invoice from the cart...
-    if ( $deprecated && empty( $invoice ) ) {
+    if ($deprecated && empty($invoice)) {
         $invoice = (int) getpaid_get_current_invoice_id();
     }
 
     // Retrieve the invoice.
-    if ( ! is_a( $invoice, 'WPInv_Invoice' ) ) {
-        $invoice = new WPInv_Invoice( $invoice );
+    if (!is_a($invoice, 'WPInv_Invoice')) {
+        $invoice = new WPInv_Invoice($invoice);
     }
 
     // Check if it exists.
-    if ( $invoice->exists() ) {
+    if ($invoice->exists()) {
         return $invoice;
     }
 
@@ -404,15 +404,15 @@ 
  * @param array $args Args to search for.
  * @return WPInv_Invoice[]|int[]|object
  */
-function wpinv_get_invoices( $args ) {
+function wpinv_get_invoices($args) {
 
     // Prepare args.
     $args = wp_parse_args(
         $args,
         array(
-            'status' => array_keys( wpinv_get_invoice_statuses() ),
+            'status' => array_keys(wpinv_get_invoice_statuses()),
             'type'   => 'wpi_invoice',
-            'limit'  => get_option( 'posts_per_page' ),
+            'limit'  => get_option('posts_per_page'),
             'return' => 'objects',
         )
     );
@@ -430,24 +430,24 @@ 
         'post__in'       => 'include',
     );
 
-    foreach ( $map_legacy as $to => $from ) {
-        if ( isset( $args[ $from ] ) ) {
-            $args[ $to ] = $args[ $from ];
-            unset( $args[ $from ] );
+    foreach ($map_legacy as $to => $from) {
+        if (isset($args[$from])) {
+            $args[$to] = $args[$from];
+            unset($args[$from]);
         }
     }
 
     // Backwards compatibility.
-    if ( ! empty( $args['email'] ) && empty( $args['user'] ) ) {
+    if (!empty($args['email']) && empty($args['user'])) {
         $args['user'] = $args['email'];
-        unset( $args['email'] );
+        unset($args['email']);
     }
 
     // Handle cases where the user is set as an email.
-    if ( ! empty( $args['author'] ) && is_email( $args['author'] ) ) {
-        $user = get_user_by( 'email', $args['user'] );
+    if (!empty($args['author']) && is_email($args['author'])) {
+        $user = get_user_by('email', $args['user']);
 
-        if ( $user ) {
+        if ($user) {
             $args['author'] = $user->user_email;
         }
 }
@@ -457,31 +457,31 @@ 
 
     // Show all posts.
     $paginate = true;
-    if ( isset( $args['paginate'] ) ) {
+    if (isset($args['paginate'])) {
 
         $paginate = $args['paginate'];
-        $args['no_found_rows'] = empty( $args['paginate'] );
-        unset( $args['paginate'] );
+        $args['no_found_rows'] = empty($args['paginate']);
+        unset($args['paginate']);
 
     }
 
     // Whether to return objects or fields.
     $return = $args['return'];
-    unset( $args['return'] );
+    unset($args['return']);
 
     // Get invoices.
-    $invoices = new WP_Query( apply_filters( 'wpinv_get_invoices_args', $args ) );
+    $invoices = new WP_Query(apply_filters('wpinv_get_invoices_args', $args));
 
     // Prepare the results.
-    if ( 'objects' === $return ) {
-        $results = array_map( 'wpinv_get_invoice', $invoices->posts );
-    } elseif ( 'self' === $return ) {
+    if ('objects' === $return) {
+        $results = array_map('wpinv_get_invoice', $invoices->posts);
+    } elseif ('self' === $return) {
         return $invoices;
     } else {
         $results = $invoices->posts;
     }
 
-    if ( $paginate ) {
+    if ($paginate) {
         return (object) array(
             'invoices'      => $results,
             'total'         => $invoices->found_posts,
@@ -499,8 +499,8 @@ 
  * @param string $transaction_id The transaction id to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_id_by_transaction_id( $transaction_id ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $transaction_id, 'transaction_id' );
+function wpinv_get_id_by_transaction_id($transaction_id) {
+    return WPInv_Invoice::get_invoice_id_by_field($transaction_id, 'transaction_id');
 }
 
 /**
@@ -509,8 +509,8 @@ 
  * @param string $invoice_number The invoice number to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_id_by_invoice_number( $invoice_number ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $invoice_number, 'number' );
+function wpinv_get_id_by_invoice_number($invoice_number) {
+    return WPInv_Invoice::get_invoice_id_by_field($invoice_number, 'number');
 }
 
 /**
@@ -519,8 +519,8 @@ 
  * @param string $invoice_key The invoice key to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_invoice_id_by_key( $invoice_key ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $invoice_key, 'key' );
+function wpinv_get_invoice_id_by_key($invoice_key) {
+    return WPInv_Invoice::get_invoice_id_by_field($invoice_key, 'key');
 }
 
 /**
@@ -530,19 +530,19 @@ 
  * @param string $type Optionally filter by type i.e customer|system
  * @return array|null
  */
-function wpinv_get_invoice_notes( $invoice = 0, $type = '' ) {
+function wpinv_get_invoice_notes($invoice = 0, $type = '') {
 
     // Prepare the invoice.
-    $invoice = wpinv_get_invoice( $invoice );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice);
+    if (empty($invoice)) {
         return null;
     }
 
     // Fetch notes.
-    $notes = getpaid_notes()->get_invoice_notes( $invoice->get_id(), $type );
+    $notes = getpaid_notes()->get_invoice_notes($invoice->get_id(), $type);
 
     // Filter the notes.
-    return apply_filters( 'wpinv_invoice_notes', $notes, $invoice->get_id(), $type );
+    return apply_filters('wpinv_invoice_notes', $notes, $invoice->get_id(), $type);
 }
 
 /**
@@ -550,10 +550,10 @@ 
  *
  * @param string $post_type
  */
-function wpinv_get_user_invoices_columns( $post_type = 'wpi_invoice' ) {
+function wpinv_get_user_invoices_columns($post_type = 'wpi_invoice') {
 
-    $label   = getpaid_get_post_type_label( $post_type, false );
-    $label   = empty( $label ) ? __( 'Invoice', 'invoicing' ) : sanitize_text_field( $label );
+    $label   = getpaid_get_post_type_label($post_type, false);
+    $label   = empty($label) ? __('Invoice', 'invoicing') : sanitize_text_field($label);
     $columns = array(
 
 		'invoice-number'  => array(
@@ -562,22 +562,22 @@ 
 		),
 
 		'created-date'    => array(
-			'title' => __( 'Created Date', 'invoicing' ),
+			'title' => __('Created Date', 'invoicing'),
 			'class' => 'text-left',
 		),
 
 		'payment-date'    => array(
-			'title' => __( 'Payment Date', 'invoicing' ),
+			'title' => __('Payment Date', 'invoicing'),
 			'class' => 'text-left',
 		),
 
 		'invoice-status'  => array(
-			'title' => __( 'Status', 'invoicing' ),
+			'title' => __('Status', 'invoicing'),
 			'class' => 'text-center',
 		),
 
 		'invoice-total'   => array(
-			'title' => __( 'Total', 'invoicing' ),
+			'title' => __('Total', 'invoicing'),
 			'class' => 'text-right',
 		),
 
@@ -588,7 +588,7 @@ 
 
 	);
 
-    return apply_filters( 'wpinv_user_invoices_columns', $columns, $post_type );
+    return apply_filters('wpinv_user_invoices_columns', $columns, $post_type);
 }
 
 /**
@@ -598,59 +598,59 @@ 
 
     // Find the invoice.
     $invoice_id = getpaid_get_current_invoice_id();
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
     // Abort if non was found.
-    if ( empty( $invoice_id ) || $invoice->is_draft() ) {
+    if (empty($invoice_id) || $invoice->is_draft()) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'We could not find your invoice', 'invoicing' ),
+                'content' => __('We could not find your invoice', 'invoicing'),
             )
         );
 
     }
 
     // Can the user view this invoice?
-    if ( ! wpinv_can_view_receipt( $invoice_id ) ) {
+    if (!wpinv_can_view_receipt($invoice_id)) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'You are not allowed to view this receipt', 'invoicing' ),
+                'content' => __('You are not allowed to view this receipt', 'invoicing'),
             )
         );
 
     }
 
     // Load the template.
-    return wpinv_get_template_html( 'invoice-receipt.php', compact( 'invoice' ) );
+    return wpinv_get_template_html('invoice-receipt.php', compact('invoice'));
 
 }
 
 /**
  * Displays the invoice history.
  */
-function getpaid_invoice_history( $user_id = 0, $post_type = 'wpi_invoice' ) {
+function getpaid_invoice_history($user_id = 0, $post_type = 'wpi_invoice') {
 
     // Ensure that we have a user id.
-    if ( empty( $user_id ) || ! is_numeric( $user_id ) ) {
+    if (empty($user_id) || !is_numeric($user_id)) {
         $user_id = get_current_user_id();
     }
 
-    $label = getpaid_get_post_type_label( $post_type );
-    $label = empty( $label ) ? __( 'Invoices', 'invoicing' ) : sanitize_text_field( $label );
+    $label = getpaid_get_post_type_label($post_type);
+    $label = empty($label) ? __('Invoices', 'invoicing') : sanitize_text_field($label);
 
     // View user id.
-    if ( empty( $user_id ) ) {
+    if (empty($user_id)) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
                 'content' => sprintf(
-                    __( 'You must be logged in to view your %s.', 'invoicing' ),
-                    strtolower( $label )
+                    __('You must be logged in to view your %s.', 'invoicing'),
+                    strtolower($label)
                 ),
             )
         );
@@ -660,22 +660,22 @@ 
     // Fetch invoices.
     $invoices = wpinv_get_invoices(
         array(
-            'page'     => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
+            'page'     => (get_query_var('paged')) ? absint(get_query_var('paged')) : 1,
             'user'     => $user_id,
             'paginate' => true,
             'type'     => $post_type,
-            'status'   => array_keys( wpinv_get_invoice_statuses( false, false, $post_type ) ),
+            'status'   => array_keys(wpinv_get_invoice_statuses(false, false, $post_type)),
         )
     );
 
-    if ( empty( $invoices->total ) ) {
+    if (empty($invoices->total)) {
 
         return aui()->alert(
             array(
                 'type'    => 'info',
                 'content' => sprintf(
-                    __( 'No %s found.', 'invoicing' ),
-                    strtolower( $label )
+                    __('No %s found.', 'invoicing'),
+                    strtolower($label)
                 ),
             )
         );
@@ -683,38 +683,38 @@ 
     }
 
     // Load the template.
-    return wpinv_get_template_html( 'invoice-history.php', compact( 'invoices', 'post_type' ) );
+    return wpinv_get_template_html('invoice-history.php', compact('invoices', 'post_type'));
 
 }
 
 /**
  * Formats an invoice number given an invoice type.
  */
-function wpinv_format_invoice_number( $number, $type = '' ) {
+function wpinv_format_invoice_number($number, $type = '') {
 
     // Allow other plugins to overide this.
-    $check = apply_filters( 'wpinv_pre_format_invoice_number', null, $number, $type );
-    if ( null !== $check ) {
+    $check = apply_filters('wpinv_pre_format_invoice_number', null, $number, $type);
+    if (null !== $check) {
         return $check;
     }
 
     // Ensure that we have a numeric number.
-    if ( ! is_numeric( $number ) ) {
+    if (!is_numeric($number)) {
         return $number;
     }
 
     // Format the number.
-    $padd             = absint( (int) wpinv_get_option( 'invoice_number_padd', 5 ) );
-    $prefix           = sanitize_text_field( (string) wpinv_get_option( 'invoice_number_prefix', 'INV-' ) );
-    $prefix           = sanitize_text_field( apply_filters( 'getpaid_invoice_type_prefix', $prefix, $type ) );
-    $postfix          = sanitize_text_field( (string) wpinv_get_option( 'invoice_number_postfix' ) );
-    $postfix          = sanitize_text_field( apply_filters( 'getpaid_invoice_type_postfix', $postfix, $type ) );
-    $formatted_number = zeroise( absint( $number ), $padd );
+    $padd             = absint((int) wpinv_get_option('invoice_number_padd', 5));
+    $prefix           = sanitize_text_field((string) wpinv_get_option('invoice_number_prefix', 'INV-'));
+    $prefix           = sanitize_text_field(apply_filters('getpaid_invoice_type_prefix', $prefix, $type));
+    $postfix          = sanitize_text_field((string) wpinv_get_option('invoice_number_postfix'));
+    $postfix          = sanitize_text_field(apply_filters('getpaid_invoice_type_postfix', $postfix, $type));
+    $formatted_number = zeroise(absint($number), $padd);
 
     // Add the prefix and post fix.
     $formatted_number = $prefix . $formatted_number . $postfix;
 
-    return apply_filters( 'wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd );
+    return apply_filters('wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd);
 }
 
 /**
@@ -723,58 +723,58 @@ 
  * @param string $type.
  * @return int|null|bool
  */
-function wpinv_get_next_invoice_number( $type = '' ) {
+function wpinv_get_next_invoice_number($type = '') {
 
     // Allow plugins to overide this.
-    $check = apply_filters( 'wpinv_get_pre_next_invoice_number', null, $type );
-    if ( null !== $check ) {
+    $check = apply_filters('wpinv_get_pre_next_invoice_number', null, $type);
+    if (null !== $check) {
         return $check;
     }
 
     // Ensure sequential invoice numbers is active.
-    if ( ! wpinv_sequential_number_active() ) {
+    if (!wpinv_sequential_number_active()) {
         return false;
     }
 
     // Retrieve the current number and the start number.
-    $number = (int) get_option( 'wpinv_last_invoice_number', 0 );
-    $start  = absint( (int) wpinv_get_option( 'invoice_sequence_start', 1 ) );
+    $number = (int) get_option('wpinv_last_invoice_number', 0);
+    $start  = absint((int) wpinv_get_option('invoice_sequence_start', 1));
 
     // Ensure that we are starting at a positive integer.
-    $start  = max( $start, 1 );
+    $start  = max($start, 1);
 
     // If this is the first invoice, use the start number.
-    $number = max( $start, $number );
+    $number = max($start, $number);
 
     // Format the invoice number.
-    $formatted_number = wpinv_format_invoice_number( $number, $type );
+    $formatted_number = wpinv_format_invoice_number($number, $type);
 
     // Ensure that this number is unique.
-    $invoice_id = WPInv_Invoice::get_invoice_id_by_field( $formatted_number, 'number' );
+    $invoice_id = WPInv_Invoice::get_invoice_id_by_field($formatted_number, 'number');
 
     // We found a match. Nice.
-    if ( empty( $invoice_id ) ) {
-        update_option( 'wpinv_last_invoice_number', $number );
-        return apply_filters( 'wpinv_get_next_invoice_number', $number );
+    if (empty($invoice_id)) {
+        update_option('wpinv_last_invoice_number', $number);
+        return apply_filters('wpinv_get_next_invoice_number', $number);
     }
 
-    update_option( 'wpinv_last_invoice_number', $number + 1 );
-    return wpinv_get_next_invoice_number( $type );
+    update_option('wpinv_last_invoice_number', $number + 1);
+    return wpinv_get_next_invoice_number($type);
 
 }
 
 /**
  * The prefix used for invoice paths.
  */
-function wpinv_post_name_prefix( $post_type = 'wpi_invoice' ) {
-    return apply_filters( 'wpinv_post_name_prefix', 'inv-', $post_type );
+function wpinv_post_name_prefix($post_type = 'wpi_invoice') {
+    return apply_filters('wpinv_post_name_prefix', 'inv-', $post_type);
 }
 
-function wpinv_generate_post_name( $post_ID ) {
-    $prefix = wpinv_post_name_prefix( get_post_type( $post_ID ) );
-    $post_name = sanitize_title( $prefix . $post_ID );
+function wpinv_generate_post_name($post_ID) {
+    $prefix = wpinv_post_name_prefix(get_post_type($post_ID));
+    $post_name = sanitize_title($prefix . $post_ID);
 
-    return apply_filters( 'wpinv_generate_post_name', $post_name, $post_ID, $prefix );
+    return apply_filters('wpinv_generate_post_name', $post_name, $post_ID, $prefix);
 }
 
 /**
@@ -782,8 +782,8 @@ 
  *
  * @param int|string|object|WPInv_Invoice|WPInv_Legacy_Invoice|WP_Post $invoice Invoice id, key, transaction id, number or object.
  */
-function wpinv_is_invoice_viewed( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_is_invoice_viewed($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return (bool) $invoice->get_is_viewed();
 }
 
@@ -792,17 +792,17 @@ 
  *
  * @param int|string|object|WPInv_Invoice|WPInv_Legacy_Invoice|WP_Post $invoice Invoice id, key, transaction id, number or object.
  */
-function getpaid_maybe_mark_invoice_as_viewed( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function getpaid_maybe_mark_invoice_as_viewed($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
 
-    if ( get_current_user_id() == $invoice->get_user_id() && ! $invoice->get_is_viewed() ) {
-        $invoice->set_is_viewed( true );
+    if (get_current_user_id() == $invoice->get_user_id() && !$invoice->get_is_viewed()) {
+        $invoice->set_is_viewed(true);
         $invoice->save();
     }
 
 }
-add_action( 'wpinv_invoice_print_before_display', 'getpaid_maybe_mark_invoice_as_viewed' );
-add_action( 'wpinv_before_receipt', 'getpaid_maybe_mark_invoice_as_viewed' );
+add_action('wpinv_invoice_print_before_display', 'getpaid_maybe_mark_invoice_as_viewed');
+add_action('wpinv_before_receipt', 'getpaid_maybe_mark_invoice_as_viewed');
 
 /**
  * Processes an invoice refund.
@@ -811,26 +811,26 @@ 
  * @param array $status_transition
  * @todo: descrease customer/store earnings
  */
-function getpaid_maybe_process_refund( $invoice, $status_transition ) {
+function getpaid_maybe_process_refund($invoice, $status_transition) {
 
-    if ( empty( $status_transition['from'] ) || ! in_array( $status_transition['from'], array( 'publish', 'wpi-processing', 'wpi-renewal' ) ) ) {
+    if (empty($status_transition['from']) || !in_array($status_transition['from'], array('publish', 'wpi-processing', 'wpi-renewal'))) {
         return;
     }
 
     $discount_code = $invoice->get_discount_code();
-    if ( ! empty( $discount_code ) ) {
-        $discount = wpinv_get_discount_obj( $discount_code );
+    if (!empty($discount_code)) {
+        $discount = wpinv_get_discount_obj($discount_code);
 
-        if ( $discount->exists() ) {
+        if ($discount->exists()) {
             $discount->increase_usage( -1 );
         }
 }
 
-    do_action( 'wpinv_pre_refund_invoice', $invoice, $invoice->get_id() );
-    do_action( 'wpinv_refund_invoice', $invoice, $invoice->get_id() );
-    do_action( 'wpinv_post_refund_invoice', $invoice, $invoice->get_id() );
+    do_action('wpinv_pre_refund_invoice', $invoice, $invoice->get_id());
+    do_action('wpinv_refund_invoice', $invoice, $invoice->get_id());
+    do_action('wpinv_post_refund_invoice', $invoice, $invoice->get_id());
 }
-add_action( 'getpaid_invoice_status_wpi-refunded', 'getpaid_maybe_process_refund', 10, 2 );
+add_action('getpaid_invoice_status_wpi-refunded', 'getpaid_maybe_process_refund', 10, 2);
 
 
 /**
@@ -838,47 +838,47 @@ 
  *
  * @param int $invoice_id
  */
-function getpaid_process_invoice_payment( $invoice_id ) {
+function getpaid_process_invoice_payment($invoice_id) {
 
     // Fetch the invoice.
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
     // We only want to do this once.
-    if ( 1 == get_post_meta( $invoice->get_id(), 'wpinv_processed_payment', true ) ) {
+    if (1 == get_post_meta($invoice->get_id(), 'wpinv_processed_payment', true)) {
         return;
     }
 
-    update_post_meta( $invoice->get_id(), 'wpinv_processed_payment', 1 );
+    update_post_meta($invoice->get_id(), 'wpinv_processed_payment', 1);
 
     // Fires when processing a payment.
-    do_action( 'getpaid_process_payment', $invoice );
+    do_action('getpaid_process_payment', $invoice);
 
     // Fire an action for each invoice item.
-    foreach ( $invoice->get_items() as $item ) {
-        do_action( 'getpaid_process_item_payment', $item, $invoice );
+    foreach ($invoice->get_items() as $item) {
+        do_action('getpaid_process_item_payment', $item, $invoice);
     }
 
     // Increase discount usage.
     $discount_code = $invoice->get_discount_code();
-    if ( ! empty( $discount_code ) && ! $invoice->is_renewal() ) {
-        $discount = wpinv_get_discount_obj( $discount_code );
+    if (!empty($discount_code) && !$invoice->is_renewal()) {
+        $discount = wpinv_get_discount_obj($discount_code);
 
-        if ( $discount->exists() ) {
+        if ($discount->exists()) {
             $discount->increase_usage();
         }
 }
 
     // Record reverse vat.
-    if ( 'invoice' === $invoice->get_type() && wpinv_use_taxes() && ! $invoice->get_disable_taxes() ) {
+    if ('invoice' === $invoice->get_type() && wpinv_use_taxes() && !$invoice->get_disable_taxes()) {
 
         $taxes = $invoice->get_total_tax();
-        if ( empty( $taxes ) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction( $invoice->get_country() ) ) {
-            $invoice->add_note( __( 'VAT was reverse charged', 'invoicing' ), false, false, true );
+        if (empty($taxes) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction($invoice->get_country())) {
+            $invoice->add_note(__('VAT was reverse charged', 'invoicing'), false, false, true);
         }
 }
 
 }
-add_action( 'getpaid_invoice_payment_status_changed', 'getpaid_process_invoice_payment' );
+add_action('getpaid_invoice_payment_status_changed', 'getpaid_process_invoice_payment');
 
 /**
  * Returns an array of invoice item columns
@@ -886,13 +886,13 @@ 
  * @param int|WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_invoice_item_columns( $invoice ) {
+function getpaid_invoice_item_columns($invoice) {
 
     // Prepare the invoice.
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if there is no invoice.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return array();
     }
 
@@ -900,52 +900,52 @@ 
     $columns = apply_filters(
         'getpaid_invoice_item_columns',
         array(
-            'name'     => __( 'Item', 'invoicing' ),
-            'price'    => __( 'Price', 'invoicing' ),
-            'tax_rate' => __( 'Tax Rate', 'invoicing' ),
-            'quantity' => __( 'Quantity', 'invoicing' ),
-            'subtotal' => __( 'Item Subtotal', 'invoicing' ),
+            'name'     => __('Item', 'invoicing'),
+            'price'    => __('Price', 'invoicing'),
+            'tax_rate' => __('Tax Rate', 'invoicing'),
+            'quantity' => __('Quantity', 'invoicing'),
+            'subtotal' => __('Item Subtotal', 'invoicing'),
         ),
         $invoice
     );
 
     // Quantities.
-    if ( isset( $columns['quantity'] ) ) {
+    if (isset($columns['quantity'])) {
 
-        if ( 'hours' == $invoice->get_template() ) {
-            $columns['quantity'] = __( 'Hours', 'invoicing' );
+        if ('hours' == $invoice->get_template()) {
+            $columns['quantity'] = __('Hours', 'invoicing');
         }
 
-        if ( ! wpinv_item_quantities_enabled() || 'amount' == $invoice->get_template() ) {
-            unset( $columns['quantity'] );
+        if (!wpinv_item_quantities_enabled() || 'amount' == $invoice->get_template()) {
+            unset($columns['quantity']);
         }
     }
 
     // Price.
-    if ( isset( $columns['price'] ) ) {
+    if (isset($columns['price'])) {
 
-        if ( 'amount' == $invoice->get_template() ) {
-            $columns['price'] = __( 'Amount', 'invoicing' );
+        if ('amount' == $invoice->get_template()) {
+            $columns['price'] = __('Amount', 'invoicing');
         }
 
-        if ( 'hours' == $invoice->get_template() ) {
-            $columns['price'] = __( 'Rate', 'invoicing' );
+        if ('hours' == $invoice->get_template()) {
+            $columns['price'] = __('Rate', 'invoicing');
         }
 }
 
     // Sub total.
-    if ( isset( $columns['subtotal'] ) ) {
+    if (isset($columns['subtotal'])) {
 
-        if ( 'amount' == $invoice->get_template() ) {
-            unset( $columns['subtotal'] );
+        if ('amount' == $invoice->get_template()) {
+            unset($columns['subtotal']);
         }
 }
 
     // Tax rates.
-    if ( isset( $columns['tax_rate'] ) ) {
+    if (isset($columns['tax_rate'])) {
 
-        if ( 0 == $invoice->get_total_tax() ) {
-            unset( $columns['tax_rate'] );
+        if (0 == $invoice->get_total_tax()) {
+            unset($columns['tax_rate']);
         }
     }
 
@@ -958,53 +958,53 @@ 
  * @param int|WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_invoice_totals_rows( $invoice ) {
+function getpaid_invoice_totals_rows($invoice) {
 
     // Prepare the invoice.
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if there is no invoice.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return array();
     }
 
     $totals = apply_filters(
         'getpaid_invoice_totals_rows',
         array(
-            'subtotal' => __( 'Subtotal', 'invoicing' ),
-            'shipping' => __( 'Shipping', 'invoicing' ),
-            'tax'      => __( 'Tax', 'invoicing' ),
-            'fee'      => __( 'Fee', 'invoicing' ),
-            'discount' => __( 'Discount', 'invoicing' ),
-            'total'    => __( 'Total', 'invoicing' ),
+            'subtotal' => __('Subtotal', 'invoicing'),
+            'shipping' => __('Shipping', 'invoicing'),
+            'tax'      => __('Tax', 'invoicing'),
+            'fee'      => __('Fee', 'invoicing'),
+            'discount' => __('Discount', 'invoicing'),
+            'total'    => __('Total', 'invoicing'),
         ),
         $invoice
     );
 
-    if ( ! $invoice->has_shipping() ) {
-        unset( $totals['shipping'] );
+    if (!$invoice->has_shipping()) {
+        unset($totals['shipping']);
     }
 
-    if ( ( $invoice->get_disable_taxes() || ! wpinv_use_taxes() ) && isset( $totals['tax'] ) ) {
-        unset( $totals['tax'] );
+    if (($invoice->get_disable_taxes() || !wpinv_use_taxes()) && isset($totals['tax'])) {
+        unset($totals['tax']);
     }
 
     // If we have taxes, display individual taxes.
-    if ( isset( $totals['tax'] ) && wpinv_display_individual_tax_rates() ) {
+    if (isset($totals['tax']) && wpinv_display_individual_tax_rates()) {
 
         $new_totals = array();
-        foreach ( $totals as $key => $label ) {
+        foreach ($totals as $key => $label) {
 
-            if ( 'tax' !== $key ) {
-                $new_totals[ $key ] = $label;
+            if ('tax' !== $key) {
+                $new_totals[$key] = $label;
                 continue;
             }
 
-            $taxes = array_keys( $invoice->get_taxes() );
-            if ( ! empty( $taxes ) ) {
+            $taxes = array_keys($invoice->get_taxes());
+            if (!empty($taxes)) {
 
-                foreach ( $taxes as $tax ) {
-                    $new_totals[ 'tax__' . $tax ] = $tax;
+                foreach ($taxes as $tax) {
+                    $new_totals['tax__' . $tax] = $tax;
                 }
             }
         }
@@ -1012,12 +1012,12 @@ 
         $totals = $new_totals;
     }
 
-    if ( 0 == $invoice->get_total_fees() && isset( $totals['fee'] ) ) {
-        unset( $totals['fee'] );
+    if (0 == $invoice->get_total_fees() && isset($totals['fee'])) {
+        unset($totals['fee']);
     }
 
-    if ( 0 == $invoice->get_total_discount() && isset( $totals['discount'] ) ) {
-        unset( $totals['discount'] );
+    if (0 == $invoice->get_total_discount() && isset($totals['discount'])) {
+        unset($totals['discount']);
     }
 
     return $totals;
@@ -1028,47 +1028,47 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_new_invoice( $invoice ) {
+function getpaid_new_invoice($invoice) {
 
-    if ( ! $invoice->get_status() ) {
+    if (!$invoice->get_status()) {
         return;
     }
 
     // Add an invoice created note.
     $invoice->add_note(
         sprintf(
-            __( '%1$s created with the status "%2$s".', 'invoicing' ),
-            ucfirst( $invoice->get_invoice_quote_type() ),
-            wpinv_status_nicename( $invoice->get_status(), $invoice )
+            __('%1$s created with the status "%2$s".', 'invoicing'),
+            ucfirst($invoice->get_invoice_quote_type()),
+            wpinv_status_nicename($invoice->get_status(), $invoice)
         )
     );
 
 }
-add_action( 'getpaid_new_invoice', 'getpaid_new_invoice' );
+add_action('getpaid_new_invoice', 'getpaid_new_invoice');
 
 /**
  * This function updates invoice caches.
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_update_invoice_caches( $invoice ) {
+function getpaid_update_invoice_caches($invoice) {
 
     // Cache invoice number.
-    wp_cache_set( $invoice->get_number(), $invoice->get_id(), 'getpaid_invoice_numbers_to_invoice_ids' );
+    wp_cache_set($invoice->get_number(), $invoice->get_id(), 'getpaid_invoice_numbers_to_invoice_ids');
 
     // Cache invoice key.
-    wp_cache_set( $invoice->get_key(), $invoice->get_id(), 'getpaid_invoice_keys_to_invoice_ids' );
+    wp_cache_set($invoice->get_key(), $invoice->get_id(), 'getpaid_invoice_keys_to_invoice_ids');
 
     // (Maybe) cache transaction id.
     $transaction_id = $invoice->get_transaction_id();
 
-    if ( ! empty( $transaction_id ) ) {
-        wp_cache_set( $transaction_id, $invoice->get_id(), 'getpaid_invoice_transaction_ids_to_invoice_ids' );
+    if (!empty($transaction_id)) {
+        wp_cache_set($transaction_id, $invoice->get_id(), 'getpaid_invoice_transaction_ids_to_invoice_ids');
     }
 
 }
-add_action( 'getpaid_new_invoice', 'getpaid_update_invoice_caches', 5 );
-add_action( 'getpaid_update_invoice', 'getpaid_update_invoice_caches', 5 );
+add_action('getpaid_new_invoice', 'getpaid_update_invoice_caches', 5);
+add_action('getpaid_update_invoice', 'getpaid_update_invoice_caches', 5);
 
 /**
  * Duplicates an invoice.
@@ -1078,7 +1078,7 @@ 
  * @param  WPInv_Invoice $old_invoice The invoice to duplicate
  * @return WPInv_Invoice The new invoice.
  */
-function getpaid_duplicate_invoice( $old_invoice ) {
+function getpaid_duplicate_invoice($old_invoice) {
 
     // Create the new invoice.
     $invoice = new WPInv_Invoice();
@@ -1138,136 +1138,136 @@ 
  * @param WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_get_invoice_meta( $invoice ) {
+function getpaid_get_invoice_meta($invoice) {
 
     // Load the invoice meta.
     $meta = array(
 
         'number'         => array(
             'label' => sprintf(
-                __( '%s Number', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('%s Number', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
-            'value' => sanitize_text_field( $invoice->get_number() ),
+            'value' => sanitize_text_field($invoice->get_number()),
         ),
 
         'status'         => array(
             'label' => sprintf(
-                __( '%s Status', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('%s Status', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
             'value' => $invoice->get_status_label_html(),
         ),
 
         'date'           => array(
             'label' => sprintf(
-                __( '%s Date', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('%s Date', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
-            'value' => getpaid_format_date( $invoice->get_created_date() ),
+            'value' => getpaid_format_date($invoice->get_created_date()),
         ),
 
         'date_paid'      => array(
-            'label' => __( 'Paid On', 'invoicing' ),
-            'value' => getpaid_format_date( $invoice->get_completed_date() ),
+            'label' => __('Paid On', 'invoicing'),
+            'value' => getpaid_format_date($invoice->get_completed_date()),
         ),
 
         'gateway'        => array(
-            'label' => __( 'Payment Method', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_gateway_title() ),
+            'label' => __('Payment Method', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_gateway_title()),
         ),
 
         'transaction_id' => array(
-            'label' => __( 'Transaction ID', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_transaction_id() ),
+            'label' => __('Transaction ID', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_transaction_id()),
         ),
 
         'due_date'       => array(
-            'label' => __( 'Due Date', 'invoicing' ),
-            'value' => getpaid_format_date( $invoice->get_due_date() ),
+            'label' => __('Due Date', 'invoicing'),
+            'value' => getpaid_format_date($invoice->get_due_date()),
         ),
 
         'vat_number'     => array(
-            'label' => __( 'VAT Number', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_vat_number() ),
+            'label' => __('VAT Number', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_vat_number()),
         ),
 
     );
 
-    $additional_meta = get_post_meta( $invoice->get_id(), 'additional_meta_data', true );
+    $additional_meta = get_post_meta($invoice->get_id(), 'additional_meta_data', true);
 
-    if ( ! empty( $additional_meta ) ) {
+    if (!empty($additional_meta)) {
 
-        foreach ( $additional_meta as $label => $value ) {
-            $meta[ sanitize_key( $label ) ] = array(
-                'label' => esc_html( $label ),
-                'value' => esc_html( $value ),
+        foreach ($additional_meta as $label => $value) {
+            $meta[sanitize_key($label)] = array(
+                'label' => esc_html($label),
+                'value' => esc_html($value),
             );
         }
 }
     // If it is not paid, remove the date of payment.
-    if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
-        unset( $meta['date_paid'] );
-        unset( $meta['transaction_id'] );
+    if (!$invoice->is_paid() && !$invoice->is_refunded()) {
+        unset($meta['date_paid']);
+        unset($meta['transaction_id']);
     }
 
-    if ( ! $invoice->is_paid() || 'none' == $invoice->get_gateway() ) {
-        unset( $meta['gateway'] );
+    if (!$invoice->is_paid() || 'none' == $invoice->get_gateway()) {
+        unset($meta['gateway']);
     }
 
     // Only display the due date if due dates are enabled.
-    if ( ! $invoice->needs_payment() || ! wpinv_get_option( 'overdue_active' ) ) {
-        unset( $meta['due_date'] );
+    if (!$invoice->needs_payment() || !wpinv_get_option('overdue_active')) {
+        unset($meta['due_date']);
     }
 
     // Only display the vat number if taxes are enabled.
-    if ( ! wpinv_use_taxes() ) {
-        unset( $meta['vat_number'] );
+    if (!wpinv_use_taxes()) {
+        unset($meta['vat_number']);
     }
 
     // Link to the parent invoice.
-    if ( $invoice->get_parent_id() > 0 ) {
+    if ($invoice->get_parent_id() > 0) {
 
         $meta['parent'] = array(
 
             'label' => sprintf(
-                __( 'Parent %s', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('Parent %s', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
 
-            'value' => wpinv_invoice_link( $invoice->get_parent_id() ),
+            'value' => wpinv_invoice_link($invoice->get_parent_id()),
 
         );
 
     }
 
-    if ( $invoice->is_recurring() ) {
+    if ($invoice->is_recurring()) {
 
-        $subscription = getpaid_get_invoice_subscriptions( $invoice );
-        if ( ! empty( $subscription ) && ! is_array( $subscription ) && $subscription->exists() ) {
+        $subscription = getpaid_get_invoice_subscriptions($invoice);
+        if (!empty($subscription) && !is_array($subscription) && $subscription->exists()) {
 
             // Display the renewal date.
-            if ( $subscription->is_active() && 'cancelled' != $subscription->get_status() ) {
+            if ($subscription->is_active() && 'cancelled' != $subscription->get_status()) {
 
                 $meta['renewal_date'] = array(
-                    'label' => __( 'Renews On', 'invoicing' ),
-                    'value' => getpaid_format_date( $subscription->get_expiration() ) .
+                    'label' => __('Renews On', 'invoicing'),
+                    'value' => getpaid_format_date($subscription->get_expiration()) .
                     sprintf(
                         ' <a class="small" href="%s">%s<a>',
                         $subscription->get_view_url(),
-                        __( '(View Subscription)', 'invoicing' )
+                        __('(View Subscription)', 'invoicing')
                     ),
                 );
 
             }
 
-            if ( $invoice->is_parent() ) {
+            if ($invoice->is_parent()) {
 
                 // Display the recurring amount.
                 $meta['recurring_total'] = array(
 
-                    'label' => __( 'Recurring Amount', 'invoicing' ),
-                    'value' => wpinv_price( $subscription->get_recurring_amount(), $invoice->get_currency() ),
+                    'label' => __('Recurring Amount', 'invoicing'),
+                    'value' => wpinv_price($subscription->get_recurring_amount(), $invoice->get_currency()),
 
                 );
 
@@ -1278,13 +1278,13 @@ 
     // Add the invoice total to the meta.
     $meta['invoice_total'] = array(
 
-        'label' => __( 'Total Amount', 'invoicing' ),
-        'value' => wpinv_price( $invoice->get_total(), $invoice->get_currency() ),
+        'label' => __('Total Amount', 'invoicing'),
+        'value' => wpinv_price($invoice->get_total(), $invoice->get_currency()),
 
     );
 
     // Provide a way for third party plugins to filter the meta.
-    $meta = apply_filters( 'getpaid_invoice_meta_data', $meta, $invoice );
+    $meta = apply_filters('getpaid_invoice_meta_data', $meta, $invoice);
 
     return $meta;
 
@@ -1323,12 +1323,12 @@ 
  * @param GetPaid_Form_Item $item
  * @return float
  */
-function getpaid_get_invoice_tax_rate( $invoice, $item ) {
+function getpaid_get_invoice_tax_rate($invoice, $item) {
 
-    $rates   = getpaid_get_item_tax_rates( $item, $invoice->get_country(), $invoice->get_state() );
-	$rates   = getpaid_filter_item_tax_rates( $item, $rates );
-    $rates   = wp_list_pluck( $rates, 'rate' );
+    $rates   = getpaid_get_item_tax_rates($item, $invoice->get_country(), $invoice->get_state());
+	$rates = getpaid_filter_item_tax_rates($item, $rates);
+    $rates   = wp_list_pluck($rates, 'rate');
 
-    return array_sum( $rates );
+    return array_sum($rates);
 
 }

Indentation +37 added lines, -37 removed lines

@@ -67,7 +67,7 @@ 
  * Checks if the current user cna view an invoice receipt.
  */
 function wpinv_can_view_receipt( $invoice ) {
-	return (bool) apply_filters( 'wpinv_can_view_receipt', wpinv_user_can_view_invoice( $invoice ), $invoice );
+    return (bool) apply_filters( 'wpinv_can_view_receipt', wpinv_user_can_view_invoice( $invoice ), $invoice );
 }
 
 /**
@@ -556,37 +556,37 @@ 
     $label   = empty( $label ) ? __( 'Invoice', 'invoicing' ) : sanitize_text_field( $label );
     $columns = array(
 
-		'invoice-number'  => array(
-			'title' => $label,
-			'class' => 'text-left',
-		),
+        'invoice-number'  => array(
+            'title' => $label,
+            'class' => 'text-left',
+        ),
 
-		'created-date'    => array(
-			'title' => __( 'Created Date', 'invoicing' ),
-			'class' => 'text-left',
-		),
+        'created-date'    => array(
+            'title' => __( 'Created Date', 'invoicing' ),
+            'class' => 'text-left',
+        ),
 
-		'payment-date'    => array(
-			'title' => __( 'Payment Date', 'invoicing' ),
-			'class' => 'text-left',
-		),
+        'payment-date'    => array(
+            'title' => __( 'Payment Date', 'invoicing' ),
+            'class' => 'text-left',
+        ),
 
-		'invoice-status'  => array(
-			'title' => __( 'Status', 'invoicing' ),
-			'class' => 'text-center',
-		),
+        'invoice-status'  => array(
+            'title' => __( 'Status', 'invoicing' ),
+            'class' => 'text-center',
+        ),
 
-		'invoice-total'   => array(
-			'title' => __( 'Total', 'invoicing' ),
-			'class' => 'text-right',
-		),
+        'invoice-total'   => array(
+            'title' => __( 'Total', 'invoicing' ),
+            'class' => 'text-right',
+        ),
 
-		'invoice-actions' => array(
-			'title' => ' ',
-			'class' => 'text-center',
-		),
+        'invoice-actions' => array(
+            'title' => ' ',
+            'class' => 'text-center',
+        ),
 
-	);
+    );
 
     return apply_filters( 'wpinv_user_invoices_columns', $columns, $post_type );
 }
@@ -1297,22 +1297,22 @@ 
  */
 function getpaid_get_invoice_status_classes() {
 
-	return apply_filters(
-		'getpaid_get_invoice_status_classes',
-		array(
+    return apply_filters(
+        'getpaid_get_invoice_status_classes',
+        array(
             'wpi-quote-declined' => 'bg-danger',
             'wpi-failed'         => 'bg-danger',
-			'wpi-processing'     => 'bg-info',
-			'wpi-onhold'         => 'bg-warning text-dark',
-			'wpi-quote-accepted' => 'bg-success',
-			'publish'            => 'bg-success',
-			'wpi-renewal'        => 'bg-primary',
+            'wpi-processing'     => 'bg-info',
+            'wpi-onhold'         => 'bg-warning text-dark',
+            'wpi-quote-accepted' => 'bg-success',
+            'publish'            => 'bg-success',
+            'wpi-renewal'        => 'bg-primary',
             'wpi-cancelled'      => 'bg-secondary',
             'wpi-pending'        => 'bg-dark text-white',
             'wpi-quote-pending'  => 'bg-dark text-white',
             'wpi-refunded'       => 'bg-secondary',
-		)
-	);
+        )
+    );
 
 }
 
@@ -1326,7 +1326,7 @@ 
 function getpaid_get_invoice_tax_rate( $invoice, $item ) {
 
     $rates   = getpaid_get_item_tax_rates( $item, $invoice->get_country(), $invoice->get_state() );
-	$rates   = getpaid_filter_item_tax_rates( $item, $rates );
+    $rates   = getpaid_filter_item_tax_rates( $item, $rates );
     $rates   = wp_list_pluck( $rates, 'rate' );
 
     return array_sum( $rates );