AyeCode / invoicing

includes/class-getpaid-invoice-notification-emails.php

Indentation +454 added lines, -454 removed lines

@@ -12,489 +12,489 @@
  */
 class GetPaid_Invoice_Notification_Emails {
 
-	/**
-	 * The array of invoice email actions.
-	 *
-	 * @param array
-	 */
-	public $invoice_actions;
-
-	/**
-	 * Class constructor
-	 *
-	 */
-	public function __construct() {
-
-		$this->invoice_actions = apply_filters(
-			'getpaid_notification_email_invoice_triggers',
-			array(
-				'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
-				'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
-				'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
-				'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
-				'getpaid_invoice_status_wpi-processing' => 'processing_invoice',
-				'getpaid_invoice_status_publish'        => 'completed_invoice',
-				'getpaid_invoice_status_wpi-renewal'    => 'completed_invoice',
-				'getpaid_invoice_status_wpi-refunded'   => 'refunded_invoice',
-				'getpaid_new_customer_note'             => 'user_note',
-				'getpaid_daily_maintenance'             => 'overdue',
-			)
-		);
-
-		$this->init_hooks();
-
-	}
-
-	/**
-	 * Registers email hooks.
-	 */
-	public function init_hooks() {
-
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
-		add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
-
-		foreach ( $this->invoice_actions as $hook => $email_type ) {
-			$this->init_email_type_hook( $hook, $email_type );
-		}
-	}
-
-	/**
-	 * Registers an email hook for an invoice action.
-	 *
-	 * @param string $hook
-	 * @param string|array $email_type
-	 */
-	public function init_email_type_hook( $hook, $email_type ) {
-
-		$email_type = wpinv_parse_list( $email_type );
-
-		foreach ( $email_type as $type ) {
-
-			$email = new GetPaid_Notification_Email( $type );
-
-			// Abort if it is not active.
-			if ( ! $email->is_active() ) {
-				continue;
-			}
-
-			if ( method_exists( $this, $type ) ) {
-				add_action( $hook, array( $this, $type ), 100, 2 );
-				continue;
-			}
-
-			do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
-		}
-
-	}
-
-	/**
-	 * Filters invoice merge tags.
-	 *
-	 * @param array $merge_tags
-	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
-	 */
-	public function invoice_merge_tags( $merge_tags, $object ) {
-
-		if ( is_a( $object, 'WPInv_Invoice' ) ) {
-			return array_merge(
-				$merge_tags,
-				$this->get_invoice_merge_tags( $object )
-			);
-		}
-
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
-			return array_merge(
-				$merge_tags,
-				$this->get_invoice_merge_tags( $object->get_parent_payment() )
-			);
-		}
-
-		return $merge_tags;
-
-	}
-
-	/**
-	 * Generates invoice merge tags.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @return array
-	 */
-	public function get_invoice_merge_tags( $invoice ) {
-
-		// Abort if it does not exist.
-		if ( ! $invoice->get_id() ) {
-			return array();
-		}
-
-		$merge_tags = array(
-			'{name}'                 => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{full_name}'            => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{first_name}'           => sanitize_text_field( $invoice->get_first_name() ),
-			'{last_name}'            => sanitize_text_field( $invoice->get_last_name() ),
-			'{email}'                => sanitize_email( $invoice->get_email() ),
-			'{invoice_number}'       => sanitize_text_field( $invoice->get_number() ),
-			'{invoice_currency}'     => sanitize_text_field( $invoice->get_currency() ),
-			'{invoice_total}'        => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
-			'{invoice_link}'         => esc_url( $invoice->get_view_url() ),
-			'{invoice_pay_link}'     => esc_url( $invoice->get_checkout_payment_url() ),
-			'{invoice_receipt_link}' => esc_url( $invoice->get_receipt_url() ),
-			'{invoice_date}'         => getpaid_format_date_value( $invoice->get_date_created() ),
-			'{invoice_due_date}'     => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
-			'{invoice_quote}'        => sanitize_text_field( strtolower( $invoice->get_label() ) ),
-			'{invoice_label}'        => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
-			'{invoice_description}'  => wp_kses_post( $invoice->get_description() ),
-			'{subscription_name}'    => wp_kses_post( $invoice->get_subscription_name() ),
-			'{is_was}'               => strtotime( $invoice->get_due_date() ) < current_time( 'timestamp' ) ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
-		);
-
-		$payment_form_data = $invoice->get_meta( 'payment_form_data', true );
-
-		if ( is_array( $payment_form_data ) ) {
-
-			foreach ( $payment_form_data as $label => $value ) {
-
-				$label = preg_replace( '/[^a-z0-9]+/', '_', strtolower( $label ) );
-				$value = is_array( $value ) ? implode( ', ', $value ) : $value;
-
-				if ( is_scalar( $value ) ) {
-					$merge_tags[ "{{$label}}" ] = wp_kses_post( $value );
-				}
-			}
-		}
-
-		return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
-	}
-
-	/**
-	 * Helper function to send an email.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Notification_Email $email
-	 * @param string $type
-	 * @param string|array $recipients
-	 * @param array $extra_args Extra template args.
-	 */
-	public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
-
-		do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
-
-		$skip = $invoice->is_free() && wpinv_get_option( 'skip_email_free_invoice' );
-		if ( apply_filters( 'getpaid_skip_invoice_email', $skip, $type, $invoice ) ) {
-			return;
-		}
-
-		$mailer     = new GetPaid_Notification_Email_Sender();
-		$merge_tags = $email->get_merge_tags();
-
-		$result = $mailer->send(
-			apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
-			$email->add_merge_tags( $email->get_subject(), $merge_tags ),
-			$email->get_content( $merge_tags, $extra_args ),
-			$email->get_attachments()
-		);
-
-		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
-			$mailer->send(
-				wpinv_get_admin_email(),
-				$email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
-				$email->get_content( $merge_tags ),
-				$email->get_attachments()
-			);
-		}
-
-		if ( $result ) {
-			$invoice->add_system_note(
-				sprintf(
-					// translators: %1 is the email type, %2 is the invoice recipient.
-					__( 'Successfully sent %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
-				)
-			);
-		} else {
-			$invoice->add_system_note(
-				sprintf(
-					// translators: %1 is the email type, %2 is the invoice recipient.
-					__( 'Failed sending %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
-				)
-			);
-		}
-
-		do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
-
-		return $result;
-	}
-
-	/**
-	 * Also send emails to any cc users.
-	 *
-	 * @param array $recipients
-	 * @param GetPaid_Notification_Email $email
-	 */
-	public function filter_email_recipients( $recipients, $email ) {
-
-		if ( ! $email->is_admin_email() ) {
-			$cc   = $email->object->get_email_cc();
-			$cc_2 = get_user_meta( $email->object->get_user_id(), '_wpinv_email_cc', true );
-
-			if ( ! empty( $cc ) ) {
-				$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
-			}
-
-			if ( ! empty( $cc_2 ) ) {
-				$cc_2 = array_map( 'sanitize_email', wpinv_parse_list( $cc_2 ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc_2 ) ) );
-			}
-		}
-
-		return $recipients;
-
-	}
-
-	/**
-	 * Sends a new invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function new_invoice( $invoice ) {
-
-		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_paid() || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
-			return;
-		}
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = wpinv_get_admin_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a cancelled invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function cancelled_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-	}
-
-	/**
-	 * Sends a failed invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function failed_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = wpinv_get_admin_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a notification whenever an invoice is put on hold.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function onhold_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a notification whenever an invoice is marked as processing payment.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function processing_invoice( $invoice ) {
+    /**
+     * The array of invoice email actions.
+     *
+     * @param array
+     */
+    public $invoice_actions;
+
+    /**
+     * Class constructor
+     *
+     */
+    public function __construct() {
+
+        $this->invoice_actions = apply_filters(
+            'getpaid_notification_email_invoice_triggers',
+            array(
+                'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
+                'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
+                'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
+                'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
+                'getpaid_invoice_status_wpi-processing' => 'processing_invoice',
+                'getpaid_invoice_status_publish'        => 'completed_invoice',
+                'getpaid_invoice_status_wpi-renewal'    => 'completed_invoice',
+                'getpaid_invoice_status_wpi-refunded'   => 'refunded_invoice',
+                'getpaid_new_customer_note'             => 'user_note',
+                'getpaid_daily_maintenance'             => 'overdue',
+            )
+        );
+
+        $this->init_hooks();
+
+    }
+
+    /**
+     * Registers email hooks.
+     */
+    public function init_hooks() {
+
+        add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
+        add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
+
+        foreach ( $this->invoice_actions as $hook => $email_type ) {
+            $this->init_email_type_hook( $hook, $email_type );
+        }
+    }
+
+    /**
+     * Registers an email hook for an invoice action.
+     *
+     * @param string $hook
+     * @param string|array $email_type
+     */
+    public function init_email_type_hook( $hook, $email_type ) {
+
+        $email_type = wpinv_parse_list( $email_type );
+
+        foreach ( $email_type as $type ) {
+
+            $email = new GetPaid_Notification_Email( $type );
+
+            // Abort if it is not active.
+            if ( ! $email->is_active() ) {
+                continue;
+            }
+
+            if ( method_exists( $this, $type ) ) {
+                add_action( $hook, array( $this, $type ), 100, 2 );
+                continue;
+            }
+
+            do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
+        }
+
+    }
+
+    /**
+     * Filters invoice merge tags.
+     *
+     * @param array $merge_tags
+     * @param mixed|WPInv_Invoice|WPInv_Subscription $object
+     */
+    public function invoice_merge_tags( $merge_tags, $object ) {
+
+        if ( is_a( $object, 'WPInv_Invoice' ) ) {
+            return array_merge(
+                $merge_tags,
+                $this->get_invoice_merge_tags( $object )
+            );
+        }
+
+        if ( is_a( $object, 'WPInv_Subscription' ) ) {
+            return array_merge(
+                $merge_tags,
+                $this->get_invoice_merge_tags( $object->get_parent_payment() )
+            );
+        }
+
+        return $merge_tags;
+
+    }
+
+    /**
+     * Generates invoice merge tags.
+     *
+     * @param WPInv_Invoice $invoice
+     * @return array
+     */
+    public function get_invoice_merge_tags( $invoice ) {
+
+        // Abort if it does not exist.
+        if ( ! $invoice->get_id() ) {
+            return array();
+        }
+
+        $merge_tags = array(
+            '{name}'                 => sanitize_text_field( $invoice->get_user_full_name() ),
+            '{full_name}'            => sanitize_text_field( $invoice->get_user_full_name() ),
+            '{first_name}'           => sanitize_text_field( $invoice->get_first_name() ),
+            '{last_name}'            => sanitize_text_field( $invoice->get_last_name() ),
+            '{email}'                => sanitize_email( $invoice->get_email() ),
+            '{invoice_number}'       => sanitize_text_field( $invoice->get_number() ),
+            '{invoice_currency}'     => sanitize_text_field( $invoice->get_currency() ),
+            '{invoice_total}'        => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
+            '{invoice_link}'         => esc_url( $invoice->get_view_url() ),
+            '{invoice_pay_link}'     => esc_url( $invoice->get_checkout_payment_url() ),
+            '{invoice_receipt_link}' => esc_url( $invoice->get_receipt_url() ),
+            '{invoice_date}'         => getpaid_format_date_value( $invoice->get_date_created() ),
+            '{invoice_due_date}'     => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
+            '{invoice_quote}'        => sanitize_text_field( strtolower( $invoice->get_label() ) ),
+            '{invoice_label}'        => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
+            '{invoice_description}'  => wp_kses_post( $invoice->get_description() ),
+            '{subscription_name}'    => wp_kses_post( $invoice->get_subscription_name() ),
+            '{is_was}'               => strtotime( $invoice->get_due_date() ) < current_time( 'timestamp' ) ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
+        );
+
+        $payment_form_data = $invoice->get_meta( 'payment_form_data', true );
+
+        if ( is_array( $payment_form_data ) ) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a notification whenever an invoice is paid.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function completed_invoice( $invoice ) {
+            foreach ( $payment_form_data as $label => $value ) {
 
-		// (Maybe) abort if it is a renewal invoice.
-		if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
-			return;
-		}
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
+                $label = preg_replace( '/[^a-z0-9]+/', '_', strtolower( $label ) );
+                $value = is_array( $value ) ? implode( ', ', $value ) : $value;
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+                if ( is_scalar( $value ) ) {
+                    $merge_tags[ "{{$label}}" ] = wp_kses_post( $value );
+                }
+            }
+        }
 
-	}
+        return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
+    }
 
-	/**
-	 * Sends a notification whenever an invoice is refunded.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function refunded_invoice( $invoice ) {
+    /**
+     * Helper function to send an email.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Notification_Email $email
+     * @param string $type
+     * @param string|array $recipients
+     * @param array $extra_args Extra template args.
+     */
+    public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+        do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
+
+        $skip = $invoice->is_free() && wpinv_get_option( 'skip_email_free_invoice' );
+        if ( apply_filters( 'getpaid_skip_invoice_email', $skip, $type, $invoice ) ) {
+            return;
+        }
+
+        $mailer     = new GetPaid_Notification_Email_Sender();
+        $merge_tags = $email->get_merge_tags();
+
+        $result = $mailer->send(
+            apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
+            $email->add_merge_tags( $email->get_subject(), $merge_tags ),
+            $email->get_content( $merge_tags, $extra_args ),
+            $email->get_attachments()
+        );
 
-	}
+        // Maybe send a copy to the admin.
+        if ( $email->include_admin_bcc() ) {
+            $mailer->send(
+                wpinv_get_admin_email(),
+                $email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
+                $email->get_content( $merge_tags ),
+                $email->get_attachments()
+            );
+        }
+
+        if ( $result ) {
+            $invoice->add_system_note(
+                sprintf(
+                    // translators: %1 is the email type, %2 is the invoice recipient.
+                    __( 'Successfully sent %1$s notification email to %2$s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
+                )
+            );
+        } else {
+            $invoice->add_system_note(
+                sprintf(
+                    // translators: %1 is the email type, %2 is the invoice recipient.
+                    __( 'Failed sending %1$s notification email to %2$s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
+                )
+            );
+        }
+
+        do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
+
+        return $result;
+    }
+
+    /**
+     * Also send emails to any cc users.
+     *
+     * @param array $recipients
+     * @param GetPaid_Notification_Email $email
+     */
+    public function filter_email_recipients( $recipients, $email ) {
+
+        if ( ! $email->is_admin_email() ) {
+            $cc   = $email->object->get_email_cc();
+            $cc_2 = get_user_meta( $email->object->get_user_id(), '_wpinv_email_cc', true );
+
+            if ( ! empty( $cc ) ) {
+                $cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
+                $recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+            }
+
+            if ( ! empty( $cc_2 ) ) {
+                $cc_2 = array_map( 'sanitize_email', wpinv_parse_list( $cc_2 ) );
+                $recipients = array_filter( array_unique( array_merge( $recipients, $cc_2 ) ) );
+            }
+        }
+
+        return $recipients;
+
+    }
+
+    /**
+     * Sends a new invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function new_invoice( $invoice ) {
+
+        // Only send this email for invoices created via the admin page.
+        if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_paid() || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
+            return;
+        }
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = wpinv_get_admin_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a cancelled invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function cancelled_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+    }
+
+    /**
+     * Sends a failed invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function failed_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = wpinv_get_admin_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is put on hold.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function onhold_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is marked as processing payment.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function processing_invoice( $invoice ) {
 
-	/**
-	 * Notifies a user about new invoices
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param bool $force
-	 */
-	public function user_invoice( $invoice, $force = false ) {
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is paid.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function completed_invoice( $invoice ) {
 
-		if ( ! $force && ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
-			return;
-		}
-
-		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $invoice->is_paid() ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
-			return;
-		}
+        // (Maybe) abort if it is a renewal invoice.
+        if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
+            return;
+        }
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
 
-	}
-
-	/**
-	 * Checks if an invoice is a payment form invoice.
-	 *
-	 * @param int $invoice
-	 * @return bool
-	 */
-	public function is_payment_form_invoice( $invoice ) {
-		$is_payment_form_invoice = empty( $_GET['getpaid-admin-action'] ) && ( 'payment_form' === get_post_meta( $invoice, 'wpinv_created_via', true ) || 'geodirectory' === get_post_meta( $invoice, 'wpinv_created_via', true ) );
-		return apply_filters( 'getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice );
-	}
+    }
 
-	/**
-	 * Notifies admin about new invoice notes
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param string $note
-	 */
-	public function user_note( $invoice, $note ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
+    /**
+     * Sends a notification whenever an invoice is refunded.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function refunded_invoice( $invoice ) {
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
-
-	}
-
-	/**
-	 * (Force) Sends overdue notices.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function force_send_overdue_notice( $invoice ) {
-		$email = new GetPaid_Notification_Email( 'overdue', $invoice );
-		return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
-	}
-
-	/**
-	 * Sends overdue notices.
-	 *
-	 * @TODO: Create an invoices query class.
-	 */
-	public function overdue() {
-		global $wpdb;
-
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
-
-		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
-
-		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
-			return;
-		}
-
-		// Retrieve date query.
-		$date_query = $this->get_date_query( $reminder_days );
-
-		// Invoices table.
-		$table = $wpdb->prefix . 'getpaid_invoices';
-
-		// Fetch invoices.
-		$invoices  = $wpdb->get_col(
-			"SELECT posts.ID FROM $wpdb->posts as posts
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Notifies a user about new invoices
+     *
+     * @param WPInv_Invoice $invoice
+     * @param bool $force
+     */
+    public function user_invoice( $invoice, $force = false ) {
+
+        if ( ! $force && ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
+            return;
+        }
+
+        // Only send this email for invoices created via the admin page.
+        if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $invoice->is_paid() ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
+            return;
+        }
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Checks if an invoice is a payment form invoice.
+     *
+     * @param int $invoice
+     * @return bool
+     */
+    public function is_payment_form_invoice( $invoice ) {
+        $is_payment_form_invoice = empty( $_GET['getpaid-admin-action'] ) && ( 'payment_form' === get_post_meta( $invoice, 'wpinv_created_via', true ) || 'geodirectory' === get_post_meta( $invoice, 'wpinv_created_via', true ) );
+        return apply_filters( 'getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice );
+    }
+
+    /**
+     * Notifies admin about new invoice notes
+     *
+     * @param WPInv_Invoice $invoice
+     * @param string $note
+     */
+    public function user_note( $invoice, $note ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
+
+    }
+
+    /**
+     * (Force) Sends overdue notices.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function force_send_overdue_notice( $invoice ) {
+        $email = new GetPaid_Notification_Email( 'overdue', $invoice );
+        return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
+    }
+
+    /**
+     * Sends overdue notices.
+     *
+     * @TODO: Create an invoices query class.
+     */
+    public function overdue() {
+        global $wpdb;
+
+        $email = new GetPaid_Notification_Email( __FUNCTION__ );
+
+        // Fetch reminder days.
+        $reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+
+        // Abort if non is set.
+        if ( empty( $reminder_days ) ) {
+            return;
+        }
+
+        // Retrieve date query.
+        $date_query = $this->get_date_query( $reminder_days );
+
+        // Invoices table.
+        $table = $wpdb->prefix . 'getpaid_invoices';
+
+        // Fetch invoices.
+        $invoices  = $wpdb->get_col(
+            "SELECT posts.ID FROM $wpdb->posts as posts
 			LEFT JOIN $table as invoices ON invoices.post_id = posts.ID
 			WHERE posts.post_type = 'wpi_invoice' AND posts.post_status = 'wpi-pending' $date_query"
         );
 
-		foreach ( $invoices as $invoice ) {
+        foreach ( $invoices as $invoice ) {
 
-			// Only send this email for invoices created via the admin page.
-			if ( ! $this->is_payment_form_invoice( $invoice ) ) {
-				$invoice       = new WPInv_Invoice( $invoice );
-				$email->object = $invoice;
+            // Only send this email for invoices created via the admin page.
+            if ( ! $this->is_payment_form_invoice( $invoice ) ) {
+                $invoice       = new WPInv_Invoice( $invoice );
+                $email->object = $invoice;
 
-				if ( $invoice->needs_payment() ) {
-					$this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
-				}
+                if ( $invoice->needs_payment() ) {
+                    $this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
+                }
 }
 }
 
-	}
+    }
 
-	/**
-	 * Calculates the date query for an invoices query
-	 *
-	 * @param array $reminder_days
-	 * @return string
-	 */
-	public function get_date_query( $reminder_days ) {
+    /**
+     * Calculates the date query for an invoices query
+     *
+     * @param array $reminder_days
+     * @return string
+     */
+    public function get_date_query( $reminder_days ) {
 
-		$date_query = array(
-			'relation' => 'OR',
-		);
+        $date_query = array(
+            'relation' => 'OR',
+        );
 
-		foreach ( $reminder_days as $days ) {
-			$date = date_parse( date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) ) );
+        foreach ( $reminder_days as $days ) {
+            $date = date_parse( date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) ) );
 
-			$date_query[] = array(
-				'year'  => $date['year'],
-				'month' => $date['month'],
-				'day'   => $date['day'],
-			);
+            $date_query[] = array(
+                'year'  => $date['year'],
+                'month' => $date['month'],
+                'day'   => $date['day'],
+            );
 
-		}
+        }
 
-		$date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
+        $date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
 
-		return $date_query->get_sql();
+        return $date_query->get_sql();
 
-	}
+    }
 
 }

Spacing +125 added lines, -125 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * This class handles invoice notificaiton emails.
@@ -28,7 +28,7 @@ 
 		$this->invoice_actions = apply_filters(
 			'getpaid_notification_email_invoice_triggers',
 			array(
-				'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
+				'getpaid_new_invoice'                   => array('new_invoice', 'user_invoice'),
 				'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
 				'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
 				'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
@@ -50,11 +50,11 @@ 
 	 */
 	public function init_hooks() {
 
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
-		add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
+		add_filter('getpaid_get_email_merge_tags', array($this, 'invoice_merge_tags'), 10, 2);
+		add_filter('getpaid_invoice_email_recipients', array($this, 'filter_email_recipients'), 10, 2);
 
-		foreach ( $this->invoice_actions as $hook => $email_type ) {
-			$this->init_email_type_hook( $hook, $email_type );
+		foreach ($this->invoice_actions as $hook => $email_type) {
+			$this->init_email_type_hook($hook, $email_type);
 		}
 	}
 
@@ -64,25 +64,25 @@ 
 	 * @param string $hook
 	 * @param string|array $email_type
 	 */
-	public function init_email_type_hook( $hook, $email_type ) {
+	public function init_email_type_hook($hook, $email_type) {
 
-		$email_type = wpinv_parse_list( $email_type );
+		$email_type = wpinv_parse_list($email_type);
 
-		foreach ( $email_type as $type ) {
+		foreach ($email_type as $type) {
 
-			$email = new GetPaid_Notification_Email( $type );
+			$email = new GetPaid_Notification_Email($type);
 
 			// Abort if it is not active.
-			if ( ! $email->is_active() ) {
+			if (!$email->is_active()) {
 				continue;
 			}
 
-			if ( method_exists( $this, $type ) ) {
-				add_action( $hook, array( $this, $type ), 100, 2 );
+			if (method_exists($this, $type)) {
+				add_action($hook, array($this, $type), 100, 2);
 				continue;
 			}
 
-			do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
+			do_action('getpaid_invoice_init_email_type_hook', $type, $hook);
 		}
 
 	}
@@ -93,19 +93,19 @@ 
 	 * @param array $merge_tags
 	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
 	 */
-	public function invoice_merge_tags( $merge_tags, $object ) {
+	public function invoice_merge_tags($merge_tags, $object) {
 
-		if ( is_a( $object, 'WPInv_Invoice' ) ) {
+		if (is_a($object, 'WPInv_Invoice')) {
 			return array_merge(
 				$merge_tags,
-				$this->get_invoice_merge_tags( $object )
+				$this->get_invoice_merge_tags($object)
 			);
 		}
 
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
+		if (is_a($object, 'WPInv_Subscription')) {
 			return array_merge(
 				$merge_tags,
-				$this->get_invoice_merge_tags( $object->get_parent_payment() )
+				$this->get_invoice_merge_tags($object->get_parent_payment())
 			);
 		}
 
@@ -119,50 +119,50 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return array
 	 */
-	public function get_invoice_merge_tags( $invoice ) {
+	public function get_invoice_merge_tags($invoice) {
 
 		// Abort if it does not exist.
-		if ( ! $invoice->get_id() ) {
+		if (!$invoice->get_id()) {
 			return array();
 		}
 
 		$merge_tags = array(
-			'{name}'                 => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{full_name}'            => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{first_name}'           => sanitize_text_field( $invoice->get_first_name() ),
-			'{last_name}'            => sanitize_text_field( $invoice->get_last_name() ),
-			'{email}'                => sanitize_email( $invoice->get_email() ),
-			'{invoice_number}'       => sanitize_text_field( $invoice->get_number() ),
-			'{invoice_currency}'     => sanitize_text_field( $invoice->get_currency() ),
-			'{invoice_total}'        => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
-			'{invoice_link}'         => esc_url( $invoice->get_view_url() ),
-			'{invoice_pay_link}'     => esc_url( $invoice->get_checkout_payment_url() ),
-			'{invoice_receipt_link}' => esc_url( $invoice->get_receipt_url() ),
-			'{invoice_date}'         => getpaid_format_date_value( $invoice->get_date_created() ),
-			'{invoice_due_date}'     => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
-			'{invoice_quote}'        => sanitize_text_field( strtolower( $invoice->get_label() ) ),
-			'{invoice_label}'        => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
-			'{invoice_description}'  => wp_kses_post( $invoice->get_description() ),
-			'{subscription_name}'    => wp_kses_post( $invoice->get_subscription_name() ),
-			'{is_was}'               => strtotime( $invoice->get_due_date() ) < current_time( 'timestamp' ) ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
+			'{name}'                 => sanitize_text_field($invoice->get_user_full_name()),
+			'{full_name}'            => sanitize_text_field($invoice->get_user_full_name()),
+			'{first_name}'           => sanitize_text_field($invoice->get_first_name()),
+			'{last_name}'            => sanitize_text_field($invoice->get_last_name()),
+			'{email}'                => sanitize_email($invoice->get_email()),
+			'{invoice_number}'       => sanitize_text_field($invoice->get_number()),
+			'{invoice_currency}'     => sanitize_text_field($invoice->get_currency()),
+			'{invoice_total}'        => sanitize_text_field(wpinv_price($invoice->get_total(), $invoice->get_currency())),
+			'{invoice_link}'         => esc_url($invoice->get_view_url()),
+			'{invoice_pay_link}'     => esc_url($invoice->get_checkout_payment_url()),
+			'{invoice_receipt_link}' => esc_url($invoice->get_receipt_url()),
+			'{invoice_date}'         => getpaid_format_date_value($invoice->get_date_created()),
+			'{invoice_due_date}'     => getpaid_format_date_value($invoice->get_due_date(), __('on receipt', 'invoicing')),
+			'{invoice_quote}'        => sanitize_text_field(strtolower($invoice->get_label())),
+			'{invoice_label}'        => sanitize_text_field(ucfirst($invoice->get_label())),
+			'{invoice_description}'  => wp_kses_post($invoice->get_description()),
+			'{subscription_name}'    => wp_kses_post($invoice->get_subscription_name()),
+			'{is_was}'               => strtotime($invoice->get_due_date()) < current_time('timestamp') ? __('was', 'invoicing') : __('is', 'invoicing'),
 		);
 
-		$payment_form_data = $invoice->get_meta( 'payment_form_data', true );
+		$payment_form_data = $invoice->get_meta('payment_form_data', true);
 
-		if ( is_array( $payment_form_data ) ) {
+		if (is_array($payment_form_data)) {
 
-			foreach ( $payment_form_data as $label => $value ) {
+			foreach ($payment_form_data as $label => $value) {
 
-				$label = preg_replace( '/[^a-z0-9]+/', '_', strtolower( $label ) );
-				$value = is_array( $value ) ? implode( ', ', $value ) : $value;
+				$label = preg_replace('/[^a-z0-9]+/', '_', strtolower($label));
+				$value = is_array($value) ? implode(', ', $value) : $value;
 
-				if ( is_scalar( $value ) ) {
-					$merge_tags[ "{{$label}}" ] = wp_kses_post( $value );
+				if (is_scalar($value)) {
+					$merge_tags["{{$label}}"] = wp_kses_post($value);
 				}
 			}
 		}
 
-		return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
+		return apply_filters('getpaid_invoice_email_merge_tags', $merge_tags, $invoice);
 	}
 
 	/**
@@ -174,12 +174,12 @@ 
 	 * @param string|array $recipients
 	 * @param array $extra_args Extra template args.
 	 */
-	public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
+	public function send_email($invoice, $email, $type, $recipients, $extra_args = array()) {
 
-		do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
+		do_action('getpaid_before_send_invoice_notification', $type, $invoice, $email);
 
-		$skip = $invoice->is_free() && wpinv_get_option( 'skip_email_free_invoice' );
-		if ( apply_filters( 'getpaid_skip_invoice_email', $skip, $type, $invoice ) ) {
+		$skip = $invoice->is_free() && wpinv_get_option('skip_email_free_invoice');
+		if (apply_filters('getpaid_skip_invoice_email', $skip, $type, $invoice)) {
 			return;
 		}
 
@@ -187,43 +187,43 @@ 
 		$merge_tags = $email->get_merge_tags();
 
 		$result = $mailer->send(
-			apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
-			$email->add_merge_tags( $email->get_subject(), $merge_tags ),
-			$email->get_content( $merge_tags, $extra_args ),
+			apply_filters('getpaid_invoice_email_recipients', wpinv_parse_list($recipients), $email),
+			$email->add_merge_tags($email->get_subject(), $merge_tags),
+			$email->get_content($merge_tags, $extra_args),
 			$email->get_attachments()
 		);
 
 		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
+		if ($email->include_admin_bcc()) {
 			$mailer->send(
 				wpinv_get_admin_email(),
-				$email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
-				$email->get_content( $merge_tags ),
+				$email->add_merge_tags($email->get_subject() . __(' - ADMIN BCC COPY', 'invoicing'), $merge_tags),
+				$email->get_content($merge_tags),
 				$email->get_attachments()
 			);
 		}
 
-		if ( $result ) {
+		if ($result) {
 			$invoice->add_system_note(
 				sprintf(
 					// translators: %1 is the email type, %2 is the invoice recipient.
-					__( 'Successfully sent %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
+					__('Successfully sent %1$s notification email to %2$s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin', 'invoicing') : __('the customer', 'invoicing')
 				)
 			);
 		} else {
 			$invoice->add_system_note(
 				sprintf(
 					// translators: %1 is the email type, %2 is the invoice recipient.
-					__( 'Failed sending %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
+					__('Failed sending %1$s notification email to %2$s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin', 'invoicing') : __('the customer', 'invoicing')
 				)
 			);
 		}
 
-		do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
+		do_action('getpaid_after_send_invoice_notification', $type, $invoice, $email);
 
 		return $result;
 	}
@@ -234,20 +234,20 @@ 
 	 * @param array $recipients
 	 * @param GetPaid_Notification_Email $email
 	 */
-	public function filter_email_recipients( $recipients, $email ) {
+	public function filter_email_recipients($recipients, $email) {
 
-		if ( ! $email->is_admin_email() ) {
+		if (!$email->is_admin_email()) {
 			$cc   = $email->object->get_email_cc();
-			$cc_2 = get_user_meta( $email->object->get_user_id(), '_wpinv_email_cc', true );
+			$cc_2 = get_user_meta($email->object->get_user_id(), '_wpinv_email_cc', true);
 
-			if ( ! empty( $cc ) ) {
-				$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+			if (!empty($cc)) {
+				$cc = array_map('sanitize_email', wpinv_parse_list($cc));
+				$recipients = array_filter(array_unique(array_merge($recipients, $cc)));
 			}
 
-			if ( ! empty( $cc_2 ) ) {
-				$cc_2 = array_map( 'sanitize_email', wpinv_parse_list( $cc_2 ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc_2 ) ) );
+			if (!empty($cc_2)) {
+				$cc_2 = array_map('sanitize_email', wpinv_parse_list($cc_2));
+				$recipients = array_filter(array_unique(array_merge($recipients, $cc_2)));
 			}
 		}
 
@@ -260,17 +260,17 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function new_invoice( $invoice ) {
+	public function new_invoice($invoice) {
 
 		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_paid() || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
+		if (!$invoice->is_type('invoice') || $invoice->is_paid() || $this->is_payment_form_invoice($invoice->get_id())) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = wpinv_get_admin_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -279,12 +279,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function cancelled_invoice( $invoice ) {
+	public function cancelled_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 	}
 
 	/**
@@ -292,12 +292,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function failed_invoice( $invoice ) {
+	public function failed_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = wpinv_get_admin_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -306,12 +306,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function onhold_invoice( $invoice ) {
+	public function onhold_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -320,12 +320,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function processing_invoice( $invoice ) {
+	public function processing_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -334,17 +334,17 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function completed_invoice( $invoice ) {
+	public function completed_invoice($invoice) {
 
 		// (Maybe) abort if it is a renewal invoice.
-		if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
+		if ($invoice->is_renewal() && !wpinv_get_option('email_completed_invoice_renewal_active', false)) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -353,12 +353,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function refunded_invoice( $invoice ) {
+	public function refunded_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -368,21 +368,21 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @param bool $force
 	 */
-	public function user_invoice( $invoice, $force = false ) {
+	public function user_invoice($invoice, $force = false) {
 
-		if ( ! $force && ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
+		if (!$force && !empty($GLOBALS['wpinv_skip_invoice_notification'])) {
 			return;
 		}
 
 		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $invoice->is_paid() ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
+		if (!$invoice->is_type('invoice') || (empty($force) && $invoice->is_paid()) || (empty($force) && $this->is_payment_form_invoice($invoice->get_id()))) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -392,9 +392,9 @@ 
 	 * @param int $invoice
 	 * @return bool
 	 */
-	public function is_payment_form_invoice( $invoice ) {
-		$is_payment_form_invoice = empty( $_GET['getpaid-admin-action'] ) && ( 'payment_form' === get_post_meta( $invoice, 'wpinv_created_via', true ) || 'geodirectory' === get_post_meta( $invoice, 'wpinv_created_via', true ) );
-		return apply_filters( 'getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice );
+	public function is_payment_form_invoice($invoice) {
+		$is_payment_form_invoice = empty($_GET['getpaid-admin-action']) && ('payment_form' === get_post_meta($invoice, 'wpinv_created_via', true) || 'geodirectory' === get_post_meta($invoice, 'wpinv_created_via', true));
+		return apply_filters('getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice);
 	}
 
 	/**
@@ -403,12 +403,12 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @param string $note
 	 */
-	public function user_note( $invoice, $note ) {
+	public function user_note($invoice, $note) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient, array('customer_note' => $note));
 
 	}
 
@@ -417,9 +417,9 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function force_send_overdue_notice( $invoice ) {
-		$email = new GetPaid_Notification_Email( 'overdue', $invoice );
-		return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
+	public function force_send_overdue_notice($invoice) {
+		$email = new GetPaid_Notification_Email('overdue', $invoice);
+		return $this->send_email($invoice, $email, 'overdue', $invoice->get_email());
 	}
 
 	/**
@@ -430,38 +430,38 @@ 
 	public function overdue() {
 		global $wpdb;
 
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__);
 
 		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+		$reminder_days = array_unique(wp_parse_id_list($email->get_option('days')));
 
 		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
+		if (empty($reminder_days)) {
 			return;
 		}
 
 		// Retrieve date query.
-		$date_query = $this->get_date_query( $reminder_days );
+		$date_query = $this->get_date_query($reminder_days);
 
 		// Invoices table.
 		$table = $wpdb->prefix . 'getpaid_invoices';
 
 		// Fetch invoices.
-		$invoices  = $wpdb->get_col(
+		$invoices = $wpdb->get_col(
 			"SELECT posts.ID FROM $wpdb->posts as posts
 			LEFT JOIN $table as invoices ON invoices.post_id = posts.ID
 			WHERE posts.post_type = 'wpi_invoice' AND posts.post_status = 'wpi-pending' $date_query"
         );
 
-		foreach ( $invoices as $invoice ) {
+		foreach ($invoices as $invoice) {
 
 			// Only send this email for invoices created via the admin page.
-			if ( ! $this->is_payment_form_invoice( $invoice ) ) {
-				$invoice       = new WPInv_Invoice( $invoice );
+			if (!$this->is_payment_form_invoice($invoice)) {
+				$invoice       = new WPInv_Invoice($invoice);
 				$email->object = $invoice;
 
-				if ( $invoice->needs_payment() ) {
-					$this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
+				if ($invoice->needs_payment()) {
+					$this->send_email($invoice, $email, __FUNCTION__, $invoice->get_email());
 				}
 }
 }
@@ -474,14 +474,14 @@ 
 	 * @param array $reminder_days
 	 * @return string
 	 */
-	public function get_date_query( $reminder_days ) {
+	public function get_date_query($reminder_days) {
 
 		$date_query = array(
 			'relation' => 'OR',
 		);
 
-		foreach ( $reminder_days as $days ) {
-			$date = date_parse( date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) ) );
+		foreach ($reminder_days as $days) {
+			$date = date_parse(date('Y-m-d', strtotime("-$days days", current_time('timestamp'))));
 
 			$date_query[] = array(
 				'year'  => $date['year'],
@@ -491,7 +491,7 @@ 
 
 		}
 
-		$date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
+		$date_query = new WP_Date_Query($date_query, 'invoices.due_date');
 
 		return $date_query->get_sql();
 

includes/reports/class-getpaid-reports-export.php

Indentation +181 added lines, -181 removed lines

@@ -12,47 +12,47 @@ 
  */
 class GetPaid_Reports_Export {
 
-	/**
-	 * Displays the reports tab.
-	 *
-	 */
-	public function display() {
-
-		echo "<div class='row mt-4' style='max-width: 920px;' >";
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$this->display_post_type_export( $post_type );
-		}
-		$this->display_subscription_export();
-		echo '</div>';
-
-	}
-
-	/**
-	 * Retrieves the download url.
-	 *
-	 */
-	public function get_download_url( $post_type ) {
-
-		return wp_nonce_url(
-			add_query_arg(
-				array(
-					'getpaid-admin-action' => 'export_invoices',
-					'post_type'            => urlencode( $post_type ),
-				)
-			),
-			'getpaid-nonce',
-			'getpaid-nonce'
-		);
-
-	}
-
-	/**
-	 * Displays a single post type export card.
-	 *
-	 */
-	public function display_post_type_export( $post_type ) {
-
-		?>
+    /**
+     * Displays the reports tab.
+     *
+     */
+    public function display() {
+
+        echo "<div class='row mt-4' style='max-width: 920px;' >";
+        foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
+            $this->display_post_type_export( $post_type );
+        }
+        $this->display_subscription_export();
+        echo '</div>';
+
+    }
+
+    /**
+     * Retrieves the download url.
+     *
+     */
+    public function get_download_url( $post_type ) {
+
+        return wp_nonce_url(
+            add_query_arg(
+                array(
+                    'getpaid-admin-action' => 'export_invoices',
+                    'post_type'            => urlencode( $post_type ),
+                )
+            ),
+            'getpaid-nonce',
+            'getpaid-nonce'
+        );
+
+    }
+
+    /**
+     * Displays a single post type export card.
+     *
+     */
+    public function display_post_type_export( $post_type ) {
+
+        ?>
 
 		<div class="col-12 col-md-6">
 			<div class="card m-0 p-0" style="max-width:100%">
@@ -60,11 +60,11 @@ 
 				<div class="card-header">
 					<strong>
 						<?php
-							printf(
-								esc_html__( 'Export %s', 'invoicing' ),
-								esc_html( getpaid_get_post_type_label( $post_type ) )
-							);
-						?>
+                            printf(
+                                esc_html__( 'Export %s', 'invoicing' ),
+                                esc_html( getpaid_get_post_type_label( $post_type ) )
+                            );
+                        ?>
 					</strong>
 				</div>
 
@@ -73,12 +73,12 @@ 
 					<form method="post" action="<?php echo esc_url( $this->get_download_url( $post_type ) ); ?>">
 
 						<?php
-							$this->display_markup( $this->generate_from_date( $post_type ) );
-							$this->display_markup( $this->generate_to_date( $post_type ) );
-							$this->display_markup( $this->generate_post_status_select( $post_type ) );
-							$this->display_markup( $this->generate_file_type_select( $post_type ) );
-							submit_button( __( 'Download', 'invoicing' ) );
-						?>
+                            $this->display_markup( $this->generate_from_date( $post_type ) );
+                            $this->display_markup( $this->generate_to_date( $post_type ) );
+                            $this->display_markup( $this->generate_post_status_select( $post_type ) );
+                            $this->display_markup( $this->generate_file_type_select( $post_type ) );
+                            submit_button( __( 'Download', 'invoicing' ) );
+                        ?>
 
 					</form>
 
@@ -89,128 +89,128 @@ 
 
 		<?php
 
-	}
-
-	/**
-	 * Generates the from date input field.
-	 *
-	 */
-	public function generate_from_date( $post_type ) {
-
-		return aui()->input(
-			array(
-				'type'             => 'datepicker',
-				'id'               => esc_attr( "$post_type-from_date" ),
-				'name'             => 'from_date',
-				'label'            => __( 'From Date', 'invoicing' ),
-				'placeholder'      => 'YYYY-MM-DD',
-				'extra_attributes' => array(
-					'data-enable-time' => 'false',
-					'data-allow-input' => 'true',
-				),
-			),
-			false
-		);
-
-	}
-
-	/**
-	 * Generates the to date input field.
-	 *
-	 */
-	public function generate_to_date( $post_type ) {
-
-		return aui()->input(
-			array(
-				'name'        => 'to_date',
-				'id'          => esc_attr( "$post_type-to_date" ),
-				'placeholder' => 'yy-mm-dd',
-				'label'       => __( 'To Date', 'invoicing' ),
-				'label_type'  => 'vertical',
-				'label_class' => 'd-block',
-				'type'        => 'datepicker',
-			)
-		);
-
-	}
-
-	/**
-	 * Generates the to post status select field.
-	 *
-	 */
-	public function generate_post_status_select( $post_type ) {
-
-		if ( 'subscriptions' === $post_type ) {
-			$options = getpaid_get_subscription_statuses();
-		} else {
-			$options = wpinv_get_invoice_statuses( true, false, $post_type );
-		}
-
-		return aui()->select(
-			array(
-				'name'        => 'status',
-				'id'          => esc_attr( "$post_type-status" ),
-				'placeholder' => __( 'All Statuses', 'invoicing' ),
-				'label'       => __( 'Status', 'invoicing' ),
-				'label_type'  => 'vertical',
-				'label_class' => 'd-block',
-				'options'     => $options,
-			)
-		);
-
-	}
-
-	/**
-	 * Generates the to file type select field.
-	 *
-	 */
-	public function generate_file_type_select( $post_type ) {
-
-		return aui()->select(
-			array(
-				'name'        => 'file_type',
-				'id'          => esc_attr( "$post_type-file_type" ),
-				'placeholder' => __( 'Select File Type', 'invoicing' ),
-				'label'       => __( 'Export File', 'invoicing' ),
-				'label_type'  => 'vertical',
-				'label_class' => 'd-block',
-				'options'     => array(
-					'csv'  => __( 'CSV', 'invoicing' ),
-					'xml'  => __( 'XML', 'invoicing' ),
-					'json' => __( 'JSON', 'invoicing' ),
-				),
-			)
-		);
-
-	}
-
-	/**
-	 * Displays a field's markup.
-	 *
-	 */
-	public function display_markup( $markup ) {
-
-		echo wp_kses(
-			str_replace(
-				array(
-					'form-control',
-					'custom-select',
-				),
-				'regular-text',
-				$markup
-			),
-			getpaid_allowed_html()
-		);
-
-	}
-
-	/**
-	 * Displays a subscription export card.
-	 *
-	 */
-	public function display_subscription_export() {
-
-		?>
+    }
+
+    /**
+     * Generates the from date input field.
+     *
+     */
+    public function generate_from_date( $post_type ) {
+
+        return aui()->input(
+            array(
+                'type'             => 'datepicker',
+                'id'               => esc_attr( "$post_type-from_date" ),
+                'name'             => 'from_date',
+                'label'            => __( 'From Date', 'invoicing' ),
+                'placeholder'      => 'YYYY-MM-DD',
+                'extra_attributes' => array(
+                    'data-enable-time' => 'false',
+                    'data-allow-input' => 'true',
+                ),
+            ),
+            false
+        );
+
+    }
+
+    /**
+     * Generates the to date input field.
+     *
+     */
+    public function generate_to_date( $post_type ) {
+
+        return aui()->input(
+            array(
+                'name'        => 'to_date',
+                'id'          => esc_attr( "$post_type-to_date" ),
+                'placeholder' => 'yy-mm-dd',
+                'label'       => __( 'To Date', 'invoicing' ),
+                'label_type'  => 'vertical',
+                'label_class' => 'd-block',
+                'type'        => 'datepicker',
+            )
+        );
+
+    }
+
+    /**
+     * Generates the to post status select field.
+     *
+     */
+    public function generate_post_status_select( $post_type ) {
+
+        if ( 'subscriptions' === $post_type ) {
+            $options = getpaid_get_subscription_statuses();
+        } else {
+            $options = wpinv_get_invoice_statuses( true, false, $post_type );
+        }
+
+        return aui()->select(
+            array(
+                'name'        => 'status',
+                'id'          => esc_attr( "$post_type-status" ),
+                'placeholder' => __( 'All Statuses', 'invoicing' ),
+                'label'       => __( 'Status', 'invoicing' ),
+                'label_type'  => 'vertical',
+                'label_class' => 'd-block',
+                'options'     => $options,
+            )
+        );
+
+    }
+
+    /**
+     * Generates the to file type select field.
+     *
+     */
+    public function generate_file_type_select( $post_type ) {
+
+        return aui()->select(
+            array(
+                'name'        => 'file_type',
+                'id'          => esc_attr( "$post_type-file_type" ),
+                'placeholder' => __( 'Select File Type', 'invoicing' ),
+                'label'       => __( 'Export File', 'invoicing' ),
+                'label_type'  => 'vertical',
+                'label_class' => 'd-block',
+                'options'     => array(
+                    'csv'  => __( 'CSV', 'invoicing' ),
+                    'xml'  => __( 'XML', 'invoicing' ),
+                    'json' => __( 'JSON', 'invoicing' ),
+                ),
+            )
+        );
+
+    }
+
+    /**
+     * Displays a field's markup.
+     *
+     */
+    public function display_markup( $markup ) {
+
+        echo wp_kses(
+            str_replace(
+                array(
+                    'form-control',
+                    'custom-select',
+                ),
+                'regular-text',
+                $markup
+            ),
+            getpaid_allowed_html()
+        );
+
+    }
+
+    /**
+     * Displays a subscription export card.
+     *
+     */
+    public function display_subscription_export() {
+
+        ?>
 
 		<div class="col-12 col-md-6">
 			<div class="card m-0 p-0" style="max-width:100%">
@@ -226,12 +226,12 @@ 
 					<form method="post" action="<?php echo esc_url( $this->get_download_url( 'subscriptions' ) ); ?>">
 
 						<?php
-							$this->display_markup( $this->generate_from_date( 'subscriptions' ) );
-							$this->display_markup( $this->generate_to_date( 'subscriptions' ) );
-							$this->display_markup( $this->generate_post_status_select( 'subscriptions' ) );
-							$this->display_markup( $this->generate_file_type_select( 'subscriptions' ) );
-							submit_button( __( 'Download', 'invoicing' ) );
-						?>
+                            $this->display_markup( $this->generate_from_date( 'subscriptions' ) );
+                            $this->display_markup( $this->generate_to_date( 'subscriptions' ) );
+                            $this->display_markup( $this->generate_post_status_select( 'subscriptions' ) );
+                            $this->display_markup( $this->generate_file_type_select( 'subscriptions' ) );
+                            submit_button( __( 'Download', 'invoicing' ) );
+                        ?>
 
 					</form>
 
@@ -242,6 +242,6 @@ 
 
 		<?php
 
-	}
+    }
 
 }

Spacing +41 added lines, -41 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Export Class.
@@ -19,8 +19,8 @@ 
 	public function display() {
 
 		echo "<div class='row mt-4' style='max-width: 920px;' >";
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$this->display_post_type_export( $post_type );
+		foreach (array_keys(getpaid_get_invoice_post_types()) as $post_type) {
+			$this->display_post_type_export($post_type);
 		}
 		$this->display_subscription_export();
 		echo '</div>';
@@ -31,13 +31,13 @@ 
 	 * Retrieves the download url.
 	 *
 	 */
-	public function get_download_url( $post_type ) {
+	public function get_download_url($post_type) {
 
 		return wp_nonce_url(
 			add_query_arg(
 				array(
 					'getpaid-admin-action' => 'export_invoices',
-					'post_type'            => urlencode( $post_type ),
+					'post_type'            => urlencode($post_type),
 				)
 			),
 			'getpaid-nonce',
@@ -50,7 +50,7 @@ 
 	 * Displays a single post type export card.
 	 *
 	 */
-	public function display_post_type_export( $post_type ) {
+	public function display_post_type_export($post_type) {
 
 		?>
 
@@ -61,8 +61,8 @@ 
 					<strong>
 						<?php
 							printf(
-								esc_html__( 'Export %s', 'invoicing' ),
-								esc_html( getpaid_get_post_type_label( $post_type ) )
+								esc_html__('Export %s', 'invoicing'),
+								esc_html(getpaid_get_post_type_label($post_type))
 							);
 						?>
 					</strong>
@@ -70,14 +70,14 @@ 
 
 				<div class="card-body">
 
-					<form method="post" action="<?php echo esc_url( $this->get_download_url( $post_type ) ); ?>">
+					<form method="post" action="<?php echo esc_url($this->get_download_url($post_type)); ?>">
 
 						<?php
-							$this->display_markup( $this->generate_from_date( $post_type ) );
-							$this->display_markup( $this->generate_to_date( $post_type ) );
-							$this->display_markup( $this->generate_post_status_select( $post_type ) );
-							$this->display_markup( $this->generate_file_type_select( $post_type ) );
-							submit_button( __( 'Download', 'invoicing' ) );
+							$this->display_markup($this->generate_from_date($post_type));
+							$this->display_markup($this->generate_to_date($post_type));
+							$this->display_markup($this->generate_post_status_select($post_type));
+							$this->display_markup($this->generate_file_type_select($post_type));
+							submit_button(__('Download', 'invoicing'));
 						?>
 
 					</form>
@@ -95,14 +95,14 @@ 
 	 * Generates the from date input field.
 	 *
 	 */
-	public function generate_from_date( $post_type ) {
+	public function generate_from_date($post_type) {
 
 		return aui()->input(
 			array(
 				'type'             => 'datepicker',
-				'id'               => esc_attr( "$post_type-from_date" ),
+				'id'               => esc_attr("$post_type-from_date"),
 				'name'             => 'from_date',
-				'label'            => __( 'From Date', 'invoicing' ),
+				'label'            => __('From Date', 'invoicing'),
 				'placeholder'      => 'YYYY-MM-DD',
 				'extra_attributes' => array(
 					'data-enable-time' => 'false',
@@ -118,14 +118,14 @@ 
 	 * Generates the to date input field.
 	 *
 	 */
-	public function generate_to_date( $post_type ) {
+	public function generate_to_date($post_type) {
 
 		return aui()->input(
 			array(
 				'name'        => 'to_date',
-				'id'          => esc_attr( "$post_type-to_date" ),
+				'id'          => esc_attr("$post_type-to_date"),
 				'placeholder' => 'yy-mm-dd',
-				'label'       => __( 'To Date', 'invoicing' ),
+				'label'       => __('To Date', 'invoicing'),
 				'label_type'  => 'vertical',
 				'label_class' => 'd-block',
 				'type'        => 'datepicker',
@@ -138,20 +138,20 @@ 
 	 * Generates the to post status select field.
 	 *
 	 */
-	public function generate_post_status_select( $post_type ) {
+	public function generate_post_status_select($post_type) {
 
-		if ( 'subscriptions' === $post_type ) {
+		if ('subscriptions' === $post_type) {
 			$options = getpaid_get_subscription_statuses();
 		} else {
-			$options = wpinv_get_invoice_statuses( true, false, $post_type );
+			$options = wpinv_get_invoice_statuses(true, false, $post_type);
 		}
 
 		return aui()->select(
 			array(
 				'name'        => 'status',
-				'id'          => esc_attr( "$post_type-status" ),
-				'placeholder' => __( 'All Statuses', 'invoicing' ),
-				'label'       => __( 'Status', 'invoicing' ),
+				'id'          => esc_attr("$post_type-status"),
+				'placeholder' => __('All Statuses', 'invoicing'),
+				'label'       => __('Status', 'invoicing'),
 				'label_type'  => 'vertical',
 				'label_class' => 'd-block',
 				'options'     => $options,
@@ -164,20 +164,20 @@ 
 	 * Generates the to file type select field.
 	 *
 	 */
-	public function generate_file_type_select( $post_type ) {
+	public function generate_file_type_select($post_type) {
 
 		return aui()->select(
 			array(
 				'name'        => 'file_type',
-				'id'          => esc_attr( "$post_type-file_type" ),
-				'placeholder' => __( 'Select File Type', 'invoicing' ),
-				'label'       => __( 'Export File', 'invoicing' ),
+				'id'          => esc_attr("$post_type-file_type"),
+				'placeholder' => __('Select File Type', 'invoicing'),
+				'label'       => __('Export File', 'invoicing'),
 				'label_type'  => 'vertical',
 				'label_class' => 'd-block',
 				'options'     => array(
-					'csv'  => __( 'CSV', 'invoicing' ),
-					'xml'  => __( 'XML', 'invoicing' ),
-					'json' => __( 'JSON', 'invoicing' ),
+					'csv'  => __('CSV', 'invoicing'),
+					'xml'  => __('XML', 'invoicing'),
+					'json' => __('JSON', 'invoicing'),
 				),
 			)
 		);
@@ -188,7 +188,7 @@ 
 	 * Displays a field's markup.
 	 *
 	 */
-	public function display_markup( $markup ) {
+	public function display_markup($markup) {
 
 		echo wp_kses(
 			str_replace(
@@ -217,20 +217,20 @@ 
 
 				<div class="card-header">
 					<strong>
-						<?php esc_html_e( 'Export Subscriptions', 'invoicing' ); ?>
+						<?php esc_html_e('Export Subscriptions', 'invoicing'); ?>
 					</strong>
 				</div>
 
 				<div class="card-body">
 
-					<form method="post" action="<?php echo esc_url( $this->get_download_url( 'subscriptions' ) ); ?>">
+					<form method="post" action="<?php echo esc_url($this->get_download_url('subscriptions')); ?>">
 
 						<?php
-							$this->display_markup( $this->generate_from_date( 'subscriptions' ) );
-							$this->display_markup( $this->generate_to_date( 'subscriptions' ) );
-							$this->display_markup( $this->generate_post_status_select( 'subscriptions' ) );
-							$this->display_markup( $this->generate_file_type_select( 'subscriptions' ) );
-							submit_button( __( 'Download', 'invoicing' ) );
+							$this->display_markup($this->generate_from_date('subscriptions'));
+							$this->display_markup($this->generate_to_date('subscriptions'));
+							$this->display_markup($this->generate_post_status_select('subscriptions'));
+							$this->display_markup($this->generate_file_type_select('subscriptions'));
+							submit_button(__('Download', 'invoicing'));
 						?>
 
 					</form>

includes/class-getpaid-notification-email-sender.php

Indentation +134 added lines, -134 removed lines

@@ -13,17 +13,17 @@ 
 class GetPaid_Notification_Email_Sender {
 
     /**
-	 * Whether or not we should inline CSS into the email.
-	 */
-	public $inline_css = true;
+     * Whether or not we should inline CSS into the email.
+     */
+    public $inline_css = true;
 
     /**
-	 * The wp_mail() data.
-	 */
+     * The wp_mail() data.
+     */
     public $wp_mail_data = null;
 
     /**
-	 * Sends a new email.
+     * Sends a new email.
      *
      * @param string|array $to The recipients email or an array of recipient emails.
      * @param string $subject The email's subject.
@@ -31,49 +31,49 @@ 
      * @param array $attachments The email attachments.
      *
      * @return bool
-	 */
-	public function send( $to, $subject, $email, $attachments = array() ) {
+     */
+    public function send( $to, $subject, $email, $attachments = array() ) {
 
-		/*
+        /*
 		 * Allow to filter data on per-email basis.
 		 */
-		$data = apply_filters(
-			'getpaid_email_data',
-			array(
-				'to'          => array_filter( array_unique( wpinv_parse_list( $to ) ) ),
-				'subject'     => htmlspecialchars_decode( wp_strip_all_tags( $subject ), ENT_QUOTES ),
-				'email'       => apply_filters( 'wpinv_mail_content', $email ),
-				'headers'     => $this->get_headers(),
-				'attachments' => $attachments,
-			),
-			$this
-		);
+        $data = apply_filters(
+            'getpaid_email_data',
+            array(
+                'to'          => array_filter( array_unique( wpinv_parse_list( $to ) ) ),
+                'subject'     => htmlspecialchars_decode( wp_strip_all_tags( $subject ), ENT_QUOTES ),
+                'email'       => apply_filters( 'wpinv_mail_content', $email ),
+                'headers'     => $this->get_headers(),
+                'attachments' => $attachments,
+            ),
+            $this
+        );
 
         // Remove slashes.
         $data               = (array) wp_unslash( $data );
 
         // Cache it.
-		$this->wp_mail_data = $data;
+        $this->wp_mail_data = $data;
 
-		// Attach our own hooks.
-		$this->before_sending();
+        // Attach our own hooks.
+        $this->before_sending();
 
         $result = false;
 
         foreach ( $this->wp_mail_data['to'] as $to ) {
-			$result = $this->_send( $to, $data );
+            $result = $this->_send( $to, $data );
         }
 
-		// Remove our hooks.
-		$this->after_sending();
+        // Remove our hooks.
+        $this->after_sending();
 
-		$this->wp_mail_data = null;
+        $this->wp_mail_data = null;
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Does the actual sending.
+    /**
+     * Does the actual sending.
      *
      * @param string $to The recipient's email.
      * @param array $data The email's data.
@@ -81,81 +81,81 @@ 
      * @param array $attachments The email attachments.
      *
      * @return bool
-	 */
-	protected function _send( $to, $data ) {
-
-		// Prepare the sending function.
-		$sending_function = apply_filters( 'getpaid_email_email_sending_function', 'wp_mail' );
-
-		// Send the actual email.
-		$result = call_user_func(
-			$sending_function,
-			$to,
-			html_entity_decode( $data['subject'], ENT_QUOTES, get_bloginfo( 'charset' ) ),
-			$data['email'],
-			$data['headers'],
-			$data['attachments']
-		);
-
-		if ( ! $result ) {
-			$log_message = wp_sprintf( __( "\nTime: %1\$s\nTo: %2\$s\nSubject: %3\$s\n", 'invoicing' ), date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), $to, $data['subject'] );
-			wpinv_error_log( $log_message, __( 'Email from Invoicing plugin failed to send', 'invoicing' ), __FILE__, __LINE__ );
-		}
-
-		return $result;
-	}
+     */
+    protected function _send( $to, $data ) {
+
+        // Prepare the sending function.
+        $sending_function = apply_filters( 'getpaid_email_email_sending_function', 'wp_mail' );
+
+        // Send the actual email.
+        $result = call_user_func(
+            $sending_function,
+            $to,
+            html_entity_decode( $data['subject'], ENT_QUOTES, get_bloginfo( 'charset' ) ),
+            $data['email'],
+            $data['headers'],
+            $data['attachments']
+        );
+
+        if ( ! $result ) {
+            $log_message = wp_sprintf( __( "\nTime: %1\$s\nTo: %2\$s\nSubject: %3\$s\n", 'invoicing' ), date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), $to, $data['subject'] );
+            wpinv_error_log( $log_message, __( 'Email from Invoicing plugin failed to send', 'invoicing' ), __FILE__, __LINE__ );
+        }
+
+        return $result;
+    }
 
     /**
-	 * Retrieves email headers.
-	 */
-	public function get_headers() {
+     * Retrieves email headers.
+     */
+    public function get_headers() {
 
-		$name       = $this->get_from_name();
-		$reply_to   = $this->get_reply_to();
-		$headers    = array( "Reply-To:$name <$reply_to>" );
+        $name       = $this->get_from_name();
+        $reply_to   = $this->get_reply_to();
+        $headers    = array( "Reply-To:$name <$reply_to>" );
 
-		return apply_filters( 'getpaid_email_headers', $headers, $this );
+        return apply_filters( 'getpaid_email_headers', $headers, $this );
 
-	}
+    }
 
     /**
-	 * Fires before an email is sent
-	 *
-	 * @since 1.0.0
-	 */
-	public function before_sending() {
+     * Fires before an email is sent
+     *
+     * @since 1.0.0
+     */
+    public function before_sending() {
 
         do_action( 'getpaid_before_send_email', $this );
-		add_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
-		add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
-		add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
-		add_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000 );
+        add_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
+        add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
+        add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
+        add_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000 );
 
-	}
+    }
 
     /**
-	 * Returns the from name.
-	 */
-	public function get_from_name() {
+     * Returns the from name.
+     */
+    public function get_from_name() {
 
         $from_name = wpinv_get_option( 'email_from_name', get_bloginfo( 'name' ) );
 
-		if ( empty( $from_name ) ) {
-			$from_name = get_bloginfo( 'name' );
+        if ( empty( $from_name ) ) {
+            $from_name = get_bloginfo( 'name' );
         }
 
-		return wp_specialchars_decode( $from_name, ENT_QUOTES );
+        return wp_specialchars_decode( $from_name, ENT_QUOTES );
     }
 
     /**
-	 * Returns the from email.
-	 */
-	public function get_from_address() {
+     * Returns the from email.
+     */
+    public function get_from_address() {
 
         $from_address = wpinv_get_option( 'email_from', $this->default_from_address() );
 
-		if ( ! is_email( $from_address ) ) {
-			$from_address = $this->default_from_address();
+        if ( ! is_email( $from_address ) ) {
+            $from_address = $this->default_from_address();
         }
 
         return $from_address;
@@ -163,75 +163,75 @@ 
     }
 
     /**
-	 * The default emails from address.
-	 *
-	 * Defaults to wordpress@$sitename
-	 * Some hosts will block outgoing mail from this address if it doesn't exist,
-	 * but there's no easy alternative. Defaulting to admin_email might appear to be
-	 * another option, but some hosts may refuse to relay mail from an unknown domain.
-	 *
-	 */
-	public function default_from_address() {
-
-		// Get the site domain and get rid of www.
-		$sitename = strtolower( $_SERVER['SERVER_NAME'] );
-		if ( substr( $sitename, 0, 4 ) == 'www.' ) {
-			$sitename = substr( $sitename, 4 );
-		}
-
-		$from_email = 'wordpress@' . $sitename;
-
-		return apply_filters( 'getpaid_default_from_address', $from_email );
+     * The default emails from address.
+     *
+     * Defaults to wordpress@$sitename
+     * Some hosts will block outgoing mail from this address if it doesn't exist,
+     * but there's no easy alternative. Defaulting to admin_email might appear to be
+     * another option, but some hosts may refuse to relay mail from an unknown domain.
+     *
+     */
+    public function default_from_address() {
+
+        // Get the site domain and get rid of www.
+        $sitename = strtolower( $_SERVER['SERVER_NAME'] );
+        if ( substr( $sitename, 0, 4 ) == 'www.' ) {
+            $sitename = substr( $sitename, 4 );
+        }
+
+        $from_email = 'wordpress@' . $sitename;
+
+        return apply_filters( 'getpaid_default_from_address', $from_email );
 
     }
 
     /**
-	 * Get the email reply-to.
-	 *
-	 *
-	 * @return string The email reply-to address.
-	 */
-	public function get_reply_to() {
+     * Get the email reply-to.
+     *
+     *
+     * @return string The email reply-to address.
+     */
+    public function get_reply_to() {
 
-		$reply_to = current( wpinv_parse_list( wpinv_get_admin_email() ) );
+        $reply_to = current( wpinv_parse_list( wpinv_get_admin_email() ) );
 
-		if ( ! is_email( $reply_to ) ) {
-			$reply_to = get_option( 'admin_email' );
-		}
+        if ( ! is_email( $reply_to ) ) {
+            $reply_to = get_option( 'admin_email' );
+        }
 
-		return $reply_to;
+        return $reply_to;
     }
 
     /**
-	 * Get the email content type.
-	 *
-	 */
-	public function get_content_type() {
-		return apply_filters( 'getpaid_email_content_type', 'text/html', $this );
+     * Get the email content type.
+     *
+     */
+    public function get_content_type() {
+        return apply_filters( 'getpaid_email_content_type', 'text/html', $this );
     }
 
     /**
-	 * Ensures that our email messages are not messed up by template plugins.
-	 *
-	 * @return array wp_mail_data.
-	 */
-	public function ensure_email_content( $args ) {
-		$args['message'] = $this->wp_mail_data['email'];
-		return $args;
+     * Ensures that our email messages are not messed up by template plugins.
+     *
+     * @return array wp_mail_data.
+     */
+    public function ensure_email_content( $args ) {
+        $args['message'] = $this->wp_mail_data['email'];
+        return $args;
     }
 
     /**
-	 * A little house keeping after an email is sent.
-	 *
- 	 */
-	public function after_sending() {
+     * A little house keeping after an email is sent.
+     *
+     */
+    public function after_sending() {
 
         do_action( 'getpaid_after_send_email', $this->wp_mail_data );
-		remove_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
-		remove_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
-		remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
-		remove_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000 );
+        remove_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
+        remove_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
+        remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
+        remove_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000 );
 
-	}
+    }
 
 }

Spacing +41 added lines, -41 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * This function is responsible for sending emails.
@@ -32,7 +32,7 @@ 
      *
      * @return bool
 	 */
-	public function send( $to, $subject, $email, $attachments = array() ) {
+	public function send($to, $subject, $email, $attachments = array()) {
 
 		/*
 		 * Allow to filter data on per-email basis.
@@ -40,9 +40,9 @@ 
 		$data = apply_filters(
 			'getpaid_email_data',
 			array(
-				'to'          => array_filter( array_unique( wpinv_parse_list( $to ) ) ),
-				'subject'     => htmlspecialchars_decode( wp_strip_all_tags( $subject ), ENT_QUOTES ),
-				'email'       => apply_filters( 'wpinv_mail_content', $email ),
+				'to'          => array_filter(array_unique(wpinv_parse_list($to))),
+				'subject'     => htmlspecialchars_decode(wp_strip_all_tags($subject), ENT_QUOTES),
+				'email'       => apply_filters('wpinv_mail_content', $email),
 				'headers'     => $this->get_headers(),
 				'attachments' => $attachments,
 			),
@@ -50,7 +50,7 @@ 
 		);
 
         // Remove slashes.
-        $data               = (array) wp_unslash( $data );
+        $data = (array) wp_unslash($data);
 
         // Cache it.
 		$this->wp_mail_data = $data;
@@ -60,8 +60,8 @@ 
 
         $result = false;
 
-        foreach ( $this->wp_mail_data['to'] as $to ) {
-			$result = $this->_send( $to, $data );
+        foreach ($this->wp_mail_data['to'] as $to) {
+			$result = $this->_send($to, $data);
         }
 
 		// Remove our hooks.
@@ -82,24 +82,24 @@ 
      *
      * @return bool
 	 */
-	protected function _send( $to, $data ) {
+	protected function _send($to, $data) {
 
 		// Prepare the sending function.
-		$sending_function = apply_filters( 'getpaid_email_email_sending_function', 'wp_mail' );
+		$sending_function = apply_filters('getpaid_email_email_sending_function', 'wp_mail');
 
 		// Send the actual email.
 		$result = call_user_func(
 			$sending_function,
 			$to,
-			html_entity_decode( $data['subject'], ENT_QUOTES, get_bloginfo( 'charset' ) ),
+			html_entity_decode($data['subject'], ENT_QUOTES, get_bloginfo('charset')),
 			$data['email'],
 			$data['headers'],
 			$data['attachments']
 		);
 
-		if ( ! $result ) {
-			$log_message = wp_sprintf( __( "\nTime: %1\$s\nTo: %2\$s\nSubject: %3\$s\n", 'invoicing' ), date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), $to, $data['subject'] );
-			wpinv_error_log( $log_message, __( 'Email from Invoicing plugin failed to send', 'invoicing' ), __FILE__, __LINE__ );
+		if (!$result) {
+			$log_message = wp_sprintf(__("\nTime: %1\$s\nTo: %2\$s\nSubject: %3\$s\n", 'invoicing'), date_i18n('F j Y H:i:s', current_time('timestamp')), $to, $data['subject']);
+			wpinv_error_log($log_message, __('Email from Invoicing plugin failed to send', 'invoicing'), __FILE__, __LINE__);
 		}
 
 		return $result;
@@ -112,9 +112,9 @@ 
 
 		$name       = $this->get_from_name();
 		$reply_to   = $this->get_reply_to();
-		$headers    = array( "Reply-To:$name <$reply_to>" );
+		$headers    = array("Reply-To:$name <$reply_to>");
 
-		return apply_filters( 'getpaid_email_headers', $headers, $this );
+		return apply_filters('getpaid_email_headers', $headers, $this);
 
 	}
 
@@ -125,11 +125,11 @@ 
 	 */
 	public function before_sending() {
 
-        do_action( 'getpaid_before_send_email', $this );
-		add_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
-		add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
-		add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
-		add_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000 );
+        do_action('getpaid_before_send_email', $this);
+		add_filter('wp_mail_from', array($this, 'get_from_address'), 1000);
+		add_filter('wp_mail_from_name', array($this, 'get_from_name'), 1000);
+		add_filter('wp_mail_content_type', array($this, 'get_content_type'), 1000);
+		add_filter('wp_mail', array($this, 'ensure_email_content'), 1000);
 
 	}
 
@@ -138,13 +138,13 @@ 
 	 */
 	public function get_from_name() {
 
-        $from_name = wpinv_get_option( 'email_from_name', get_bloginfo( 'name' ) );
+        $from_name = wpinv_get_option('email_from_name', get_bloginfo('name'));
 
-		if ( empty( $from_name ) ) {
-			$from_name = get_bloginfo( 'name' );
+		if (empty($from_name)) {
+			$from_name = get_bloginfo('name');
         }
 
-		return wp_specialchars_decode( $from_name, ENT_QUOTES );
+		return wp_specialchars_decode($from_name, ENT_QUOTES);
     }
 
     /**
@@ -152,9 +152,9 @@ 
 	 */
 	public function get_from_address() {
 
-        $from_address = wpinv_get_option( 'email_from', $this->default_from_address() );
+        $from_address = wpinv_get_option('email_from', $this->default_from_address());
 
-		if ( ! is_email( $from_address ) ) {
+		if (!is_email($from_address)) {
 			$from_address = $this->default_from_address();
         }
 
@@ -174,14 +174,14 @@ 
 	public function default_from_address() {
 
 		// Get the site domain and get rid of www.
-		$sitename = strtolower( $_SERVER['SERVER_NAME'] );
-		if ( substr( $sitename, 0, 4 ) == 'www.' ) {
-			$sitename = substr( $sitename, 4 );
+		$sitename = strtolower($_SERVER['SERVER_NAME']);
+		if (substr($sitename, 0, 4) == 'www.') {
+			$sitename = substr($sitename, 4);
 		}
 
 		$from_email = 'wordpress@' . $sitename;
 
-		return apply_filters( 'getpaid_default_from_address', $from_email );
+		return apply_filters('getpaid_default_from_address', $from_email);
 
     }
 
@@ -193,10 +193,10 @@ 
 	 */
 	public function get_reply_to() {
 
-		$reply_to = current( wpinv_parse_list( wpinv_get_admin_email() ) );
+		$reply_to = current(wpinv_parse_list(wpinv_get_admin_email()));
 
-		if ( ! is_email( $reply_to ) ) {
-			$reply_to = get_option( 'admin_email' );
+		if (!is_email($reply_to)) {
+			$reply_to = get_option('admin_email');
 		}
 
 		return $reply_to;
@@ -207,7 +207,7 @@ 
 	 *
 	 */
 	public function get_content_type() {
-		return apply_filters( 'getpaid_email_content_type', 'text/html', $this );
+		return apply_filters('getpaid_email_content_type', 'text/html', $this);
     }
 
     /**
@@ -215,7 +215,7 @@ 
 	 *
 	 * @return array wp_mail_data.
 	 */
-	public function ensure_email_content( $args ) {
+	public function ensure_email_content($args) {
 		$args['message'] = $this->wp_mail_data['email'];
 		return $args;
     }
@@ -226,11 +226,11 @@ 
  	 */
 	public function after_sending() {
 
-        do_action( 'getpaid_after_send_email', $this->wp_mail_data );
-		remove_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
-		remove_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
-		remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
-		remove_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000 );
+        do_action('getpaid_after_send_email', $this->wp_mail_data);
+		remove_filter('wp_mail_from', array($this, 'get_from_address'), 1000);
+		remove_filter('wp_mail_from_name', array($this, 'get_from_name'), 1000);
+		remove_filter('wp_mail_content_type', array($this, 'get_content_type'), 1000);
+		remove_filter('wp_mail', array($this, 'ensure_email_content'), 1000);
 
 	}
 

includes/payments/class-getpaid-checkout.php

Indentation +303 added lines, -303 removed lines

@@ -12,184 +12,184 @@ 
  */
 class GetPaid_Checkout {
 
-	/**
-	 * @var GetPaid_Payment_Form_Submission
-	 */
-	protected $payment_form_submission;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-		$this->payment_form_submission = $submission;
-	}
-
-	/**
-	 * Processes the checkout.
-	 *
-	 */
-	public function process_checkout() {
-
-		// Validate the submission.
-		$this->validate_submission();
-
-		// Prepare the invoice.
-		$items      = $this->get_submission_items();
-		$invoice    = $this->get_submission_invoice();
-		$invoice    = $this->process_submission_invoice( $invoice, $items );
-		$prepared   = $this->prepare_submission_data_for_saving();
-
-		$this->prepare_billing_info( $invoice );
-
-		$shipping   = $this->prepare_shipping_info( $invoice );
-
-		// Save the invoice.
-		$invoice->set_is_viewed( true );
-		$invoice->recalculate_total();
+    /**
+     * @var GetPaid_Payment_Form_Submission
+     */
+    protected $payment_form_submission;
+
+    /**
+     * Class constructor.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+        $this->payment_form_submission = $submission;
+    }
+
+    /**
+     * Processes the checkout.
+     *
+     */
+    public function process_checkout() {
+
+        // Validate the submission.
+        $this->validate_submission();
+
+        // Prepare the invoice.
+        $items      = $this->get_submission_items();
+        $invoice    = $this->get_submission_invoice();
+        $invoice    = $this->process_submission_invoice( $invoice, $items );
+        $prepared   = $this->prepare_submission_data_for_saving();
+
+        $this->prepare_billing_info( $invoice );
+
+        $shipping   = $this->prepare_shipping_info( $invoice );
+
+        // Save the invoice.
+        $invoice->set_is_viewed( true );
+        $invoice->recalculate_total();
         $invoice->save();
 
-		do_action( 'getpaid_checkout_invoice_updated', $invoice );
+        do_action( 'getpaid_checkout_invoice_updated', $invoice );
 
-		// Send to the gateway.
-		$this->post_process_submission( $invoice, $prepared, $shipping );
-	}
+        // Send to the gateway.
+        $this->post_process_submission( $invoice, $prepared, $shipping );
+    }
 
-	/**
-	 * Validates the submission.
-	 *
-	 */
-	protected function validate_submission() {
+    /**
+     * Validates the submission.
+     *
+     */
+    protected function validate_submission() {
 
-		$submission = $this->payment_form_submission;
-		$data       = $submission->get_data();
+        $submission = $this->payment_form_submission;
+        $data       = $submission->get_data();
 
-		// Do we have an error?
+        // Do we have an error?
         if ( ! empty( $submission->last_error ) ) {
-			wp_send_json_error( $submission->last_error );
+            wp_send_json_error( $submission->last_error );
         }
 
-		// We need a billing email.
+        // We need a billing email.
         if ( ! $submission->has_billing_email() ) {
             wp_send_json_error( __( 'Provide a valid billing email.', 'invoicing' ) );
-		}
+        }
 
-		// Non-recurring gateways should not be allowed to process recurring invoices.
-		if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
-		}
+        // Non-recurring gateways should not be allowed to process recurring invoices.
+        if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
+            wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
+        }
 
-		// Ensure the gateway is active.
-		if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway is not active', 'invoicing' ) );
-		}
+        // Ensure the gateway is active.
+        if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
+            wp_send_json_error( __( 'The selected payment gateway is not active', 'invoicing' ) );
+        }
 
-		// Clear any existing errors.
-		wpinv_clear_errors();
+        // Clear any existing errors.
+        wpinv_clear_errors();
 
-		// Allow themes and plugins to hook to errors
-		do_action( 'getpaid_checkout_error_checks', $submission );
+        // Allow themes and plugins to hook to errors
+        do_action( 'getpaid_checkout_error_checks', $submission );
 
-		// Do we have any errors?
+        // Do we have any errors?
         if ( wpinv_get_errors() ) {
             wp_send_json_error( getpaid_get_errors_html() );
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Retrieves submission items.
-	 *
-	 * @return GetPaid_Form_Item[]
-	 */
-	protected function get_submission_items() {
+    /**
+     * Retrieves submission items.
+     *
+     * @return GetPaid_Form_Item[]
+     */
+    protected function get_submission_items() {
 
-		$items = $this->payment_form_submission->get_items();
+        $items = $this->payment_form_submission->get_items();
 
         // Ensure that we have items.
         if ( empty( $items ) && ! $this->payment_form_submission->has_fees() ) {
             wp_send_json_error( __( 'Please provide at least one item or amount.', 'invoicing' ) );
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Retrieves submission invoice.
-	 *
-	 * @return WPInv_Invoice
-	 */
-	protected function get_submission_invoice() {
-		$submission = $this->payment_form_submission;
-
-		if ( ! $submission->has_invoice() ) {
-			$invoice = new WPInv_Invoice();
-			$invoice->set_created_via( 'payment_form' );
-			return $invoice;
         }
 
-		$invoice = $submission->get_invoice();
+        return $items;
+    }
 
-		// Make sure that it is neither paid or refunded.
-		if ( $invoice->is_paid() || $invoice->is_refunded() ) {
-			wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
-		}
+    /**
+     * Retrieves submission invoice.
+     *
+     * @return WPInv_Invoice
+     */
+    protected function get_submission_invoice() {
+        $submission = $this->payment_form_submission;
 
-		return $invoice;
-	}
+        if ( ! $submission->has_invoice() ) {
+            $invoice = new WPInv_Invoice();
+            $invoice->set_created_via( 'payment_form' );
+            return $invoice;
+        }
 
-	/**
-	 * Processes the submission invoice.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	protected function process_submission_invoice( $invoice, $items ) {
+        $invoice = $submission->get_invoice();
 
-		$submission = $this->payment_form_submission;
+        // Make sure that it is neither paid or refunded.
+        if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+            wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
+        }
 
-		// Set-up the invoice details.
-		$invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
-		$invoice->set_user_id( $this->get_submission_customer() );
-		$invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
+        return $invoice;
+    }
+
+    /**
+     * Processes the submission invoice.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    protected function process_submission_invoice( $invoice, $items ) {
+
+        $submission = $this->payment_form_submission;
+
+        // Set-up the invoice details.
+        $invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
+        $invoice->set_user_id( $this->get_submission_customer() );
+        $invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
         $invoice->set_items( $items );
         $invoice->set_fees( $submission->get_fees() );
         $invoice->set_taxes( $submission->get_taxes() );
-		$invoice->set_discounts( $submission->get_discounts() );
-		$invoice->set_gateway( $submission->get_field( 'wpi-gateway' ) );
-		$invoice->set_currency( $submission->get_currency() );
+        $invoice->set_discounts( $submission->get_discounts() );
+        $invoice->set_gateway( $submission->get_field( 'wpi-gateway' ) );
+        $invoice->set_currency( $submission->get_currency() );
 
-		if ( $submission->has_shipping() ) {
-			$invoice->set_shipping( $submission->get_shipping() );
-		}
+        if ( $submission->has_shipping() ) {
+            $invoice->set_shipping( $submission->get_shipping() );
+        }
 
-		$address_confirmed = $submission->get_field( 'confirm-address' );
-		$invoice->set_address_confirmed( ! empty( $address_confirmed ) );
+        $address_confirmed = $submission->get_field( 'confirm-address' );
+        $invoice->set_address_confirmed( ! empty( $address_confirmed ) );
 
-		if ( $submission->has_discount_code() ) {
+        if ( $submission->has_discount_code() ) {
             $invoice->set_discount_code( $submission->get_discount_code() );
-		}
-
-		getpaid_maybe_add_default_address( $invoice );
-		return $invoice;
-	}
-
-	/**
-	 * Retrieves the submission's customer.
-	 *
-	 * @return int The customer id.
-	 */
-	protected function get_submission_customer() {
-		$submission = $this->payment_form_submission;
-
-		// If this is an existing invoice...
-		if ( $submission->has_invoice() ) {
-			return $submission->get_invoice()->get_user_id();
-		}
-
-		// (Maybe) create the user.
+        }
+
+        getpaid_maybe_add_default_address( $invoice );
+        return $invoice;
+    }
+
+    /**
+     * Retrieves the submission's customer.
+     *
+     * @return int The customer id.
+     */
+    protected function get_submission_customer() {
+        $submission = $this->payment_form_submission;
+
+        // If this is an existing invoice...
+        if ( $submission->has_invoice() ) {
+            return $submission->get_invoice()->get_user_id();
+        }
+
+        // (Maybe) create the user.
         $user = get_current_user_id();
 
         if ( empty( $user ) ) {
@@ -197,16 +197,16 @@ 
         }
 
         if ( empty( $user ) ) {
-			$name = array( $submission->get_field( 'wpinv_first_name', 'billing' ), $submission->get_field( 'wpinv_last_name', 'billing' ) );
-			$name = implode( '', array_filter( $name ) );
+            $name = array( $submission->get_field( 'wpinv_first_name', 'billing' ), $submission->get_field( 'wpinv_last_name', 'billing' ) );
+            $name = implode( '', array_filter( $name ) );
             $user = wpinv_create_user( $submission->get_billing_email(), $name );
 
-			// (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 ), $user ) ) {
-				wp_send_new_user_notifications( $user, 'user' );
-			}
-		}
+            // (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 ), $user ) ) {
+                wp_send_new_user_notifications( $user, 'user' );
+            }
+        }
 
         if ( is_wp_error( $user ) ) {
             wp_send_json_error( $user->get_error_message() );
@@ -214,49 +214,49 @@ 
 
         if ( is_numeric( $user ) ) {
             return $user;
-		}
+        }
 
-		return $user->ID;
+        return $user->ID;
 
-	}
+    }
 
-	/**
+    /**
      * Prepares submission data for saving to the database.
      *
-	 * @return array
+     * @return array
      */
     public function prepare_submission_data_for_saving() {
 
-		$submission = $this->payment_form_submission;
+        $submission = $this->payment_form_submission;
 
-		// Prepared submission details.
+        // Prepared submission details.
         $prepared = array(
-			'all'  => array(),
-			'meta' => array(),
-		);
+            'all'  => array(),
+            'meta' => array(),
+        );
 
         // Raw submission details.
-		$data     = $submission->get_data();
+        $data     = $submission->get_data();
 
-		// Loop through the submitted details.
+        // Loop through the submitted details.
         foreach ( $submission->get_payment_form()->get_elements() as $field ) {
 
-			// Skip premade fields.
+            // Skip premade fields.
             if ( ! empty( $field['premade'] ) ) {
                 continue;
             }
 
-			// Ensure address is provided.
-			if ( $field['type'] == 'address' ) {
+            // Ensure address is provided.
+            if ( $field['type'] == 'address' ) {
                 $address_type = isset( $field['address_type'] ) && 'shipping' === $field['address_type'] ? 'shipping' : 'billing';
 
-				foreach ( $field['fields'] as $address_field ) {
+                foreach ( $field['fields'] as $address_field ) {
 
-					if ( ! empty( $address_field['visible'] ) && ! empty( $address_field['required'] ) && '' === trim( $_POST[ $address_type ][ $address_field['name'] ] ) ) {
-						wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
-					}
-			}
-		}
+                    if ( ! empty( $address_field['visible'] ) && ! empty( $address_field['required'] ) && '' === trim( $_POST[ $address_type ][ $address_field['name'] ] ) ) {
+                        wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
+                    }
+            }
+        }
 
             // If it is required and not set, abort.
             if ( ! $submission->is_required_field_set( $field ) ) {
@@ -266,31 +266,31 @@ 
             // Handle misc fields.
             if ( isset( $data[ $field['id'] ] ) ) {
 
-				// Uploads.
-				if ( $field['type'] == 'file_upload' ) {
-					$max_file_num = empty( $field['max_file_num'] ) ? 1 : absint( $field['max_file_num'] );
+                // Uploads.
+                if ( $field['type'] == 'file_upload' ) {
+                    $max_file_num = empty( $field['max_file_num'] ) ? 1 : absint( $field['max_file_num'] );
 
-					if ( count( $data[ $field['id'] ] ) > $max_file_num ) {
-						wp_send_json_error( __( 'Maximum number of allowed files exceeded.', 'invoicing' ) );
-					}
+                    if ( count( $data[ $field['id'] ] ) > $max_file_num ) {
+                        wp_send_json_error( __( 'Maximum number of allowed files exceeded.', 'invoicing' ) );
+                    }
 
-					$value = array();
+                    $value = array();
 
-					foreach ( $data[ $field['id'] ] as $url => $name ) {
-						$value[] = sprintf(
-							'<a href="%s" target="_blank">%s</a>',
-							esc_url_raw( $url ),
-							esc_html( $name )
-						);
-					}
+                    foreach ( $data[ $field['id'] ] as $url => $name ) {
+                        $value[] = sprintf(
+                            '<a href="%s" target="_blank">%s</a>',
+                            esc_url_raw( $url ),
+                            esc_html( $name )
+                        );
+                    }
 
-					$value = implode( ' | ', $value );
+                    $value = implode( ' | ', $value );
 
-				} elseif ( $field['type'] == 'checkbox' ) {
-					$value = isset( $data[ $field['id'] ] ) ? __( 'Yes', 'invoicing' ) : __( 'No', 'invoicing' );
-				} else {
-					$value = wp_kses_post( $data[ $field['id'] ] );
-				}
+                } elseif ( $field['type'] == 'checkbox' ) {
+                    $value = isset( $data[ $field['id'] ] ) ? __( 'Yes', 'invoicing' ) : __( 'No', 'invoicing' );
+                } else {
+                    $value = wp_kses_post( $data[ $field['id'] ] );
+                }
 
                 $label = $field['id'];
 
@@ -298,188 +298,188 @@ 
                     $label = $field['label'];
                 }
 
-				if ( ! empty( $field['add_meta'] ) ) {
-					$prepared['meta'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
-				}
-				$prepared['all'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+                if ( ! empty( $field['add_meta'] ) ) {
+                    $prepared['meta'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+                }
+                $prepared['all'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
 
             }
 }
 
-		return $prepared;
+        return $prepared;
 
-	}
+    }
 
-	/**
+    /**
      * Retrieves address details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
-	 * @param string $type
+     * @return array
+     * @param WPInv_Invoice $invoice
+     * @param string $type
      */
     public function prepare_address_details( $invoice, $type = 'billing' ) {
 
-		$data     = $this->payment_form_submission->get_data();
-		$type     = sanitize_key( $type );
-		$address  = array();
-		$prepared = array();
+        $data     = $this->payment_form_submission->get_data();
+        $type     = sanitize_key( $type );
+        $address  = array();
+        $prepared = array();
 
-		if ( ! empty( $data[ $type ] ) ) {
-			$address = $data[ $type ];
-		}
+        if ( ! empty( $data[ $type ] ) ) {
+            $address = $data[ $type ];
+        }
 
-		// Clean address details.
-		foreach ( $address as $key => $value ) {
-			$key             = sanitize_key( $key );
-			$key             = str_replace( 'wpinv_', '', $key );
-			$value           = wpinv_clean( $value );
-			$prepared[ $key ] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
-		}
+        // Clean address details.
+        foreach ( $address as $key => $value ) {
+            $key             = sanitize_key( $key );
+            $key             = str_replace( 'wpinv_', '', $key );
+            $value           = wpinv_clean( $value );
+            $prepared[ $key ] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
+        }
 
-		// Filter address details.
-		$prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
+        // Filter address details.
+        $prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
 
-		// Remove non-whitelisted values.
-		return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
+        // Remove non-whitelisted values.
+        return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
 
-	}
+    }
 
-	/**
+    /**
      * Prepares the billing details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
+     * @return array
+     * @param WPInv_Invoice $invoice
      */
     protected function prepare_billing_info( &$invoice ) {
 
-		$billing_address = $this->prepare_address_details( $invoice, 'billing' );
+        $billing_address = $this->prepare_address_details( $invoice, 'billing' );
 
-		// Update the invoice with the billing details.
-		$invoice->set_props( $billing_address );
+        // Update the invoice with the billing details.
+        $invoice->set_props( $billing_address );
 
-	}
+    }
 
-	/**
+    /**
      * Prepares the shipping details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
+     * @return array
+     * @param WPInv_Invoice $invoice
      */
     protected function prepare_shipping_info( $invoice ) {
 
-		$data = $this->payment_form_submission->get_data();
+        $data = $this->payment_form_submission->get_data();
 
-		if ( empty( $data['same-shipping-address'] ) ) {
-			return $this->prepare_address_details( $invoice, 'shipping' );
-		}
+        if ( empty( $data['same-shipping-address'] ) ) {
+            return $this->prepare_address_details( $invoice, 'shipping' );
+        }
 
-		return $this->prepare_address_details( $invoice, 'billing' );
+        return $this->prepare_address_details( $invoice, 'billing' );
 
-	}
+    }
 
-	/**
-	 * Confirms the submission is valid and send users to the gateway.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param array $prepared_payment_form_data
-	 * @param array $shipping
-	 */
-	protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
+    /**
+     * Confirms the submission is valid and send users to the gateway.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param array $prepared_payment_form_data
+     * @param array $shipping
+     */
+    protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
 
-		// Ensure the invoice exists.
+        // Ensure the invoice exists.
         if ( ! $invoice->exists() ) {
             wp_send_json_error( __( 'An error occured while saving your invoice. Please try again.', 'invoicing' ) );
         }
 
-		// Save payment form data.
-		$prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
+        // Save payment form data.
+        $prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
         delete_post_meta( $invoice->get_id(), 'payment_form_data' );
-		delete_post_meta( $invoice->get_id(), 'additional_meta_data' );
-		if ( ! empty( $prepared_payment_form_data ) ) {
+        delete_post_meta( $invoice->get_id(), 'additional_meta_data' );
+        if ( ! empty( $prepared_payment_form_data ) ) {
 
-			if ( ! empty( $prepared_payment_form_data['all'] ) ) {
-				update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all'] );
-			}
+            if ( ! empty( $prepared_payment_form_data['all'] ) ) {
+                update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all'] );
+            }
 
-			if ( ! empty( $prepared_payment_form_data['meta'] ) ) {
-				update_post_meta( $invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta'] );
-			}
+            if ( ! empty( $prepared_payment_form_data['meta'] ) ) {
+                update_post_meta( $invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta'] );
+            }
 }
 
-		// Save payment form data.
-		$shipping = apply_filters( 'getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission );
+        // Save payment form data.
+        $shipping = apply_filters( 'getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission );
         if ( ! empty( $shipping ) ) {
             update_post_meta( $invoice->get_id(), 'shipping_address', $shipping );
-		}
+        }
 
-		// Backwards compatibility.
+        // Backwards compatibility.
         add_filter( 'wp_redirect', array( $this, 'send_redirect_response' ) );
 
-		$this->process_payment( $invoice );
+        $this->process_payment( $invoice );
 
         // If we are here, there was an error.
-		wpinv_send_back_to_checkout( $invoice );
+        wpinv_send_back_to_checkout( $invoice );
 
-	}
+    }
 
-	/**
-	 * Processes the actual payment.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	protected function process_payment( $invoice ) {
+    /**
+     * Processes the actual payment.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    protected function process_payment( $invoice ) {
 
-		// Clear any checkout errors.
-		wpinv_clear_errors();
+        // Clear any checkout errors.
+        wpinv_clear_errors();
 
-		// No need to send free invoices to the gateway.
-		if ( $invoice->is_free() ) {
-			$this->process_free_payment( $invoice );
-		}
+        // No need to send free invoices to the gateway.
+        if ( $invoice->is_free() ) {
+            $this->process_free_payment( $invoice );
+        }
 
-		$submission = $this->payment_form_submission;
+        $submission = $this->payment_form_submission;
 
-		// Fires before sending to the gateway.
-		do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
+        // Fires before sending to the gateway.
+        do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
 
-		// Allow the sumission data to be modified before it is sent to the gateway.
-		$submission_data    = $submission->get_data();
-		$submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
-		$submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
+        // Allow the sumission data to be modified before it is sent to the gateway.
+        $submission_data    = $submission->get_data();
+        $submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
+        $submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
 
-		// Validate the currency.
-		if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
-			wpinv_set_error( 'invalid_currency', __( 'The chosen payment gateway does not support this currency', 'invoicing' ) );
-		}
+        // Validate the currency.
+        if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
+            wpinv_set_error( 'invalid_currency', __( 'The chosen payment gateway does not support this currency', 'invoicing' ) );
+        }
 
-		// Check to see if we have any errors.
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
-		}
+        // Check to see if we have any errors.
+        if ( wpinv_get_errors() ) {
+            wpinv_send_back_to_checkout( $invoice );
+        }
 
-		// Send info to the gateway for payment processing
-		do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
+        // Send info to the gateway for payment processing
+        do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
 
-		// Backwards compatibility.
-		wpinv_send_to_gateway( $submission_gateway, $invoice );
+        // Backwards compatibility.
+        wpinv_send_to_gateway( $submission_gateway, $invoice );
 
-	}
+    }
 
-	/**
-	 * Marks the invoice as paid in case the checkout is free.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	protected function process_free_payment( $invoice ) {
+    /**
+     * Marks the invoice as paid in case the checkout is free.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    protected function process_free_payment( $invoice ) {
 
-		$invoice->set_gateway( 'none' );
-		$invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
-		$invoice->mark_paid();
-		wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        $invoice->set_gateway( 'none' );
+        $invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
+        $invoice->mark_paid();
+        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
 
-	}
+    }
 
-	/**
+    /**
      * Sends a redrect response to payment details.
      *
      */

Spacing +136 added lines, -136 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main Checkout Class.
@@ -22,7 +22,7 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 		$this->payment_form_submission = $submission;
 	}
 
@@ -38,22 +38,22 @@ 
 		// Prepare the invoice.
 		$items      = $this->get_submission_items();
 		$invoice    = $this->get_submission_invoice();
-		$invoice    = $this->process_submission_invoice( $invoice, $items );
+		$invoice    = $this->process_submission_invoice($invoice, $items);
 		$prepared   = $this->prepare_submission_data_for_saving();
 
-		$this->prepare_billing_info( $invoice );
+		$this->prepare_billing_info($invoice);
 
-		$shipping   = $this->prepare_shipping_info( $invoice );
+		$shipping = $this->prepare_shipping_info($invoice);
 
 		// Save the invoice.
-		$invoice->set_is_viewed( true );
+		$invoice->set_is_viewed(true);
 		$invoice->recalculate_total();
         $invoice->save();
 
-		do_action( 'getpaid_checkout_invoice_updated', $invoice );
+		do_action('getpaid_checkout_invoice_updated', $invoice);
 
 		// Send to the gateway.
-		$this->post_process_submission( $invoice, $prepared, $shipping );
+		$this->post_process_submission($invoice, $prepared, $shipping);
 	}
 
 	/**
@@ -66,34 +66,34 @@ 
 		$data       = $submission->get_data();
 
 		// Do we have an error?
-        if ( ! empty( $submission->last_error ) ) {
-			wp_send_json_error( $submission->last_error );
+        if (!empty($submission->last_error)) {
+			wp_send_json_error($submission->last_error);
         }
 
 		// We need a billing email.
-        if ( ! $submission->has_billing_email() ) {
-            wp_send_json_error( __( 'Provide a valid billing email.', 'invoicing' ) );
+        if (!$submission->has_billing_email()) {
+            wp_send_json_error(__('Provide a valid billing email.', 'invoicing'));
 		}
 
 		// Non-recurring gateways should not be allowed to process recurring invoices.
-		if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
+		if ($submission->should_collect_payment_details() && $submission->has_recurring && !wpinv_gateway_support_subscription($data['wpi-gateway'])) {
+			wp_send_json_error(__('The selected payment gateway does not support subscription payments.', 'invoicing'));
 		}
 
 		// Ensure the gateway is active.
-		if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway is not active', 'invoicing' ) );
+		if ($submission->should_collect_payment_details() && !wpinv_is_gateway_active($data['wpi-gateway'])) {
+			wp_send_json_error(__('The selected payment gateway is not active', 'invoicing'));
 		}
 
 		// Clear any existing errors.
 		wpinv_clear_errors();
 
 		// Allow themes and plugins to hook to errors
-		do_action( 'getpaid_checkout_error_checks', $submission );
+		do_action('getpaid_checkout_error_checks', $submission);
 
 		// Do we have any errors?
-        if ( wpinv_get_errors() ) {
-            wp_send_json_error( getpaid_get_errors_html() );
+        if (wpinv_get_errors()) {
+            wp_send_json_error(getpaid_get_errors_html());
 		}
 
 	}
@@ -108,8 +108,8 @@ 
 		$items = $this->payment_form_submission->get_items();
 
         // Ensure that we have items.
-        if ( empty( $items ) && ! $this->payment_form_submission->has_fees() ) {
-            wp_send_json_error( __( 'Please provide at least one item or amount.', 'invoicing' ) );
+        if (empty($items) && !$this->payment_form_submission->has_fees()) {
+            wp_send_json_error(__('Please provide at least one item or amount.', 'invoicing'));
 		}
 
 		return $items;
@@ -123,17 +123,17 @@ 
 	protected function get_submission_invoice() {
 		$submission = $this->payment_form_submission;
 
-		if ( ! $submission->has_invoice() ) {
+		if (!$submission->has_invoice()) {
 			$invoice = new WPInv_Invoice();
-			$invoice->set_created_via( 'payment_form' );
+			$invoice->set_created_via('payment_form');
 			return $invoice;
         }
 
 		$invoice = $submission->get_invoice();
 
 		// Make sure that it is neither paid or refunded.
-		if ( $invoice->is_paid() || $invoice->is_refunded() ) {
-			wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
+		if ($invoice->is_paid() || $invoice->is_refunded()) {
+			wp_send_json_error(__('This invoice has already been paid for.', 'invoicing'));
 		}
 
 		return $invoice;
@@ -146,33 +146,33 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	protected function process_submission_invoice( $invoice, $items ) {
+	protected function process_submission_invoice($invoice, $items) {
 
 		$submission = $this->payment_form_submission;
 
 		// Set-up the invoice details.
-		$invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
-		$invoice->set_user_id( $this->get_submission_customer() );
-		$invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
-        $invoice->set_items( $items );
-        $invoice->set_fees( $submission->get_fees() );
-        $invoice->set_taxes( $submission->get_taxes() );
-		$invoice->set_discounts( $submission->get_discounts() );
-		$invoice->set_gateway( $submission->get_field( 'wpi-gateway' ) );
-		$invoice->set_currency( $submission->get_currency() );
-
-		if ( $submission->has_shipping() ) {
-			$invoice->set_shipping( $submission->get_shipping() );
+		$invoice->set_email(sanitize_email($submission->get_billing_email()));
+		$invoice->set_user_id($this->get_submission_customer());
+		$invoice->set_payment_form(absint($submission->get_payment_form()->get_id()));
+        $invoice->set_items($items);
+        $invoice->set_fees($submission->get_fees());
+        $invoice->set_taxes($submission->get_taxes());
+		$invoice->set_discounts($submission->get_discounts());
+		$invoice->set_gateway($submission->get_field('wpi-gateway'));
+		$invoice->set_currency($submission->get_currency());
+
+		if ($submission->has_shipping()) {
+			$invoice->set_shipping($submission->get_shipping());
 		}
 
-		$address_confirmed = $submission->get_field( 'confirm-address' );
-		$invoice->set_address_confirmed( ! empty( $address_confirmed ) );
+		$address_confirmed = $submission->get_field('confirm-address');
+		$invoice->set_address_confirmed(!empty($address_confirmed));
 
-		if ( $submission->has_discount_code() ) {
-            $invoice->set_discount_code( $submission->get_discount_code() );
+		if ($submission->has_discount_code()) {
+            $invoice->set_discount_code($submission->get_discount_code());
 		}
 
-		getpaid_maybe_add_default_address( $invoice );
+		getpaid_maybe_add_default_address($invoice);
 		return $invoice;
 	}
 
@@ -185,34 +185,34 @@ 
 		$submission = $this->payment_form_submission;
 
 		// If this is an existing invoice...
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			return $submission->get_invoice()->get_user_id();
 		}
 
 		// (Maybe) create the user.
         $user = get_current_user_id();
 
-        if ( empty( $user ) ) {
-            $user = get_user_by( 'email', $submission->get_billing_email() );
+        if (empty($user)) {
+            $user = get_user_by('email', $submission->get_billing_email());
         }
 
-        if ( empty( $user ) ) {
-			$name = array( $submission->get_field( 'wpinv_first_name', 'billing' ), $submission->get_field( 'wpinv_last_name', 'billing' ) );
-			$name = implode( '', array_filter( $name ) );
-            $user = wpinv_create_user( $submission->get_billing_email(), $name );
+        if (empty($user)) {
+			$name = array($submission->get_field('wpinv_first_name', 'billing'), $submission->get_field('wpinv_last_name', 'billing'));
+			$name = implode('', array_filter($name));
+            $user = wpinv_create_user($submission->get_billing_email(), $name);
 
 			// (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 ), $user ) ) {
-				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), $user)) {
+				wp_send_new_user_notifications($user, 'user');
 			}
 		}
 
-        if ( is_wp_error( $user ) ) {
-            wp_send_json_error( $user->get_error_message() );
+        if (is_wp_error($user)) {
+            wp_send_json_error($user->get_error_message());
         }
 
-        if ( is_numeric( $user ) ) {
+        if (is_numeric($user)) {
             return $user;
 		}
 
@@ -236,72 +236,72 @@ 
 		);
 
         // Raw submission details.
-		$data     = $submission->get_data();
+		$data = $submission->get_data();
 
 		// Loop through the submitted details.
-        foreach ( $submission->get_payment_form()->get_elements() as $field ) {
+        foreach ($submission->get_payment_form()->get_elements() as $field) {
 
 			// Skip premade fields.
-            if ( ! empty( $field['premade'] ) ) {
+            if (!empty($field['premade'])) {
                 continue;
             }
 
 			// Ensure address is provided.
-			if ( $field['type'] == 'address' ) {
-                $address_type = isset( $field['address_type'] ) && 'shipping' === $field['address_type'] ? 'shipping' : 'billing';
+			if ($field['type'] == 'address') {
+                $address_type = isset($field['address_type']) && 'shipping' === $field['address_type'] ? 'shipping' : 'billing';
 
-				foreach ( $field['fields'] as $address_field ) {
+				foreach ($field['fields'] as $address_field) {
 
-					if ( ! empty( $address_field['visible'] ) && ! empty( $address_field['required'] ) && '' === trim( $_POST[ $address_type ][ $address_field['name'] ] ) ) {
-						wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
+					if (!empty($address_field['visible']) && !empty($address_field['required']) && '' === trim($_POST[$address_type][$address_field['name']])) {
+						wp_send_json_error(__('Please fill all required fields.', 'invoicing'));
 					}
 			}
 		}
 
             // If it is required and not set, abort.
-            if ( ! $submission->is_required_field_set( $field ) ) {
-                wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
+            if (!$submission->is_required_field_set($field)) {
+                wp_send_json_error(__('Please fill all required fields.', 'invoicing'));
             }
 
             // Handle misc fields.
-            if ( isset( $data[ $field['id'] ] ) ) {
+            if (isset($data[$field['id']])) {
 
 				// Uploads.
-				if ( $field['type'] == 'file_upload' ) {
-					$max_file_num = empty( $field['max_file_num'] ) ? 1 : absint( $field['max_file_num'] );
+				if ($field['type'] == 'file_upload') {
+					$max_file_num = empty($field['max_file_num']) ? 1 : absint($field['max_file_num']);
 
-					if ( count( $data[ $field['id'] ] ) > $max_file_num ) {
-						wp_send_json_error( __( 'Maximum number of allowed files exceeded.', 'invoicing' ) );
+					if (count($data[$field['id']]) > $max_file_num) {
+						wp_send_json_error(__('Maximum number of allowed files exceeded.', 'invoicing'));
 					}
 
 					$value = array();
 
-					foreach ( $data[ $field['id'] ] as $url => $name ) {
+					foreach ($data[$field['id']] as $url => $name) {
 						$value[] = sprintf(
 							'<a href="%s" target="_blank">%s</a>',
-							esc_url_raw( $url ),
-							esc_html( $name )
+							esc_url_raw($url),
+							esc_html($name)
 						);
 					}
 
-					$value = implode( ' | ', $value );
+					$value = implode(' | ', $value);
 
-				} elseif ( $field['type'] == 'checkbox' ) {
-					$value = isset( $data[ $field['id'] ] ) ? __( 'Yes', 'invoicing' ) : __( 'No', 'invoicing' );
+				} elseif ($field['type'] == 'checkbox') {
+					$value = isset($data[$field['id']]) ? __('Yes', 'invoicing') : __('No', 'invoicing');
 				} else {
-					$value = wp_kses_post( $data[ $field['id'] ] );
+					$value = wp_kses_post($data[$field['id']]);
 				}
 
                 $label = $field['id'];
 
-                if ( isset( $field['label'] ) ) {
+                if (isset($field['label'])) {
                     $label = $field['label'];
                 }
 
-				if ( ! empty( $field['add_meta'] ) ) {
-					$prepared['meta'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+				if (!empty($field['add_meta'])) {
+					$prepared['meta'][wpinv_clean($label)] = wp_kses_post_deep($value);
 				}
-				$prepared['all'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+				$prepared['all'][wpinv_clean($label)] = wp_kses_post_deep($value);
 
             }
 }
@@ -317,30 +317,30 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @param string $type
      */
-    public function prepare_address_details( $invoice, $type = 'billing' ) {
+    public function prepare_address_details($invoice, $type = 'billing') {
 
 		$data     = $this->payment_form_submission->get_data();
-		$type     = sanitize_key( $type );
+		$type     = sanitize_key($type);
 		$address  = array();
 		$prepared = array();
 
-		if ( ! empty( $data[ $type ] ) ) {
-			$address = $data[ $type ];
+		if (!empty($data[$type])) {
+			$address = $data[$type];
 		}
 
 		// Clean address details.
-		foreach ( $address as $key => $value ) {
-			$key             = sanitize_key( $key );
-			$key             = str_replace( 'wpinv_', '', $key );
-			$value           = wpinv_clean( $value );
-			$prepared[ $key ] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
+		foreach ($address as $key => $value) {
+			$key             = sanitize_key($key);
+			$key             = str_replace('wpinv_', '', $key);
+			$value           = wpinv_clean($value);
+			$prepared[$key] = apply_filters("getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice);
 		}
 
 		// Filter address details.
-		$prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
+		$prepared = apply_filters("getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice);
 
 		// Remove non-whitelisted values.
-		return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
+		return array_filter($prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY);
 
 	}
 
@@ -350,12 +350,12 @@ 
 	 * @return array
 	 * @param WPInv_Invoice $invoice
      */
-    protected function prepare_billing_info( &$invoice ) {
+    protected function prepare_billing_info(&$invoice) {
 
-		$billing_address = $this->prepare_address_details( $invoice, 'billing' );
+		$billing_address = $this->prepare_address_details($invoice, 'billing');
 
 		// Update the invoice with the billing details.
-		$invoice->set_props( $billing_address );
+		$invoice->set_props($billing_address);
 
 	}
 
@@ -365,15 +365,15 @@ 
 	 * @return array
 	 * @param WPInv_Invoice $invoice
      */
-    protected function prepare_shipping_info( $invoice ) {
+    protected function prepare_shipping_info($invoice) {
 
 		$data = $this->payment_form_submission->get_data();
 
-		if ( empty( $data['same-shipping-address'] ) ) {
-			return $this->prepare_address_details( $invoice, 'shipping' );
+		if (empty($data['same-shipping-address'])) {
+			return $this->prepare_address_details($invoice, 'shipping');
 		}
 
-		return $this->prepare_address_details( $invoice, 'billing' );
+		return $this->prepare_address_details($invoice, 'billing');
 
 	}
 
@@ -384,41 +384,41 @@ 
 	 * @param array $prepared_payment_form_data
 	 * @param array $shipping
 	 */
-	protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
+	protected function post_process_submission($invoice, $prepared_payment_form_data, $shipping) {
 
 		// Ensure the invoice exists.
-        if ( ! $invoice->exists() ) {
-            wp_send_json_error( __( 'An error occured while saving your invoice. Please try again.', 'invoicing' ) );
+        if (!$invoice->exists()) {
+            wp_send_json_error(__('An error occured while saving your invoice. Please try again.', 'invoicing'));
         }
 
 		// Save payment form data.
-		$prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
-        delete_post_meta( $invoice->get_id(), 'payment_form_data' );
-		delete_post_meta( $invoice->get_id(), 'additional_meta_data' );
-		if ( ! empty( $prepared_payment_form_data ) ) {
+		$prepared_payment_form_data = apply_filters('getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice);
+        delete_post_meta($invoice->get_id(), 'payment_form_data');
+		delete_post_meta($invoice->get_id(), 'additional_meta_data');
+		if (!empty($prepared_payment_form_data)) {
 
-			if ( ! empty( $prepared_payment_form_data['all'] ) ) {
-				update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all'] );
+			if (!empty($prepared_payment_form_data['all'])) {
+				update_post_meta($invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all']);
 			}
 
-			if ( ! empty( $prepared_payment_form_data['meta'] ) ) {
-				update_post_meta( $invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta'] );
+			if (!empty($prepared_payment_form_data['meta'])) {
+				update_post_meta($invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta']);
 			}
 }
 
 		// Save payment form data.
-		$shipping = apply_filters( 'getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission );
-        if ( ! empty( $shipping ) ) {
-            update_post_meta( $invoice->get_id(), 'shipping_address', $shipping );
+		$shipping = apply_filters('getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission);
+        if (!empty($shipping)) {
+            update_post_meta($invoice->get_id(), 'shipping_address', $shipping);
 		}
 
 		// Backwards compatibility.
-        add_filter( 'wp_redirect', array( $this, 'send_redirect_response' ) );
+        add_filter('wp_redirect', array($this, 'send_redirect_response'));
 
-		$this->process_payment( $invoice );
+		$this->process_payment($invoice);
 
         // If we are here, there was an error.
-		wpinv_send_back_to_checkout( $invoice );
+		wpinv_send_back_to_checkout($invoice);
 
 	}
 
@@ -427,41 +427,41 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	protected function process_payment( $invoice ) {
+	protected function process_payment($invoice) {
 
 		// Clear any checkout errors.
 		wpinv_clear_errors();
 
 		// No need to send free invoices to the gateway.
-		if ( $invoice->is_free() ) {
-			$this->process_free_payment( $invoice );
+		if ($invoice->is_free()) {
+			$this->process_free_payment($invoice);
 		}
 
 		$submission = $this->payment_form_submission;
 
 		// Fires before sending to the gateway.
-		do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
+		do_action('getpaid_checkout_before_gateway', $invoice, $submission);
 
 		// Allow the sumission data to be modified before it is sent to the gateway.
 		$submission_data    = $submission->get_data();
-		$submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
-		$submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
+		$submission_gateway = apply_filters('getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice);
+		$submission_data    = apply_filters('getpaid_gateway_submission_data', $submission_data, $submission, $invoice);
 
 		// Validate the currency.
-		if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
-			wpinv_set_error( 'invalid_currency', __( 'The chosen payment gateway does not support this currency', 'invoicing' ) );
+		if (!apply_filters("getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency())) {
+			wpinv_set_error('invalid_currency', __('The chosen payment gateway does not support this currency', 'invoicing'));
 		}
 
 		// Check to see if we have any errors.
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
+		if (wpinv_get_errors()) {
+			wpinv_send_back_to_checkout($invoice);
 		}
 
 		// Send info to the gateway for payment processing
-		do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
+		do_action("getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission);
 
 		// Backwards compatibility.
-		wpinv_send_to_gateway( $submission_gateway, $invoice );
+		wpinv_send_to_gateway($submission_gateway, $invoice);
 
 	}
 
@@ -470,12 +470,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	protected function process_free_payment( $invoice ) {
+	protected function process_free_payment($invoice) {
 
-		$invoice->set_gateway( 'none' );
-		$invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
+		$invoice->set_gateway('none');
+		$invoice->add_note(__("This is a free invoice and won't be sent to the payment gateway", 'invoicing'), false, false, true);
 		$invoice->mark_paid();
-		wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+		wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
 	}
 
@@ -483,9 +483,9 @@ 
      * Sends a redrect response to payment details.
      *
      */
-    public function send_redirect_response( $url ) {
-        $url = urlencode( $url );
-        wp_send_json_success( $url );
+    public function send_redirect_response($url) {
+        $url = urlencode($url);
+        wp_send_json_success($url);
     }
 
 }

includes/class-bp-getpaid-component.php

Indentation +132 added lines, -132 removed lines

@@ -17,45 +17,45 @@ 
  */
 class BP_GetPaid_Component extends BP_Component {
 
-	/**
-	 * Start the component setup process.
-	 *
-	 * @since 2.1.5
-	 */
-	public function __construct() {
-		parent::start(
-			'getpaid',
-			'GetPaid',
-			buddypress()->plugin_dir,
-			array(
-				'adminbar_myaccount_order' => 30,
-			)
-		);
-	}
+    /**
+     * Start the component setup process.
+     *
+     * @since 2.1.5
+     */
+    public function __construct() {
+        parent::start(
+            'getpaid',
+            'GetPaid',
+            buddypress()->plugin_dir,
+            array(
+                'adminbar_myaccount_order' => 30,
+            )
+        );
+    }
 
     /**
-	 * Set up component global variables.
-	 *
-	 * @since 2.1.5
-	 *
-	 *
-	 * @param array $args {
-	 *     All values are optional.
-	 *     @type string   $slug                  The component slug. Used to construct certain URLs, such as 'friends' in
-	 *                                           http://example.com/members/joe/friends/. Default: the value of $this->id.
-	 *     @type string   $root_slug             The component root slug. Note that this value is generally unused if the
-	 *                                           component has a root directory (the slug will be overridden by the
-	 *                                           post_name of the directory page). Default: the slug of the directory page
-	 *                                           if one is found, otherwise an empty string.
-	 *     @type bool     $has_directory         Set to true if the component requires an associated WordPress page.
-	 *     @type callable $notification_callback Optional. The callable function that formats the component's notifications.
-	 *     @type string   $search_term           Optional. The placeholder text in the component directory search box. Eg,
-	 *                                           'Search Groups...'.
-	 *     @type array    $global_tables         Optional. An array of database table names.
-	 *     @type array    $meta_tables           Optional. An array of metadata table names.
-	 * }
-	 */
-	public function setup_globals( $args = array() ) {
+     * Set up component global variables.
+     *
+     * @since 2.1.5
+     *
+     *
+     * @param array $args {
+     *     All values are optional.
+     *     @type string   $slug                  The component slug. Used to construct certain URLs, such as 'friends' in
+     *                                           http://example.com/members/joe/friends/. Default: the value of $this->id.
+     *     @type string   $root_slug             The component root slug. Note that this value is generally unused if the
+     *                                           component has a root directory (the slug will be overridden by the
+     *                                           post_name of the directory page). Default: the slug of the directory page
+     *                                           if one is found, otherwise an empty string.
+     *     @type bool     $has_directory         Set to true if the component requires an associated WordPress page.
+     *     @type callable $notification_callback Optional. The callable function that formats the component's notifications.
+     *     @type string   $search_term           Optional. The placeholder text in the component directory search box. Eg,
+     *                                           'Search Groups...'.
+     *     @type array    $global_tables         Optional. An array of database table names.
+     *     @type array    $meta_tables           Optional. An array of metadata table names.
+     * }
+     */
+    public function setup_globals( $args = array() ) {
         parent::setup_globals(
             array(
                 'id'            => 'getpaid',
@@ -64,21 +64,21 @@ 
                 'has_directory' => false,
             )
         );
-	}
-
-	/**
-	 * Set up component navigation.
-	 *
-	 * @since 2.1.5
-	 *
-	 * @see BP_Component::setup_nav() for a description of arguments.
-	 *
-	 * @param array $main_nav Optional. See BP_Component::setup_nav() for description.
-	 * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
-	 */
-	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-		// Abort if the integration is inactive.
+    }
+
+    /**
+     * Set up component navigation.
+     *
+     * @since 2.1.5
+     *
+     * @see BP_Component::setup_nav() for a description of arguments.
+     *
+     * @param array $main_nav Optional. See BP_Component::setup_nav() for description.
+     * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
+     */
+    public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+
+        // Abort if the integration is inactive.
         if ( ! getpaid_is_buddypress_integration_active() || ! is_user_logged_in() ) {
             return;
         }
@@ -88,25 +88,25 @@ 
             return;
         }
 
-		// Determine user to use.
-		$user_domain   = bp_loggedin_user_domain();
-		$slug          = 'getpaid';
-		$payments_link = trailingslashit( $user_domain . $slug );
-
-		// Add 'Payments' to the main navigation.
-		$main_nav = array(
-			'name'                    => _x( 'Billing', 'BuddyPress profile payments screen nav', 'invoicing' ),
-			'slug'                    => $slug,
-			'position'                => apply_filters( 'wpinv_bp_nav_position', wpinv_get_option( 'wpinv_menu_position', 91 ), $slug ),
-			'screen_function'         => array( $this, 'display_current_tab' ),
-			'default_subnav_slug'     => apply_filters( 'getpaid_default_tab', 'gp-edit-address' ),
+        // Determine user to use.
+        $user_domain   = bp_loggedin_user_domain();
+        $slug          = 'getpaid';
+        $payments_link = trailingslashit( $user_domain . $slug );
+
+        // Add 'Payments' to the main navigation.
+        $main_nav = array(
+            'name'                    => _x( 'Billing', 'BuddyPress profile payments screen nav', 'invoicing' ),
+            'slug'                    => $slug,
+            'position'                => apply_filters( 'wpinv_bp_nav_position', wpinv_get_option( 'wpinv_menu_position', 91 ), $slug ),
+            'screen_function'         => array( $this, 'display_current_tab' ),
+            'default_subnav_slug'     => apply_filters( 'getpaid_default_tab', 'gp-edit-address' ),
             'show_for_displayed_user' => false,
-			'item_css_id'             => $this->id,
-			'parent_url'              => $user_domain,
-			'parent_slug'             => buddypress()->slug,
-		);
+            'item_css_id'             => $this->id,
+            'parent_url'              => $user_domain,
+            'parent_slug'             => buddypress()->slug,
+        );
 
-		// Add the subnav items to the payments nav item if we are using a theme that supports this.
+        // Add the subnav items to the payments nav item if we are using a theme that supports this.
         foreach ( getpaid_get_user_content_tabs() as $_slug => $tab ) {
 
             $sub_nav[] = array(
@@ -116,8 +116,8 @@ 
                 'parent_slug'             => $slug,
                 'position'                => 10,
                 'screen_function'         => function() use ( $tab ) {
-					$GLOBALS['getpaid_bp_current_tab'] = $tab;
-					$this->display_current_tab();
+                    $GLOBALS['getpaid_bp_current_tab'] = $tab;
+                    $this->display_current_tab();
                 },
                 'show_for_displayed_user' => false,
                 'item_css_id'             => "getpaid-bp-$_slug",
@@ -125,27 +125,27 @@ 
 
         }
 
-		parent::setup_nav( $main_nav, $sub_nav );
-	}
-
-	/**
-	 * Set up the component entries in the WordPress Admin Bar.
-	 *
-	 * @since 2.1.5
-	 *
-	 * @see BP_Component::setup_nav() for a description of the $wp_admin_nav
-	 *      parameter array.
-	 *
-	 * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
-	 *                            description.
-	 */
-	public function setup_admin_bar( $wp_admin_nav = array() ) {
+        parent::setup_nav( $main_nav, $sub_nav );
+    }
 
-		// Menus for logged in user.
-		if ( is_user_logged_in() ) {
-
-			// Setup the logged in user variables.
-			$payments_link = trailingslashit( bp_loggedin_user_domain() . 'getpaid/' );
+    /**
+     * Set up the component entries in the WordPress Admin Bar.
+     *
+     * @since 2.1.5
+     *
+     * @see BP_Component::setup_nav() for a description of the $wp_admin_nav
+     *      parameter array.
+     *
+     * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
+     *                            description.
+     */
+    public function setup_admin_bar( $wp_admin_nav = array() ) {
+
+        // Menus for logged in user.
+        if ( is_user_logged_in() ) {
+
+            // Setup the logged in user variables.
+            $payments_link = trailingslashit( bp_loggedin_user_domain() . 'getpaid/' );
 
             // Add the "Payments" sub menu.
             $wp_admin_nav[] = array(
@@ -168,48 +168,48 @@ 
             }
 }
 
-		parent::setup_admin_bar( $wp_admin_nav );
-	}
-
-	/**
-	 * Retrieves the current tab.
-	 *
-	 * @since 2.1.5
-	 */
-	public function get_current_tab() {
-		global $getpaid_bp_current_tab;
-
-		if ( empty( $getpaid_bp_current_tab ) ) {
-			return array(
-				'label'   => __( 'Invoices', 'invoicing' ),
-				'content' => '[wpinv_history]',
-				'icon'    => 'fas fa-file-invoice',
-			);
-		}
-
-		return $getpaid_bp_current_tab;
-	}
-
-	/**
-	 * Displays the current tab.
-	 *
-	 * @since 2.1.5
-	 */
-	public function display_current_tab() {
-
-		add_action( 'bp_template_content', array( $this, 'handle_display_current_tab' ) );
-		$template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
+        parent::setup_admin_bar( $wp_admin_nav );
+    }
+
+    /**
+     * Retrieves the current tab.
+     *
+     * @since 2.1.5
+     */
+    public function get_current_tab() {
+        global $getpaid_bp_current_tab;
+
+        if ( empty( $getpaid_bp_current_tab ) ) {
+            return array(
+                'label'   => __( 'Invoices', 'invoicing' ),
+                'content' => '[wpinv_history]',
+                'icon'    => 'fas fa-file-invoice',
+            );
+        }
+
+        return $getpaid_bp_current_tab;
+    }
+
+    /**
+     * Displays the current tab.
+     *
+     * @since 2.1.5
+     */
+    public function display_current_tab() {
+
+        add_action( 'bp_template_content', array( $this, 'handle_display_current_tab' ) );
+        $template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
 
         bp_core_load_template( apply_filters( 'wpinv_bp_core_template_plugin', $template ) );
-	}
-
-	/**
-	 * Handles the actual display of the current tab.
-	 *
-	 * @since 2.1.5
-	 */
-	public function handle_display_current_tab() {
-		echo getpaid_prepare_user_content_tab( $this->get_current_tab() );
-	}
+    }
+
+    /**
+     * Handles the actual display of the current tab.
+     *
+     * @since 2.1.5
+     */
+    public function handle_display_current_tab() {
+        echo getpaid_prepare_user_content_tab( $this->get_current_tab() );
+    }
 
 }

Spacing +27 added lines, -27 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 // Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main GetPaid Class.
@@ -55,7 +55,7 @@ 
 	 *     @type array    $meta_tables           Optional. An array of metadata table names.
 	 * }
 	 */
-	public function setup_globals( $args = array() ) {
+	public function setup_globals($args = array()) {
         parent::setup_globals(
             array(
                 'id'            => 'getpaid',
@@ -76,30 +76,30 @@ 
 	 * @param array $main_nav Optional. See BP_Component::setup_nav() for description.
 	 * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
 	 */
-	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+	public function setup_nav($main_nav = array(), $sub_nav = array()) {
 
 		// Abort if the integration is inactive.
-        if ( ! getpaid_is_buddypress_integration_active() || ! is_user_logged_in() ) {
+        if (!getpaid_is_buddypress_integration_active() || !is_user_logged_in()) {
             return;
         }
 
         // Or a user is not viewing their profile.
-        if ( bp_displayed_user_id() !== bp_loggedin_user_id() ) {
+        if (bp_displayed_user_id() !== bp_loggedin_user_id()) {
             return;
         }
 
 		// Determine user to use.
 		$user_domain   = bp_loggedin_user_domain();
 		$slug          = 'getpaid';
-		$payments_link = trailingslashit( $user_domain . $slug );
+		$payments_link = trailingslashit($user_domain . $slug);
 
 		// Add 'Payments' to the main navigation.
 		$main_nav = array(
-			'name'                    => _x( 'Billing', 'BuddyPress profile payments screen nav', 'invoicing' ),
+			'name'                    => _x('Billing', 'BuddyPress profile payments screen nav', 'invoicing'),
 			'slug'                    => $slug,
-			'position'                => apply_filters( 'wpinv_bp_nav_position', wpinv_get_option( 'wpinv_menu_position', 91 ), $slug ),
-			'screen_function'         => array( $this, 'display_current_tab' ),
-			'default_subnav_slug'     => apply_filters( 'getpaid_default_tab', 'gp-edit-address' ),
+			'position'                => apply_filters('wpinv_bp_nav_position', wpinv_get_option('wpinv_menu_position', 91), $slug),
+			'screen_function'         => array($this, 'display_current_tab'),
+			'default_subnav_slug'     => apply_filters('getpaid_default_tab', 'gp-edit-address'),
             'show_for_displayed_user' => false,
 			'item_css_id'             => $this->id,
 			'parent_url'              => $user_domain,
@@ -107,7 +107,7 @@ 
 		);
 
 		// Add the subnav items to the payments nav item if we are using a theme that supports this.
-        foreach ( getpaid_get_user_content_tabs() as $_slug => $tab ) {
+        foreach (getpaid_get_user_content_tabs() as $_slug => $tab) {
 
             $sub_nav[] = array(
                 'name'                    => $tab['label'],
@@ -115,7 +115,7 @@ 
                 'parent_url'              => $payments_link,
                 'parent_slug'             => $slug,
                 'position'                => 10,
-                'screen_function'         => function() use ( $tab ) {
+                'screen_function'         => function() use ($tab) {
 					$GLOBALS['getpaid_bp_current_tab'] = $tab;
 					$this->display_current_tab();
                 },
@@ -125,7 +125,7 @@ 
 
         }
 
-		parent::setup_nav( $main_nav, $sub_nav );
+		parent::setup_nav($main_nav, $sub_nav);
 	}
 
 	/**
@@ -139,36 +139,36 @@ 
 	 * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
 	 *                            description.
 	 */
-	public function setup_admin_bar( $wp_admin_nav = array() ) {
+	public function setup_admin_bar($wp_admin_nav = array()) {
 
 		// Menus for logged in user.
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 
 			// Setup the logged in user variables.
-			$payments_link = trailingslashit( bp_loggedin_user_domain() . 'getpaid/' );
+			$payments_link = trailingslashit(bp_loggedin_user_domain() . 'getpaid/');
 
             // Add the "Payments" sub menu.
             $wp_admin_nav[] = array(
                 'parent' => buddypress()->my_account_menu_id,
                 'id'     => 'my-account-getpaid',
-                'title'  => _x( 'Billing', 'BuddyPress my account payments sub nav', 'invoicing' ),
-                'href'   => $payments_link . apply_filters( 'getpaid_default_tab', 'gp-edit-address' ),
+                'title'  => _x('Billing', 'BuddyPress my account payments sub nav', 'invoicing'),
+                'href'   => $payments_link . apply_filters('getpaid_default_tab', 'gp-edit-address'),
             );
 
-            foreach ( getpaid_get_user_content_tabs() as $slug => $tab ) {
+            foreach (getpaid_get_user_content_tabs() as $slug => $tab) {
 
                 $wp_admin_nav[] = array(
                     'parent'   => 'my-account-getpaid',
                     'id'       => 'my-account-getpaid' . $slug,
                     'title'    => $tab['label'],
-                    'href'     => trailingslashit( $payments_link . $slug ),
+                    'href'     => trailingslashit($payments_link . $slug),
                     'position' => 20,
                 );
 
             }
 }
 
-		parent::setup_admin_bar( $wp_admin_nav );
+		parent::setup_admin_bar($wp_admin_nav);
 	}
 
 	/**
@@ -179,9 +179,9 @@ 
 	public function get_current_tab() {
 		global $getpaid_bp_current_tab;
 
-		if ( empty( $getpaid_bp_current_tab ) ) {
+		if (empty($getpaid_bp_current_tab)) {
 			return array(
-				'label'   => __( 'Invoices', 'invoicing' ),
+				'label'   => __('Invoices', 'invoicing'),
 				'content' => '[wpinv_history]',
 				'icon'    => 'fas fa-file-invoice',
 			);
@@ -197,10 +197,10 @@ 
 	 */
 	public function display_current_tab() {
 
-		add_action( 'bp_template_content', array( $this, 'handle_display_current_tab' ) );
-		$template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
+		add_action('bp_template_content', array($this, 'handle_display_current_tab'));
+		$template = apply_filters('bp_core_template_plugin', 'members/single/plugins');
 
-        bp_core_load_template( apply_filters( 'wpinv_bp_core_template_plugin', $template ) );
+        bp_core_load_template(apply_filters('wpinv_bp_core_template_plugin', $template));
 	}
 
 	/**
@@ -209,7 +209,7 @@ 
 	 * @since 2.1.5
 	 */
 	public function handle_display_current_tab() {
-		echo getpaid_prepare_user_content_tab( $this->get_current_tab() );
+		echo getpaid_prepare_user_content_tab($this->get_current_tab());
 	}
 
 }

templates/payment-forms/cart-item.php

Indentation +126 added lines, -126 removed lines

@@ -26,71 +26,71 @@ 
 
 				<?php
 
-					// Fires before printing a line item column.
-					do_action( "getpaid_form_cart_item_before_$key", $item, $form );
+                    // Fires before printing a line item column.
+                    do_action( "getpaid_form_cart_item_before_$key", $item, $form );
 
-					// Item name.
-					if ( 'name' === $key ) {
+                    // Item name.
+                    if ( 'name' === $key ) {
 
 
-						ob_start();
+                        ob_start();
 
-						// Add an optional description.
-						$description = $item->get_description();
+                        // Add an optional description.
+                        $description = $item->get_description();
 
-						if ( ! empty( $description ) ) {
-							echo "<small class='form-text text-muted pr-2 m-0'>" . wp_kses_post( $description ) . '</small>';
-						}
+                        if ( ! empty( $description ) ) {
+                            echo "<small class='form-text text-muted pr-2 m-0'>" . wp_kses_post( $description ) . '</small>';
+                        }
 
-						// Price help text.
-						$description = getpaid_item_recurring_price_help_text( $item, $currency );
-						if ( $description ) {
-							echo "<small class='getpaid-form-item-price-desc form-text text-muted font-italic pr-2 m-0'>" . wp_kses_post( $description ) . '</small>';
-						}
+                        // Price help text.
+                        $description = getpaid_item_recurring_price_help_text( $item, $currency );
+                        if ( $description ) {
+                            echo "<small class='getpaid-form-item-price-desc form-text text-muted font-italic pr-2 m-0'>" . wp_kses_post( $description ) . '</small>';
+                        }
 
-						do_action( 'getpaid_payment_form_cart_item_description', $item, $form );
+                        do_action( 'getpaid_payment_form_cart_item_description', $item, $form );
 
-						if ( wpinv_current_user_can_manage_invoicing() ) {
+                        if ( wpinv_current_user_can_manage_invoicing() ) {
 
-							edit_post_link(
-								__( 'Edit this item.', 'invoicing' ),
-								'<small class="form-text text-muted">',
-								'</small>',
-								$item->get_id(),
-								'text-danger'
-							);
+                            edit_post_link(
+                                __( 'Edit this item.', 'invoicing' ),
+                                '<small class="form-text text-muted">',
+                                '</small>',
+                                $item->get_id(),
+                                'text-danger'
+                            );
 
-						}
+                        }
 
-						$description = ob_get_clean();
+                        $description = ob_get_clean();
 
-						// Display the name.
-						$tootip = empty( $description ) ? '' : '&nbsp;<i class="fas fa-xs fa-info gp-tooltip d-sm-none text-muted"></i>';
+                        // Display the name.
+                        $tootip = empty( $description ) ? '' : '&nbsp;<i class="fas fa-xs fa-info gp-tooltip d-sm-none text-muted"></i>';
 
-						$has_featured_image = has_post_thumbnail( $item->get_id() );
+                        $has_featured_image = has_post_thumbnail( $item->get_id() );
 
-						if ( $has_featured_image ) {
-							echo '<div class="d-flex align-items-center getpaid-form-item-has-featured-image">';
-							echo '<div class="getpaid-form-item-image-container mr-2">';
-							echo get_the_post_thumbnail( $item->get_id(), 'thumbnail', array( 'class' => 'getpaid-form-item-image mb-0' ) );
-							echo '</div>';
-							echo '<div class="getpaid-form-item-name-container">';
-						}
+                        if ( $has_featured_image ) {
+                            echo '<div class="d-flex align-items-center getpaid-form-item-has-featured-image">';
+                            echo '<div class="getpaid-form-item-image-container mr-2">';
+                            echo get_the_post_thumbnail( $item->get_id(), 'thumbnail', array( 'class' => 'getpaid-form-item-image mb-0' ) );
+                            echo '</div>';
+                            echo '<div class="getpaid-form-item-name-container">';
+                        }
 
-						echo '<div class="mb-1 font-weight-bold">' . esc_html( $item->get_name() ) . wp_kses_post( $tootip ) . '</div>';
+                        echo '<div class="mb-1 font-weight-bold">' . esc_html( $item->get_name() ) . wp_kses_post( $tootip ) . '</div>';
 
-						if ( ! empty( $description ) ) {
-							printf( '<span class="d-none d-sm-block getpaid-item-desc">%s</span>', wp_kses_post( $description ) );
-						}
+                        if ( ! empty( $description ) ) {
+                            printf( '<span class="d-none d-sm-block getpaid-item-desc">%s</span>', wp_kses_post( $description ) );
+                        }
 
-						if ( $item->allows_quantities() ) {
-							printf(
-								'<small class="d-sm-none text-muted form-text">%s</small>',
-								sprintf(
-									// translators: %s is the item quantity.
-									esc_html__( 'Qty %s', 'invoicing' ),
-									sprintf(
-										'<input
+                        if ( $item->allows_quantities() ) {
+                            printf(
+                                '<small class="d-sm-none text-muted form-text">%s</small>',
+                                sprintf(
+                                    // translators: %s is the item quantity.
+                                    esc_html__( 'Qty %s', 'invoicing' ),
+                                    sprintf(
+                                        '<input
 												type="number"
 												step="0.01"
 												style="width: 48px;"
@@ -99,62 +99,62 @@ 
 												min="1"
 												max="%s"
 												>',
-										(float) $item->get_quantity() == 0 ? 1 : (float) $item->get_quantity(),
-										floatval( null !== $max_qty ? $max_qty : 1000000000000 )
-									)
-								)
-							);
-						} else {
-							printf(
-								'<small class="d-sm-none text-muted form-text">%s</small>',
-								sprintf(
-									// translators: %s is the item quantity.
-									esc_html__( 'Qty %s', 'invoicing' ),
-									(float) $item->get_quantity()
-								)
-							);
-						}
-
-						if ( $has_featured_image ) {
-							echo '</div>';
-							echo '</div>';
-						}
-					}
-
-					// Item price.
-					if ( 'price' === $key ) {
-
-					// Set the currency position.
-					$position = wpinv_currency_position();
-
-					if ( 'left_space' === $position ) {
-						$position = 'left';
-					}
-
-					if ( 'right_space' === $position ) {
-						$position = 'right';
-					}
-
-					if ( $item->user_can_set_their_price() ) {
-						$price            = max( (float) $item->get_price(), (float) $item->get_minimum_price() );
-						$minimum          = (float) $item->get_minimum_price();
-						$validate_minimum = '';
-						$class            = '';
-						$data_minimum     = '';
-
-						if ( $minimum > 0 ) {
-							$validate_minimum = sprintf(
-								// translators: %s is the minimum price.
-								esc_attr__( 'The minimum allowed amount is %s', 'invoicing' ),
-								wp_strip_all_tags( wpinv_price( $minimum, $currency ) )
-							);
-
-							$class = 'getpaid-validate-minimum-amount';
-
-							$data_minimum     = "data-minimum-amount='" . esc_attr( getpaid_unstandardize_amount( $minimum ) ) . "'";
-						}
-
-						?>
+                                        (float) $item->get_quantity() == 0 ? 1 : (float) $item->get_quantity(),
+                                        floatval( null !== $max_qty ? $max_qty : 1000000000000 )
+                                    )
+                                )
+                            );
+                        } else {
+                            printf(
+                                '<small class="d-sm-none text-muted form-text">%s</small>',
+                                sprintf(
+                                    // translators: %s is the item quantity.
+                                    esc_html__( 'Qty %s', 'invoicing' ),
+                                    (float) $item->get_quantity()
+                                )
+                            );
+                        }
+
+                        if ( $has_featured_image ) {
+                            echo '</div>';
+                            echo '</div>';
+                        }
+                    }
+
+                    // Item price.
+                    if ( 'price' === $key ) {
+
+                    // Set the currency position.
+                    $position = wpinv_currency_position();
+
+                    if ( 'left_space' === $position ) {
+                        $position = 'left';
+                    }
+
+                    if ( 'right_space' === $position ) {
+                        $position = 'right';
+                    }
+
+                    if ( $item->user_can_set_their_price() ) {
+                        $price            = max( (float) $item->get_price(), (float) $item->get_minimum_price() );
+                        $minimum          = (float) $item->get_minimum_price();
+                        $validate_minimum = '';
+                        $class            = '';
+                        $data_minimum     = '';
+
+                        if ( $minimum > 0 ) {
+                            $validate_minimum = sprintf(
+                                // translators: %s is the minimum price.
+                                esc_attr__( 'The minimum allowed amount is %s', 'invoicing' ),
+                                wp_strip_all_tags( wpinv_price( $minimum, $currency ) )
+                            );
+
+                            $class = 'getpaid-validate-minimum-amount';
+
+                            $data_minimum     = "data-minimum-amount='" . esc_attr( getpaid_unstandardize_amount( $minimum ) ) . "'";
+                        }
+
+                        ?>
 								<div class="input-group input-group-sm">
 								<?php if ( 'left' === $position ) : ?>
 										<div class="input-group-prepend">
@@ -179,44 +179,44 @@ 
 
 							<?php
 
-						} else {
-						echo wp_kses_post( wpinv_price( $item->get_price(), $currency ) );
+                        } else {
+                        echo wp_kses_post( wpinv_price( $item->get_price(), $currency ) );
 
-						?>
+                        ?>
 								<input name='getpaid-items[<?php echo (int) $item->get_id(); ?>][price]' type='hidden' class='getpaid-item-price-input' value='<?php echo esc_attr( $item->get_price() ); ?>'>
 						<?php
-						}
+                        }
 
-					printf(
+                    printf(
                         '<small class="d-sm-none text-muted form-text getpaid-mobile-item-subtotal">%s</small>',
-						// translators: %s is the item subtotal.
+                        // translators: %s is the item subtotal.
                         sprintf( esc_html__( 'Subtotal: %s', 'invoicing' ), wp_kses_post( wpinv_price( $item->get_sub_total(), $currency ) ) )
                     );
-					}
+                    }
 
-					// Item quantity.
-					if ( 'quantity' === $key ) {
+                    // Item quantity.
+                    if ( 'quantity' === $key ) {
 
-					if ( $item->allows_quantities() ) {
-						?>
+                    if ( $item->allows_quantities() ) {
+                        ?>
 								<input name='getpaid-items[<?php echo (int) $item->get_id(); ?>][quantity]' type="number" step="any" style='width: 64px; line-height: 1; min-height: 35px;' class='getpaid-item-quantity-input p-1 align-middle font-weight-normal shadow-none m-0 rounded-0 text-center border' value='<?php echo (float) $item->get_quantity() == 0 ? 1 : (float) $item->get_quantity(); ?>' min='1' <?php echo null !== $max_qty ? 'max="' . (float) $max_qty . '"' : ''; ?> required>
 							<?php
-						} else {
-						echo (float) $item->get_quantity();
-						echo '&nbsp;&nbsp;&nbsp;';
-						?>
+                        } else {
+                        echo (float) $item->get_quantity();
+                        echo '&nbsp;&nbsp;&nbsp;';
+                        ?>
 								<input type='hidden' name='getpaid-items[<?php echo (int) $item->get_id(); ?>][quantity]' class='getpaid-item-quantity-input' value='<?php echo (float) $item->get_quantity(); ?>'>
 						<?php
-						}
+                        }
 }
 
-					// Item sub total.
-					if ( 'subtotal' === $key ) {
-					echo wp_kses_post( wpinv_price( $item->get_sub_total(), $currency ) );
-					}
+                    // Item sub total.
+                    if ( 'subtotal' === $key ) {
+                    echo wp_kses_post( wpinv_price( $item->get_sub_total(), $currency ) );
+                    }
 
-					do_action( "getpaid_payment_form_cart_item_$key", $item, $form );
-				?>
+                    do_action( "getpaid_payment_form_cart_item_$key", $item, $form );
+                ?>
 
 			</div>
 

Spacing +52 added lines, -52 removed lines

@@ -9,28 +9,28 @@ 
  * @var GetPaid_Form_Item $item
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-do_action( 'getpaid_before_payment_form_cart_item', $form, $item );
+do_action('getpaid_before_payment_form_cart_item', $form, $item);
 
 $currency = $form->get_currency();
-$max_qty  = wpinv_item_max_buyable_quantity( $item->get_id() );
+$max_qty  = wpinv_item_max_buyable_quantity($item->get_id());
 ?>
 <div class='getpaid-payment-form-items-cart-item getpaid-<?php echo $item->is_required() ? 'required' : 'selectable'; ?> item-<?php echo (int) $item->get_id(); ?> border-bottom py-2 px-3'>
 
 	<div class="form-row align-items-center needs-validation">
 
-		<?php foreach ( array_keys( $columns ) as $key ) : ?>
+		<?php foreach (array_keys($columns) as $key) : ?>
 
-			<div class="<?php echo 'name' === $key ? 'col-6' : 'col'; ?> <?php echo ( in_array( $key, array( 'subtotal', 'quantity', 'tax_rate' ), true ) ) ? 'd-none d-sm-block' : ''; ?> position-relative getpaid-form-cart-item-<?php echo esc_attr( $key ); ?> getpaid-form-cart-item-<?php echo esc_attr( $key ); ?>-<?php echo (int) $item->get_id(); ?>">
+			<div class="<?php echo 'name' === $key ? 'col-6' : 'col'; ?> <?php echo (in_array($key, array('subtotal', 'quantity', 'tax_rate'), true)) ? 'd-none d-sm-block' : ''; ?> position-relative getpaid-form-cart-item-<?php echo esc_attr($key); ?> getpaid-form-cart-item-<?php echo esc_attr($key); ?>-<?php echo (int) $item->get_id(); ?>">
 
 				<?php
 
 					// Fires before printing a line item column.
-					do_action( "getpaid_form_cart_item_before_$key", $item, $form );
+					do_action("getpaid_form_cart_item_before_$key", $item, $form);
 
 					// Item name.
-					if ( 'name' === $key ) {
+					if ('name' === $key) {
 
 
 						ob_start();
@@ -38,22 +38,22 @@ 
 						// Add an optional description.
 						$description = $item->get_description();
 
-						if ( ! empty( $description ) ) {
-							echo "<small class='form-text text-muted pr-2 m-0'>" . wp_kses_post( $description ) . '</small>';
+						if (!empty($description)) {
+							echo "<small class='form-text text-muted pr-2 m-0'>" . wp_kses_post($description) . '</small>';
 						}
 
 						// Price help text.
-						$description = getpaid_item_recurring_price_help_text( $item, $currency );
-						if ( $description ) {
-							echo "<small class='getpaid-form-item-price-desc form-text text-muted font-italic pr-2 m-0'>" . wp_kses_post( $description ) . '</small>';
+						$description = getpaid_item_recurring_price_help_text($item, $currency);
+						if ($description) {
+							echo "<small class='getpaid-form-item-price-desc form-text text-muted font-italic pr-2 m-0'>" . wp_kses_post($description) . '</small>';
 						}
 
-						do_action( 'getpaid_payment_form_cart_item_description', $item, $form );
+						do_action('getpaid_payment_form_cart_item_description', $item, $form);
 
-						if ( wpinv_current_user_can_manage_invoicing() ) {
+						if (wpinv_current_user_can_manage_invoicing()) {
 
 							edit_post_link(
-								__( 'Edit this item.', 'invoicing' ),
+								__('Edit this item.', 'invoicing'),
 								'<small class="form-text text-muted">',
 								'</small>',
 								$item->get_id(),
@@ -65,30 +65,30 @@ 
 						$description = ob_get_clean();
 
 						// Display the name.
-						$tootip = empty( $description ) ? '' : '&nbsp;<i class="fas fa-xs fa-info gp-tooltip d-sm-none text-muted"></i>';
+						$tootip = empty($description) ? '' : '&nbsp;<i class="fas fa-xs fa-info gp-tooltip d-sm-none text-muted"></i>';
 
-						$has_featured_image = has_post_thumbnail( $item->get_id() );
+						$has_featured_image = has_post_thumbnail($item->get_id());
 
-						if ( $has_featured_image ) {
+						if ($has_featured_image) {
 							echo '<div class="d-flex align-items-center getpaid-form-item-has-featured-image">';
 							echo '<div class="getpaid-form-item-image-container mr-2">';
-							echo get_the_post_thumbnail( $item->get_id(), 'thumbnail', array( 'class' => 'getpaid-form-item-image mb-0' ) );
+							echo get_the_post_thumbnail($item->get_id(), 'thumbnail', array('class' => 'getpaid-form-item-image mb-0'));
 							echo '</div>';
 							echo '<div class="getpaid-form-item-name-container">';
 						}
 
-						echo '<div class="mb-1 font-weight-bold">' . esc_html( $item->get_name() ) . wp_kses_post( $tootip ) . '</div>';
+						echo '<div class="mb-1 font-weight-bold">' . esc_html($item->get_name()) . wp_kses_post($tootip) . '</div>';
 
-						if ( ! empty( $description ) ) {
-							printf( '<span class="d-none d-sm-block getpaid-item-desc">%s</span>', wp_kses_post( $description ) );
+						if (!empty($description)) {
+							printf('<span class="d-none d-sm-block getpaid-item-desc">%s</span>', wp_kses_post($description));
 						}
 
-						if ( $item->allows_quantities() ) {
+						if ($item->allows_quantities()) {
 							printf(
 								'<small class="d-sm-none text-muted form-text">%s</small>',
 								sprintf(
 									// translators: %s is the item quantity.
-									esc_html__( 'Qty %s', 'invoicing' ),
+									esc_html__('Qty %s', 'invoicing'),
 									sprintf(
 										'<input
 												type="number"
@@ -100,7 +100,7 @@ 
 												max="%s"
 												>',
 										(float) $item->get_quantity() == 0 ? 1 : (float) $item->get_quantity(),
-										floatval( null !== $max_qty ? $max_qty : 1000000000000 )
+										floatval(null !== $max_qty ? $max_qty : 1000000000000)
 									)
 								)
 							);
@@ -109,70 +109,70 @@ 
 								'<small class="d-sm-none text-muted form-text">%s</small>',
 								sprintf(
 									// translators: %s is the item quantity.
-									esc_html__( 'Qty %s', 'invoicing' ),
+									esc_html__('Qty %s', 'invoicing'),
 									(float) $item->get_quantity()
 								)
 							);
 						}
 
-						if ( $has_featured_image ) {
+						if ($has_featured_image) {
 							echo '</div>';
 							echo '</div>';
 						}
 					}
 
 					// Item price.
-					if ( 'price' === $key ) {
+					if ('price' === $key) {
 
 					// Set the currency position.
 					$position = wpinv_currency_position();
 
-					if ( 'left_space' === $position ) {
+					if ('left_space' === $position) {
 						$position = 'left';
 					}
 
-					if ( 'right_space' === $position ) {
+					if ('right_space' === $position) {
 						$position = 'right';
 					}
 
-					if ( $item->user_can_set_their_price() ) {
-						$price            = max( (float) $item->get_price(), (float) $item->get_minimum_price() );
+					if ($item->user_can_set_their_price()) {
+						$price            = max((float) $item->get_price(), (float) $item->get_minimum_price());
 						$minimum          = (float) $item->get_minimum_price();
 						$validate_minimum = '';
 						$class            = '';
 						$data_minimum     = '';
 
-						if ( $minimum > 0 ) {
+						if ($minimum > 0) {
 							$validate_minimum = sprintf(
 								// translators: %s is the minimum price.
-								esc_attr__( 'The minimum allowed amount is %s', 'invoicing' ),
-								wp_strip_all_tags( wpinv_price( $minimum, $currency ) )
+								esc_attr__('The minimum allowed amount is %s', 'invoicing'),
+								wp_strip_all_tags(wpinv_price($minimum, $currency))
 							);
 
 							$class = 'getpaid-validate-minimum-amount';
 
-							$data_minimum     = "data-minimum-amount='" . esc_attr( getpaid_unstandardize_amount( $minimum ) ) . "'";
+							$data_minimum = "data-minimum-amount='" . esc_attr(getpaid_unstandardize_amount($minimum)) . "'";
 						}
 
 						?>
 								<div class="input-group input-group-sm">
-								<?php if ( 'left' === $position ) : ?>
+								<?php if ('left' === $position) : ?>
 										<div class="input-group-prepend">
-											<span class="input-group-text"><?php echo wp_kses_post( wpinv_currency_symbol( $currency ) ); ?></span>
+											<span class="input-group-text"><?php echo wp_kses_post(wpinv_currency_symbol($currency)); ?></span>
 										</div>
 									<?php endif; ?>
 
-									<input type="text" <?php echo wp_kses_post( $data_minimum ); ?> name="getpaid-items[<?php echo (int) $item->get_id(); ?>][price]" value="<?php echo esc_attr( getpaid_unstandardize_amount( $price ) ); ?>" placeholder="<?php echo esc_attr( getpaid_unstandardize_amount( $item->get_minimum_price() ) ); ?>" class="getpaid-item-price-input p-1 align-middle font-weight-normal shadow-none m-0 rounded-0 text-center border <?php echo esc_attr( $class ); ?>" style="width: 64px; line-height: 1; min-height: 35px;">
+									<input type="text" <?php echo wp_kses_post($data_minimum); ?> name="getpaid-items[<?php echo (int) $item->get_id(); ?>][price]" value="<?php echo esc_attr(getpaid_unstandardize_amount($price)); ?>" placeholder="<?php echo esc_attr(getpaid_unstandardize_amount($item->get_minimum_price())); ?>" class="getpaid-item-price-input p-1 align-middle font-weight-normal shadow-none m-0 rounded-0 text-center border <?php echo esc_attr($class); ?>" style="width: 64px; line-height: 1; min-height: 35px;">
 
-								<?php if ( ! empty( $validate_minimum ) ) : ?>
+								<?php if (!empty($validate_minimum)) : ?>
 										<div class="invalid-tooltip">
-											<?php echo wp_kses_post( $validate_minimum ); ?>
+											<?php echo wp_kses_post($validate_minimum); ?>
 										</div>
 									<?php endif; ?>
 
-								<?php if ( 'left' !== $position ) : ?>
+								<?php if ('left' !== $position) : ?>
 										<div class="input-group-append">
-											<span class="input-group-text"><?php echo wp_kses_post( wpinv_currency_symbol( $currency ) ); ?></span>
+											<span class="input-group-text"><?php echo wp_kses_post(wpinv_currency_symbol($currency)); ?></span>
 										</div>
 									<?php endif; ?>
 								</div>
@@ -180,24 +180,24 @@ 
 							<?php
 
 						} else {
-						echo wp_kses_post( wpinv_price( $item->get_price(), $currency ) );
+						echo wp_kses_post(wpinv_price($item->get_price(), $currency));
 
 						?>
-								<input name='getpaid-items[<?php echo (int) $item->get_id(); ?>][price]' type='hidden' class='getpaid-item-price-input' value='<?php echo esc_attr( $item->get_price() ); ?>'>
+								<input name='getpaid-items[<?php echo (int) $item->get_id(); ?>][price]' type='hidden' class='getpaid-item-price-input' value='<?php echo esc_attr($item->get_price()); ?>'>
 						<?php
 						}
 
 					printf(
                         '<small class="d-sm-none text-muted form-text getpaid-mobile-item-subtotal">%s</small>',
 						// translators: %s is the item subtotal.
-                        sprintf( esc_html__( 'Subtotal: %s', 'invoicing' ), wp_kses_post( wpinv_price( $item->get_sub_total(), $currency ) ) )
+                        sprintf(esc_html__('Subtotal: %s', 'invoicing'), wp_kses_post(wpinv_price($item->get_sub_total(), $currency)))
                     );
 					}
 
 					// Item quantity.
-					if ( 'quantity' === $key ) {
+					if ('quantity' === $key) {
 
-					if ( $item->allows_quantities() ) {
+					if ($item->allows_quantities()) {
 						?>
 								<input name='getpaid-items[<?php echo (int) $item->get_id(); ?>][quantity]' type="number" step="any" style='width: 64px; line-height: 1; min-height: 35px;' class='getpaid-item-quantity-input p-1 align-middle font-weight-normal shadow-none m-0 rounded-0 text-center border' value='<?php echo (float) $item->get_quantity() == 0 ? 1 : (float) $item->get_quantity(); ?>' min='1' <?php echo null !== $max_qty ? 'max="' . (float) $max_qty . '"' : ''; ?> required>
 							<?php
@@ -211,11 +211,11 @@ 
 }
 
 					// Item sub total.
-					if ( 'subtotal' === $key ) {
-					echo wp_kses_post( wpinv_price( $item->get_sub_total(), $currency ) );
+					if ('subtotal' === $key) {
+					echo wp_kses_post(wpinv_price($item->get_sub_total(), $currency));
 					}
 
-					do_action( "getpaid_payment_form_cart_item_$key", $item, $form );
+					do_action("getpaid_payment_form_cart_item_$key", $item, $form);
 				?>
 
 			</div>
@@ -226,4 +226,4 @@ 
 
 </div>
 <?php
-do_action( 'getpaid_payment_form_cart_item', $form, $item );
+do_action('getpaid_payment_form_cart_item', $form, $item);

includes/gateways/class-getpaid-payment-gateway.php

Indentation +613 added lines, -613 removed lines

@@ -13,462 +13,462 @@ 
  */
 abstract class GetPaid_Payment_Gateway {
 
-	/**
-	 * Set if the place checkout button should be renamed on selection.
-	 *
-	 * @var string
-	 */
-	public $checkout_button_text;
-
-	/**
-	 * Boolean whether the method is enabled.
-	 *
-	 * @var bool
-	 */
-	public $enabled = true;
-
-	/**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
-	public $id;
-
-	/**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
-	public $order = 10;
-
-	/**
-	 * Payment method title for the frontend.
-	 *
-	 * @var string
-	 */
-	public $title;
-
-	/**
-	 * Payment method description for the frontend.
-	 *
-	 * @var string
-	 */
-	public $description;
-
-	/**
-	 * Gateway title.
-	 *
-	 * @var string
-	 */
-	public $method_title = '';
-
-	/**
-	 * Gateway description.
-	 *
-	 * @var string
-	 */
-	public $method_description = '';
-
-	/**
-	 * Countries this gateway is allowed for.
-	 *
-	 * @var array
-	 */
-	public $countries;
-
-	/**
-	 * Currencies this gateway is allowed for.
-	 *
-	 * @var array
-	 */
-	public $currencies;
-
-	/**
-	 * Currencies this gateway is not allowed for.
-	 *
-	 * @var array
-	 */
-	public $exclude_currencies;
-
-	/**
-	 * Maximum transaction amount, zero does not define a maximum.
-	 *
-	 * @var int
-	 */
-	public $max_amount = 0;
-
-	/**
-	 * Optional URL to view a transaction.
-	 *
-	 * @var string
-	 */
-	public $view_transaction_url = '';
-
-	/**
-	 * Optional URL to view a subscription.
-	 *
-	 * @var string
-	 */
-	public $view_subscription_url = '';
-
-	/**
-	 * Optional label to show for "new payment method" in the payment
-	 * method/token selection radio selection.
-	 *
-	 * @var string
-	 */
-	public $new_method_label = '';
-
-	/**
-	 * Contains a user's saved tokens for this gateway.
-	 *
-	 * @var array
-	 */
-	protected $tokens = array();
-
-	/**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
-	protected $supports = array();
-
-	/**
-	 * Class constructor.
-	 */
-	public function __construct() {
-
-		// Register gateway.
-		add_filter( 'wpinv_payment_gateways', array( $this, 'register_gateway' ) );
-
-		$this->enabled = wpinv_is_gateway_active( $this->id );
-
-		// Add support for various features.
-		foreach ( $this->supports as $feature ) {
-			add_filter( "wpinv_{$this->id}_support_{$feature}", '__return_true' );
-			add_filter( "getpaid_{$this->id}_support_{$feature}", '__return_true' );
-			add_filter( "getpaid_{$this->id}_supports_{$feature}", '__return_true' );
-		}
-
-		// Invoice addons.
-		if ( $this->supports( 'addons' ) ) {
-			add_action( "getpaid_process_{$this->id}_invoice_addons", array( $this, 'process_addons' ), 10, 2 );
-		}
-
-		// Gateway settings.
-		add_filter( "wpinv_gateway_settings_{$this->id}", array( $this, 'admin_settings' ) );
-
-		// Gateway checkout fiellds.
-		add_action( "wpinv_{$this->id}_cc_form", array( $this, 'payment_fields' ), 10, 2 );
-
-		// Process payment.
-		add_action( "getpaid_gateway_{$this->id}", array( $this, 'process_payment' ), 10, 3 );
-
-		// Change the checkout button text.
-		if ( ! empty( $this->checkout_button_text ) ) {
-			add_filter( "getpaid_gateway_{$this->id}_checkout_button_label", array( $this, 'rename_checkout_button' ) );
-		}
-
-		// Check if a gateway is valid for a given currency.
-		add_filter( "getpaid_gateway_{$this->id}_is_valid_for_currency", array( $this, 'validate_currency' ), 10, 2 );
-
-		// Generate the transaction url.
-		add_filter( "getpaid_gateway_{$this->id}_transaction_url", array( $this, 'filter_transaction_url' ), 10, 2 );
-
-		// Generate the subscription url.
-		add_filter( 'getpaid_remote_subscription_profile_url', array( $this, 'generate_subscription_url' ), 10, 2 );
-
-		// Confirm payments.
-		add_filter( "wpinv_payment_confirm_{$this->id}", array( $this, 'confirm_payment' ), 10, 2 );
-
-		// Verify IPNs.
-		add_action( "wpinv_verify_{$this->id}_ipn", array( $this, 'verify_ipn' ) );
-
-	}
-
-	/**
-	 * Checks if this gateway is a given gateway.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is( $gateway ) {
-		return $gateway == $this->id;
-	}
-
-	/**
-	 * Returns a users saved tokens for this gateway.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function get_tokens( $sandbox = null ) {
-
-		if ( is_user_logged_in() && $this->supports( 'tokens' ) && 0 == count( $this->tokens ) ) {
-			$tokens = get_user_meta( get_current_user_id(), "getpaid_{$this->id}_tokens", true );
-
-			if ( is_array( $tokens ) ) {
-				$this->tokens = $tokens;
-			}
+    /**
+     * Set if the place checkout button should be renamed on selection.
+     *
+     * @var string
+     */
+    public $checkout_button_text;
+
+    /**
+     * Boolean whether the method is enabled.
+     *
+     * @var bool
+     */
+    public $enabled = true;
+
+    /**
+     * Payment method id.
+     *
+     * @var string
+     */
+    public $id;
+
+    /**
+     * Payment method order.
+     *
+     * @var int
+     */
+    public $order = 10;
+
+    /**
+     * Payment method title for the frontend.
+     *
+     * @var string
+     */
+    public $title;
+
+    /**
+     * Payment method description for the frontend.
+     *
+     * @var string
+     */
+    public $description;
+
+    /**
+     * Gateway title.
+     *
+     * @var string
+     */
+    public $method_title = '';
+
+    /**
+     * Gateway description.
+     *
+     * @var string
+     */
+    public $method_description = '';
+
+    /**
+     * Countries this gateway is allowed for.
+     *
+     * @var array
+     */
+    public $countries;
+
+    /**
+     * Currencies this gateway is allowed for.
+     *
+     * @var array
+     */
+    public $currencies;
+
+    /**
+     * Currencies this gateway is not allowed for.
+     *
+     * @var array
+     */
+    public $exclude_currencies;
+
+    /**
+     * Maximum transaction amount, zero does not define a maximum.
+     *
+     * @var int
+     */
+    public $max_amount = 0;
+
+    /**
+     * Optional URL to view a transaction.
+     *
+     * @var string
+     */
+    public $view_transaction_url = '';
+
+    /**
+     * Optional URL to view a subscription.
+     *
+     * @var string
+     */
+    public $view_subscription_url = '';
+
+    /**
+     * Optional label to show for "new payment method" in the payment
+     * method/token selection radio selection.
+     *
+     * @var string
+     */
+    public $new_method_label = '';
+
+    /**
+     * Contains a user's saved tokens for this gateway.
+     *
+     * @var array
+     */
+    protected $tokens = array();
+
+    /**
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
+    protected $supports = array();
+
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
+
+        // Register gateway.
+        add_filter( 'wpinv_payment_gateways', array( $this, 'register_gateway' ) );
+
+        $this->enabled = wpinv_is_gateway_active( $this->id );
+
+        // Add support for various features.
+        foreach ( $this->supports as $feature ) {
+            add_filter( "wpinv_{$this->id}_support_{$feature}", '__return_true' );
+            add_filter( "getpaid_{$this->id}_support_{$feature}", '__return_true' );
+            add_filter( "getpaid_{$this->id}_supports_{$feature}", '__return_true' );
+        }
+
+        // Invoice addons.
+        if ( $this->supports( 'addons' ) ) {
+            add_action( "getpaid_process_{$this->id}_invoice_addons", array( $this, 'process_addons' ), 10, 2 );
+        }
+
+        // Gateway settings.
+        add_filter( "wpinv_gateway_settings_{$this->id}", array( $this, 'admin_settings' ) );
+
+        // Gateway checkout fiellds.
+        add_action( "wpinv_{$this->id}_cc_form", array( $this, 'payment_fields' ), 10, 2 );
+
+        // Process payment.
+        add_action( "getpaid_gateway_{$this->id}", array( $this, 'process_payment' ), 10, 3 );
+
+        // Change the checkout button text.
+        if ( ! empty( $this->checkout_button_text ) ) {
+            add_filter( "getpaid_gateway_{$this->id}_checkout_button_label", array( $this, 'rename_checkout_button' ) );
+        }
+
+        // Check if a gateway is valid for a given currency.
+        add_filter( "getpaid_gateway_{$this->id}_is_valid_for_currency", array( $this, 'validate_currency' ), 10, 2 );
+
+        // Generate the transaction url.
+        add_filter( "getpaid_gateway_{$this->id}_transaction_url", array( $this, 'filter_transaction_url' ), 10, 2 );
+
+        // Generate the subscription url.
+        add_filter( 'getpaid_remote_subscription_profile_url', array( $this, 'generate_subscription_url' ), 10, 2 );
+
+        // Confirm payments.
+        add_filter( "wpinv_payment_confirm_{$this->id}", array( $this, 'confirm_payment' ), 10, 2 );
+
+        // Verify IPNs.
+        add_action( "wpinv_verify_{$this->id}_ipn", array( $this, 'verify_ipn' ) );
+
+    }
+
+    /**
+     * Checks if this gateway is a given gateway.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is( $gateway ) {
+        return $gateway == $this->id;
+    }
+
+    /**
+     * Returns a users saved tokens for this gateway.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function get_tokens( $sandbox = null ) {
+
+        if ( is_user_logged_in() && $this->supports( 'tokens' ) && 0 == count( $this->tokens ) ) {
+            $tokens = get_user_meta( get_current_user_id(), "getpaid_{$this->id}_tokens", true );
+
+            if ( is_array( $tokens ) ) {
+                $this->tokens = $tokens;
+            }
 }
 
-		if ( ! is_bool( $sandbox ) ) {
-			return $this->tokens;
-		}
-
-		// Filter tokens.
-		$args = array( 'type' => $sandbox ? 'sandbox' : 'live' );
-		return wp_list_filter( $this->tokens, $args );
-
-	}
-
-	/**
-	 * Saves a token for this gateway.
-	 *
-	 * @since 1.0.19
-	 */
-	public function save_token( $token ) {
-
-		$tokens   = $this->get_tokens();
-		$tokens[] = $token;
-
-		update_user_meta( get_current_user_id(), "getpaid_{$this->id}_tokens", $tokens );
-
-		$this->tokens = $tokens;
-
-	}
-
-	/**
-	 * Return the title for admin screens.
-	 *
-	 * @return string
-	 */
-	public function get_method_title() {
-		return apply_filters( 'getpaid_gateway_method_title', $this->method_title, $this );
-	}
-
-	/**
-	 * Return the description for admin screens.
-	 *
-	 * @return string
-	 */
-	public function get_method_description() {
-		return apply_filters( 'getpaid_gateway_method_description', $this->method_description, $this );
-	}
-
-	/**
-	 * Get the success url.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
-	 * @return string
-	 */
-	public function get_return_url( $invoice ) {
-
-		// Payment success url
-		$return_url = add_query_arg(
-			array(
-				'payment-confirm' => $this->id,
-				'invoice_key'     => $invoice->get_key(),
-				'utm_nooverride'  => 1,
-			),
-			wpinv_get_success_page_uri()
-		);
-
-		return apply_filters( 'getpaid_gateway_success_url', $return_url, $invoice, $this );
-	}
-
-	/**
-	 * Confirms payments when rendering the success page.
-	 *
-	 * @param string $content Success page content.
-	 * @return string
-	 */
-	public function confirm_payment( $content ) {
-
-		// Retrieve the invoice.
-		$invoice_id = getpaid_get_current_invoice_id();
-		$invoice    = wpinv_get_invoice( $invoice_id );
-
-		// Ensure that it exists and that it is pending payment.
-		if ( empty( $invoice_id ) || ! $invoice->needs_payment() ) {
-			return $content;
-		}
-
-		// Can the user view this invoice??
-		if ( ! wpinv_user_can_view_invoice( $invoice ) ) {
-			return $content;
-		}
-
-		// Show payment processing indicator.
-		return wpinv_get_template_html( 'wpinv-payment-processing.php', compact( 'invoice' ) );
-	}
-
-	/**
-	 * Processes ipns and marks payments as complete.
-	 *
-	 * @return void
-	 */
-	public function verify_ipn() {}
-
-	/**
-	 * Processes invoice addons.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	public function process_addons( $invoice, $items ) {
-
-	}
-
-	/**
-	 * Get a link to the transaction on the 3rd party gateway site (if applicable).
-	 *
-	 * @param string $transaction_url transaction url.
-	 * @param WPInv_Invoice $invoice Invoice object.
-	 * @return string transaction URL, or empty string.
-	 */
-	public function filter_transaction_url( $transaction_url, $invoice ) {
-
-		$transaction_id  = $invoice->get_transaction_id();
-
-		if ( ! empty( $this->view_transaction_url ) && ! empty( $transaction_id ) ) {
-			$transaction_url = sprintf( $this->view_transaction_url, $transaction_id );
-			$replace         = $this->is_sandbox( $invoice ) ? 'sandbox' : '';
-			$transaction_url = str_replace( '{sandbox}', $replace, $transaction_url );
-		}
-
-		return $transaction_url;
-	}
-
-	/**
-	 * Get a link to the subscription on the 3rd party gateway site (if applicable).
-	 *
-	 * @param string $subscription_url transaction url.
-	 * @param WPInv_Subscription $subscription Subscription objectt.
-	 * @return string subscription URL, or empty string.
-	 */
-	public function generate_subscription_url( $subscription_url, $subscription ) {
-
-		$profile_id      = $subscription->get_profile_id();
-
-		if ( $this->id == $subscription->get_gateway() && ! empty( $this->view_subscription_url ) && ! empty( $profile_id ) ) {
-
-			$subscription_url = sprintf( $this->view_subscription_url, $profile_id );
-			$replace          = $this->is_sandbox( $subscription->get_parent_invoice() ) ? 'sandbox' : '';
-			$subscription_url = str_replace( '{sandbox}', $replace, $subscription_url );
-
-		}
-
-		return $subscription_url;
-	}
-
-	/**
-	 * Check if the gateway is available for use.
-	 *
-	 * @return bool
-	 */
-	public function is_available() {
-		return ! empty( $this->enabled );
-	}
-
-	/**
-	 * Return the gateway's title.
-	 *
-	 * @return string
-	 */
-	public function get_title() {
-		return apply_filters( 'getpaid_gateway_title', $this->title, $this );
-	}
-
-	/**
-	 * Return the gateway's description.
-	 *
-	 * @return string
-	 */
-	public function get_description() {
-		return apply_filters( 'getpaid_gateway_description', $this->description, $this );
-	}
-
-	/**
-	 * Process Payment.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return void
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
-		// Process the payment then either redirect to the success page or the gateway.
-		do_action( 'getpaid_process_invoice_payment_' . $this->id, $invoice, $submission_data, $submission );
-	}
-
-	/**
-	 * Process refund.
-	 *
-	 * If the gateway declares 'refunds' support, this will allow it to refund.
-	 * a passed in amount.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param  float  $amount Refund amount.
-	 * @param  string $reason Refund reason.
-	 * @return WP_Error|bool True or false based on success, or a WP_Error object.
-	 */
-	public function process_refund( $invoice, $amount = null, $reason = '' ) {
-		return apply_filters( 'getpaid_process_invoice_refund_' . $this->id, false, $invoice, $amount, $reason );
-	}
-
-	/**
-	 * Displays the payment fields, credit cards etc.
-	 *
-	 * @param int $invoice_id 0 or invoice id.
-	 * @param GetPaid_Payment_Form $form Current payment form.
-	 */
-	public function payment_fields( $invoice_id, $form ) {
-		do_action( 'getpaid_getpaid_gateway_payment_fields_' . $this->id, $invoice_id, $form );
-	}
-
-	/**
-	 * Filters the gateway settings.
-	 *
-	 * @param array $admin_settings
-	 */
-	public function admin_settings( $admin_settings ) {
-		return $admin_settings;
-	}
-
-	/**
-	 * Retrieves the value of a gateway setting.
-	 *
-	 * @param string $option
-	 */
-	public function get_option( $option, $default = false ) {
-		return wpinv_get_option( $this->id . '_' . $option, $default );
-	}
-
-	/**
-	 * Check if a gateway supports a given feature.
-	 *
-	 * Gateways should override this to declare support (or lack of support) for a feature.
-	 * For backward compatibility, gateways support 'products' by default, but nothing else.
-	 *
-	 * @param string $feature string The name of a feature to test support for.
-	 * @return bool True if the gateway supports the feature, false otherwise.
-	 * @since 1.0.19
-	 */
-	public function supports( $feature ) {
-		return getpaid_payment_gateway_supports( $this->id, $feature );
-	}
-
-	/**
-	 * Returns the credit card form html.
-	 *
-	 * @param bool $save whether or not to display the save button.
-	 */
+        if ( ! is_bool( $sandbox ) ) {
+            return $this->tokens;
+        }
+
+        // Filter tokens.
+        $args = array( 'type' => $sandbox ? 'sandbox' : 'live' );
+        return wp_list_filter( $this->tokens, $args );
+
+    }
+
+    /**
+     * Saves a token for this gateway.
+     *
+     * @since 1.0.19
+     */
+    public function save_token( $token ) {
+
+        $tokens   = $this->get_tokens();
+        $tokens[] = $token;
+
+        update_user_meta( get_current_user_id(), "getpaid_{$this->id}_tokens", $tokens );
+
+        $this->tokens = $tokens;
+
+    }
+
+    /**
+     * Return the title for admin screens.
+     *
+     * @return string
+     */
+    public function get_method_title() {
+        return apply_filters( 'getpaid_gateway_method_title', $this->method_title, $this );
+    }
+
+    /**
+     * Return the description for admin screens.
+     *
+     * @return string
+     */
+    public function get_method_description() {
+        return apply_filters( 'getpaid_gateway_method_description', $this->method_description, $this );
+    }
+
+    /**
+     * Get the success url.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
+     * @return string
+     */
+    public function get_return_url( $invoice ) {
+
+        // Payment success url
+        $return_url = add_query_arg(
+            array(
+                'payment-confirm' => $this->id,
+                'invoice_key'     => $invoice->get_key(),
+                'utm_nooverride'  => 1,
+            ),
+            wpinv_get_success_page_uri()
+        );
+
+        return apply_filters( 'getpaid_gateway_success_url', $return_url, $invoice, $this );
+    }
+
+    /**
+     * Confirms payments when rendering the success page.
+     *
+     * @param string $content Success page content.
+     * @return string
+     */
+    public function confirm_payment( $content ) {
+
+        // Retrieve the invoice.
+        $invoice_id = getpaid_get_current_invoice_id();
+        $invoice    = wpinv_get_invoice( $invoice_id );
+
+        // Ensure that it exists and that it is pending payment.
+        if ( empty( $invoice_id ) || ! $invoice->needs_payment() ) {
+            return $content;
+        }
+
+        // Can the user view this invoice??
+        if ( ! wpinv_user_can_view_invoice( $invoice ) ) {
+            return $content;
+        }
+
+        // Show payment processing indicator.
+        return wpinv_get_template_html( 'wpinv-payment-processing.php', compact( 'invoice' ) );
+    }
+
+    /**
+     * Processes ipns and marks payments as complete.
+     *
+     * @return void
+     */
+    public function verify_ipn() {}
+
+    /**
+     * Processes invoice addons.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    public function process_addons( $invoice, $items ) {
+
+    }
+
+    /**
+     * Get a link to the transaction on the 3rd party gateway site (if applicable).
+     *
+     * @param string $transaction_url transaction url.
+     * @param WPInv_Invoice $invoice Invoice object.
+     * @return string transaction URL, or empty string.
+     */
+    public function filter_transaction_url( $transaction_url, $invoice ) {
+
+        $transaction_id  = $invoice->get_transaction_id();
+
+        if ( ! empty( $this->view_transaction_url ) && ! empty( $transaction_id ) ) {
+            $transaction_url = sprintf( $this->view_transaction_url, $transaction_id );
+            $replace         = $this->is_sandbox( $invoice ) ? 'sandbox' : '';
+            $transaction_url = str_replace( '{sandbox}', $replace, $transaction_url );
+        }
+
+        return $transaction_url;
+    }
+
+    /**
+     * Get a link to the subscription on the 3rd party gateway site (if applicable).
+     *
+     * @param string $subscription_url transaction url.
+     * @param WPInv_Subscription $subscription Subscription objectt.
+     * @return string subscription URL, or empty string.
+     */
+    public function generate_subscription_url( $subscription_url, $subscription ) {
+
+        $profile_id      = $subscription->get_profile_id();
+
+        if ( $this->id == $subscription->get_gateway() && ! empty( $this->view_subscription_url ) && ! empty( $profile_id ) ) {
+
+            $subscription_url = sprintf( $this->view_subscription_url, $profile_id );
+            $replace          = $this->is_sandbox( $subscription->get_parent_invoice() ) ? 'sandbox' : '';
+            $subscription_url = str_replace( '{sandbox}', $replace, $subscription_url );
+
+        }
+
+        return $subscription_url;
+    }
+
+    /**
+     * Check if the gateway is available for use.
+     *
+     * @return bool
+     */
+    public function is_available() {
+        return ! empty( $this->enabled );
+    }
+
+    /**
+     * Return the gateway's title.
+     *
+     * @return string
+     */
+    public function get_title() {
+        return apply_filters( 'getpaid_gateway_title', $this->title, $this );
+    }
+
+    /**
+     * Return the gateway's description.
+     *
+     * @return string
+     */
+    public function get_description() {
+        return apply_filters( 'getpaid_gateway_description', $this->description, $this );
+    }
+
+    /**
+     * Process Payment.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return void
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
+        // Process the payment then either redirect to the success page or the gateway.
+        do_action( 'getpaid_process_invoice_payment_' . $this->id, $invoice, $submission_data, $submission );
+    }
+
+    /**
+     * Process refund.
+     *
+     * If the gateway declares 'refunds' support, this will allow it to refund.
+     * a passed in amount.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param  float  $amount Refund amount.
+     * @param  string $reason Refund reason.
+     * @return WP_Error|bool True or false based on success, or a WP_Error object.
+     */
+    public function process_refund( $invoice, $amount = null, $reason = '' ) {
+        return apply_filters( 'getpaid_process_invoice_refund_' . $this->id, false, $invoice, $amount, $reason );
+    }
+
+    /**
+     * Displays the payment fields, credit cards etc.
+     *
+     * @param int $invoice_id 0 or invoice id.
+     * @param GetPaid_Payment_Form $form Current payment form.
+     */
+    public function payment_fields( $invoice_id, $form ) {
+        do_action( 'getpaid_getpaid_gateway_payment_fields_' . $this->id, $invoice_id, $form );
+    }
+
+    /**
+     * Filters the gateway settings.
+     *
+     * @param array $admin_settings
+     */
+    public function admin_settings( $admin_settings ) {
+        return $admin_settings;
+    }
+
+    /**
+     * Retrieves the value of a gateway setting.
+     *
+     * @param string $option
+     */
+    public function get_option( $option, $default = false ) {
+        return wpinv_get_option( $this->id . '_' . $option, $default );
+    }
+
+    /**
+     * Check if a gateway supports a given feature.
+     *
+     * Gateways should override this to declare support (or lack of support) for a feature.
+     * For backward compatibility, gateways support 'products' by default, but nothing else.
+     *
+     * @param string $feature string The name of a feature to test support for.
+     * @return bool True if the gateway supports the feature, false otherwise.
+     * @since 1.0.19
+     */
+    public function supports( $feature ) {
+        return getpaid_payment_gateway_supports( $this->id, $feature );
+    }
+
+    /**
+     * Returns the credit card form html.
+     *
+     * @param bool $save whether or not to display the save button.
+     */
     public function get_cc_form( $save = false ) {
 
-		ob_start();
+        ob_start();
 
         $id_prefix = esc_attr( uniqid( $this->id ) );
 
@@ -486,7 +486,7 @@ 
             '11' => __( 'November', 'invoicing' ),
             '12' => __( 'December', 'invoicing' ),
         );
-		$months = apply_filters( 'getpaid_cc_months', $months, $this );
+        $months = apply_filters( 'getpaid_cc_months', $months, $this );
 
         $year  = (int) current_time( 'Y' );
         $years = array();
@@ -495,7 +495,7 @@ 
             $years[ $year + $i ] = $year + $i;
         }
 
-		$years = apply_filters( 'getpaid_cc_years', $years, $this );
+        $years = apply_filters( 'getpaid_cc_years', $years, $this );
 
         ?>
             <div class="<?php echo esc_attr( $this->id ); ?>-cc-form getpaid-cc-form mt-1">
@@ -531,7 +531,7 @@ 
 
                                             <?php
                                                 foreach ( $months as $key => $month ) {
-												echo "<option value='" . esc_attr( $key ) . "'>" . esc_html( $month ) . '</option>';
+                                                echo "<option value='" . esc_attr( $key ) . "'>" . esc_html( $month ) . '</option>';
                                                 }
                                             ?>
 
@@ -544,7 +544,7 @@ 
 
                                             <?php
                                                 foreach ( $years as $key => $year ) {
-												echo "<option value='" . esc_attr( $key ) . "'>" . esc_html( $year ) . '</option>';
+                                                echo "<option value='" . esc_attr( $key ) . "'>" . esc_html( $year ) . '</option>';
                                                 }
                                             ?>
 
@@ -562,13 +562,13 @@ 
                                         'name'             => $this->id . '[cc_cvv2]',
                                         'id'               => "$id_prefix-cc-cvv2",
                                         'label'            => __( 'CCV', 'invoicing' ),
-										'label_type'       => 'vertical',
-										'class'            => 'form-control-sm',
-										'extra_attributes' => array(
-											'autocomplete' => 'cc-csc',
-										),
+                                        'label_type'       => 'vertical',
+                                        'class'            => 'form-control-sm',
+                                        'extra_attributes' => array(
+                                            'autocomplete' => 'cc-csc',
+                                        ),
                                     ),
-									true
+                                    true
                                 );
                             ?>
                         </div>
@@ -577,192 +577,192 @@ 
 
 					<?php
 
-						if ( $save ) {
-							$this->save_payment_method_checkbox();
-						}
+                        if ( $save ) {
+                            $this->save_payment_method_checkbox();
+                        }
 
-					?>
+                    ?>
                 </div>
 
             </div>
 		<?php
 
-		return ob_get_clean();
+        return ob_get_clean();
+
+    }
+
+    /**
+     * Displays a new payment method entry form.
+     *
+     * @since 1.0.19
+     */
+    public function new_payment_method_entry( $form ) {
+        echo "<div class='getpaid-new-payment-method-form' style='display:none;'> " . wp_kses( $form, getpaid_allowed_html() ) . '</div>';
+    }
+
+    /**
+     * Grab and display our saved payment methods.
+     *
+     * @since 1.0.19
+     */
+    public function saved_payment_methods() {
+        echo '<ul class="getpaid-saved-payment-methods list-unstyled m-0 mt-2" data-count="' . esc_attr( count( $this->get_tokens( $this->is_sandbox() ) ) ) . '">';
+
+        foreach ( $this->get_tokens( $this->is_sandbox() ) as $token ) {
+            $this->get_saved_payment_method_option_html( $token );
+        }
+
+        $this->get_new_payment_method_option_html();
+        echo '</ul>';
 
     }
 
-	/**
-	 * Displays a new payment method entry form.
-	 *
-	 * @since 1.0.19
-	 */
-	public function new_payment_method_entry( $form ) {
-		echo "<div class='getpaid-new-payment-method-form' style='display:none;'> " . wp_kses( $form, getpaid_allowed_html() ) . '</div>';
-	}
-
-	/**
-	 * Grab and display our saved payment methods.
-	 *
-	 * @since 1.0.19
-	 */
-	public function saved_payment_methods() {
-		echo '<ul class="getpaid-saved-payment-methods list-unstyled m-0 mt-2" data-count="' . esc_attr( count( $this->get_tokens( $this->is_sandbox() ) ) ) . '">';
-
-		foreach ( $this->get_tokens( $this->is_sandbox() ) as $token ) {
-			$this->get_saved_payment_method_option_html( $token );
-		}
-
-		$this->get_new_payment_method_option_html();
-		echo '</ul>';
-
-	}
-
-	/**
-	 * Gets saved payment method HTML from a token.
-	 *
-	 * @since 1.0.19
-	 * @param  array $token Payment Token.
-	 * @return string Generated payment method HTML
-	 */
-	public function get_saved_payment_method_option_html( $token ) {
-
-		printf(
-			'<li class="getpaid-payment-method form-group">
+    /**
+     * Gets saved payment method HTML from a token.
+     *
+     * @since 1.0.19
+     * @param  array $token Payment Token.
+     * @return string Generated payment method HTML
+     */
+    public function get_saved_payment_method_option_html( $token ) {
+
+        printf(
+            '<li class="getpaid-payment-method form-group">
 				<label>
 					<input name="getpaid-%1$s-payment-method" type="radio" value="%2$s" data-currency="%5$s" style="width:auto;" class="getpaid-saved-payment-method-token-input" %4$s />
 					<span>%3$s</span>
 				</label>
 			</li>',
-			esc_attr( $this->id ),
-			esc_attr( $token['id'] ),
-			esc_html( $token['name'] ),
-			checked( empty( $token['default'] ), false, false ),
-			empty( $token['currency'] ) ? 'none' : esc_attr( $token['currency'] )
-		);
-
-	}
-
-	/**
-	 * Displays a radio button for entering a new payment method (new CC details) instead of using a saved method.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_new_payment_method_option_html() {
-
-		$label = apply_filters( 'getpaid_new_payment_method_label', $this->new_method_label ? $this->new_method_label : __( 'Use a new payment method', 'invoicing' ), $this );
-
-		printf(
-			'<li class="getpaid-new-payment-method">
+            esc_attr( $this->id ),
+            esc_attr( $token['id'] ),
+            esc_html( $token['name'] ),
+            checked( empty( $token['default'] ), false, false ),
+            empty( $token['currency'] ) ? 'none' : esc_attr( $token['currency'] )
+        );
+
+    }
+
+    /**
+     * Displays a radio button for entering a new payment method (new CC details) instead of using a saved method.
+     *
+     * @since 1.0.19
+     */
+    public function get_new_payment_method_option_html() {
+
+        $label = apply_filters( 'getpaid_new_payment_method_label', $this->new_method_label ? $this->new_method_label : __( 'Use a new payment method', 'invoicing' ), $this );
+
+        printf(
+            '<li class="getpaid-new-payment-method">
 				<label>
 					<input name="getpaid-%1$s-payment-method" type="radio" data-currency="none" value="new" style="width:auto;" />
 					<span>%2$s</span>
 				</label>
 			</li>',
-			esc_attr( $this->id ),
-			esc_html( $label )
-		);
-
-	}
-
-	/**
-	 * Outputs a checkbox for saving a new payment method to the database.
-	 *
-	 * @since 1.0.19
-	 */
-	public function save_payment_method_checkbox() {
-
-		aui()->input(
-			array(
-				'type'       => 'checkbox',
-				'name'       => esc_attr( "getpaid-$this->id-new-payment-method" ),
-				'id'         => esc_attr( uniqid( $this->id ) ),
-				'required'   => false,
-				'label'      => esc_html__( 'Save payment method', 'invoicing' ),
-				'value'      => 'true',
-				'checked'    => true,
-				'wrap_class' => 'getpaid-save-payment-method pt-1 pb-1',
-			),
-			true
-		);
-
-	}
-
-	/**
-	 * Registers the gateway.
-	 *
-	 * @return array
-	 */
-	public function register_gateway( $gateways ) {
-
-		$gateways[ $this->id ] = array(
-
-			'admin_label'    => $this->method_title,
+            esc_attr( $this->id ),
+            esc_html( $label )
+        );
+
+    }
+
+    /**
+     * Outputs a checkbox for saving a new payment method to the database.
+     *
+     * @since 1.0.19
+     */
+    public function save_payment_method_checkbox() {
+
+        aui()->input(
+            array(
+                'type'       => 'checkbox',
+                'name'       => esc_attr( "getpaid-$this->id-new-payment-method" ),
+                'id'         => esc_attr( uniqid( $this->id ) ),
+                'required'   => false,
+                'label'      => esc_html__( 'Save payment method', 'invoicing' ),
+                'value'      => 'true',
+                'checked'    => true,
+                'wrap_class' => 'getpaid-save-payment-method pt-1 pb-1',
+            ),
+            true
+        );
+
+    }
+
+    /**
+     * Registers the gateway.
+     *
+     * @return array
+     */
+    public function register_gateway( $gateways ) {
+
+        $gateways[ $this->id ] = array(
+
+            'admin_label'    => $this->method_title,
             'checkout_label' => $this->title,
-			'ordering'       => $this->order,
+            'ordering'       => $this->order,
 
-		);
+        );
 
-		return $gateways;
+        return $gateways;
 
-	}
+    }
 
-	/**
-	 * Checks whether or not this is a sandbox request.
-	 *
-	 * @param  WPInv_Invoice|null $invoice Invoice object or null.
-	 * @return bool
-	 */
-	public function is_sandbox( $invoice = null ) {
+    /**
+     * Checks whether or not this is a sandbox request.
+     *
+     * @param  WPInv_Invoice|null $invoice Invoice object or null.
+     * @return bool
+     */
+    public function is_sandbox( $invoice = null ) {
 
-		if ( ! empty( $invoice ) && ! $invoice->needs_payment() ) {
-			return $invoice->get_mode() == 'test';
-		}
+        if ( ! empty( $invoice ) && ! $invoice->needs_payment() ) {
+            return $invoice->get_mode() == 'test';
+        }
 
-		return wpinv_is_test_mode( $this->id );
+        return wpinv_is_test_mode( $this->id );
 
-	}
+    }
 
-	/**
-	 * Renames the checkout button
-	 *
-	 * @return string
-	 */
-	public function rename_checkout_button() {
-		return $this->checkout_button_text;
-	}
+    /**
+     * Renames the checkout button
+     *
+     * @return string
+     */
+    public function rename_checkout_button() {
+        return $this->checkout_button_text;
+    }
 
-	/**
-	 * Validate gateway currency
-	 *
-	 * @return bool
-	 */
-	public function validate_currency( $validation, $currency ) {
+    /**
+     * Validate gateway currency
+     *
+     * @return bool
+     */
+    public function validate_currency( $validation, $currency ) {
 
-		// Required currencies.
-		if ( ! empty( $this->currencies ) && ! in_array( $currency, $this->currencies ) ) {
-			return false;
-		}
+        // Required currencies.
+        if ( ! empty( $this->currencies ) && ! in_array( $currency, $this->currencies ) ) {
+            return false;
+        }
 
-		// Excluded currencies.
-		if ( ! empty( $this->exclude_currencies ) && in_array( $currency, $this->exclude_currencies ) ) {
-			return false;
-		}
+        // Excluded currencies.
+        if ( ! empty( $this->exclude_currencies ) && in_array( $currency, $this->exclude_currencies ) ) {
+            return false;
+        }
 
-		return $validation;
-	}
+        return $validation;
+    }
 
-	/**
-	 * Displays an error
-	 *
-	 */
-	public function show_error( $code, $message, $type ) {
+    /**
+     * Displays an error
+     *
+     */
+    public function show_error( $code, $message, $type ) {
 
-		if ( is_admin() ) {
-			getpaid_admin()->{"show_$type"}( $message );
-		}
+        if ( is_admin() ) {
+            getpaid_admin()->{"show_$type"}( $message );
+        }
 
-		wpinv_set_error( $code, $message, $type );
+        wpinv_set_error( $code, $message, $type );
 
-	}
+    }
 
 }

Spacing +127 added lines, -127 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Abstaract Payment Gateway class.
@@ -139,50 +139,50 @@ 
 	public function __construct() {
 
 		// Register gateway.
-		add_filter( 'wpinv_payment_gateways', array( $this, 'register_gateway' ) );
+		add_filter('wpinv_payment_gateways', array($this, 'register_gateway'));
 
-		$this->enabled = wpinv_is_gateway_active( $this->id );
+		$this->enabled = wpinv_is_gateway_active($this->id);
 
 		// Add support for various features.
-		foreach ( $this->supports as $feature ) {
-			add_filter( "wpinv_{$this->id}_support_{$feature}", '__return_true' );
-			add_filter( "getpaid_{$this->id}_support_{$feature}", '__return_true' );
-			add_filter( "getpaid_{$this->id}_supports_{$feature}", '__return_true' );
+		foreach ($this->supports as $feature) {
+			add_filter("wpinv_{$this->id}_support_{$feature}", '__return_true');
+			add_filter("getpaid_{$this->id}_support_{$feature}", '__return_true');
+			add_filter("getpaid_{$this->id}_supports_{$feature}", '__return_true');
 		}
 
 		// Invoice addons.
-		if ( $this->supports( 'addons' ) ) {
-			add_action( "getpaid_process_{$this->id}_invoice_addons", array( $this, 'process_addons' ), 10, 2 );
+		if ($this->supports('addons')) {
+			add_action("getpaid_process_{$this->id}_invoice_addons", array($this, 'process_addons'), 10, 2);
 		}
 
 		// Gateway settings.
-		add_filter( "wpinv_gateway_settings_{$this->id}", array( $this, 'admin_settings' ) );
+		add_filter("wpinv_gateway_settings_{$this->id}", array($this, 'admin_settings'));
 
 		// Gateway checkout fiellds.
-		add_action( "wpinv_{$this->id}_cc_form", array( $this, 'payment_fields' ), 10, 2 );
+		add_action("wpinv_{$this->id}_cc_form", array($this, 'payment_fields'), 10, 2);
 
 		// Process payment.
-		add_action( "getpaid_gateway_{$this->id}", array( $this, 'process_payment' ), 10, 3 );
+		add_action("getpaid_gateway_{$this->id}", array($this, 'process_payment'), 10, 3);
 
 		// Change the checkout button text.
-		if ( ! empty( $this->checkout_button_text ) ) {
-			add_filter( "getpaid_gateway_{$this->id}_checkout_button_label", array( $this, 'rename_checkout_button' ) );
+		if (!empty($this->checkout_button_text)) {
+			add_filter("getpaid_gateway_{$this->id}_checkout_button_label", array($this, 'rename_checkout_button'));
 		}
 
 		// Check if a gateway is valid for a given currency.
-		add_filter( "getpaid_gateway_{$this->id}_is_valid_for_currency", array( $this, 'validate_currency' ), 10, 2 );
+		add_filter("getpaid_gateway_{$this->id}_is_valid_for_currency", array($this, 'validate_currency'), 10, 2);
 
 		// Generate the transaction url.
-		add_filter( "getpaid_gateway_{$this->id}_transaction_url", array( $this, 'filter_transaction_url' ), 10, 2 );
+		add_filter("getpaid_gateway_{$this->id}_transaction_url", array($this, 'filter_transaction_url'), 10, 2);
 
 		// Generate the subscription url.
-		add_filter( 'getpaid_remote_subscription_profile_url', array( $this, 'generate_subscription_url' ), 10, 2 );
+		add_filter('getpaid_remote_subscription_profile_url', array($this, 'generate_subscription_url'), 10, 2);
 
 		// Confirm payments.
-		add_filter( "wpinv_payment_confirm_{$this->id}", array( $this, 'confirm_payment' ), 10, 2 );
+		add_filter("wpinv_payment_confirm_{$this->id}", array($this, 'confirm_payment'), 10, 2);
 
 		// Verify IPNs.
-		add_action( "wpinv_verify_{$this->id}_ipn", array( $this, 'verify_ipn' ) );
+		add_action("wpinv_verify_{$this->id}_ipn", array($this, 'verify_ipn'));
 
 	}
 
@@ -192,7 +192,7 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public function is( $gateway ) {
+	public function is($gateway) {
 		return $gateway == $this->id;
 	}
 
@@ -202,23 +202,23 @@ 
 	 * @since 1.0.19
 	 * @return array
 	 */
-	public function get_tokens( $sandbox = null ) {
+	public function get_tokens($sandbox = null) {
 
-		if ( is_user_logged_in() && $this->supports( 'tokens' ) && 0 == count( $this->tokens ) ) {
-			$tokens = get_user_meta( get_current_user_id(), "getpaid_{$this->id}_tokens", true );
+		if (is_user_logged_in() && $this->supports('tokens') && 0 == count($this->tokens)) {
+			$tokens = get_user_meta(get_current_user_id(), "getpaid_{$this->id}_tokens", true);
 
-			if ( is_array( $tokens ) ) {
+			if (is_array($tokens)) {
 				$this->tokens = $tokens;
 			}
 }
 
-		if ( ! is_bool( $sandbox ) ) {
+		if (!is_bool($sandbox)) {
 			return $this->tokens;
 		}
 
 		// Filter tokens.
-		$args = array( 'type' => $sandbox ? 'sandbox' : 'live' );
-		return wp_list_filter( $this->tokens, $args );
+		$args = array('type' => $sandbox ? 'sandbox' : 'live');
+		return wp_list_filter($this->tokens, $args);
 
 	}
 
@@ -227,12 +227,12 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function save_token( $token ) {
+	public function save_token($token) {
 
 		$tokens   = $this->get_tokens();
 		$tokens[] = $token;
 
-		update_user_meta( get_current_user_id(), "getpaid_{$this->id}_tokens", $tokens );
+		update_user_meta(get_current_user_id(), "getpaid_{$this->id}_tokens", $tokens);
 
 		$this->tokens = $tokens;
 
@@ -244,7 +244,7 @@ 
 	 * @return string
 	 */
 	public function get_method_title() {
-		return apply_filters( 'getpaid_gateway_method_title', $this->method_title, $this );
+		return apply_filters('getpaid_gateway_method_title', $this->method_title, $this);
 	}
 
 	/**
@@ -253,7 +253,7 @@ 
 	 * @return string
 	 */
 	public function get_method_description() {
-		return apply_filters( 'getpaid_gateway_method_description', $this->method_description, $this );
+		return apply_filters('getpaid_gateway_method_description', $this->method_description, $this);
 	}
 
 	/**
@@ -262,7 +262,7 @@ 
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 * @return string
 	 */
-	public function get_return_url( $invoice ) {
+	public function get_return_url($invoice) {
 
 		// Payment success url
 		$return_url = add_query_arg(
@@ -274,7 +274,7 @@ 
 			wpinv_get_success_page_uri()
 		);
 
-		return apply_filters( 'getpaid_gateway_success_url', $return_url, $invoice, $this );
+		return apply_filters('getpaid_gateway_success_url', $return_url, $invoice, $this);
 	}
 
 	/**
@@ -283,24 +283,24 @@ 
 	 * @param string $content Success page content.
 	 * @return string
 	 */
-	public function confirm_payment( $content ) {
+	public function confirm_payment($content) {
 
 		// Retrieve the invoice.
 		$invoice_id = getpaid_get_current_invoice_id();
-		$invoice    = wpinv_get_invoice( $invoice_id );
+		$invoice    = wpinv_get_invoice($invoice_id);
 
 		// Ensure that it exists and that it is pending payment.
-		if ( empty( $invoice_id ) || ! $invoice->needs_payment() ) {
+		if (empty($invoice_id) || !$invoice->needs_payment()) {
 			return $content;
 		}
 
 		// Can the user view this invoice??
-		if ( ! wpinv_user_can_view_invoice( $invoice ) ) {
+		if (!wpinv_user_can_view_invoice($invoice)) {
 			return $content;
 		}
 
 		// Show payment processing indicator.
-		return wpinv_get_template_html( 'wpinv-payment-processing.php', compact( 'invoice' ) );
+		return wpinv_get_template_html('wpinv-payment-processing.php', compact('invoice'));
 	}
 
 	/**
@@ -317,7 +317,7 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
 	}
 
@@ -328,14 +328,14 @@ 
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 * @return string transaction URL, or empty string.
 	 */
-	public function filter_transaction_url( $transaction_url, $invoice ) {
+	public function filter_transaction_url($transaction_url, $invoice) {
 
-		$transaction_id  = $invoice->get_transaction_id();
+		$transaction_id = $invoice->get_transaction_id();
 
-		if ( ! empty( $this->view_transaction_url ) && ! empty( $transaction_id ) ) {
-			$transaction_url = sprintf( $this->view_transaction_url, $transaction_id );
-			$replace         = $this->is_sandbox( $invoice ) ? 'sandbox' : '';
-			$transaction_url = str_replace( '{sandbox}', $replace, $transaction_url );
+		if (!empty($this->view_transaction_url) && !empty($transaction_id)) {
+			$transaction_url = sprintf($this->view_transaction_url, $transaction_id);
+			$replace         = $this->is_sandbox($invoice) ? 'sandbox' : '';
+			$transaction_url = str_replace('{sandbox}', $replace, $transaction_url);
 		}
 
 		return $transaction_url;
@@ -348,15 +348,15 @@ 
 	 * @param WPInv_Subscription $subscription Subscription objectt.
 	 * @return string subscription URL, or empty string.
 	 */
-	public function generate_subscription_url( $subscription_url, $subscription ) {
+	public function generate_subscription_url($subscription_url, $subscription) {
 
-		$profile_id      = $subscription->get_profile_id();
+		$profile_id = $subscription->get_profile_id();
 
-		if ( $this->id == $subscription->get_gateway() && ! empty( $this->view_subscription_url ) && ! empty( $profile_id ) ) {
+		if ($this->id == $subscription->get_gateway() && !empty($this->view_subscription_url) && !empty($profile_id)) {
 
-			$subscription_url = sprintf( $this->view_subscription_url, $profile_id );
-			$replace          = $this->is_sandbox( $subscription->get_parent_invoice() ) ? 'sandbox' : '';
-			$subscription_url = str_replace( '{sandbox}', $replace, $subscription_url );
+			$subscription_url = sprintf($this->view_subscription_url, $profile_id);
+			$replace          = $this->is_sandbox($subscription->get_parent_invoice()) ? 'sandbox' : '';
+			$subscription_url = str_replace('{sandbox}', $replace, $subscription_url);
 
 		}
 
@@ -369,7 +369,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		return ! empty( $this->enabled );
+		return !empty($this->enabled);
 	}
 
 	/**
@@ -378,7 +378,7 @@ 
 	 * @return string
 	 */
 	public function get_title() {
-		return apply_filters( 'getpaid_gateway_title', $this->title, $this );
+		return apply_filters('getpaid_gateway_title', $this->title, $this);
 	}
 
 	/**
@@ -387,7 +387,7 @@ 
 	 * @return string
 	 */
 	public function get_description() {
-		return apply_filters( 'getpaid_gateway_description', $this->description, $this );
+		return apply_filters('getpaid_gateway_description', $this->description, $this);
 	}
 
 	/**
@@ -399,9 +399,9 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return void
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 		// Process the payment then either redirect to the success page or the gateway.
-		do_action( 'getpaid_process_invoice_payment_' . $this->id, $invoice, $submission_data, $submission );
+		do_action('getpaid_process_invoice_payment_' . $this->id, $invoice, $submission_data, $submission);
 	}
 
 	/**
@@ -415,8 +415,8 @@ 
 	 * @param  string $reason Refund reason.
 	 * @return WP_Error|bool True or false based on success, or a WP_Error object.
 	 */
-	public function process_refund( $invoice, $amount = null, $reason = '' ) {
-		return apply_filters( 'getpaid_process_invoice_refund_' . $this->id, false, $invoice, $amount, $reason );
+	public function process_refund($invoice, $amount = null, $reason = '') {
+		return apply_filters('getpaid_process_invoice_refund_' . $this->id, false, $invoice, $amount, $reason);
 	}
 
 	/**
@@ -425,8 +425,8 @@ 
 	 * @param int $invoice_id 0 or invoice id.
 	 * @param GetPaid_Payment_Form $form Current payment form.
 	 */
-	public function payment_fields( $invoice_id, $form ) {
-		do_action( 'getpaid_getpaid_gateway_payment_fields_' . $this->id, $invoice_id, $form );
+	public function payment_fields($invoice_id, $form) {
+		do_action('getpaid_getpaid_gateway_payment_fields_' . $this->id, $invoice_id, $form);
 	}
 
 	/**
@@ -434,7 +434,7 @@ 
 	 *
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 		return $admin_settings;
 	}
 
@@ -443,8 +443,8 @@ 
 	 *
 	 * @param string $option
 	 */
-	public function get_option( $option, $default = false ) {
-		return wpinv_get_option( $this->id . '_' . $option, $default );
+	public function get_option($option, $default = false) {
+		return wpinv_get_option($this->id . '_' . $option, $default);
 	}
 
 	/**
@@ -457,8 +457,8 @@ 
 	 * @return bool True if the gateway supports the feature, false otherwise.
 	 * @since 1.0.19
 	 */
-	public function supports( $feature ) {
-		return getpaid_payment_gateway_supports( $this->id, $feature );
+	public function supports($feature) {
+		return getpaid_payment_gateway_supports($this->id, $feature);
 	}
 
 	/**
@@ -466,39 +466,39 @@ 
 	 *
 	 * @param bool $save whether or not to display the save button.
 	 */
-    public function get_cc_form( $save = false ) {
+    public function get_cc_form($save = false) {
 
 		ob_start();
 
-        $id_prefix = esc_attr( uniqid( $this->id ) );
+        $id_prefix = esc_attr(uniqid($this->id));
 
         $months = array(
-            '01' => __( 'January', 'invoicing' ),
-            '02' => __( 'February', 'invoicing' ),
-            '03' => __( 'March', 'invoicing' ),
-            '04' => __( 'April', 'invoicing' ),
-            '05' => __( 'May', 'invoicing' ),
-            '06' => __( 'June', 'invoicing' ),
-            '07' => __( 'July', 'invoicing' ),
-            '08' => __( 'August', 'invoicing' ),
-            '09' => __( 'September', 'invoicing' ),
-            '10' => __( 'October', 'invoicing' ),
-            '11' => __( 'November', 'invoicing' ),
-            '12' => __( 'December', 'invoicing' ),
+            '01' => __('January', 'invoicing'),
+            '02' => __('February', 'invoicing'),
+            '03' => __('March', 'invoicing'),
+            '04' => __('April', 'invoicing'),
+            '05' => __('May', 'invoicing'),
+            '06' => __('June', 'invoicing'),
+            '07' => __('July', 'invoicing'),
+            '08' => __('August', 'invoicing'),
+            '09' => __('September', 'invoicing'),
+            '10' => __('October', 'invoicing'),
+            '11' => __('November', 'invoicing'),
+            '12' => __('December', 'invoicing'),
         );
-		$months = apply_filters( 'getpaid_cc_months', $months, $this );
+		$months = apply_filters('getpaid_cc_months', $months, $this);
 
-        $year  = (int) current_time( 'Y' );
+        $year  = (int) current_time('Y');
         $years = array();
 
-        for ( $i = 0; $i <= 10; $i++ ) {
-            $years[ $year + $i ] = $year + $i;
+        for ($i = 0; $i <= 10; $i++) {
+            $years[$year + $i] = $year + $i;
         }
 
-		$years = apply_filters( 'getpaid_cc_years', $years, $this );
+		$years = apply_filters('getpaid_cc_years', $years, $this);
 
         ?>
-            <div class="<?php echo esc_attr( $this->id ); ?>-cc-form getpaid-cc-form mt-1">
+            <div class="<?php echo esc_attr($this->id); ?>-cc-form getpaid-cc-form mt-1">
 
 
                 <div class="getpaid-cc-card-inner">
@@ -507,14 +507,14 @@ 
                         <div class="col-12">
 
 							<div class="form-group">
-								<label for="<?php echo esc_attr( "$id_prefix-cc-number" ); ?>"><?php esc_html_e( 'Card number', 'invoicing' ); ?></label>
+								<label for="<?php echo esc_attr("$id_prefix-cc-number"); ?>"><?php esc_html_e('Card number', 'invoicing'); ?></label>
 								<div class="input-group input-group-sm">
 									<div class="input-group-prepend ">
 										<span class="input-group-text">
 											<i class="fa fa-credit-card"></i>
 										</span>
 									</div>
-									<input type="text" name="<?php echo esc_attr( $this->id . '[cc_number]' ); ?>" id="<?php echo esc_attr( "$id_prefix-cc-number" ); ?>" class="form-control form-control-sm getpaid-format-card-number" autocomplete="cc-number">
+									<input type="text" name="<?php echo esc_attr($this->id . '[cc_number]'); ?>" id="<?php echo esc_attr("$id_prefix-cc-number"); ?>" class="form-control form-control-sm getpaid-format-card-number" autocomplete="cc-number">
 								</div>
 							</div>
 
@@ -522,16 +522,16 @@ 
 
                         <div class="col-12">
                             <div class="form-group">
-                                <label><?php esc_html_e( 'Expiration', 'invoicing' ); ?></label>
+                                <label><?php esc_html_e('Expiration', 'invoicing'); ?></label>
                                 <div class="form-row">
 
                                     <div class="col">
-                                        <select class="form-control form-control-sm" autocomplete="cc-exp-month" name="<?php echo esc_attr( $this->id ); ?>[cc_expire_month]">
-                                            <option disabled selected="selected"><?php esc_html_e( 'MM', 'invoicing' ); ?></option>
+                                        <select class="form-control form-control-sm" autocomplete="cc-exp-month" name="<?php echo esc_attr($this->id); ?>[cc_expire_month]">
+                                            <option disabled selected="selected"><?php esc_html_e('MM', 'invoicing'); ?></option>
 
                                             <?php
-                                                foreach ( $months as $key => $month ) {
-												echo "<option value='" . esc_attr( $key ) . "'>" . esc_html( $month ) . '</option>';
+                                                foreach ($months as $key => $month) {
+												echo "<option value='" . esc_attr($key) . "'>" . esc_html($month) . '</option>';
                                                 }
                                             ?>
 
@@ -539,12 +539,12 @@ 
                                     </div>
 
                                     <div class="col">
-                                        <select class="form-control form-control-sm" autocomplete="cc-exp-year" name="<?php echo esc_attr( $this->id ); ?>[cc_expire_year]">
-                                            <option disabled selected="selected"><?php esc_html_e( 'YY', 'invoicing' ); ?></option>
+                                        <select class="form-control form-control-sm" autocomplete="cc-exp-year" name="<?php echo esc_attr($this->id); ?>[cc_expire_year]">
+                                            <option disabled selected="selected"><?php esc_html_e('YY', 'invoicing'); ?></option>
 
                                             <?php
-                                                foreach ( $years as $key => $year ) {
-												echo "<option value='" . esc_attr( $key ) . "'>" . esc_html( $year ) . '</option>';
+                                                foreach ($years as $key => $year) {
+												echo "<option value='" . esc_attr($key) . "'>" . esc_html($year) . '</option>';
                                                 }
                                             ?>
 
@@ -561,7 +561,7 @@ 
                                     array(
                                         'name'             => $this->id . '[cc_cvv2]',
                                         'id'               => "$id_prefix-cc-cvv2",
-                                        'label'            => __( 'CCV', 'invoicing' ),
+                                        'label'            => __('CCV', 'invoicing'),
 										'label_type'       => 'vertical',
 										'class'            => 'form-control-sm',
 										'extra_attributes' => array(
@@ -577,7 +577,7 @@ 
 
 					<?php
 
-						if ( $save ) {
+						if ($save) {
 							$this->save_payment_method_checkbox();
 						}
 
@@ -596,8 +596,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function new_payment_method_entry( $form ) {
-		echo "<div class='getpaid-new-payment-method-form' style='display:none;'> " . wp_kses( $form, getpaid_allowed_html() ) . '</div>';
+	public function new_payment_method_entry($form) {
+		echo "<div class='getpaid-new-payment-method-form' style='display:none;'> " . wp_kses($form, getpaid_allowed_html()) . '</div>';
 	}
 
 	/**
@@ -606,10 +606,10 @@ 
 	 * @since 1.0.19
 	 */
 	public function saved_payment_methods() {
-		echo '<ul class="getpaid-saved-payment-methods list-unstyled m-0 mt-2" data-count="' . esc_attr( count( $this->get_tokens( $this->is_sandbox() ) ) ) . '">';
+		echo '<ul class="getpaid-saved-payment-methods list-unstyled m-0 mt-2" data-count="' . esc_attr(count($this->get_tokens($this->is_sandbox()))) . '">';
 
-		foreach ( $this->get_tokens( $this->is_sandbox() ) as $token ) {
-			$this->get_saved_payment_method_option_html( $token );
+		foreach ($this->get_tokens($this->is_sandbox()) as $token) {
+			$this->get_saved_payment_method_option_html($token);
 		}
 
 		$this->get_new_payment_method_option_html();
@@ -624,7 +624,7 @@ 
 	 * @param  array $token Payment Token.
 	 * @return string Generated payment method HTML
 	 */
-	public function get_saved_payment_method_option_html( $token ) {
+	public function get_saved_payment_method_option_html($token) {
 
 		printf(
 			'<li class="getpaid-payment-method form-group">
@@ -633,11 +633,11 @@ 
 					<span>%3$s</span>
 				</label>
 			</li>',
-			esc_attr( $this->id ),
-			esc_attr( $token['id'] ),
-			esc_html( $token['name'] ),
-			checked( empty( $token['default'] ), false, false ),
-			empty( $token['currency'] ) ? 'none' : esc_attr( $token['currency'] )
+			esc_attr($this->id),
+			esc_attr($token['id']),
+			esc_html($token['name']),
+			checked(empty($token['default']), false, false),
+			empty($token['currency']) ? 'none' : esc_attr($token['currency'])
 		);
 
 	}
@@ -649,7 +649,7 @@ 
 	 */
 	public function get_new_payment_method_option_html() {
 
-		$label = apply_filters( 'getpaid_new_payment_method_label', $this->new_method_label ? $this->new_method_label : __( 'Use a new payment method', 'invoicing' ), $this );
+		$label = apply_filters('getpaid_new_payment_method_label', $this->new_method_label ? $this->new_method_label : __('Use a new payment method', 'invoicing'), $this);
 
 		printf(
 			'<li class="getpaid-new-payment-method">
@@ -658,8 +658,8 @@ 
 					<span>%2$s</span>
 				</label>
 			</li>',
-			esc_attr( $this->id ),
-			esc_html( $label )
+			esc_attr($this->id),
+			esc_html($label)
 		);
 
 	}
@@ -674,10 +674,10 @@ 
 		aui()->input(
 			array(
 				'type'       => 'checkbox',
-				'name'       => esc_attr( "getpaid-$this->id-new-payment-method" ),
-				'id'         => esc_attr( uniqid( $this->id ) ),
+				'name'       => esc_attr("getpaid-$this->id-new-payment-method"),
+				'id'         => esc_attr(uniqid($this->id)),
 				'required'   => false,
-				'label'      => esc_html__( 'Save payment method', 'invoicing' ),
+				'label'      => esc_html__('Save payment method', 'invoicing'),
 				'value'      => 'true',
 				'checked'    => true,
 				'wrap_class' => 'getpaid-save-payment-method pt-1 pb-1',
@@ -692,9 +692,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function register_gateway( $gateways ) {
+	public function register_gateway($gateways) {
 
-		$gateways[ $this->id ] = array(
+		$gateways[$this->id] = array(
 
 			'admin_label'    => $this->method_title,
             'checkout_label' => $this->title,
@@ -712,13 +712,13 @@ 
 	 * @param  WPInv_Invoice|null $invoice Invoice object or null.
 	 * @return bool
 	 */
-	public function is_sandbox( $invoice = null ) {
+	public function is_sandbox($invoice = null) {
 
-		if ( ! empty( $invoice ) && ! $invoice->needs_payment() ) {
+		if (!empty($invoice) && !$invoice->needs_payment()) {
 			return $invoice->get_mode() == 'test';
 		}
 
-		return wpinv_is_test_mode( $this->id );
+		return wpinv_is_test_mode($this->id);
 
 	}
 
@@ -736,15 +736,15 @@ 
 	 *
 	 * @return bool
 	 */
-	public function validate_currency( $validation, $currency ) {
+	public function validate_currency($validation, $currency) {
 
 		// Required currencies.
-		if ( ! empty( $this->currencies ) && ! in_array( $currency, $this->currencies ) ) {
+		if (!empty($this->currencies) && !in_array($currency, $this->currencies)) {
 			return false;
 		}
 
 		// Excluded currencies.
-		if ( ! empty( $this->exclude_currencies ) && in_array( $currency, $this->exclude_currencies ) ) {
+		if (!empty($this->exclude_currencies) && in_array($currency, $this->exclude_currencies)) {
 			return false;
 		}
 
@@ -755,13 +755,13 @@ 
 	 * Displays an error
 	 *
 	 */
-	public function show_error( $code, $message, $type ) {
+	public function show_error($code, $message, $type) {
 
-		if ( is_admin() ) {
-			getpaid_admin()->{"show_$type"}( $message );
+		if (is_admin()) {
+			getpaid_admin()->{"show_$type"}($message);
 		}
 
-		wpinv_set_error( $code, $message, $type );
+		wpinv_set_error($code, $message, $type);
 
 	}
 

vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php

Indentation +18 added lines, -18 removed lines

@@ -7,40 +7,40 @@
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
  * Set the version only if its the current newest while loading.
  */
 add_action('after_setup_theme', function () {
-	global $ayecode_ui_version,$ayecode_ui_file_key;
-	$this_version = "0.1.72";
-	if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){
-		$ayecode_ui_version = $this_version ;
-		$ayecode_ui_file_key = wp_hash( __FILE__ );
-	}
+    global $ayecode_ui_version,$ayecode_ui_file_key;
+    $this_version = "0.1.72";
+    if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){
+        $ayecode_ui_version = $this_version ;
+        $ayecode_ui_file_key = wp_hash( __FILE__ );
+    }
 },0);
 
 /**
  * Load this version of WP Bootstrap Settings only if the file hash is the current one.
  */
 add_action('after_setup_theme', function () {
-	global $ayecode_ui_file_key;
-	if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
-		include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
-		include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
-	}
+    global $ayecode_ui_file_key;
+    if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
+        include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
+        include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
+    }
 },1);
 
 /**
  * Add the function that calls the class.
  */
 if(!function_exists('aui')){
-	function aui(){
-		if(!class_exists("AUI",false)){
-			return false;
-		}
-		return AUI::instance();
-	}
+    function aui(){
+        if(!class_exists("AUI",false)){
+            return false;
+        }
+        return AUI::instance();
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -6,39 +6,39 @@
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 /**
  * Set the version only if its the current newest while loading.
  */
-add_action('after_setup_theme', function () {
-	global $ayecode_ui_version,$ayecode_ui_file_key;
+add_action('after_setup_theme', function() {
+	global $ayecode_ui_version, $ayecode_ui_file_key;
 	$this_version = "0.1.72";
-	if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){
-		$ayecode_ui_version = $this_version ;
-		$ayecode_ui_file_key = wp_hash( __FILE__ );
+	if (empty($ayecode_ui_version) || version_compare($this_version, $ayecode_ui_version, '>')) {
+		$ayecode_ui_version = $this_version;
+		$ayecode_ui_file_key = wp_hash(__FILE__);
 	}
 },0);
 
 /**
  * Load this version of WP Bootstrap Settings only if the file hash is the current one.
  */
-add_action('after_setup_theme', function () {
+add_action('after_setup_theme', function() {
 	global $ayecode_ui_file_key;
-	if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
-		include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
-		include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
+	if ($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash(__FILE__)) {
+		include_once(dirname(__FILE__) . '/includes/class-aui.php');
+		include_once(dirname(__FILE__) . '/includes/ayecode-ui-settings.php');
 	}
 },1);
 
 /**
  * Add the function that calls the class.
  */
-if(!function_exists('aui')){
-	function aui(){
-		if(!class_exists("AUI",false)){
+if (!function_exists('aui')) {
+	function aui() {
+		if (!class_exists("AUI", false)) {
 			return false;
 		}
 		return AUI::instance();

vendor/ayecode/wp-ayecode-ui/includes/components/class-aui-component-input.php

Indentation +1216 added lines, -1216 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -11,1240 +11,1240 @@ 
  */
 class AUI_Component_Input {
 
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function input( $args = array() ) {
-		$defaults = array(
-			'type'                     => 'text',
-			'name'                     => '',
-			'class'                    => '',
-			'wrap_class'               => '',
-			'id'                       => '',
-			'placeholder'              => '',
-			'title'                    => '',
-			'value'                    => '',
-			'required'                 => false,
-			'size'                     => '', // sm, lg, small, large
-			'clear_icon'               => '', // true will show a clear icon, can't be used with input_group_right
-			'label'                    => '',
-			'label_after'              => false,
-			'label_class'              => '',
-			'label_col'                => '2',
-			'label_type'               => '', // top, horizontal, empty = hidden
-			'label_force_left'         => false, // used to force checkbox label left when using horizontal
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'help_text'                => '',
-			'validation_text'          => '',
-			'validation_pattern'       => '',
-			'no_wrap'                  => false,
-			'input_group_right'        => '',
-			'input_group_left'         => '',
-			'input_group_right_inside' => false,
-			// forces the input group inside the input
-			'input_group_left_inside'  => false,
-			// forces the input group inside the input
-			'step'                     => '',
-			'switch'                   => false,
-			// to show checkbox as a switch
-			'checked'                  => false,
-			// set a checkbox or radio as selected
-			'password_toggle'          => true,
-			// toggle view/hide password
-			'element_require'          => '',
-			// [%element_id%] == "1"
-			'extra_attributes'         => array(),
-			// an array of extra attributes
-			'wrap_attributes'          => array()
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		if ( ! empty( $args['type'] ) ) {
-			// hidden label option needs to be empty
-			$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-			$type = sanitize_html_class( $args['type'] );
-
-			$help_text   = '';
-			$label       = '';
-			$label_after = $args['label_after'];
-			$label_args  = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-
-			// floating labels need label after
-			if ( $args['label_type'] == 'floating' && $type != 'checkbox' ) {
-				$label_after         = true;
-				$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-			}
-
-			// size
-			$size = '';
-			if ( $args['size'] == 'lg' || $args['size'] == 'large' ) {
-				$size = 'lg';
-				$args['class'] .= ' form-control-lg';
-			}elseif ( $args['size'] == 'sm' || $args['size'] == 'small' ) {
-				$size = 'sm';
-				$args['class'] .= ' form-control-sm';
-			}
-
-			// clear function
-			$clear_function = 'jQuery(this).parent().parent().find(\'input\').val(\'\');';
-
-			// Some special sauce for files
-			if ( $type == 'file' ) {
-				$label_after = true; // if type file we need the label after
-				$args['class'] .= ' custom-file-input ';
-			} elseif ( $type == 'checkbox' ) {
-				$label_after = true; // if type file we need the label after
-				$args['class'] .= ' custom-control-input ';
-			} elseif ( $type == 'datepicker' || $type == 'timepicker' ) {
-				$type = 'text';
-				$args['class'] .= ' bg-initial '; // @todo not sure why we have this?
-
-				$args['extra_attributes']['data-aui-init'] = 'flatpickr';
-
-				// set a way to clear field if empty
-				if ( $args['input_group_right'] === '' && $args['clear_icon'] !== false ) {
-					$args['input_group_right_inside'] = true;
-					$args['clear_icon'] = true;
-				}
-
-				// enqueue the script
-				$aui_settings = AyeCode_UI_Settings::instance();
-				$aui_settings->enqueue_flatpickr();
-			} elseif ( $type == 'iconpicker' ) {
-				$type = 'text';
-				//$args['class'] .= ' aui-flatpickr bg-initial ';
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function input( $args = array() ) {
+        $defaults = array(
+            'type'                     => 'text',
+            'name'                     => '',
+            'class'                    => '',
+            'wrap_class'               => '',
+            'id'                       => '',
+            'placeholder'              => '',
+            'title'                    => '',
+            'value'                    => '',
+            'required'                 => false,
+            'size'                     => '', // sm, lg, small, large
+            'clear_icon'               => '', // true will show a clear icon, can't be used with input_group_right
+            'label'                    => '',
+            'label_after'              => false,
+            'label_class'              => '',
+            'label_col'                => '2',
+            'label_type'               => '', // top, horizontal, empty = hidden
+            'label_force_left'         => false, // used to force checkbox label left when using horizontal
+            // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'help_text'                => '',
+            'validation_text'          => '',
+            'validation_pattern'       => '',
+            'no_wrap'                  => false,
+            'input_group_right'        => '',
+            'input_group_left'         => '',
+            'input_group_right_inside' => false,
+            // forces the input group inside the input
+            'input_group_left_inside'  => false,
+            // forces the input group inside the input
+            'step'                     => '',
+            'switch'                   => false,
+            // to show checkbox as a switch
+            'checked'                  => false,
+            // set a checkbox or radio as selected
+            'password_toggle'          => true,
+            // toggle view/hide password
+            'element_require'          => '',
+            // [%element_id%] == "1"
+            'extra_attributes'         => array(),
+            // an array of extra attributes
+            'wrap_attributes'          => array()
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+        if ( ! empty( $args['type'] ) ) {
+            // hidden label option needs to be empty
+            $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+            $type = sanitize_html_class( $args['type'] );
+
+            $help_text   = '';
+            $label       = '';
+            $label_after = $args['label_after'];
+            $label_args  = array(
+                'title'      => $args['label'],
+                'for'        => $args['id'],
+                'class'      => $args['label_class'] . " ",
+                'label_type' => $args['label_type'],
+                'label_col'  => $args['label_col']
+            );
+
+            // floating labels need label after
+            if ( $args['label_type'] == 'floating' && $type != 'checkbox' ) {
+                $label_after         = true;
+                $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+            }
+
+            // size
+            $size = '';
+            if ( $args['size'] == 'lg' || $args['size'] == 'large' ) {
+                $size = 'lg';
+                $args['class'] .= ' form-control-lg';
+            }elseif ( $args['size'] == 'sm' || $args['size'] == 'small' ) {
+                $size = 'sm';
+                $args['class'] .= ' form-control-sm';
+            }
+
+            // clear function
+            $clear_function = 'jQuery(this).parent().parent().find(\'input\').val(\'\');';
+
+            // Some special sauce for files
+            if ( $type == 'file' ) {
+                $label_after = true; // if type file we need the label after
+                $args['class'] .= ' custom-file-input ';
+            } elseif ( $type == 'checkbox' ) {
+                $label_after = true; // if type file we need the label after
+                $args['class'] .= ' custom-control-input ';
+            } elseif ( $type == 'datepicker' || $type == 'timepicker' ) {
+                $type = 'text';
+                $args['class'] .= ' bg-initial '; // @todo not sure why we have this?
+
+                $args['extra_attributes']['data-aui-init'] = 'flatpickr';
+
+                // set a way to clear field if empty
+                if ( $args['input_group_right'] === '' && $args['clear_icon'] !== false ) {
+                    $args['input_group_right_inside'] = true;
+                    $args['clear_icon'] = true;
+                }
+
+                // enqueue the script
+                $aui_settings = AyeCode_UI_Settings::instance();
+                $aui_settings->enqueue_flatpickr();
+            } elseif ( $type == 'iconpicker' ) {
+                $type = 'text';
+                //$args['class'] .= ' aui-flatpickr bg-initial ';
 //				$args['class'] .= ' bg-initial ';
 
-				$args['extra_attributes']['data-aui-init'] = 'iconpicker';
-				$args['extra_attributes']['data-placement'] = 'bottomRight';
+                $args['extra_attributes']['data-aui-init'] = 'iconpicker';
+                $args['extra_attributes']['data-placement'] = 'bottomRight';
 
-				$args['input_group_right'] = '<span class="input-group-addon input-group-text c-pointer"></span>';
+                $args['input_group_right'] = '<span class="input-group-addon input-group-text c-pointer"></span>';
 //				$args['input_group_right_inside'] = true;
-				// enqueue the script
-				$aui_settings = AyeCode_UI_Settings::instance();
-				$aui_settings->enqueue_iconpicker();
-			}
-
-			if ( $type == 'checkbox' && !empty($args['name'] ) && strpos($args['name'], '[') === false ) {
-				$output .= '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
-			}
-
-			// allow clear icon
-			if ( $args['input_group_right'] === '' && $args['clear_icon'] ) {
-				$font_size = $size == 'sm' ? '1.3' : ( $size == 'lg' ? '1.65' : '1.5' );
-				$args['input_group_right_inside'] = true;
-				$args['input_group_right'] = '<span class="input-group-text aui-clear-input c-pointer bg-initial border-0 px-2 d-none" onclick="' . $clear_function . '"><span style="font-size: '.$font_size.'rem" aria-hidden="true" class="close">&times;</span></span>';
-			}
-
-			// open/type
-			$output .= '<input type="' . $type . '" ';
-
-			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
-			}
-
-			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
-			}
-
-			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
-			}
-
-			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
-			}
-
-			// value
-			if ( ! empty( $args['value'] ) ) {
-				$output .= AUI_Component_Helper::value( $args['value'] );
-			}
-
-			// checked, for radio and checkboxes
-			if ( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ) {
-				$output .= ' checked ';
-			}
-
-			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( $args['validation_text'] ) . '\')" ';
-				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
-			}
-
-			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
-			}
-
-			// step (for numbers)
-			if ( ! empty( $args['step'] ) ) {
-				$output .= ' step="' . $args['step'] . '" ';
-			}
-
-			// required
-			if ( ! empty( $args['required'] ) ) {
-				$output .= ' required ';
-			}
-
-			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
-			$output .= ' class="form-control ' . $class . '" ';
-
-			// data-attributes
-			$output .= AUI_Component_Helper::data_attributes( $args );
-
-			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-			}
-
-			// close
-			$output .= ' >';
-
-			// help text
-			if ( ! empty( $args['help_text'] ) ) {
-				$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
-			}
-
-			// label
-			if ( ! empty( $args['label'] ) ) {
-				$label_base_class = '';
-				if ( $type == 'file' ) {
-					$label_base_class = ' custom-file-label';
-				} elseif ( $type == 'checkbox' ) {
-					if ( ! empty( $args['label_force_left'] ) ) {
-						$label_args['title'] = wp_kses_post( $args['help_text'] );
-						$help_text = '';
-						//$label_args['class'] .= ' d-inline ';
-						$args['wrap_class'] .= ' align-items-center ';
-					}else{
-
-					}
-
-					$label_base_class = ' custom-control-label';
-				}
-				$label_args['class'] .= $label_base_class;
-				$temp_label_args = $label_args;
-				if(! empty( $args['label_force_left'] )){$temp_label_args['class'] = $label_base_class." text-muted";}
-				$label = self::label( $temp_label_args, $type );
-			}
-
-
-
-
-			// set help text in the correct position
-			if ( $label_after ) {
-				$output .= $label . $help_text;
-			}
-
-			// some input types need a separate wrap
-			if ( $type == 'file' ) {
-				$output = self::wrap( array(
-					'content' => $output,
-					'class'   => 'form-group custom-file'
-				) );
-			} elseif ( $type == 'checkbox' ) {
-
-				$label_args['title'] = $args['label'];
-				$label_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'label' );
-				$label = !empty( $args['label_force_left'] ) ? self::label( $label_args, 'cb' ) : '<div class="' . $label_col . ' col-form-label"></div>';
-				$switch_size_class = $args['switch'] && !is_bool( $args['switch'] ) ? ' custom-switch-'.esc_attr( $args['switch'] ) : '';
-				$wrap_class = $args['switch'] ? 'custom-switch'.$switch_size_class : 'custom-checkbox';
-				if ( ! empty( $args['label_force_left'] ) ) {
-					$wrap_class .= ' d-flex align-content-center';
-					$label = str_replace("custom-control-label","", self::label( $label_args, 'cb' ) );
-				}
-				$output     = self::wrap( array(
-					'content' => $output,
-					'class'   => 'custom-control ' . $wrap_class
-				) );
-
-				if ( $args['label_type'] == 'horizontal' ) {
-					$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
-					$output    = $label . '<div class="' . $input_col . '">' . $output . '</div>';
-				}
-			} elseif ( $type == 'password' && $args['password_toggle'] && ! $args['input_group_right'] ) {
-
-
-				// allow password field to toggle view
-				$args['input_group_right'] = '<span class="input-group-text c-pointer px-3" 
+                // enqueue the script
+                $aui_settings = AyeCode_UI_Settings::instance();
+                $aui_settings->enqueue_iconpicker();
+            }
+
+            if ( $type == 'checkbox' && !empty($args['name'] ) && strpos($args['name'], '[') === false ) {
+                $output .= '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
+            }
+
+            // allow clear icon
+            if ( $args['input_group_right'] === '' && $args['clear_icon'] ) {
+                $font_size = $size == 'sm' ? '1.3' : ( $size == 'lg' ? '1.65' : '1.5' );
+                $args['input_group_right_inside'] = true;
+                $args['input_group_right'] = '<span class="input-group-text aui-clear-input c-pointer bg-initial border-0 px-2 d-none" onclick="' . $clear_function . '"><span style="font-size: '.$font_size.'rem" aria-hidden="true" class="close">&times;</span></span>';
+            }
+
+            // open/type
+            $output .= '<input type="' . $type . '" ';
+
+            // name
+            if ( ! empty( $args['name'] ) ) {
+                $output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+            }
+
+            // id
+            if ( ! empty( $args['id'] ) ) {
+                $output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+            }
+
+            // placeholder
+            if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
+                $output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+            }
+
+            // title
+            if ( ! empty( $args['title'] ) ) {
+                $output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+            }
+
+            // value
+            if ( ! empty( $args['value'] ) ) {
+                $output .= AUI_Component_Helper::value( $args['value'] );
+            }
+
+            // checked, for radio and checkboxes
+            if ( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ) {
+                $output .= ' checked ';
+            }
+
+            // validation text
+            if ( ! empty( $args['validation_text'] ) ) {
+                $output .= ' oninvalid="setCustomValidity(\'' . esc_attr( $args['validation_text'] ) . '\')" ';
+                $output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
+            }
+
+            // validation_pattern
+            if ( ! empty( $args['validation_pattern'] ) ) {
+                $output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+            }
+
+            // step (for numbers)
+            if ( ! empty( $args['step'] ) ) {
+                $output .= ' step="' . $args['step'] . '" ';
+            }
+
+            // required
+            if ( ! empty( $args['required'] ) ) {
+                $output .= ' required ';
+            }
+
+            // class
+            $class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+            $output .= ' class="form-control ' . $class . '" ';
+
+            // data-attributes
+            $output .= AUI_Component_Helper::data_attributes( $args );
+
+            // extra attributes
+            if ( ! empty( $args['extra_attributes'] ) ) {
+                $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+            }
+
+            // close
+            $output .= ' >';
+
+            // help text
+            if ( ! empty( $args['help_text'] ) ) {
+                $help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+            }
+
+            // label
+            if ( ! empty( $args['label'] ) ) {
+                $label_base_class = '';
+                if ( $type == 'file' ) {
+                    $label_base_class = ' custom-file-label';
+                } elseif ( $type == 'checkbox' ) {
+                    if ( ! empty( $args['label_force_left'] ) ) {
+                        $label_args['title'] = wp_kses_post( $args['help_text'] );
+                        $help_text = '';
+                        //$label_args['class'] .= ' d-inline ';
+                        $args['wrap_class'] .= ' align-items-center ';
+                    }else{
+
+                    }
+
+                    $label_base_class = ' custom-control-label';
+                }
+                $label_args['class'] .= $label_base_class;
+                $temp_label_args = $label_args;
+                if(! empty( $args['label_force_left'] )){$temp_label_args['class'] = $label_base_class." text-muted";}
+                $label = self::label( $temp_label_args, $type );
+            }
+
+
+
+
+            // set help text in the correct position
+            if ( $label_after ) {
+                $output .= $label . $help_text;
+            }
+
+            // some input types need a separate wrap
+            if ( $type == 'file' ) {
+                $output = self::wrap( array(
+                    'content' => $output,
+                    'class'   => 'form-group custom-file'
+                ) );
+            } elseif ( $type == 'checkbox' ) {
+
+                $label_args['title'] = $args['label'];
+                $label_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'label' );
+                $label = !empty( $args['label_force_left'] ) ? self::label( $label_args, 'cb' ) : '<div class="' . $label_col . ' col-form-label"></div>';
+                $switch_size_class = $args['switch'] && !is_bool( $args['switch'] ) ? ' custom-switch-'.esc_attr( $args['switch'] ) : '';
+                $wrap_class = $args['switch'] ? 'custom-switch'.$switch_size_class : 'custom-checkbox';
+                if ( ! empty( $args['label_force_left'] ) ) {
+                    $wrap_class .= ' d-flex align-content-center';
+                    $label = str_replace("custom-control-label","", self::label( $label_args, 'cb' ) );
+                }
+                $output     = self::wrap( array(
+                    'content' => $output,
+                    'class'   => 'custom-control ' . $wrap_class
+                ) );
+
+                if ( $args['label_type'] == 'horizontal' ) {
+                    $input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+                    $output    = $label . '<div class="' . $input_col . '">' . $output . '</div>';
+                }
+            } elseif ( $type == 'password' && $args['password_toggle'] && ! $args['input_group_right'] ) {
+
+
+                // allow password field to toggle view
+                $args['input_group_right'] = '<span class="input-group-text c-pointer px-3" 
 onclick="var $el = jQuery(this).find(\'i\');$el.toggleClass(\'fa-eye fa-eye-slash\');
 var $eli = jQuery(this).parent().parent().find(\'input\');
 if($el.hasClass(\'fa-eye\'))
 {$eli.attr(\'type\',\'text\');}
 else{$eli.attr(\'type\',\'password\');}"
 ><i class="far fa-fw fa-eye-slash"></i></span>';
-			}
-
-			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-				$group_size = $size == 'lg' ? ' input-group-lg' : '';
-				$group_size = !$group_size && $size == 'sm' ? ' input-group-sm' : $group_size;
-
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
-						'content'                 => $output,
-						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
-						'input_group_left'        => $args['input_group_left'],
-						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
-				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
-						'content'                  => $output,
-						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
-						'input_group_right'        => $args['input_group_right'],
-						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
-				}
-
-			}
-
-			if ( ! $label_after ) {
-				$output .= $help_text;
-			}
-
-
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$output = self::wrap( array(
-					'content' => $output,
-					'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-				) );
-			}
-
-			if ( ! $label_after ) {
-				$output = $label . $output;
-			}
-
-			// wrap
-			if ( ! $args['no_wrap'] ) {
-				$form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : 'form-group';
-				$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-				$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-				$output           = self::wrap( array(
-					'content'         => $output,
-					'class'           => $wrap_class,
-					'element_require' => $args['element_require'],
-					'argument_id'     => $args['id'],
-					'wrap_attributes' => $args['wrap_attributes'],
-				) );
-			}
-		}
-
-		return $output;
-	}
-
-	public static function label( $args = array(), $type = '' ) {
-		//<label for="exampleInputEmail1">Email address</label>
-		$defaults = array(
-			'title'      => 'div',
-			'for'        => '',
-			'class'      => '',
-			'label_type' => '', // empty = hidden, top, horizontal
-			'label_col'  => '',
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-
-		if ( $args['title'] ) {
-
-			// maybe hide labels //@todo set a global option for visibility class
-			if ( $type == 'file' || $type == 'checkbox' || $type == 'radio' || ! empty( $args['label_type'] ) ) {
-				$class = $args['class'];
-			} else {
-				$class = 'sr-only ' . $args['class'];
-			}
-
-			// maybe horizontal
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$class .= ' ' . AUI_Component_Helper::get_column_class( $args['label_col'], 'label' ) . ' col-form-label';
-			}
-
-			// open
-			$output .= '<label ';
-
-			// for
-			if ( ! empty( $args['for'] ) ) {
-				$output .= ' for="' . esc_attr( $args['for'] ) . '" ';
-			}
-
-			// class
-			$class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
-			$output .= ' class="' . $class . '" ';
-
-			// close
-			$output .= '>';
-
-
-			// title, don't escape fully as can contain html
-			if ( ! empty( $args['title'] ) ) {
-				$output .= wp_kses_post( $args['title'] );
-			}
-
-			// close wrap
-			$output .= '</label>';
-
-
-		}
-
-
-		return $output;
-	}
-
-	/**
-	 * Wrap some content in a HTML wrapper.
-	 *
-	 * @param array $args
-	 *
-	 * @return string
-	 */
-	public static function wrap( $args = array() ) {
-		$defaults = array(
-			'type'                     => 'div',
-			'class'                    => 'form-group',
-			'content'                  => '',
-			'input_group_left'         => '',
-			'input_group_right'        => '',
-			'input_group_left_inside'  => false,
-			'input_group_right_inside' => false,
-			'element_require'          => '',
-			'argument_id'              => '',
-			'wrap_attributes'          => array()
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		if ( $args['type'] ) {
-
-			// open
-			$output .= '<' . sanitize_html_class( $args['type'] );
-
-			// element require
-			if ( ! empty( $args['element_require'] ) ) {
-				$output .= AUI_Component_Helper::element_require( $args['element_require'] );
-				$args['class'] .= " aui-conditional-field";
-			}
-
-			// argument_id
-			if ( ! empty( $args['argument_id'] ) ) {
-				$output .= ' data-argument="' . esc_attr( $args['argument_id'] ) . '"';
-			}
-
-			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
-			$output .= ' class="' . $class . '" ';
-
-			// Attributes
-			if ( ! empty( $args['wrap_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['wrap_attributes'] );
-			}
-
-			// close wrap
-			$output .= ' >';
-
-
-			// Input group left
-			if ( ! empty( $args['input_group_left'] ) ) {
-				$position_class   = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_left = strpos( $args['input_group_left'], '<' ) !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
-				$output .= '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
-			}
-
-			// content
-			$output .= $args['content'];
-
-			// Input group right
-			if ( ! empty( $args['input_group_right'] ) ) {
-				$position_class    = ! empty( $args['input_group_right_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_right = strpos( $args['input_group_right'], '<' ) !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
-				$output .= '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
-			}
-
-
-			// close wrap
-			$output .= '</' . sanitize_html_class( $args['type'] ) . '>';
-
-
-		} else {
-			$output = $args['content'];
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function textarea( $args = array() ) {
-		$defaults = array(
-			'name'               => '',
-			'class'              => '',
-			'wrap_class'         => '',
-			'id'                 => '',
-			'placeholder'        => '',
-			'title'              => '',
-			'value'              => '',
-			'required'           => false,
-			'label'              => '',
-			'label_after'        => false,
-			'label_class'        => '',
-			'label_type'         => '',
-			'label_col'          => '',
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'input_group_right'        => '',
-			'input_group_left'         => '',
-			'input_group_right_inside' => false,
-			'help_text'          => '',
-			'validation_text'    => '',
-			'validation_pattern' => '',
-			'no_wrap'            => false,
-			'rows'               => '',
-			'wysiwyg'            => false,
-			'allow_tags'         => false,
-			// Allow HTML tags
-			'element_require'    => '',
-			// [%element_id%] == "1"
-			'extra_attributes'   => array(),
-			// an array of extra attributes
-			'wrap_attributes'    => array(),
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-
-		// hidden label option needs to be empty
-		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-		// floating labels don't work with wysiwyg so set it as top
-		if ( $args['label_type'] == 'floating' && ! empty( $args['wysiwyg'] ) ) {
-			$args['label_type'] = 'top';
-		}
-
-		$label_after = $args['label_after'];
-
-		// floating labels need label after
-		if ( $args['label_type'] == 'floating' && empty( $args['wysiwyg'] ) ) {
-			$label_after         = true;
-			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-		}
-
-		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
-			$label_args = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-			$output .= self::label( $label_args );
-		}
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
-			$output .= '<div class="' . $input_col . '">';
-		}
-
-		if ( ! empty( $args['wysiwyg'] ) ) {
-			ob_start();
-			$content   = $args['value'];
-			$editor_id = ! empty( $args['id'] ) ? sanitize_html_class( $args['id'] ) : 'wp_editor';
-			$settings  = array(
-				'textarea_rows' => ! empty( absint( $args['rows'] ) ) ? absint( $args['rows'] ) : 4,
-				'quicktags'     => false,
-				'media_buttons' => false,
-				'editor_class'  => 'form-control',
-				'textarea_name' => ! empty( $args['name'] ) ? sanitize_html_class( $args['name'] ) : sanitize_html_class( $args['id'] ),
-				'teeny'         => true,
-			);
-
-			// maybe set settings if array
-			if ( is_array( $args['wysiwyg'] ) ) {
-				$settings = wp_parse_args( $args['wysiwyg'], $settings );
-			}
-
-			wp_editor( $content, $editor_id, $settings );
-			$output .= ob_get_clean();
-		} else {
-
-			// open
-			$output .= '<textarea ';
-
-			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
-			}
-
-			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
-			}
-
-			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
-			}
-
-			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
-			}
-
-			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( $args['validation_text'] ) . '\')" ';
-				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
-			}
-
-			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
-			}
-
-			// required
-			if ( ! empty( $args['required'] ) ) {
-				$output .= ' required ';
-			}
-
-			// rows
-			if ( ! empty( $args['rows'] ) ) {
-				$output .= ' rows="' . absint( $args['rows'] ) . '" ';
-			}
-
-
-			// class
-			$class = ! empty( $args['class'] ) ? $args['class'] : '';
-			$output .= ' class="form-control ' . $class . '" ';
-
-			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-			}
-
-			// close tag
-			$output .= ' >';
-
-			// value
-			if ( ! empty( $args['value'] ) ) {
-				if ( ! empty( $args['allow_tags'] ) ) {
-					$output .= AUI_Component_Helper::sanitize_html_field( $args['value'], $args ); // Sanitize HTML.
-				} else {
-					$output .= AUI_Component_Helper::sanitize_textarea_field( $args['value'] );
-				}
-			}
-
-			// closing tag
-			$output .= '</textarea>';
-
-
-			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
-						'content'                 => $output,
-						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-						'input_group_left'        => $args['input_group_left'],
-						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
-				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
-						'content'                  => $output,
-						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-						'input_group_right'        => $args['input_group_right'],
-						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
-				}
-
-			}
-
-
-		}
-
-		if ( ! empty( $args['label'] ) && $label_after ) {
-			$label_args = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-			$output .= self::label( $label_args );
-		}
-
-		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$output .= AUI_Component_Helper::help_text( $args['help_text'] );
-		}
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output .= '</div>';
-		}
-
-
-		// wrap
-		if ( ! $args['no_wrap'] ) {
-			$form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : 'form-group';
-			$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-			$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output           = self::wrap( array(
-				'content'         => $output,
-				'class'           => $wrap_class,
-				'element_require' => $args['element_require'],
-				'argument_id'     => $args['id'],
-				'wrap_attributes' => $args['wrap_attributes'],
-			) );
-		}
-
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function select( $args = array() ) {
-		$defaults = array(
-			'class'            => '',
-			'wrap_class'       => '',
-			'id'               => '',
-			'title'            => '',
-			'value'            => '',
-			// can be an array or a string
-			'required'         => false,
-			'label'            => '',
-			'label_after'      => false,
-			'label_type'       => '',
-			'label_col'        => '',
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'label_class'      => '',
-			'help_text'        => '',
-			'placeholder'      => '',
-			'options'          => array(),
-			// array or string
-			'icon'             => '',
-			'multiple'         => false,
-			'select2'          => false,
-			'no_wrap'          => false,
-			'input_group_right' => '',
-			'input_group_left' => '',
-			'input_group_right_inside' => false, // forces the input group inside the input
-			'input_group_left_inside' => false, // forces the input group inside the input
-			'element_require'  => '',
-			// [%element_id%] == "1"
-			'extra_attributes' => array(),
-			// an array of extra attributes
-			'wrap_attributes'  => array(),
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-
-		// for now lets hide floating labels
-		if ( $args['label_type'] == 'floating' ) {
-			$args['label_type'] = 'hidden';
-		}
-
-		// hidden label option needs to be empty
-		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-
-		$label_after = $args['label_after'];
-
-		// floating labels need label after
-		if ( $args['label_type'] == 'floating' ) {
-			$label_after         = true;
-			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-		}
-
-		// Maybe setup select2
-		$is_select2 = false;
-		if ( ! empty( $args['select2'] ) ) {
-			$args['class'] .= ' aui-select2';
-			$is_select2 = true;
-		} elseif ( strpos( $args['class'], 'aui-select2' ) !== false ) {
-			$is_select2 = true;
-		}
-
-		// select2 tags
-		if ( ! empty( $args['select2'] ) && $args['select2'] === 'tags' ) { // triple equals needed here for some reason
-			$args['data-tags']             = 'true';
-			$args['data-token-separators'] = "[',']";
-			$args['multiple']              = true;
-		}
-
-		// select2 placeholder
-		if ( $is_select2 && isset( $args['placeholder'] ) && '' != $args['placeholder'] && empty( $args['data-placeholder'] ) ) {
-			$args['data-placeholder'] = esc_attr( $args['placeholder'] );
-			$args['data-allow-clear'] = isset( $args['data-allow-clear'] ) ? (bool) $args['data-allow-clear'] : true;
-		}
-
-
-
-		// maybe horizontal label
+            }
+
+            // input group wraps
+            if ( $args['input_group_left'] || $args['input_group_right'] ) {
+                $w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+                $group_size = $size == 'lg' ? ' input-group-lg' : '';
+                $group_size = !$group_size && $size == 'sm' ? ' input-group-sm' : $group_size;
+
+                if ( $args['input_group_left'] ) {
+                    $output = self::wrap( array(
+                        'content'                 => $output,
+                        'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
+                        'input_group_left'        => $args['input_group_left'],
+                        'input_group_left_inside' => $args['input_group_left_inside']
+                    ) );
+                }
+                if ( $args['input_group_right'] ) {
+                    $output = self::wrap( array(
+                        'content'                  => $output,
+                        'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
+                        'input_group_right'        => $args['input_group_right'],
+                        'input_group_right_inside' => $args['input_group_right_inside']
+                    ) );
+                }
+
+            }
+
+            if ( ! $label_after ) {
+                $output .= $help_text;
+            }
+
+
+            if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
+                $output = self::wrap( array(
+                    'content' => $output,
+                    'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
+                ) );
+            }
+
+            if ( ! $label_after ) {
+                $output = $label . $output;
+            }
+
+            // wrap
+            if ( ! $args['no_wrap'] ) {
+                $form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : 'form-group';
+                $wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
+                $wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+                $output           = self::wrap( array(
+                    'content'         => $output,
+                    'class'           => $wrap_class,
+                    'element_require' => $args['element_require'],
+                    'argument_id'     => $args['id'],
+                    'wrap_attributes' => $args['wrap_attributes'],
+                ) );
+            }
+        }
+
+        return $output;
+    }
+
+    public static function label( $args = array(), $type = '' ) {
+        //<label for="exampleInputEmail1">Email address</label>
+        $defaults = array(
+            'title'      => 'div',
+            'for'        => '',
+            'class'      => '',
+            'label_type' => '', // empty = hidden, top, horizontal
+            'label_col'  => '',
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+
+        if ( $args['title'] ) {
+
+            // maybe hide labels //@todo set a global option for visibility class
+            if ( $type == 'file' || $type == 'checkbox' || $type == 'radio' || ! empty( $args['label_type'] ) ) {
+                $class = $args['class'];
+            } else {
+                $class = 'sr-only ' . $args['class'];
+            }
+
+            // maybe horizontal
+            if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
+                $class .= ' ' . AUI_Component_Helper::get_column_class( $args['label_col'], 'label' ) . ' col-form-label';
+            }
+
+            // open
+            $output .= '<label ';
+
+            // for
+            if ( ! empty( $args['for'] ) ) {
+                $output .= ' for="' . esc_attr( $args['for'] ) . '" ';
+            }
+
+            // class
+            $class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
+            $output .= ' class="' . $class . '" ';
+
+            // close
+            $output .= '>';
+
+
+            // title, don't escape fully as can contain html
+            if ( ! empty( $args['title'] ) ) {
+                $output .= wp_kses_post( $args['title'] );
+            }
+
+            // close wrap
+            $output .= '</label>';
+
+
+        }
+
+
+        return $output;
+    }
+
+    /**
+     * Wrap some content in a HTML wrapper.
+     *
+     * @param array $args
+     *
+     * @return string
+     */
+    public static function wrap( $args = array() ) {
+        $defaults = array(
+            'type'                     => 'div',
+            'class'                    => 'form-group',
+            'content'                  => '',
+            'input_group_left'         => '',
+            'input_group_right'        => '',
+            'input_group_left_inside'  => false,
+            'input_group_right_inside' => false,
+            'element_require'          => '',
+            'argument_id'              => '',
+            'wrap_attributes'          => array()
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+        if ( $args['type'] ) {
+
+            // open
+            $output .= '<' . sanitize_html_class( $args['type'] );
+
+            // element require
+            if ( ! empty( $args['element_require'] ) ) {
+                $output .= AUI_Component_Helper::element_require( $args['element_require'] );
+                $args['class'] .= " aui-conditional-field";
+            }
+
+            // argument_id
+            if ( ! empty( $args['argument_id'] ) ) {
+                $output .= ' data-argument="' . esc_attr( $args['argument_id'] ) . '"';
+            }
+
+            // class
+            $class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+            $output .= ' class="' . $class . '" ';
+
+            // Attributes
+            if ( ! empty( $args['wrap_attributes'] ) ) {
+                $output .= AUI_Component_Helper::extra_attributes( $args['wrap_attributes'] );
+            }
+
+            // close wrap
+            $output .= ' >';
+
+
+            // Input group left
+            if ( ! empty( $args['input_group_left'] ) ) {
+                $position_class   = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
+                $input_group_left = strpos( $args['input_group_left'], '<' ) !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
+                $output .= '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
+            }
+
+            // content
+            $output .= $args['content'];
+
+            // Input group right
+            if ( ! empty( $args['input_group_right'] ) ) {
+                $position_class    = ! empty( $args['input_group_right_inside'] ) ? 'position-absolute h-100' : '';
+                $input_group_right = strpos( $args['input_group_right'], '<' ) !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
+                $output .= '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
+            }
+
+
+            // close wrap
+            $output .= '</' . sanitize_html_class( $args['type'] ) . '>';
+
+
+        } else {
+            $output = $args['content'];
+        }
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function textarea( $args = array() ) {
+        $defaults = array(
+            'name'               => '',
+            'class'              => '',
+            'wrap_class'         => '',
+            'id'                 => '',
+            'placeholder'        => '',
+            'title'              => '',
+            'value'              => '',
+            'required'           => false,
+            'label'              => '',
+            'label_after'        => false,
+            'label_class'        => '',
+            'label_type'         => '',
+            'label_col'          => '',
+            // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'input_group_right'        => '',
+            'input_group_left'         => '',
+            'input_group_right_inside' => false,
+            'help_text'          => '',
+            'validation_text'    => '',
+            'validation_pattern' => '',
+            'no_wrap'            => false,
+            'rows'               => '',
+            'wysiwyg'            => false,
+            'allow_tags'         => false,
+            // Allow HTML tags
+            'element_require'    => '',
+            // [%element_id%] == "1"
+            'extra_attributes'   => array(),
+            // an array of extra attributes
+            'wrap_attributes'    => array(),
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+
+        // hidden label option needs to be empty
+        $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+        // floating labels don't work with wysiwyg so set it as top
+        if ( $args['label_type'] == 'floating' && ! empty( $args['wysiwyg'] ) ) {
+            $args['label_type'] = 'top';
+        }
+
+        $label_after = $args['label_after'];
+
+        // floating labels need label after
+        if ( $args['label_type'] == 'floating' && empty( $args['wysiwyg'] ) ) {
+            $label_after         = true;
+            $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+        }
+
+        // label
+        if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
+        } elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+            $label_args = array(
+                'title'      => $args['label'],
+                'for'        => $args['id'],
+                'class'      => $args['label_class'] . " ",
+                'label_type' => $args['label_type'],
+                'label_col'  => $args['label_col']
+            );
+            $output .= self::label( $label_args );
+        }
+
+        // maybe horizontal label
+        if ( $args['label_type'] == 'horizontal' ) {
+            $input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+            $output .= '<div class="' . $input_col . '">';
+        }
+
+        if ( ! empty( $args['wysiwyg'] ) ) {
+            ob_start();
+            $content   = $args['value'];
+            $editor_id = ! empty( $args['id'] ) ? sanitize_html_class( $args['id'] ) : 'wp_editor';
+            $settings  = array(
+                'textarea_rows' => ! empty( absint( $args['rows'] ) ) ? absint( $args['rows'] ) : 4,
+                'quicktags'     => false,
+                'media_buttons' => false,
+                'editor_class'  => 'form-control',
+                'textarea_name' => ! empty( $args['name'] ) ? sanitize_html_class( $args['name'] ) : sanitize_html_class( $args['id'] ),
+                'teeny'         => true,
+            );
+
+            // maybe set settings if array
+            if ( is_array( $args['wysiwyg'] ) ) {
+                $settings = wp_parse_args( $args['wysiwyg'], $settings );
+            }
+
+            wp_editor( $content, $editor_id, $settings );
+            $output .= ob_get_clean();
+        } else {
+
+            // open
+            $output .= '<textarea ';
+
+            // name
+            if ( ! empty( $args['name'] ) ) {
+                $output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+            }
+
+            // id
+            if ( ! empty( $args['id'] ) ) {
+                $output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+            }
+
+            // placeholder
+            if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
+                $output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+            }
+
+            // title
+            if ( ! empty( $args['title'] ) ) {
+                $output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+            }
+
+            // validation text
+            if ( ! empty( $args['validation_text'] ) ) {
+                $output .= ' oninvalid="setCustomValidity(\'' . esc_attr( $args['validation_text'] ) . '\')" ';
+                $output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
+            }
+
+            // validation_pattern
+            if ( ! empty( $args['validation_pattern'] ) ) {
+                $output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+            }
+
+            // required
+            if ( ! empty( $args['required'] ) ) {
+                $output .= ' required ';
+            }
+
+            // rows
+            if ( ! empty( $args['rows'] ) ) {
+                $output .= ' rows="' . absint( $args['rows'] ) . '" ';
+            }
+
+
+            // class
+            $class = ! empty( $args['class'] ) ? $args['class'] : '';
+            $output .= ' class="form-control ' . $class . '" ';
+
+            // extra attributes
+            if ( ! empty( $args['extra_attributes'] ) ) {
+                $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+            }
+
+            // close tag
+            $output .= ' >';
+
+            // value
+            if ( ! empty( $args['value'] ) ) {
+                if ( ! empty( $args['allow_tags'] ) ) {
+                    $output .= AUI_Component_Helper::sanitize_html_field( $args['value'], $args ); // Sanitize HTML.
+                } else {
+                    $output .= AUI_Component_Helper::sanitize_textarea_field( $args['value'] );
+                }
+            }
+
+            // closing tag
+            $output .= '</textarea>';
+
+
+            // input group wraps
+            if ( $args['input_group_left'] || $args['input_group_right'] ) {
+                $w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+                if ( $args['input_group_left'] ) {
+                    $output = self::wrap( array(
+                        'content'                 => $output,
+                        'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+                        'input_group_left'        => $args['input_group_left'],
+                        'input_group_left_inside' => $args['input_group_left_inside']
+                    ) );
+                }
+                if ( $args['input_group_right'] ) {
+                    $output = self::wrap( array(
+                        'content'                  => $output,
+                        'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+                        'input_group_right'        => $args['input_group_right'],
+                        'input_group_right_inside' => $args['input_group_right_inside']
+                    ) );
+                }
+
+            }
+
+
+        }
+
+        if ( ! empty( $args['label'] ) && $label_after ) {
+            $label_args = array(
+                'title'      => $args['label'],
+                'for'        => $args['id'],
+                'class'      => $args['label_class'] . " ",
+                'label_type' => $args['label_type'],
+                'label_col'  => $args['label_col']
+            );
+            $output .= self::label( $label_args );
+        }
+
+        // help text
+        if ( ! empty( $args['help_text'] ) ) {
+            $output .= AUI_Component_Helper::help_text( $args['help_text'] );
+        }
+
+        // maybe horizontal label
+        if ( $args['label_type'] == 'horizontal' ) {
+            $output .= '</div>';
+        }
+
+
+        // wrap
+        if ( ! $args['no_wrap'] ) {
+            $form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : 'form-group';
+            $wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
+            $wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+            $output           = self::wrap( array(
+                'content'         => $output,
+                'class'           => $wrap_class,
+                'element_require' => $args['element_require'],
+                'argument_id'     => $args['id'],
+                'wrap_attributes' => $args['wrap_attributes'],
+            ) );
+        }
+
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function select( $args = array() ) {
+        $defaults = array(
+            'class'            => '',
+            'wrap_class'       => '',
+            'id'               => '',
+            'title'            => '',
+            'value'            => '',
+            // can be an array or a string
+            'required'         => false,
+            'label'            => '',
+            'label_after'      => false,
+            'label_type'       => '',
+            'label_col'        => '',
+            // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'label_class'      => '',
+            'help_text'        => '',
+            'placeholder'      => '',
+            'options'          => array(),
+            // array or string
+            'icon'             => '',
+            'multiple'         => false,
+            'select2'          => false,
+            'no_wrap'          => false,
+            'input_group_right' => '',
+            'input_group_left' => '',
+            'input_group_right_inside' => false, // forces the input group inside the input
+            'input_group_left_inside' => false, // forces the input group inside the input
+            'element_require'  => '',
+            // [%element_id%] == "1"
+            'extra_attributes' => array(),
+            // an array of extra attributes
+            'wrap_attributes'  => array(),
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+
+        // for now lets hide floating labels
+        if ( $args['label_type'] == 'floating' ) {
+            $args['label_type'] = 'hidden';
+        }
+
+        // hidden label option needs to be empty
+        $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+
+        $label_after = $args['label_after'];
+
+        // floating labels need label after
+        if ( $args['label_type'] == 'floating' ) {
+            $label_after         = true;
+            $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+        }
+
+        // Maybe setup select2
+        $is_select2 = false;
+        if ( ! empty( $args['select2'] ) ) {
+            $args['class'] .= ' aui-select2';
+            $is_select2 = true;
+        } elseif ( strpos( $args['class'], 'aui-select2' ) !== false ) {
+            $is_select2 = true;
+        }
+
+        // select2 tags
+        if ( ! empty( $args['select2'] ) && $args['select2'] === 'tags' ) { // triple equals needed here for some reason
+            $args['data-tags']             = 'true';
+            $args['data-token-separators'] = "[',']";
+            $args['multiple']              = true;
+        }
+
+        // select2 placeholder
+        if ( $is_select2 && isset( $args['placeholder'] ) && '' != $args['placeholder'] && empty( $args['data-placeholder'] ) ) {
+            $args['data-placeholder'] = esc_attr( $args['placeholder'] );
+            $args['data-allow-clear'] = isset( $args['data-allow-clear'] ) ? (bool) $args['data-allow-clear'] : true;
+        }
+
+
+
+        // maybe horizontal label
 //		if ( $args['label_type'] == 'horizontal' ) {
 //			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
 //			$output .= '<div class="' . $input_col . '">';
 //		}
 
-		// Set hidden input to save empty value for multiselect.
-		if ( ! empty( $args['multiple'] ) && ! empty( $args['name'] ) ) {
-			$output .= '<input type="hidden" ' . AUI_Component_Helper::name( $args['name'] ) . ' value=""/>';
-		}
-
-		// open/type
-		$output .= '<select ';
-
-		// style
-		if ( $is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
-			$output .= " style='width:100%;' ";
-		}
-
-		// element require
-		if ( ! empty( $args['element_require'] ) ) {
-			$output .= AUI_Component_Helper::element_require( $args['element_require'] );
-			$args['class'] .= " aui-conditional-field";
-		}
-
-		// class
-		$class = ! empty( $args['class'] ) ? $args['class'] : '';
-		$output .= AUI_Component_Helper::class_attr( 'custom-select ' . $class );
-
-		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'], $args['multiple'] );
-		}
-
-		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] );
-		}
-
-		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
-		}
-
-		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
-
-		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
-
-		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-		}
-
-		// required
-		if ( ! empty( $args['required'] ) ) {
-			$output .= ' required ';
-		}
-
-		// multiple
-		if ( ! empty( $args['multiple'] ) ) {
-			$output .= ' multiple ';
-		}
-
-		// close opening tag
-		$output .= ' >';
-
-		// placeholder
-		if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] && ! $is_select2 ) {
-			$output .= '<option value="" disabled selected hidden>' . esc_attr( $args['placeholder'] ) . '</option>';
-		} elseif ( $is_select2 && ! empty( $args['placeholder'] ) ) {
-			$output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
-		}
-
-		// Options
-		if ( ! empty( $args['options'] ) ) {
-
-			if ( ! is_array( $args['options'] ) ) {
-				$output .= $args['options']; // not the preferred way but an option
-			} else {
-				foreach ( $args['options'] as $val => $name ) {
-					$selected = '';
-					if ( is_array( $name ) ) {
-						if ( isset( $name['optgroup'] ) && ( $name['optgroup'] == 'start' || $name['optgroup'] == 'end' ) ) {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
-
-							$output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr( $option_label ) . '">' : '</optgroup>';
-						} else {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
-							$option_value = isset( $name['value'] ) ? $name['value'] : '';
-							$extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes( $name['extra_attributes'] ) : '';
-							if ( ! empty( $args['multiple'] ) && ! empty( $args['value'] ) && is_array( $args['value'] ) ) {
-								$selected = in_array( $option_value, stripslashes_deep( $args['value'] ) ) ? "selected" : "";
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $option_value, stripslashes_deep( $args['value'] ), false );
-							} elseif ( empty( $args['value'] ) && $args['value'] === $option_value ) {
-								$selected = selected( $option_value, $args['value'], false );
-							}
-
-							$output .= '<option value="' . esc_attr( $option_value ) . '" ' . $selected . ' '.$extra_attributes .'>' . $option_label . '</option>';
-						}
-					} else {
-						if ( ! empty( $args['value'] ) ) {
-							if ( is_array( $args['value'] ) ) {
-								$selected = in_array( $val, $args['value'] ) ? 'selected="selected"' : '';
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $args['value'], $val, false );
-							}
-						} elseif ( $args['value'] === $val ) {
-							$selected = selected( $args['value'], $val, false );
-						}
-						$output .= '<option value="' . esc_attr( $val ) . '" ' . $selected . '>' . esc_attr( $name ) . '</option>';
-					}
-				}
-			}
-
-		}
-
-		// closing tag
-		$output .= '</select>';
-
-		$label = '';
-		$help_text = '';
-		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
-			$label_args = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-			$label = self::label( $label_args );
-		}
-
-		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
-		}
-
-		// input group wraps
-		if ( $args['input_group_left'] || $args['input_group_right'] ) {
-			$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-			if ( $args['input_group_left'] ) {
-				$output = self::wrap( array(
-					'content'                 => $output,
-					'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-					'input_group_left'        => $args['input_group_left'],
-					'input_group_left_inside' => $args['input_group_left_inside']
-				) );
-			}
-			if ( $args['input_group_right'] ) {
-				$output = self::wrap( array(
-					'content'                  => $output,
-					'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-					'input_group_right'        => $args['input_group_right'],
-					'input_group_right_inside' => $args['input_group_right_inside']
-				) );
-			}
-
-		}
-
-		if ( ! $label_after ) {
-			$output .= $help_text;
-		}
-
-
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output = self::wrap( array(
-				'content' => $output,
-				'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-			) );
-		}
-
-		if ( ! $label_after ) {
-			$output = $label . $output;
-		}
-
-		// maybe horizontal label
+        // Set hidden input to save empty value for multiselect.
+        if ( ! empty( $args['multiple'] ) && ! empty( $args['name'] ) ) {
+            $output .= '<input type="hidden" ' . AUI_Component_Helper::name( $args['name'] ) . ' value=""/>';
+        }
+
+        // open/type
+        $output .= '<select ';
+
+        // style
+        if ( $is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
+            $output .= " style='width:100%;' ";
+        }
+
+        // element require
+        if ( ! empty( $args['element_require'] ) ) {
+            $output .= AUI_Component_Helper::element_require( $args['element_require'] );
+            $args['class'] .= " aui-conditional-field";
+        }
+
+        // class
+        $class = ! empty( $args['class'] ) ? $args['class'] : '';
+        $output .= AUI_Component_Helper::class_attr( 'custom-select ' . $class );
+
+        // name
+        if ( ! empty( $args['name'] ) ) {
+            $output .= AUI_Component_Helper::name( $args['name'], $args['multiple'] );
+        }
+
+        // id
+        if ( ! empty( $args['id'] ) ) {
+            $output .= AUI_Component_Helper::id( $args['id'] );
+        }
+
+        // title
+        if ( ! empty( $args['title'] ) ) {
+            $output .= AUI_Component_Helper::title( $args['title'] );
+        }
+
+        // data-attributes
+        $output .= AUI_Component_Helper::data_attributes( $args );
+
+        // aria-attributes
+        $output .= AUI_Component_Helper::aria_attributes( $args );
+
+        // extra attributes
+        if ( ! empty( $args['extra_attributes'] ) ) {
+            $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+        }
+
+        // required
+        if ( ! empty( $args['required'] ) ) {
+            $output .= ' required ';
+        }
+
+        // multiple
+        if ( ! empty( $args['multiple'] ) ) {
+            $output .= ' multiple ';
+        }
+
+        // close opening tag
+        $output .= ' >';
+
+        // placeholder
+        if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] && ! $is_select2 ) {
+            $output .= '<option value="" disabled selected hidden>' . esc_attr( $args['placeholder'] ) . '</option>';
+        } elseif ( $is_select2 && ! empty( $args['placeholder'] ) ) {
+            $output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
+        }
+
+        // Options
+        if ( ! empty( $args['options'] ) ) {
+
+            if ( ! is_array( $args['options'] ) ) {
+                $output .= $args['options']; // not the preferred way but an option
+            } else {
+                foreach ( $args['options'] as $val => $name ) {
+                    $selected = '';
+                    if ( is_array( $name ) ) {
+                        if ( isset( $name['optgroup'] ) && ( $name['optgroup'] == 'start' || $name['optgroup'] == 'end' ) ) {
+                            $option_label = isset( $name['label'] ) ? $name['label'] : '';
+
+                            $output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr( $option_label ) . '">' : '</optgroup>';
+                        } else {
+                            $option_label = isset( $name['label'] ) ? $name['label'] : '';
+                            $option_value = isset( $name['value'] ) ? $name['value'] : '';
+                            $extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes( $name['extra_attributes'] ) : '';
+                            if ( ! empty( $args['multiple'] ) && ! empty( $args['value'] ) && is_array( $args['value'] ) ) {
+                                $selected = in_array( $option_value, stripslashes_deep( $args['value'] ) ) ? "selected" : "";
+                            } elseif ( ! empty( $args['value'] ) ) {
+                                $selected = selected( $option_value, stripslashes_deep( $args['value'] ), false );
+                            } elseif ( empty( $args['value'] ) && $args['value'] === $option_value ) {
+                                $selected = selected( $option_value, $args['value'], false );
+                            }
+
+                            $output .= '<option value="' . esc_attr( $option_value ) . '" ' . $selected . ' '.$extra_attributes .'>' . $option_label . '</option>';
+                        }
+                    } else {
+                        if ( ! empty( $args['value'] ) ) {
+                            if ( is_array( $args['value'] ) ) {
+                                $selected = in_array( $val, $args['value'] ) ? 'selected="selected"' : '';
+                            } elseif ( ! empty( $args['value'] ) ) {
+                                $selected = selected( $args['value'], $val, false );
+                            }
+                        } elseif ( $args['value'] === $val ) {
+                            $selected = selected( $args['value'], $val, false );
+                        }
+                        $output .= '<option value="' . esc_attr( $val ) . '" ' . $selected . '>' . esc_attr( $name ) . '</option>';
+                    }
+                }
+            }
+
+        }
+
+        // closing tag
+        $output .= '</select>';
+
+        $label = '';
+        $help_text = '';
+        // label
+        if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
+        } elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+            $label_args = array(
+                'title'      => $args['label'],
+                'for'        => $args['id'],
+                'class'      => $args['label_class'] . " ",
+                'label_type' => $args['label_type'],
+                'label_col'  => $args['label_col']
+            );
+            $label = self::label( $label_args );
+        }
+
+        // help text
+        if ( ! empty( $args['help_text'] ) ) {
+            $help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+        }
+
+        // input group wraps
+        if ( $args['input_group_left'] || $args['input_group_right'] ) {
+            $w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+            if ( $args['input_group_left'] ) {
+                $output = self::wrap( array(
+                    'content'                 => $output,
+                    'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+                    'input_group_left'        => $args['input_group_left'],
+                    'input_group_left_inside' => $args['input_group_left_inside']
+                ) );
+            }
+            if ( $args['input_group_right'] ) {
+                $output = self::wrap( array(
+                    'content'                  => $output,
+                    'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+                    'input_group_right'        => $args['input_group_right'],
+                    'input_group_right_inside' => $args['input_group_right_inside']
+                ) );
+            }
+
+        }
+
+        if ( ! $label_after ) {
+            $output .= $help_text;
+        }
+
+
+        if ( $args['label_type'] == 'horizontal' ) {
+            $output = self::wrap( array(
+                'content' => $output,
+                'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
+            ) );
+        }
+
+        if ( ! $label_after ) {
+            $output = $label . $output;
+        }
+
+        // maybe horizontal label
 //		if ( $args['label_type'] == 'horizontal' ) {
 //			$output .= '</div>';
 //		}
 
 
-		// wrap
-		if ( ! $args['no_wrap'] ) {
-			$wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
-			$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output     = self::wrap( array(
-				'content'         => $output,
-				'class'           => $wrap_class,
-				'element_require' => $args['element_require'],
-				'argument_id'     => $args['id'],
-				'wrap_attributes' => $args['wrap_attributes'],
-			) );
-		}
-
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function radio( $args = array() ) {
-		$defaults = array(
-			'class'            => '',
-			'wrap_class'       => '',
-			'id'               => '',
-			'title'            => '',
-			'horizontal'       => false,
-			// sets the lable horizontal
-			'value'            => '',
-			'label'            => '',
-			'label_class'      => '',
-			'label_type'       => '',
-			'label_col'        => '',
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'help_text'        => '',
-			'inline'           => true,
-			'required'         => false,
-			'options'          => array(),
-			'icon'             => '',
-			'no_wrap'          => false,
-			'element_require'  => '',
-			// [%element_id%] == "1"
-			'extra_attributes' => array(),
-			// an array of extra attributes
-			'wrap_attributes'  => array()
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args = wp_parse_args( $args, $defaults );
-
-		// for now lets use horizontal for floating
-		if ( $args['label_type'] == 'floating' ) {
-			$args['label_type'] = 'horizontal';
-		}
-
-		$label_args = array(
-			'title'      => $args['label'],
-			'class'      => $args['label_class'] . " pt-0 ",
-			'label_type' => $args['label_type'],
-			'label_col'  => $args['label_col']
-		);
-
-		$output = '';
-
-
-		// label before
-		if ( ! empty( $args['label'] ) ) {
-			$output .= self::label( $label_args, 'radio' );
-		}
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
-			$output .= '<div class="' . $input_col . '">';
-		}
-
-		if ( ! empty( $args['options'] ) ) {
-			$count = 0;
-			foreach ( $args['options'] as $value => $label ) {
-				$option_args            = $args;
-				$option_args['value']   = $value;
-				$option_args['label']   = $label;
-				$option_args['checked'] = $value == $args['value'] ? true : false;
-				$output .= self::radio_option( $option_args, $count );
-				$count ++;
-			}
-		}
-
-		// help text
-		$help_text = ! empty( $args['help_text'] ) ? AUI_Component_Helper::help_text( $args['help_text'] ) : '';
-		$output .= $help_text;
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output .= '</div>';
-		}
-
-		// wrap
-		$wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
-		$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-		$output     = self::wrap( array(
-			'content'         => $output,
-			'class'           => $wrap_class,
-			'element_require' => $args['element_require'],
-			'argument_id'     => $args['id'],
-			'wrap_attributes' => $args['wrap_attributes'],
-		) );
-
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function radio_option( $args = array(), $count = '' ) {
-		$defaults = array(
-			'class'            => '',
-			'id'               => '',
-			'title'            => '',
-			'value'            => '',
-			'required'         => false,
-			'inline'           => true,
-			'label'            => '',
-			'options'          => array(),
-			'icon'             => '',
-			'no_wrap'          => false,
-			'extra_attributes' => array() // an array of extra attributes
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args = wp_parse_args( $args, $defaults );
-
-		$output = '';
-
-		// open/type
-		$output .= '<input type="radio"';
-
-		// class
-		$output .= ' class="form-check-input" ';
-
-		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'] );
-		}
-
-		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] . $count );
-		}
-
-		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
-		}
-
-		// value
-		if ( isset( $args['value'] ) ) {
-			$output .= AUI_Component_Helper::value( $args['value'] );
-		}
-
-		// checked, for radio and checkboxes
-		if ( $args['checked'] ) {
-			$output .= ' checked ';
-		}
-
-		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
-
-		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
-
-		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-		}
-
-		// required
-		if ( ! empty( $args['required'] ) ) {
-			$output .= ' required ';
-		}
-
-		// close opening tag
-		$output .= ' >';
-
-		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) ) {
-			$output .= self::label( array(
-				'title' => $args['label'],
-				'for'   => $args['id'] . $count,
-				'class' => 'form-check-label'
-			), 'radio' );
-		}
-
-		// wrap
-		if ( ! $args['no_wrap'] ) {
-			$wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
-
-			// Unique wrap class
-			$uniq_class = 'fwrap';
-			if ( ! empty( $args['name'] ) ) {
-				$uniq_class .= '-' . $args['name'];
-			} else if ( ! empty( $args['id'] ) ) {
-				$uniq_class .= '-' . $args['id'];
-			}
-
-			if ( isset( $args['value'] ) || $args['value'] !== "" ) {
-				$uniq_class .= '-' . $args['value'];
-			} else {
-				$uniq_class .= '-' . $count;
-			}
-			$wrap_class .= ' ' . sanitize_html_class( $uniq_class );
-
-			$output = self::wrap( array(
-				'content' => $output,
-				'class'   => $wrap_class
-			) );
-		}
-
-		return $output;
-	}
+        // wrap
+        if ( ! $args['no_wrap'] ) {
+            $wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
+            $wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+            $output     = self::wrap( array(
+                'content'         => $output,
+                'class'           => $wrap_class,
+                'element_require' => $args['element_require'],
+                'argument_id'     => $args['id'],
+                'wrap_attributes' => $args['wrap_attributes'],
+            ) );
+        }
+
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function radio( $args = array() ) {
+        $defaults = array(
+            'class'            => '',
+            'wrap_class'       => '',
+            'id'               => '',
+            'title'            => '',
+            'horizontal'       => false,
+            // sets the lable horizontal
+            'value'            => '',
+            'label'            => '',
+            'label_class'      => '',
+            'label_type'       => '',
+            'label_col'        => '',
+            // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'help_text'        => '',
+            'inline'           => true,
+            'required'         => false,
+            'options'          => array(),
+            'icon'             => '',
+            'no_wrap'          => false,
+            'element_require'  => '',
+            // [%element_id%] == "1"
+            'extra_attributes' => array(),
+            // an array of extra attributes
+            'wrap_attributes'  => array()
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args = wp_parse_args( $args, $defaults );
+
+        // for now lets use horizontal for floating
+        if ( $args['label_type'] == 'floating' ) {
+            $args['label_type'] = 'horizontal';
+        }
+
+        $label_args = array(
+            'title'      => $args['label'],
+            'class'      => $args['label_class'] . " pt-0 ",
+            'label_type' => $args['label_type'],
+            'label_col'  => $args['label_col']
+        );
+
+        $output = '';
+
+
+        // label before
+        if ( ! empty( $args['label'] ) ) {
+            $output .= self::label( $label_args, 'radio' );
+        }
+
+        // maybe horizontal label
+        if ( $args['label_type'] == 'horizontal' ) {
+            $input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+            $output .= '<div class="' . $input_col . '">';
+        }
+
+        if ( ! empty( $args['options'] ) ) {
+            $count = 0;
+            foreach ( $args['options'] as $value => $label ) {
+                $option_args            = $args;
+                $option_args['value']   = $value;
+                $option_args['label']   = $label;
+                $option_args['checked'] = $value == $args['value'] ? true : false;
+                $output .= self::radio_option( $option_args, $count );
+                $count ++;
+            }
+        }
+
+        // help text
+        $help_text = ! empty( $args['help_text'] ) ? AUI_Component_Helper::help_text( $args['help_text'] ) : '';
+        $output .= $help_text;
+
+        // maybe horizontal label
+        if ( $args['label_type'] == 'horizontal' ) {
+            $output .= '</div>';
+        }
+
+        // wrap
+        $wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
+        $wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+        $output     = self::wrap( array(
+            'content'         => $output,
+            'class'           => $wrap_class,
+            'element_require' => $args['element_require'],
+            'argument_id'     => $args['id'],
+            'wrap_attributes' => $args['wrap_attributes'],
+        ) );
+
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function radio_option( $args = array(), $count = '' ) {
+        $defaults = array(
+            'class'            => '',
+            'id'               => '',
+            'title'            => '',
+            'value'            => '',
+            'required'         => false,
+            'inline'           => true,
+            'label'            => '',
+            'options'          => array(),
+            'icon'             => '',
+            'no_wrap'          => false,
+            'extra_attributes' => array() // an array of extra attributes
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args = wp_parse_args( $args, $defaults );
+
+        $output = '';
+
+        // open/type
+        $output .= '<input type="radio"';
+
+        // class
+        $output .= ' class="form-check-input" ';
+
+        // name
+        if ( ! empty( $args['name'] ) ) {
+            $output .= AUI_Component_Helper::name( $args['name'] );
+        }
+
+        // id
+        if ( ! empty( $args['id'] ) ) {
+            $output .= AUI_Component_Helper::id( $args['id'] . $count );
+        }
+
+        // title
+        if ( ! empty( $args['title'] ) ) {
+            $output .= AUI_Component_Helper::title( $args['title'] );
+        }
+
+        // value
+        if ( isset( $args['value'] ) ) {
+            $output .= AUI_Component_Helper::value( $args['value'] );
+        }
+
+        // checked, for radio and checkboxes
+        if ( $args['checked'] ) {
+            $output .= ' checked ';
+        }
+
+        // data-attributes
+        $output .= AUI_Component_Helper::data_attributes( $args );
+
+        // aria-attributes
+        $output .= AUI_Component_Helper::aria_attributes( $args );
+
+        // extra attributes
+        if ( ! empty( $args['extra_attributes'] ) ) {
+            $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+        }
+
+        // required
+        if ( ! empty( $args['required'] ) ) {
+            $output .= ' required ';
+        }
+
+        // close opening tag
+        $output .= ' >';
+
+        // label
+        if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
+        } elseif ( ! empty( $args['label'] ) ) {
+            $output .= self::label( array(
+                'title' => $args['label'],
+                'for'   => $args['id'] . $count,
+                'class' => 'form-check-label'
+            ), 'radio' );
+        }
+
+        // wrap
+        if ( ! $args['no_wrap'] ) {
+            $wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
+
+            // Unique wrap class
+            $uniq_class = 'fwrap';
+            if ( ! empty( $args['name'] ) ) {
+                $uniq_class .= '-' . $args['name'];
+            } else if ( ! empty( $args['id'] ) ) {
+                $uniq_class .= '-' . $args['id'];
+            }
+
+            if ( isset( $args['value'] ) || $args['value'] !== "" ) {
+                $uniq_class .= '-' . $args['value'];
+            } else {
+                $uniq_class .= '-' . $count;
+            }
+            $wrap_class .= ' ' . sanitize_html_class( $uniq_class );
+
+            $output = self::wrap( array(
+                'content' => $output,
+                'class'   => $wrap_class
+            ) );
+        }
+
+        return $output;
+    }
 
 }
\ No newline at end of file

Spacing +290 added lines, -290 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -18,7 +18,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function input( $args = array() ) {
+	public static function input($args = array()) {
 		$defaults = array(
 			'type'                     => 'text',
 			'name'                     => '',
@@ -65,13 +65,13 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
-		if ( ! empty( $args['type'] ) ) {
+		if (!empty($args['type'])) {
 			// hidden label option needs to be empty
 			$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
 
-			$type = sanitize_html_class( $args['type'] );
+			$type = sanitize_html_class($args['type']);
 
 			$help_text   = '';
 			$label       = '';
@@ -85,17 +85,17 @@ 
 			);
 
 			// floating labels need label after
-			if ( $args['label_type'] == 'floating' && $type != 'checkbox' ) {
+			if ($args['label_type'] == 'floating' && $type != 'checkbox') {
 				$label_after         = true;
 				$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 			}
 
 			// size
 			$size = '';
-			if ( $args['size'] == 'lg' || $args['size'] == 'large' ) {
+			if ($args['size'] == 'lg' || $args['size'] == 'large') {
 				$size = 'lg';
 				$args['class'] .= ' form-control-lg';
-			}elseif ( $args['size'] == 'sm' || $args['size'] == 'small' ) {
+			}elseif ($args['size'] == 'sm' || $args['size'] == 'small') {
 				$size = 'sm';
 				$args['class'] .= ' form-control-sm';
 			}
@@ -104,20 +104,20 @@ 
 			$clear_function = 'jQuery(this).parent().parent().find(\'input\').val(\'\');';
 
 			// Some special sauce for files
-			if ( $type == 'file' ) {
+			if ($type == 'file') {
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= ' custom-file-input ';
-			} elseif ( $type == 'checkbox' ) {
+			} elseif ($type == 'checkbox') {
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= ' custom-control-input ';
-			} elseif ( $type == 'datepicker' || $type == 'timepicker' ) {
+			} elseif ($type == 'datepicker' || $type == 'timepicker') {
 				$type = 'text';
 				$args['class'] .= ' bg-initial '; // @todo not sure why we have this?
 
 				$args['extra_attributes']['data-aui-init'] = 'flatpickr';
 
 				// set a way to clear field if empty
-				if ( $args['input_group_right'] === '' && $args['clear_icon'] !== false ) {
+				if ($args['input_group_right'] === '' && $args['clear_icon'] !== false) {
 					$args['input_group_right_inside'] = true;
 					$args['clear_icon'] = true;
 				}
@@ -125,7 +125,7 @@ 
 				// enqueue the script
 				$aui_settings = AyeCode_UI_Settings::instance();
 				$aui_settings->enqueue_flatpickr();
-			} elseif ( $type == 'iconpicker' ) {
+			} elseif ($type == 'iconpicker') {
 				$type = 'text';
 				//$args['class'] .= ' aui-flatpickr bg-initial ';
 //				$args['class'] .= ' bg-initial ';
@@ -140,103 +140,103 @@ 
 				$aui_settings->enqueue_iconpicker();
 			}
 
-			if ( $type == 'checkbox' && !empty($args['name'] ) && strpos($args['name'], '[') === false ) {
-				$output .= '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
+			if ($type == 'checkbox' && !empty($args['name']) && strpos($args['name'], '[') === false) {
+				$output .= '<input type="hidden" name="' . esc_attr($args['name']) . '" value="0" />';
 			}
 
 			// allow clear icon
-			if ( $args['input_group_right'] === '' && $args['clear_icon'] ) {
-				$font_size = $size == 'sm' ? '1.3' : ( $size == 'lg' ? '1.65' : '1.5' );
+			if ($args['input_group_right'] === '' && $args['clear_icon']) {
+				$font_size = $size == 'sm' ? '1.3' : ($size == 'lg' ? '1.65' : '1.5');
 				$args['input_group_right_inside'] = true;
-				$args['input_group_right'] = '<span class="input-group-text aui-clear-input c-pointer bg-initial border-0 px-2 d-none" onclick="' . $clear_function . '"><span style="font-size: '.$font_size.'rem" aria-hidden="true" class="close">&times;</span></span>';
+				$args['input_group_right'] = '<span class="input-group-text aui-clear-input c-pointer bg-initial border-0 px-2 d-none" onclick="' . $clear_function . '"><span style="font-size: ' . $font_size . 'rem" aria-hidden="true" class="close">&times;</span></span>';
 			}
 
 			// open/type
 			$output .= '<input type="' . $type . '" ';
 
 			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+			if (!empty($args['name'])) {
+				$output .= ' name="' . esc_attr($args['name']) . '" ';
 			}
 
 			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+			if (!empty($args['id'])) {
+				$output .= ' id="' . sanitize_html_class($args['id']) . '" ';
 			}
 
 			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+			if (isset($args['placeholder']) && '' != $args['placeholder']) {
+				$output .= ' placeholder="' . esc_attr($args['placeholder']) . '" ';
 			}
 
 			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+			if (!empty($args['title'])) {
+				$output .= ' title="' . esc_attr($args['title']) . '" ';
 			}
 
 			// value
-			if ( ! empty( $args['value'] ) ) {
-				$output .= AUI_Component_Helper::value( $args['value'] );
+			if (!empty($args['value'])) {
+				$output .= AUI_Component_Helper::value($args['value']);
 			}
 
 			// checked, for radio and checkboxes
-			if ( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ) {
+			if (($type == 'checkbox' || $type == 'radio') && $args['checked']) {
 				$output .= ' checked ';
 			}
 
 			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( $args['validation_text'] ) . '\')" ';
+			if (!empty($args['validation_text'])) {
+				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr($args['validation_text']) . '\')" ';
 				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
 			}
 
 			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+			if (!empty($args['validation_pattern'])) {
+				$output .= ' pattern="' . esc_attr($args['validation_pattern']) . '" ';
 			}
 
 			// step (for numbers)
-			if ( ! empty( $args['step'] ) ) {
+			if (!empty($args['step'])) {
 				$output .= ' step="' . $args['step'] . '" ';
 			}
 
 			// required
-			if ( ! empty( $args['required'] ) ) {
+			if (!empty($args['required'])) {
 				$output .= ' required ';
 			}
 
 			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes($args['class']) : '';
 			$output .= ' class="form-control ' . $class . '" ';
 
 			// data-attributes
-			$output .= AUI_Component_Helper::data_attributes( $args );
+			$output .= AUI_Component_Helper::data_attributes($args);
 
 			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+			if (!empty($args['extra_attributes'])) {
+				$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 			}
 
 			// close
 			$output .= ' >';
 
 			// help text
-			if ( ! empty( $args['help_text'] ) ) {
-				$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+			if (!empty($args['help_text'])) {
+				$help_text = AUI_Component_Helper::help_text($args['help_text']);
 			}
 
 			// label
-			if ( ! empty( $args['label'] ) ) {
+			if (!empty($args['label'])) {
 				$label_base_class = '';
-				if ( $type == 'file' ) {
+				if ($type == 'file') {
 					$label_base_class = ' custom-file-label';
-				} elseif ( $type == 'checkbox' ) {
-					if ( ! empty( $args['label_force_left'] ) ) {
-						$label_args['title'] = wp_kses_post( $args['help_text'] );
+				} elseif ($type == 'checkbox') {
+					if (!empty($args['label_force_left'])) {
+						$label_args['title'] = wp_kses_post($args['help_text']);
 						$help_text = '';
 						//$label_args['class'] .= ' d-inline ';
 						$args['wrap_class'] .= ' align-items-center ';
-					}else{
+					} else {
 
 					}
 
@@ -244,45 +244,45 @@ 
 				}
 				$label_args['class'] .= $label_base_class;
 				$temp_label_args = $label_args;
-				if(! empty( $args['label_force_left'] )){$temp_label_args['class'] = $label_base_class." text-muted";}
-				$label = self::label( $temp_label_args, $type );
+				if (!empty($args['label_force_left'])) {$temp_label_args['class'] = $label_base_class . " text-muted"; }
+				$label = self::label($temp_label_args, $type);
 			}
 
 
 
 
 			// set help text in the correct position
-			if ( $label_after ) {
+			if ($label_after) {
 				$output .= $label . $help_text;
 			}
 
 			// some input types need a separate wrap
-			if ( $type == 'file' ) {
-				$output = self::wrap( array(
+			if ($type == 'file') {
+				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => 'form-group custom-file'
-				) );
-			} elseif ( $type == 'checkbox' ) {
+				));
+			} elseif ($type == 'checkbox') {
 
 				$label_args['title'] = $args['label'];
-				$label_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'label' );
-				$label = !empty( $args['label_force_left'] ) ? self::label( $label_args, 'cb' ) : '<div class="' . $label_col . ' col-form-label"></div>';
-				$switch_size_class = $args['switch'] && !is_bool( $args['switch'] ) ? ' custom-switch-'.esc_attr( $args['switch'] ) : '';
-				$wrap_class = $args['switch'] ? 'custom-switch'.$switch_size_class : 'custom-checkbox';
-				if ( ! empty( $args['label_force_left'] ) ) {
+				$label_col = AUI_Component_Helper::get_column_class($args['label_col'], 'label');
+				$label = !empty($args['label_force_left']) ? self::label($label_args, 'cb') : '<div class="' . $label_col . ' col-form-label"></div>';
+				$switch_size_class = $args['switch'] && !is_bool($args['switch']) ? ' custom-switch-' . esc_attr($args['switch']) : '';
+				$wrap_class = $args['switch'] ? 'custom-switch' . $switch_size_class : 'custom-checkbox';
+				if (!empty($args['label_force_left'])) {
 					$wrap_class .= ' d-flex align-content-center';
-					$label = str_replace("custom-control-label","", self::label( $label_args, 'cb' ) );
+					$label = str_replace("custom-control-label", "", self::label($label_args, 'cb'));
 				}
-				$output     = self::wrap( array(
+				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => 'custom-control ' . $wrap_class
-				) );
+				));
 
-				if ( $args['label_type'] == 'horizontal' ) {
-					$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+				if ($args['label_type'] == 'horizontal') {
+					$input_col = AUI_Component_Helper::get_column_class($args['label_col'], 'input');
 					$output    = $label . '<div class="' . $input_col . '">' . $output . '</div>';
 				}
-			} elseif ( $type == 'password' && $args['password_toggle'] && ! $args['input_group_right'] ) {
+			} elseif ($type == 'password' && $args['password_toggle'] && !$args['input_group_right']) {
 
 
 				// allow password field to toggle view
@@ -296,65 +296,65 @@ 
 			}
 
 			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+			if ($args['input_group_left'] || $args['input_group_right']) {
+				$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
 				$group_size = $size == 'lg' ? ' input-group-lg' : '';
 				$group_size = !$group_size && $size == 'sm' ? ' input-group-sm' : $group_size;
 
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
+				if ($args['input_group_left']) {
+					$output = self::wrap(array(
 						'content'                 => $output,
 						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
 						'input_group_left'        => $args['input_group_left'],
 						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
+					));
 				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
+				if ($args['input_group_right']) {
+					$output = self::wrap(array(
 						'content'                  => $output,
 						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
 						'input_group_right'        => $args['input_group_right'],
 						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
+					));
 				}
 
 			}
 
-			if ( ! $label_after ) {
+			if (!$label_after) {
 				$output .= $help_text;
 			}
 
 
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$output = self::wrap( array(
+			if ($args['label_type'] == 'horizontal' && $type != 'checkbox') {
+				$output = self::wrap(array(
 					'content' => $output,
-					'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-				) );
+					'class'   => AUI_Component_Helper::get_column_class($args['label_col'], 'input')
+				));
 			}
 
-			if ( ! $label_after ) {
+			if (!$label_after) {
 				$output = $label . $output;
 			}
 
 			// wrap
-			if ( ! $args['no_wrap'] ) {
+			if (!$args['no_wrap']) {
 				$form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : 'form-group';
 				$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-				$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-				$output           = self::wrap( array(
+				$wrap_class       = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+				$output           = self::wrap(array(
 					'content'         => $output,
 					'class'           => $wrap_class,
 					'element_require' => $args['element_require'],
 					'argument_id'     => $args['id'],
 					'wrap_attributes' => $args['wrap_attributes'],
-				) );
+				));
 			}
 		}
 
 		return $output;
 	}
 
-	public static function label( $args = array(), $type = '' ) {
+	public static function label($args = array(), $type = '') {
 		//<label for="exampleInputEmail1">Email address</label>
 		$defaults = array(
 			'title'      => 'div',
@@ -367,33 +367,33 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
-		if ( $args['title'] ) {
+		if ($args['title']) {
 
 			// maybe hide labels //@todo set a global option for visibility class
-			if ( $type == 'file' || $type == 'checkbox' || $type == 'radio' || ! empty( $args['label_type'] ) ) {
+			if ($type == 'file' || $type == 'checkbox' || $type == 'radio' || !empty($args['label_type'])) {
 				$class = $args['class'];
 			} else {
 				$class = 'sr-only ' . $args['class'];
 			}
 
 			// maybe horizontal
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$class .= ' ' . AUI_Component_Helper::get_column_class( $args['label_col'], 'label' ) . ' col-form-label';
+			if ($args['label_type'] == 'horizontal' && $type != 'checkbox') {
+				$class .= ' ' . AUI_Component_Helper::get_column_class($args['label_col'], 'label') . ' col-form-label';
 			}
 
 			// open
 			$output .= '<label ';
 
 			// for
-			if ( ! empty( $args['for'] ) ) {
-				$output .= ' for="' . esc_attr( $args['for'] ) . '" ';
+			if (!empty($args['for'])) {
+				$output .= ' for="' . esc_attr($args['for']) . '" ';
 			}
 
 			// class
-			$class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
+			$class = $class ? AUI_Component_Helper::esc_classes($class) : '';
 			$output .= ' class="' . $class . '" ';
 
 			// close
@@ -401,8 +401,8 @@ 
 
 
 			// title, don't escape fully as can contain html
-			if ( ! empty( $args['title'] ) ) {
-				$output .= wp_kses_post( $args['title'] );
+			if (!empty($args['title'])) {
+				$output .= wp_kses_post($args['title']);
 			}
 
 			// close wrap
@@ -422,7 +422,7 @@ 
 	 *
 	 * @return string
 	 */
-	public static function wrap( $args = array() ) {
+	public static function wrap($args = array()) {
 		$defaults = array(
 			'type'                     => 'div',
 			'class'                    => 'form-group',
@@ -439,31 +439,31 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
-		if ( $args['type'] ) {
+		if ($args['type']) {
 
 			// open
-			$output .= '<' . sanitize_html_class( $args['type'] );
+			$output .= '<' . sanitize_html_class($args['type']);
 
 			// element require
-			if ( ! empty( $args['element_require'] ) ) {
-				$output .= AUI_Component_Helper::element_require( $args['element_require'] );
+			if (!empty($args['element_require'])) {
+				$output .= AUI_Component_Helper::element_require($args['element_require']);
 				$args['class'] .= " aui-conditional-field";
 			}
 
 			// argument_id
-			if ( ! empty( $args['argument_id'] ) ) {
-				$output .= ' data-argument="' . esc_attr( $args['argument_id'] ) . '"';
+			if (!empty($args['argument_id'])) {
+				$output .= ' data-argument="' . esc_attr($args['argument_id']) . '"';
 			}
 
 			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes($args['class']) : '';
 			$output .= ' class="' . $class . '" ';
 
 			// Attributes
-			if ( ! empty( $args['wrap_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['wrap_attributes'] );
+			if (!empty($args['wrap_attributes'])) {
+				$output .= AUI_Component_Helper::extra_attributes($args['wrap_attributes']);
 			}
 
 			// close wrap
@@ -471,9 +471,9 @@ 
 
 
 			// Input group left
-			if ( ! empty( $args['input_group_left'] ) ) {
-				$position_class   = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_left = strpos( $args['input_group_left'], '<' ) !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
+			if (!empty($args['input_group_left'])) {
+				$position_class   = !empty($args['input_group_left_inside']) ? 'position-absolute h-100' : '';
+				$input_group_left = strpos($args['input_group_left'], '<') !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
 				$output .= '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
 			}
 
@@ -481,15 +481,15 @@ 
 			$output .= $args['content'];
 
 			// Input group right
-			if ( ! empty( $args['input_group_right'] ) ) {
-				$position_class    = ! empty( $args['input_group_right_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_right = strpos( $args['input_group_right'], '<' ) !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
+			if (!empty($args['input_group_right'])) {
+				$position_class    = !empty($args['input_group_right_inside']) ? 'position-absolute h-100' : '';
+				$input_group_right = strpos($args['input_group_right'], '<') !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
 				$output .= '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
 			}
 
 
 			// close wrap
-			$output .= '</' . sanitize_html_class( $args['type'] ) . '>';
+			$output .= '</' . sanitize_html_class($args['type']) . '>';
 
 
 		} else {
@@ -506,7 +506,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function textarea( $args = array() ) {
+	public static function textarea($args = array()) {
 		$defaults = array(
 			'name'               => '',
 			'class'              => '',
@@ -543,28 +543,28 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
 		// hidden label option needs to be empty
 		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
 
 		// floating labels don't work with wysiwyg so set it as top
-		if ( $args['label_type'] == 'floating' && ! empty( $args['wysiwyg'] ) ) {
+		if ($args['label_type'] == 'floating' && !empty($args['wysiwyg'])) {
 			$args['label_type'] = 'top';
 		}
 
 		$label_after = $args['label_after'];
 
 		// floating labels need label after
-		if ( $args['label_type'] == 'floating' && empty( $args['wysiwyg'] ) ) {
+		if ($args['label_type'] == 'floating' && empty($args['wysiwyg'])) {
 			$label_after         = true;
 			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 		}
 
 		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+		if (!empty($args['label']) && is_array($args['label'])) {
+		} elseif (!empty($args['label']) && !$label_after) {
 			$label_args = array(
 				'title'      => $args['label'],
 				'for'        => $args['id'],
@@ -572,34 +572,34 @@ 
 				'label_type' => $args['label_type'],
 				'label_col'  => $args['label_col']
 			);
-			$output .= self::label( $label_args );
+			$output .= self::label($label_args);
 		}
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+		if ($args['label_type'] == 'horizontal') {
+			$input_col = AUI_Component_Helper::get_column_class($args['label_col'], 'input');
 			$output .= '<div class="' . $input_col . '">';
 		}
 
-		if ( ! empty( $args['wysiwyg'] ) ) {
+		if (!empty($args['wysiwyg'])) {
 			ob_start();
 			$content   = $args['value'];
-			$editor_id = ! empty( $args['id'] ) ? sanitize_html_class( $args['id'] ) : 'wp_editor';
+			$editor_id = !empty($args['id']) ? sanitize_html_class($args['id']) : 'wp_editor';
 			$settings  = array(
-				'textarea_rows' => ! empty( absint( $args['rows'] ) ) ? absint( $args['rows'] ) : 4,
+				'textarea_rows' => !empty(absint($args['rows'])) ? absint($args['rows']) : 4,
 				'quicktags'     => false,
 				'media_buttons' => false,
 				'editor_class'  => 'form-control',
-				'textarea_name' => ! empty( $args['name'] ) ? sanitize_html_class( $args['name'] ) : sanitize_html_class( $args['id'] ),
+				'textarea_name' => !empty($args['name']) ? sanitize_html_class($args['name']) : sanitize_html_class($args['id']),
 				'teeny'         => true,
 			);
 
 			// maybe set settings if array
-			if ( is_array( $args['wysiwyg'] ) ) {
-				$settings = wp_parse_args( $args['wysiwyg'], $settings );
+			if (is_array($args['wysiwyg'])) {
+				$settings = wp_parse_args($args['wysiwyg'], $settings);
 			}
 
-			wp_editor( $content, $editor_id, $settings );
+			wp_editor($content, $editor_id, $settings);
 			$output .= ob_get_clean();
 		} else {
 
@@ -607,65 +607,65 @@ 
 			$output .= '<textarea ';
 
 			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+			if (!empty($args['name'])) {
+				$output .= ' name="' . esc_attr($args['name']) . '" ';
 			}
 
 			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+			if (!empty($args['id'])) {
+				$output .= ' id="' . sanitize_html_class($args['id']) . '" ';
 			}
 
 			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+			if (isset($args['placeholder']) && '' != $args['placeholder']) {
+				$output .= ' placeholder="' . esc_attr($args['placeholder']) . '" ';
 			}
 
 			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+			if (!empty($args['title'])) {
+				$output .= ' title="' . esc_attr($args['title']) . '" ';
 			}
 
 			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( $args['validation_text'] ) . '\')" ';
+			if (!empty($args['validation_text'])) {
+				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr($args['validation_text']) . '\')" ';
 				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
 			}
 
 			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+			if (!empty($args['validation_pattern'])) {
+				$output .= ' pattern="' . esc_attr($args['validation_pattern']) . '" ';
 			}
 
 			// required
-			if ( ! empty( $args['required'] ) ) {
+			if (!empty($args['required'])) {
 				$output .= ' required ';
 			}
 
 			// rows
-			if ( ! empty( $args['rows'] ) ) {
-				$output .= ' rows="' . absint( $args['rows'] ) . '" ';
+			if (!empty($args['rows'])) {
+				$output .= ' rows="' . absint($args['rows']) . '" ';
 			}
 
 
 			// class
-			$class = ! empty( $args['class'] ) ? $args['class'] : '';
+			$class = !empty($args['class']) ? $args['class'] : '';
 			$output .= ' class="form-control ' . $class . '" ';
 
 			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+			if (!empty($args['extra_attributes'])) {
+				$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 			}
 
 			// close tag
 			$output .= ' >';
 
 			// value
-			if ( ! empty( $args['value'] ) ) {
-				if ( ! empty( $args['allow_tags'] ) ) {
-					$output .= AUI_Component_Helper::sanitize_html_field( $args['value'], $args ); // Sanitize HTML.
+			if (!empty($args['value'])) {
+				if (!empty($args['allow_tags'])) {
+					$output .= AUI_Component_Helper::sanitize_html_field($args['value'], $args); // Sanitize HTML.
 				} else {
-					$output .= AUI_Component_Helper::sanitize_textarea_field( $args['value'] );
+					$output .= AUI_Component_Helper::sanitize_textarea_field($args['value']);
 				}
 			}
 
@@ -674,23 +674,23 @@ 
 
 
 			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
+			if ($args['input_group_left'] || $args['input_group_right']) {
+				$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
+				if ($args['input_group_left']) {
+					$output = self::wrap(array(
 						'content'                 => $output,
 						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 						'input_group_left'        => $args['input_group_left'],
 						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
+					));
 				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
+				if ($args['input_group_right']) {
+					$output = self::wrap(array(
 						'content'                  => $output,
 						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 						'input_group_right'        => $args['input_group_right'],
 						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
+					));
 				}
 
 			}
@@ -698,7 +698,7 @@ 
 
 		}
 
-		if ( ! empty( $args['label'] ) && $label_after ) {
+		if (!empty($args['label']) && $label_after) {
 			$label_args = array(
 				'title'      => $args['label'],
 				'for'        => $args['id'],
@@ -706,32 +706,32 @@ 
 				'label_type' => $args['label_type'],
 				'label_col'  => $args['label_col']
 			);
-			$output .= self::label( $label_args );
+			$output .= self::label($label_args);
 		}
 
 		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$output .= AUI_Component_Helper::help_text( $args['help_text'] );
+		if (!empty($args['help_text'])) {
+			$output .= AUI_Component_Helper::help_text($args['help_text']);
 		}
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '</div>';
 		}
 
 
 		// wrap
-		if ( ! $args['no_wrap'] ) {
+		if (!$args['no_wrap']) {
 			$form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : 'form-group';
 			$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-			$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output           = self::wrap( array(
+			$wrap_class       = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+			$output           = self::wrap(array(
 				'content'         => $output,
 				'class'           => $wrap_class,
 				'element_require' => $args['element_require'],
 				'argument_id'     => $args['id'],
 				'wrap_attributes' => $args['wrap_attributes'],
-			) );
+			));
 		}
 
 
@@ -745,7 +745,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function select( $args = array() ) {
+	public static function select($args = array()) {
 		$defaults = array(
 			'class'            => '',
 			'wrap_class'       => '',
@@ -782,11 +782,11 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
 		// for now lets hide floating labels
-		if ( $args['label_type'] == 'floating' ) {
+		if ($args['label_type'] == 'floating') {
 			$args['label_type'] = 'hidden';
 		}
 
@@ -797,31 +797,31 @@ 
 		$label_after = $args['label_after'];
 
 		// floating labels need label after
-		if ( $args['label_type'] == 'floating' ) {
+		if ($args['label_type'] == 'floating') {
 			$label_after         = true;
 			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 		}
 
 		// Maybe setup select2
 		$is_select2 = false;
-		if ( ! empty( $args['select2'] ) ) {
+		if (!empty($args['select2'])) {
 			$args['class'] .= ' aui-select2';
 			$is_select2 = true;
-		} elseif ( strpos( $args['class'], 'aui-select2' ) !== false ) {
+		} elseif (strpos($args['class'], 'aui-select2') !== false) {
 			$is_select2 = true;
 		}
 
 		// select2 tags
-		if ( ! empty( $args['select2'] ) && $args['select2'] === 'tags' ) { // triple equals needed here for some reason
+		if (!empty($args['select2']) && $args['select2'] === 'tags') { // triple equals needed here for some reason
 			$args['data-tags']             = 'true';
 			$args['data-token-separators'] = "[',']";
 			$args['multiple']              = true;
 		}
 
 		// select2 placeholder
-		if ( $is_select2 && isset( $args['placeholder'] ) && '' != $args['placeholder'] && empty( $args['data-placeholder'] ) ) {
-			$args['data-placeholder'] = esc_attr( $args['placeholder'] );
-			$args['data-allow-clear'] = isset( $args['data-allow-clear'] ) ? (bool) $args['data-allow-clear'] : true;
+		if ($is_select2 && isset($args['placeholder']) && '' != $args['placeholder'] && empty($args['data-placeholder'])) {
+			$args['data-placeholder'] = esc_attr($args['placeholder']);
+			$args['data-allow-clear'] = isset($args['data-allow-clear']) ? (bool) $args['data-allow-clear'] : true;
 		}
 
 
@@ -833,61 +833,61 @@ 
 //		}
 
 		// Set hidden input to save empty value for multiselect.
-		if ( ! empty( $args['multiple'] ) && ! empty( $args['name'] ) ) {
-			$output .= '<input type="hidden" ' . AUI_Component_Helper::name( $args['name'] ) . ' value=""/>';
+		if (!empty($args['multiple']) && !empty($args['name'])) {
+			$output .= '<input type="hidden" ' . AUI_Component_Helper::name($args['name']) . ' value=""/>';
 		}
 
 		// open/type
 		$output .= '<select ';
 
 		// style
-		if ( $is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
+		if ($is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
 			$output .= " style='width:100%;' ";
 		}
 
 		// element require
-		if ( ! empty( $args['element_require'] ) ) {
-			$output .= AUI_Component_Helper::element_require( $args['element_require'] );
+		if (!empty($args['element_require'])) {
+			$output .= AUI_Component_Helper::element_require($args['element_require']);
 			$args['class'] .= " aui-conditional-field";
 		}
 
 		// class
-		$class = ! empty( $args['class'] ) ? $args['class'] : '';
-		$output .= AUI_Component_Helper::class_attr( 'custom-select ' . $class );
+		$class = !empty($args['class']) ? $args['class'] : '';
+		$output .= AUI_Component_Helper::class_attr('custom-select ' . $class);
 
 		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'], $args['multiple'] );
+		if (!empty($args['name'])) {
+			$output .= AUI_Component_Helper::name($args['name'], $args['multiple']);
 		}
 
 		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] );
+		if (!empty($args['id'])) {
+			$output .= AUI_Component_Helper::id($args['id']);
 		}
 
 		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
+		if (!empty($args['title'])) {
+			$output .= AUI_Component_Helper::title($args['title']);
 		}
 
 		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
+		$output .= AUI_Component_Helper::data_attributes($args);
 
 		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
+		$output .= AUI_Component_Helper::aria_attributes($args);
 
 		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+		if (!empty($args['extra_attributes'])) {
+			$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 		}
 
 		// required
-		if ( ! empty( $args['required'] ) ) {
+		if (!empty($args['required'])) {
 			$output .= ' required ';
 		}
 
 		// multiple
-		if ( ! empty( $args['multiple'] ) ) {
+		if (!empty($args['multiple'])) {
 			$output .= ' multiple ';
 		}
 
@@ -895,50 +895,50 @@ 
 		$output .= ' >';
 
 		// placeholder
-		if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] && ! $is_select2 ) {
-			$output .= '<option value="" disabled selected hidden>' . esc_attr( $args['placeholder'] ) . '</option>';
-		} elseif ( $is_select2 && ! empty( $args['placeholder'] ) ) {
+		if (isset($args['placeholder']) && '' != $args['placeholder'] && !$is_select2) {
+			$output .= '<option value="" disabled selected hidden>' . esc_attr($args['placeholder']) . '</option>';
+		} elseif ($is_select2 && !empty($args['placeholder'])) {
 			$output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
 		}
 
 		// Options
-		if ( ! empty( $args['options'] ) ) {
+		if (!empty($args['options'])) {
 
-			if ( ! is_array( $args['options'] ) ) {
+			if (!is_array($args['options'])) {
 				$output .= $args['options']; // not the preferred way but an option
 			} else {
-				foreach ( $args['options'] as $val => $name ) {
+				foreach ($args['options'] as $val => $name) {
 					$selected = '';
-					if ( is_array( $name ) ) {
-						if ( isset( $name['optgroup'] ) && ( $name['optgroup'] == 'start' || $name['optgroup'] == 'end' ) ) {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
+					if (is_array($name)) {
+						if (isset($name['optgroup']) && ($name['optgroup'] == 'start' || $name['optgroup'] == 'end')) {
+							$option_label = isset($name['label']) ? $name['label'] : '';
 
-							$output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr( $option_label ) . '">' : '</optgroup>';
+							$output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
 						} else {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
-							$option_value = isset( $name['value'] ) ? $name['value'] : '';
-							$extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes( $name['extra_attributes'] ) : '';
-							if ( ! empty( $args['multiple'] ) && ! empty( $args['value'] ) && is_array( $args['value'] ) ) {
-								$selected = in_array( $option_value, stripslashes_deep( $args['value'] ) ) ? "selected" : "";
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $option_value, stripslashes_deep( $args['value'] ), false );
-							} elseif ( empty( $args['value'] ) && $args['value'] === $option_value ) {
-								$selected = selected( $option_value, $args['value'], false );
+							$option_label = isset($name['label']) ? $name['label'] : '';
+							$option_value = isset($name['value']) ? $name['value'] : '';
+							$extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes($name['extra_attributes']) : '';
+							if (!empty($args['multiple']) && !empty($args['value']) && is_array($args['value'])) {
+								$selected = in_array($option_value, stripslashes_deep($args['value'])) ? "selected" : "";
+							} elseif (!empty($args['value'])) {
+								$selected = selected($option_value, stripslashes_deep($args['value']), false);
+							} elseif (empty($args['value']) && $args['value'] === $option_value) {
+								$selected = selected($option_value, $args['value'], false);
 							}
 
-							$output .= '<option value="' . esc_attr( $option_value ) . '" ' . $selected . ' '.$extra_attributes .'>' . $option_label . '</option>';
+							$output .= '<option value="' . esc_attr($option_value) . '" ' . $selected . ' ' . $extra_attributes . '>' . $option_label . '</option>';
 						}
 					} else {
-						if ( ! empty( $args['value'] ) ) {
-							if ( is_array( $args['value'] ) ) {
-								$selected = in_array( $val, $args['value'] ) ? 'selected="selected"' : '';
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $args['value'], $val, false );
+						if (!empty($args['value'])) {
+							if (is_array($args['value'])) {
+								$selected = in_array($val, $args['value']) ? 'selected="selected"' : '';
+							} elseif (!empty($args['value'])) {
+								$selected = selected($args['value'], $val, false);
 							}
-						} elseif ( $args['value'] === $val ) {
-							$selected = selected( $args['value'], $val, false );
+						} elseif ($args['value'] === $val) {
+							$selected = selected($args['value'], $val, false);
 						}
-						$output .= '<option value="' . esc_attr( $val ) . '" ' . $selected . '>' . esc_attr( $name ) . '</option>';
+						$output .= '<option value="' . esc_attr($val) . '" ' . $selected . '>' . esc_attr($name) . '</option>';
 					}
 				}
 			}
@@ -951,8 +951,8 @@ 
 		$label = '';
 		$help_text = '';
 		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+		if (!empty($args['label']) && is_array($args['label'])) {
+		} elseif (!empty($args['label']) && !$label_after) {
 			$label_args = array(
 				'title'      => $args['label'],
 				'for'        => $args['id'],
@@ -960,49 +960,49 @@ 
 				'label_type' => $args['label_type'],
 				'label_col'  => $args['label_col']
 			);
-			$label = self::label( $label_args );
+			$label = self::label($label_args);
 		}
 
 		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+		if (!empty($args['help_text'])) {
+			$help_text = AUI_Component_Helper::help_text($args['help_text']);
 		}
 
 		// input group wraps
-		if ( $args['input_group_left'] || $args['input_group_right'] ) {
-			$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-			if ( $args['input_group_left'] ) {
-				$output = self::wrap( array(
+		if ($args['input_group_left'] || $args['input_group_right']) {
+			$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
+			if ($args['input_group_left']) {
+				$output = self::wrap(array(
 					'content'                 => $output,
 					'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 					'input_group_left'        => $args['input_group_left'],
 					'input_group_left_inside' => $args['input_group_left_inside']
-				) );
+				));
 			}
-			if ( $args['input_group_right'] ) {
-				$output = self::wrap( array(
+			if ($args['input_group_right']) {
+				$output = self::wrap(array(
 					'content'                  => $output,
 					'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 					'input_group_right'        => $args['input_group_right'],
 					'input_group_right_inside' => $args['input_group_right_inside']
-				) );
+				));
 			}
 
 		}
 
-		if ( ! $label_after ) {
+		if (!$label_after) {
 			$output .= $help_text;
 		}
 
 
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output = self::wrap( array(
+		if ($args['label_type'] == 'horizontal') {
+			$output = self::wrap(array(
 				'content' => $output,
-				'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-			) );
+				'class'   => AUI_Component_Helper::get_column_class($args['label_col'], 'input')
+			));
 		}
 
-		if ( ! $label_after ) {
+		if (!$label_after) {
 			$output = $label . $output;
 		}
 
@@ -1013,16 +1013,16 @@ 
 
 
 		// wrap
-		if ( ! $args['no_wrap'] ) {
+		if (!$args['no_wrap']) {
 			$wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
-			$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output     = self::wrap( array(
+			$wrap_class = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+			$output     = self::wrap(array(
 				'content'         => $output,
 				'class'           => $wrap_class,
 				'element_require' => $args['element_require'],
 				'argument_id'     => $args['id'],
 				'wrap_attributes' => $args['wrap_attributes'],
-			) );
+			));
 		}
 
 
@@ -1036,7 +1036,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio( $args = array() ) {
+	public static function radio($args = array()) {
 		$defaults = array(
 			'class'            => '',
 			'wrap_class'       => '',
@@ -1066,10 +1066,10 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		// for now lets use horizontal for floating
-		if ( $args['label_type'] == 'floating' ) {
+		if ($args['label_type'] == 'floating') {
 			$args['label_type'] = 'horizontal';
 		}
 
@@ -1084,47 +1084,47 @@ 
 
 
 		// label before
-		if ( ! empty( $args['label'] ) ) {
-			$output .= self::label( $label_args, 'radio' );
+		if (!empty($args['label'])) {
+			$output .= self::label($label_args, 'radio');
 		}
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+		if ($args['label_type'] == 'horizontal') {
+			$input_col = AUI_Component_Helper::get_column_class($args['label_col'], 'input');
 			$output .= '<div class="' . $input_col . '">';
 		}
 
-		if ( ! empty( $args['options'] ) ) {
+		if (!empty($args['options'])) {
 			$count = 0;
-			foreach ( $args['options'] as $value => $label ) {
+			foreach ($args['options'] as $value => $label) {
 				$option_args            = $args;
 				$option_args['value']   = $value;
 				$option_args['label']   = $label;
 				$option_args['checked'] = $value == $args['value'] ? true : false;
-				$output .= self::radio_option( $option_args, $count );
-				$count ++;
+				$output .= self::radio_option($option_args, $count);
+				$count++;
 			}
 		}
 
 		// help text
-		$help_text = ! empty( $args['help_text'] ) ? AUI_Component_Helper::help_text( $args['help_text'] ) : '';
+		$help_text = !empty($args['help_text']) ? AUI_Component_Helper::help_text($args['help_text']) : '';
 		$output .= $help_text;
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '</div>';
 		}
 
 		// wrap
 		$wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
-		$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-		$output     = self::wrap( array(
+		$wrap_class = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+		$output     = self::wrap(array(
 			'content'         => $output,
 			'class'           => $wrap_class,
 			'element_require' => $args['element_require'],
 			'argument_id'     => $args['id'],
 			'wrap_attributes' => $args['wrap_attributes'],
-		) );
+		));
 
 
 		return $output;
@@ -1137,7 +1137,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio_option( $args = array(), $count = '' ) {
+	public static function radio_option($args = array(), $count = '') {
 		$defaults = array(
 			'class'            => '',
 			'id'               => '',
@@ -1155,7 +1155,7 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$output = '';
 
@@ -1166,43 +1166,43 @@ 
 		$output .= ' class="form-check-input" ';
 
 		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'] );
+		if (!empty($args['name'])) {
+			$output .= AUI_Component_Helper::name($args['name']);
 		}
 
 		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] . $count );
+		if (!empty($args['id'])) {
+			$output .= AUI_Component_Helper::id($args['id'] . $count);
 		}
 
 		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
+		if (!empty($args['title'])) {
+			$output .= AUI_Component_Helper::title($args['title']);
 		}
 
 		// value
-		if ( isset( $args['value'] ) ) {
-			$output .= AUI_Component_Helper::value( $args['value'] );
+		if (isset($args['value'])) {
+			$output .= AUI_Component_Helper::value($args['value']);
 		}
 
 		// checked, for radio and checkboxes
-		if ( $args['checked'] ) {
+		if ($args['checked']) {
 			$output .= ' checked ';
 		}
 
 		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
+		$output .= AUI_Component_Helper::data_attributes($args);
 
 		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
+		$output .= AUI_Component_Helper::aria_attributes($args);
 
 		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+		if (!empty($args['extra_attributes'])) {
+			$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 		}
 
 		// required
-		if ( ! empty( $args['required'] ) ) {
+		if (!empty($args['required'])) {
 			$output .= ' required ';
 		}
 
@@ -1210,38 +1210,38 @@ 
 		$output .= ' >';
 
 		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) ) {
-			$output .= self::label( array(
+		if (!empty($args['label']) && is_array($args['label'])) {
+		} elseif (!empty($args['label'])) {
+			$output .= self::label(array(
 				'title' => $args['label'],
 				'for'   => $args['id'] . $count,
 				'class' => 'form-check-label'
-			), 'radio' );
+			), 'radio');
 		}
 
 		// wrap
-		if ( ! $args['no_wrap'] ) {
+		if (!$args['no_wrap']) {
 			$wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
 
 			// Unique wrap class
 			$uniq_class = 'fwrap';
-			if ( ! empty( $args['name'] ) ) {
+			if (!empty($args['name'])) {
 				$uniq_class .= '-' . $args['name'];
-			} else if ( ! empty( $args['id'] ) ) {
+			} else if (!empty($args['id'])) {
 				$uniq_class .= '-' . $args['id'];
 			}
 
-			if ( isset( $args['value'] ) || $args['value'] !== "" ) {
+			if (isset($args['value']) || $args['value'] !== "") {
 				$uniq_class .= '-' . $args['value'];
 			} else {
 				$uniq_class .= '-' . $count;
 			}
-			$wrap_class .= ' ' . sanitize_html_class( $uniq_class );
+			$wrap_class .= ' ' . sanitize_html_class($uniq_class);
 
-			$output = self::wrap( array(
+			$output = self::wrap(array(
 				'content' => $output,
 				'class'   => $wrap_class
-			) );
+			));
 		}
 
 		return $output;

Braces +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
 			if ( $args['size'] == 'lg' || $args['size'] == 'large' ) {
 				$size = 'lg';
 				$args['class'] .= ' form-control-lg';
-			}elseif ( $args['size'] == 'sm' || $args['size'] == 'small' ) {
+			} elseif ( $args['size'] == 'sm' || $args['size'] == 'small' ) {
 				$size = 'sm';
 				$args['class'] .= ' form-control-sm';
 			}
@@ -236,7 +236,7 @@ 
 						$help_text = '';
 						//$label_args['class'] .= ' d-inline ';
 						$args['wrap_class'] .= ' align-items-center ';
-					}else{
+					} else{
 
 					}