AyeCode / invoicing

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

Indentation +239 added lines, -239 removed lines

@@ -13,282 +13,282 @@
 class GetPaid_Subscription_Notification_Emails {
 
     /**
-	 * The array of subscription email actions.
-	 *
-	 * @param array
-	 */
-	public $subscription_actions;
+     * The array of subscription email actions.
+     *
+     * @param array
+     */
+    public $subscription_actions;
 
     /**
-	 * Class constructor
+     * Class constructor
      *
-	 */
-	public function __construct() {
-
-		$this->subscription_actions = apply_filters(
-			'getpaid_notification_email_subscription_triggers',
-			array(
-				'getpaid_subscription_trialling' => 'subscription_trial',
-				'getpaid_subscription_cancelled' => 'subscription_cancelled',
-				'getpaid_subscription_expired'   => 'subscription_expired',
-				'getpaid_subscription_completed' => 'subscription_complete',
-				'getpaid_daily_maintenance'      => 'renewal_reminder',
-			)
-		);
-
-		$this->init_hooks();
+     */
+    public function __construct() {
+
+        $this->subscription_actions = apply_filters(
+            'getpaid_notification_email_subscription_triggers',
+            array(
+                'getpaid_subscription_trialling' => 'subscription_trial',
+                'getpaid_subscription_cancelled' => 'subscription_cancelled',
+                'getpaid_subscription_expired'   => 'subscription_expired',
+                'getpaid_subscription_completed' => 'subscription_complete',
+                'getpaid_daily_maintenance'      => 'renewal_reminder',
+            )
+        );
+
+        $this->init_hooks();
 
     }
 
     /**
-	 * Registers email hooks.
-	 */
-	public function init_hooks() {
-
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'subscription_merge_tags' ), 10, 2 );
-		foreach ( $this->subscription_actions as $hook => $email_type ) {
-
-			$email = new GetPaid_Notification_Email( $email_type );
-
-			if ( ! $email->is_active() ) {
-				continue;
-			}
-
-			if ( method_exists( $this, $email_type ) ) {
-				add_action( $hook, array( $this, $email_type ), 100, 2 );
-				continue;
-			}
-
-			do_action( 'getpaid_subscription_notification_email_register_hook', $email_type, $hook );
-
-		}
-
-	}
-
-	/**
-	 * Filters subscription merge tags.
-	 *
-	 * @param array $merge_tags
-	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
-	 */
-	public function subscription_merge_tags( $merge_tags, $object ) {
-
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
-			$merge_tags = array_merge(
-				$merge_tags,
-				$this->get_subscription_merge_tags( $object )
-			);
-		}
-
-		return $merge_tags;
-
-	}
-
-	/**
-	 * Generates subscription merge tags.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 * @return array
-	 */
-	public function get_subscription_merge_tags( $subscription ) {
-
-		// Abort if it does not exist.
-		if ( ! $subscription->get_id() ) {
-			return array();
-		}
-
-		$invoice    = $subscription->get_parent_invoice();
-		return array(
-			'{subscription_renewal_date}'     => getpaid_format_date_value( $subscription->get_next_renewal_date(), __( 'Never', 'invoicing' ) ),
-			'{subscription_created}'          => getpaid_format_date_value( $subscription->get_date_created() ),
-			'{subscription_status}'           => sanitize_text_field( $subscription->get_status_label() ),
-			'{subscription_profile_id}'       => sanitize_text_field( $subscription->get_profile_id() ),
-			'{subscription_id}'               => absint( $subscription->get_id() ),
-			'{subscription_recurring_amount}' => wpinv_price( wpinv_format_amount( $subscription->get_recurring_amount() ), $invoice->get_currency() ),
-			'{subscription_initial_amount}'   => wpinv_price( wpinv_format_amount( $subscription->get_initial_amount() ), $invoice->get_currency() ),
-			'{subscription_recurring_period}' => getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' ),
-			'{subscription_bill_times}'       => $subscription->get_bill_times(),
-			'{subscription_url}'              => esc_url( $subscription->get_view_url() ),
-		);
-
-	}
-
-	/**
-	 * Checks if we should send a notification for a subscription.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @return bool
-	 */
-	public function should_send_notification( $invoice ) {
-		return 0 != $invoice->get_id();
-	}
-
-	/**
-	 * Returns notification recipients.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @return array
-	 */
-	public function get_recipients( $invoice ) {
-		$recipients = array( $invoice->get_email() );
-
-		$cc = $invoice->get_email_cc();
-
-		if ( ! empty( $cc ) ) {
-			$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-			$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
-		}
-
-		return $recipients;
-	}
-
-	/**
-	 * Helper function to send an email.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 * @param GetPaid_Notification_Email $email
-	 * @param string $type
-	 * @param array $extra_args Extra template args.
-	 */
-	public function send_email( $subscription, $email, $type, $extra_args = array() ) {
-
-		// Abort in case the parent invoice does not exist.
-		$invoice = $subscription->get_parent_invoice();
-		if ( ! $this->should_send_notification( $invoice ) ) {
-			return;
-		}
-
-		do_action( 'getpaid_before_send_subscription_notification', $type, $subscription, $email );
-
-		$recipients  = $this->get_recipients( $invoice );
-		$mailer      = new GetPaid_Notification_Email_Sender();
-		$merge_tags  = $email->get_merge_tags();
-		$content     = $email->get_content( $merge_tags, $extra_args );
-		$subject     = $email->add_merge_tags( $email->get_subject(), $merge_tags );
-		$attachments = $email->get_attachments();
-
-		$result = $mailer->send(
-			apply_filters( 'getpaid_subscription_email_recipients', wpinv_parse_list( $recipients ), $email ),
-			$subject,
-			$content,
-			$attachments
-		);
-
-		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
-			$mailer->send(
-				wpinv_get_admin_email(),
-				$subject . __( ' - ADMIN BCC COPY', 'invoicing' ),
-				$content,
-				$attachments
-			);
-		}
-
-		if ( ! $result ) {
-			$subscription->get_parent_invoice()->add_note( sprintf( __( 'Failed sending %s notification email.', 'invoicing' ), sanitize_key( $type ) ), false, false, true );
-		}
-
-		do_action( 'getpaid_after_send_subscription_notification', $type, $subscription, $email );
-
-	}
+     * Registers email hooks.
+     */
+    public function init_hooks() {
+
+        add_filter( 'getpaid_get_email_merge_tags', array( $this, 'subscription_merge_tags' ), 10, 2 );
+        foreach ( $this->subscription_actions as $hook => $email_type ) {
+
+            $email = new GetPaid_Notification_Email( $email_type );
+
+            if ( ! $email->is_active() ) {
+                continue;
+            }
+
+            if ( method_exists( $this, $email_type ) ) {
+                add_action( $hook, array( $this, $email_type ), 100, 2 );
+                continue;
+            }
+
+            do_action( 'getpaid_subscription_notification_email_register_hook', $email_type, $hook );
+
+        }
+
+    }
 
     /**
-	 * Sends a new trial notification.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function subscription_trial( $subscription ) {
+     * Filters subscription merge tags.
+     *
+     * @param array $merge_tags
+     * @param mixed|WPInv_Invoice|WPInv_Subscription $object
+     */
+    public function subscription_merge_tags( $merge_tags, $object ) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+        if ( is_a( $object, 'WPInv_Subscription' ) ) {
+            $merge_tags = array_merge(
+                $merge_tags,
+                $this->get_subscription_merge_tags( $object )
+            );
+        }
 
-	}
+        return $merge_tags;
 
-	/**
-	 * Sends a cancelled subscription notification.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function subscription_cancelled( $subscription ) {
+    }
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+    /**
+     * Generates subscription merge tags.
+     *
+     * @param WPInv_Subscription $subscription
+     * @return array
+     */
+    public function get_subscription_merge_tags( $subscription ) {
+
+        // Abort if it does not exist.
+        if ( ! $subscription->get_id() ) {
+            return array();
+        }
+
+        $invoice    = $subscription->get_parent_invoice();
+        return array(
+            '{subscription_renewal_date}'     => getpaid_format_date_value( $subscription->get_next_renewal_date(), __( 'Never', 'invoicing' ) ),
+            '{subscription_created}'          => getpaid_format_date_value( $subscription->get_date_created() ),
+            '{subscription_status}'           => sanitize_text_field( $subscription->get_status_label() ),
+            '{subscription_profile_id}'       => sanitize_text_field( $subscription->get_profile_id() ),
+            '{subscription_id}'               => absint( $subscription->get_id() ),
+            '{subscription_recurring_amount}' => wpinv_price( wpinv_format_amount( $subscription->get_recurring_amount() ), $invoice->get_currency() ),
+            '{subscription_initial_amount}'   => wpinv_price( wpinv_format_amount( $subscription->get_initial_amount() ), $invoice->get_currency() ),
+            '{subscription_recurring_period}' => getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' ),
+            '{subscription_bill_times}'       => $subscription->get_bill_times(),
+            '{subscription_url}'              => esc_url( $subscription->get_view_url() ),
+        );
 
-	}
+    }
 
-	/**
-	 * Sends a subscription expired notification.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function subscription_expired( $subscription ) {
+    /**
+     * Checks if we should send a notification for a subscription.
+     *
+     * @param WPInv_Invoice $invoice
+     * @return bool
+     */
+    public function should_send_notification( $invoice ) {
+        return 0 != $invoice->get_id();
+    }
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+    /**
+     * Returns notification recipients.
+     *
+     * @param WPInv_Invoice $invoice
+     * @return array
+     */
+    public function get_recipients( $invoice ) {
+        $recipients = array( $invoice->get_email() );
 
-	}
+        $cc = $invoice->get_email_cc();
 
-	/**
-	 * Sends a completed subscription notification.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function subscription_complete( $subscription ) {
+        if ( ! empty( $cc ) ) {
+            $cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
+            $recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+        }
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+        return $recipients;
+    }
 
-	}
+    /**
+     * Helper function to send an email.
+     *
+     * @param WPInv_Subscription $subscription
+     * @param GetPaid_Notification_Email $email
+     * @param string $type
+     * @param array $extra_args Extra template args.
+     */
+    public function send_email( $subscription, $email, $type, $extra_args = array() ) {
+
+        // Abort in case the parent invoice does not exist.
+        $invoice = $subscription->get_parent_invoice();
+        if ( ! $this->should_send_notification( $invoice ) ) {
+            return;
+        }
+
+        do_action( 'getpaid_before_send_subscription_notification', $type, $subscription, $email );
+
+        $recipients  = $this->get_recipients( $invoice );
+        $mailer      = new GetPaid_Notification_Email_Sender();
+        $merge_tags  = $email->get_merge_tags();
+        $content     = $email->get_content( $merge_tags, $extra_args );
+        $subject     = $email->add_merge_tags( $email->get_subject(), $merge_tags );
+        $attachments = $email->get_attachments();
+
+        $result = $mailer->send(
+            apply_filters( 'getpaid_subscription_email_recipients', wpinv_parse_list( $recipients ), $email ),
+            $subject,
+            $content,
+            $attachments
+        );
+
+        // Maybe send a copy to the admin.
+        if ( $email->include_admin_bcc() ) {
+            $mailer->send(
+                wpinv_get_admin_email(),
+                $subject . __( ' - ADMIN BCC COPY', 'invoicing' ),
+                $content,
+                $attachments
+            );
+        }
+
+        if ( ! $result ) {
+            $subscription->get_parent_invoice()->add_note( sprintf( __( 'Failed sending %s notification email.', 'invoicing' ), sanitize_key( $type ) ), false, false, true );
+        }
+
+        do_action( 'getpaid_after_send_subscription_notification', $type, $subscription, $email );
 
-	/**
-	 * Sends a subscription renewal reminder notification.
-	 *
-	 */
-	public function renewal_reminder() {
+    }
 
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
+    /**
+     * Sends a new trial notification.
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function subscription_trial( $subscription ) {
 
-		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
+        $this->send_email( $subscription, $email, __FUNCTION__ );
 
-		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
-			return;
-		}
+    }
 
-		// Fetch matching subscriptions.
+    /**
+     * Sends a cancelled subscription notification.
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function subscription_cancelled( $subscription ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
+        $this->send_email( $subscription, $email, __FUNCTION__ );
+
+    }
+
+    /**
+     * Sends a subscription expired notification.
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function subscription_expired( $subscription ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
+        $this->send_email( $subscription, $email, __FUNCTION__ );
+
+    }
+
+    /**
+     * Sends a completed subscription notification.
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function subscription_complete( $subscription ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
+        $this->send_email( $subscription, $email, __FUNCTION__ );
+
+    }
+
+    /**
+     * Sends a subscription renewal reminder notification.
+     *
+     */
+    public function renewal_reminder() {
+
+        $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;
+        }
+
+        // Fetch matching subscriptions.
         $args  = array(
             'number'             => -1,
-			'count_total'        => false,
-			'status'             => 'trialling active',
+            'count_total'        => false,
+            'status'             => 'trialling active',
             'date_expires_query' => array(
-				'relation'  => 'OR'
+                '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' ) ) ) );
 
-			$args['date_expires_query'][] = array(
-				'year'  => $date['year'],
-				'month' => $date['month'],
-				'day'   => $date['day'],
-			);
+            $args['date_expires_query'][] = array(
+                'year'  => $date['year'],
+                'month' => $date['month'],
+                'day'   => $date['day'],
+            );
 
-		}
+        }
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+        $subscriptions = new GetPaid_Subscriptions_Query( $args );
 
         foreach ( $subscriptions as $subscription ) {
 
-			// Skip packages.
-			if ( get_post_meta( $subscription->get_product_id(), '_wpinv_type', true ) != 'package' ) {
-				$email->object = $subscription;
-            	$this->send_email( $subscription, $email, __FUNCTION__ );
-			}
+            // Skip packages.
+            if ( get_post_meta( $subscription->get_product_id(), '_wpinv_type', true ) != 'package' ) {
+                $email->object = $subscription;
+                $this->send_email( $subscription, $email, __FUNCTION__ );
+            }
 
-		}
+        }
 
-	}
+    }
 
 }

Spacing +63 added lines, -63 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * This class handles subscription notificaiton emails.
@@ -45,21 +45,21 @@ 
 	 */
 	public function init_hooks() {
 
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'subscription_merge_tags' ), 10, 2 );
-		foreach ( $this->subscription_actions as $hook => $email_type ) {
+		add_filter('getpaid_get_email_merge_tags', array($this, 'subscription_merge_tags'), 10, 2);
+		foreach ($this->subscription_actions as $hook => $email_type) {
 
-			$email = new GetPaid_Notification_Email( $email_type );
+			$email = new GetPaid_Notification_Email($email_type);
 
-			if ( ! $email->is_active() ) {
+			if (!$email->is_active()) {
 				continue;
 			}
 
-			if ( method_exists( $this, $email_type ) ) {
-				add_action( $hook, array( $this, $email_type ), 100, 2 );
+			if (method_exists($this, $email_type)) {
+				add_action($hook, array($this, $email_type), 100, 2);
 				continue;
 			}
 
-			do_action( 'getpaid_subscription_notification_email_register_hook', $email_type, $hook );
+			do_action('getpaid_subscription_notification_email_register_hook', $email_type, $hook);
 
 		}
 
@@ -71,12 +71,12 @@ 
 	 * @param array $merge_tags
 	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
 	 */
-	public function subscription_merge_tags( $merge_tags, $object ) {
+	public function subscription_merge_tags($merge_tags, $object) {
 
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
+		if (is_a($object, 'WPInv_Subscription')) {
 			$merge_tags = array_merge(
 				$merge_tags,
-				$this->get_subscription_merge_tags( $object )
+				$this->get_subscription_merge_tags($object)
 			);
 		}
 
@@ -90,25 +90,25 @@ 
 	 * @param WPInv_Subscription $subscription
 	 * @return array
 	 */
-	public function get_subscription_merge_tags( $subscription ) {
+	public function get_subscription_merge_tags($subscription) {
 
 		// Abort if it does not exist.
-		if ( ! $subscription->get_id() ) {
+		if (!$subscription->get_id()) {
 			return array();
 		}
 
-		$invoice    = $subscription->get_parent_invoice();
+		$invoice = $subscription->get_parent_invoice();
 		return array(
-			'{subscription_renewal_date}'     => getpaid_format_date_value( $subscription->get_next_renewal_date(), __( 'Never', 'invoicing' ) ),
-			'{subscription_created}'          => getpaid_format_date_value( $subscription->get_date_created() ),
-			'{subscription_status}'           => sanitize_text_field( $subscription->get_status_label() ),
-			'{subscription_profile_id}'       => sanitize_text_field( $subscription->get_profile_id() ),
-			'{subscription_id}'               => absint( $subscription->get_id() ),
-			'{subscription_recurring_amount}' => wpinv_price( wpinv_format_amount( $subscription->get_recurring_amount() ), $invoice->get_currency() ),
-			'{subscription_initial_amount}'   => wpinv_price( wpinv_format_amount( $subscription->get_initial_amount() ), $invoice->get_currency() ),
-			'{subscription_recurring_period}' => getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' ),
+			'{subscription_renewal_date}'     => getpaid_format_date_value($subscription->get_next_renewal_date(), __('Never', 'invoicing')),
+			'{subscription_created}'          => getpaid_format_date_value($subscription->get_date_created()),
+			'{subscription_status}'           => sanitize_text_field($subscription->get_status_label()),
+			'{subscription_profile_id}'       => sanitize_text_field($subscription->get_profile_id()),
+			'{subscription_id}'               => absint($subscription->get_id()),
+			'{subscription_recurring_amount}' => wpinv_price(wpinv_format_amount($subscription->get_recurring_amount()), $invoice->get_currency()),
+			'{subscription_initial_amount}'   => wpinv_price(wpinv_format_amount($subscription->get_initial_amount()), $invoice->get_currency()),
+			'{subscription_recurring_period}' => getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), ''),
 			'{subscription_bill_times}'       => $subscription->get_bill_times(),
-			'{subscription_url}'              => esc_url( $subscription->get_view_url() ),
+			'{subscription_url}'              => esc_url($subscription->get_view_url()),
 		);
 
 	}
@@ -119,7 +119,7 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return bool
 	 */
-	public function should_send_notification( $invoice ) {
+	public function should_send_notification($invoice) {
 		return 0 != $invoice->get_id();
 	}
 
@@ -129,14 +129,14 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return array
 	 */
-	public function get_recipients( $invoice ) {
-		$recipients = array( $invoice->get_email() );
+	public function get_recipients($invoice) {
+		$recipients = array($invoice->get_email());
 
 		$cc = $invoice->get_email_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)) {
+			$cc = array_map('sanitize_email', wpinv_parse_list($cc));
+			$recipients = array_filter(array_unique(array_merge($recipients, $cc)));
 		}
 
 		return $recipients;
@@ -150,45 +150,45 @@ 
 	 * @param string $type
 	 * @param array $extra_args Extra template args.
 	 */
-	public function send_email( $subscription, $email, $type, $extra_args = array() ) {
+	public function send_email($subscription, $email, $type, $extra_args = array()) {
 
 		// Abort in case the parent invoice does not exist.
 		$invoice = $subscription->get_parent_invoice();
-		if ( ! $this->should_send_notification( $invoice ) ) {
+		if (!$this->should_send_notification($invoice)) {
 			return;
 		}
 
-		do_action( 'getpaid_before_send_subscription_notification', $type, $subscription, $email );
+		do_action('getpaid_before_send_subscription_notification', $type, $subscription, $email);
 
-		$recipients  = $this->get_recipients( $invoice );
+		$recipients  = $this->get_recipients($invoice);
 		$mailer      = new GetPaid_Notification_Email_Sender();
 		$merge_tags  = $email->get_merge_tags();
-		$content     = $email->get_content( $merge_tags, $extra_args );
-		$subject     = $email->add_merge_tags( $email->get_subject(), $merge_tags );
+		$content     = $email->get_content($merge_tags, $extra_args);
+		$subject     = $email->add_merge_tags($email->get_subject(), $merge_tags);
 		$attachments = $email->get_attachments();
 
 		$result = $mailer->send(
-			apply_filters( 'getpaid_subscription_email_recipients', wpinv_parse_list( $recipients ), $email ),
+			apply_filters('getpaid_subscription_email_recipients', wpinv_parse_list($recipients), $email),
 			$subject,
 			$content,
 			$attachments
 		);
 
 		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
+		if ($email->include_admin_bcc()) {
 			$mailer->send(
 				wpinv_get_admin_email(),
-				$subject . __( ' - ADMIN BCC COPY', 'invoicing' ),
+				$subject . __(' - ADMIN BCC COPY', 'invoicing'),
 				$content,
 				$attachments
 			);
 		}
 
-		if ( ! $result ) {
-			$subscription->get_parent_invoice()->add_note( sprintf( __( 'Failed sending %s notification email.', 'invoicing' ), sanitize_key( $type ) ), false, false, true );
+		if (!$result) {
+			$subscription->get_parent_invoice()->add_note(sprintf(__('Failed sending %s notification email.', 'invoicing'), sanitize_key($type)), false, false, true);
 		}
 
-		do_action( 'getpaid_after_send_subscription_notification', $type, $subscription, $email );
+		do_action('getpaid_after_send_subscription_notification', $type, $subscription, $email);
 
 	}
 
@@ -197,10 +197,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_trial( $subscription ) {
+	public function subscription_trial($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -209,10 +209,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_cancelled( $subscription ) {
+	public function subscription_cancelled($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -221,10 +221,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_expired( $subscription ) {
+	public function subscription_expired($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -233,10 +233,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_complete( $subscription ) {
+	public function subscription_complete($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -246,18 +246,18 @@ 
 	 */
 	public function renewal_reminder() {
 
-		$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;
 		}
 
 		// Fetch matching subscriptions.
-        $args  = array(
+        $args = array(
             'number'             => -1,
 			'count_total'        => false,
 			'status'             => 'trialling active',
@@ -266,8 +266,8 @@ 
             ),
 		);
 
-		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'))));
 
 			$args['date_expires_query'][] = array(
 				'year'  => $date['year'],
@@ -277,14 +277,14 @@ 
 
 		}
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+		$subscriptions = new GetPaid_Subscriptions_Query($args);
 
-        foreach ( $subscriptions as $subscription ) {
+        foreach ($subscriptions as $subscription) {
 
 			// Skip packages.
-			if ( get_post_meta( $subscription->get_product_id(), '_wpinv_type', true ) != 'package' ) {
+			if (get_post_meta($subscription->get_product_id(), '_wpinv_type', true) != 'package') {
 				$email->object = $subscription;
-            	$this->send_email( $subscription, $email, __FUNCTION__ );
+            	$this->send_email($subscription, $email, __FUNCTION__);
 			}
 
 		}

includes/admin/wpinv-upgrade-functions.php

Spacing +50 added lines, -50 removed lines

@@ -11,55 +11,55 @@ 
  * @since 1.0.0
 */
 function wpinv_automatic_upgrade() {
-    $wpi_version = get_option( 'wpinv_version' );
+    $wpi_version = get_option('wpinv_version');
 
     // Update tables.
-    if ( ! get_option( 'getpaid_created_invoice_tables' ) ) {
+    if (!get_option('getpaid_created_invoice_tables')) {
         wpinv_v119_upgrades();
-        update_option( 'getpaid_created_invoice_tables', true );
+        update_option('getpaid_created_invoice_tables', true);
     }
 
-    if ( $wpi_version == WPINV_VERSION ) {
+    if ($wpi_version == WPINV_VERSION) {
         return;
     }
 
-    if ( version_compare( $wpi_version, '0.0.5', '<' ) ) {
+    if (version_compare($wpi_version, '0.0.5', '<')) {
         wpinv_v005_upgrades();
     }
 
-    if ( version_compare( $wpi_version, '1.0.3', '<' ) ) {
+    if (version_compare($wpi_version, '1.0.3', '<')) {
         wpinv_v110_upgrades();
     }
 
-    update_option( 'wpinv_version', WPINV_VERSION );
+    update_option('wpinv_version', WPINV_VERSION);
 }
-add_action( 'admin_init', 'wpinv_automatic_upgrade' );
+add_action('admin_init', 'wpinv_automatic_upgrade');
 
 function wpinv_v005_upgrades() {
     global $wpdb;
 
     // Invoices status
-    $results = $wpdb->get_results( "SELECT ID FROM " . $wpdb->posts . " WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
-    if ( !empty( $results ) ) {
-        $wpdb->query( "UPDATE " . $wpdb->posts . " SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+    $results = $wpdb->get_results("SELECT ID FROM " . $wpdb->posts . " WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
+    if (!empty($results)) {
+        $wpdb->query("UPDATE " . $wpdb->posts . " SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
 
         // Clean post cache
-        foreach ( $results as $row ) {
-            clean_post_cache( $row->ID );
+        foreach ($results as $row) {
+            clean_post_cache($row->ID);
         }
     }
 
     // Item meta key changes
     $query = "SELECT DISTINCT post_id FROM " . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
-    $results = $wpdb->get_results( $query );
+    $results = $wpdb->get_results($query);
 
-    if ( !empty( $results ) ) {
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
+    if (!empty($results)) {
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )");
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'");
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'");
         
-        foreach ( $results as $row ) {
-            clean_post_cache( $row->post_id );
+        foreach ($results as $row) {
+            clean_post_cache($row->post_id);
         }
     }
 
@@ -88,7 +88,7 @@ 
 function wpinv_create_invoices_table() {
     global $wpdb;
 
-    require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+    require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
     // Create invoices table.
     $table = $wpdb->prefix . 'getpaid_invoices';
@@ -132,7 +132,7 @@ 
             KEY `key` ( `key` )
             ) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-    dbDelta( $sql );
+    dbDelta($sql);
 
     // Create invoice items table.
     $table = $wpdb->prefix . 'getpaid_invoice_items';
@@ -160,7 +160,7 @@ 
             KEY post_id ( post_id )
             ) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-    dbDelta( $sql );
+    dbDelta($sql);
 }
 
 /**
@@ -172,10 +172,10 @@ 
     $invoices = array_unique(
         get_posts(
             array(
-                'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
+                'post_type'      => array('wpi_invoice', 'wpi_quote'),
                 'posts_per_page' => -1,
                 'fields'         => 'ids',
-                'post_status'    => array_keys( get_post_stati() ),
+                'post_status'    => array_keys(get_post_stati()),
             )
         )
     );
@@ -183,19 +183,19 @@ 
     $invoices_table = $wpdb->prefix . 'getpaid_invoices';
     $invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
 
-    if ( ! class_exists( 'WPInv_Legacy_Invoice' ) ) {
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php' );
+    if (!class_exists('WPInv_Legacy_Invoice')) {
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php');
     }
 
     $invoice_rows = array();
-    foreach ( $invoices as $invoice ) {
+    foreach ($invoices as $invoice) {
 
-        $invoice = new WPInv_Legacy_Invoice( $invoice );
-        $fields = array (
+        $invoice = new WPInv_Legacy_Invoice($invoice);
+        $fields = array(
             'post_id'        => $invoice->ID,
             'number'         => $invoice->get_number(),
             'key'            => $invoice->get_key(),
-            'type'           => str_replace( 'wpi_', '', $invoice->post_type ),
+            'type'           => str_replace('wpi_', '', $invoice->post_type),
             'mode'           => $invoice->mode,
             'user_ip'        => $invoice->get_ip(),
             'first_name'     => $invoice->get_first_name(),
@@ -224,27 +224,27 @@ 
             'custom_meta'    => $invoice->payment_meta
         );
 
-        foreach ( $fields as $key => $val ) {
-            if ( is_null( $val ) ) {
+        foreach ($fields as $key => $val) {
+            if (is_null($val)) {
                 $val = '';
             }
-            $val = maybe_serialize( $val );
-            $fields[ $key ] = $wpdb->prepare( '%s', $val );
+            $val = maybe_serialize($val);
+            $fields[$key] = $wpdb->prepare('%s', $val);
         }
 
-        $fields = implode( ', ', $fields );
+        $fields = implode(', ', $fields);
         $invoice_rows[] = "($fields)";
 
         $item_rows    = array();
         $item_columns = array();
-        foreach ( $invoice->get_cart_details() as $details ) {
+        foreach ($invoice->get_cart_details() as $details) {
             $fields = array(
                 'post_id'          => $invoice->ID,
                 'item_id'          => $details['id'],
                 'item_name'        => $details['name'],
-                'item_description' => empty( $details['meta']['description'] ) ? '' : $details['meta']['description'],
+                'item_description' => empty($details['meta']['description']) ? '' : $details['meta']['description'],
                 'vat_rate'         => $details['vat_rate'],
-                'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
+                'vat_class'        => empty($details['vat_class']) ? '_standard' : $details['vat_class'],
                 'tax'              => $details['tax'],
                 'item_price'       => $details['item_price'],
                 'custom_price'     => $details['custom_price'],
@@ -256,26 +256,26 @@ 
                 'fees'             => $details['fees'],
             );
 
-            $item_columns = array_keys ( $fields );
+            $item_columns = array_keys($fields);
 
-            foreach ( $fields as $key => $val ) {
-                if ( is_null( $val ) ) {
+            foreach ($fields as $key => $val) {
+                if (is_null($val)) {
                     $val = '';
                 }
-                $val = maybe_serialize( $val );
-                $fields[ $key ] = $wpdb->prepare( '%s', $val );
+                $val = maybe_serialize($val);
+                $fields[$key] = $wpdb->prepare('%s', $val);
             }
 
-            $fields = implode( ', ', $fields );
+            $fields = implode(', ', $fields);
             $item_rows[] = "($fields)";
         }
 
-        $item_rows    = implode( ', ', $item_rows );
-        $item_columns = implode( ', ', $item_columns );
-        $wpdb->query( "INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows" );
+        $item_rows    = implode(', ', $item_rows);
+        $item_columns = implode(', ', $item_columns);
+        $wpdb->query("INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows");
     }
 
-    $invoice_rows = implode( ', ', $invoice_rows );
-    $wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
+    $invoice_rows = implode(', ', $invoice_rows);
+    $wpdb->query("INSERT INTO $invoices_table VALUES $invoice_rows");
 
 }

includes/wpinv-template-functions.php

Indentation +102 added lines, -102 removed lines

@@ -140,7 +140,7 @@ 
  * @param string $default_path The root path to the default template. Defaults to invoicing/templates
  */
 function wpinv_get_template_html( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
-	return getpaid_template()->get_template( $template_name, $args, $template_path, $default_path );
+    return getpaid_template()->get_template( $template_name, $args, $template_path, $default_path );
 }
 
 /**
@@ -158,7 +158,7 @@ 
  * @return string
  */
 function wpinv_get_theme_template_dir_name() {
-	return trailingslashit( apply_filters( 'wpinv_templates_dir', 'invoicing' ) );
+    return trailingslashit( apply_filters( 'wpinv_templates_dir', 'invoicing' ) );
 }
 
 /**
@@ -175,122 +175,122 @@ 
 }
 
 function wpinv_get_template_part( $slug, $name = null, $load = true ) {
-	do_action( 'get_template_part_' . $slug, $slug, $name );
+    do_action( 'get_template_part_' . $slug, $slug, $name );
 
-	// Setup possible parts
-	$templates = array();
-	if ( isset( $name ) )
-		$templates[] = $slug . '-' . $name . '.php';
-	$templates[] = $slug . '.php';
+    // Setup possible parts
+    $templates = array();
+    if ( isset( $name ) )
+        $templates[] = $slug . '-' . $name . '.php';
+    $templates[] = $slug . '.php';
 
-	// Allow template parts to be filtered
-	$templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
+    // Allow template parts to be filtered
+    $templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
 
-	// Return the part that is found
-	return wpinv_locate_tmpl( $templates, $load, false );
+    // Return the part that is found
+    return wpinv_locate_tmpl( $templates, $load, false );
 }
 
 function wpinv_locate_tmpl( $template_names, $load = false, $require_once = true ) {
-	// No file found yet
-	$located = false;
+    // No file found yet
+    $located = false;
 
-	// Try to find a template file
-	foreach ( (array)$template_names as $template_name ) {
+    // Try to find a template file
+    foreach ( (array)$template_names as $template_name ) {
 
-		// Continue if template is empty
-		if ( empty( $template_name ) )
-			continue;
+        // Continue if template is empty
+        if ( empty( $template_name ) )
+            continue;
 
-		// Trim off any slashes from the template name
-		$template_name = ltrim( $template_name, '/' );
+        // Trim off any slashes from the template name
+        $template_name = ltrim( $template_name, '/' );
 
-		// try locating this template file by looping through the template paths
-		foreach( wpinv_get_theme_template_paths() as $template_path ) {
+        // try locating this template file by looping through the template paths
+        foreach( wpinv_get_theme_template_paths() as $template_path ) {
 
-			if( file_exists( $template_path . $template_name ) ) {
-				$located = $template_path . $template_name;
-				break;
-			}
-		}
+            if( file_exists( $template_path . $template_name ) ) {
+                $located = $template_path . $template_name;
+                break;
+            }
+        }
 
-		if( !empty( $located ) ) {
-			break;
-		}
-	}
+        if( !empty( $located ) ) {
+            break;
+        }
+    }
 
-	if ( ( true == $load ) && ! empty( $located ) )
-		load_template( $located, $require_once );
+    if ( ( true == $load ) && ! empty( $located ) )
+        load_template( $located, $require_once );
 
-	return $located;
+    return $located;
 }
 
 function wpinv_get_theme_template_paths() {
-	$template_dir = wpinv_get_theme_template_dir_name();
+    $template_dir = wpinv_get_theme_template_dir_name();
 
-	$file_paths = array(
-		1 => trailingslashit( get_stylesheet_directory() ) . $template_dir,
-		10 => trailingslashit( get_template_directory() ) . $template_dir,
-		100 => wpinv_get_templates_dir()
-	);
+    $file_paths = array(
+        1 => trailingslashit( get_stylesheet_directory() ) . $template_dir,
+        10 => trailingslashit( get_template_directory() ) . $template_dir,
+        100 => wpinv_get_templates_dir()
+    );
 
-	$file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
+    $file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
 
-	// sort the file paths based on priority
-	ksort( $file_paths, SORT_NUMERIC );
+    // sort the file paths based on priority
+    ksort( $file_paths, SORT_NUMERIC );
 
-	return array_map( 'trailingslashit', $file_paths );
+    return array_map( 'trailingslashit', $file_paths );
 }
 
 function wpinv_checkout_meta_tags() {
 
-	$pages   = array();
-	$pages[] = wpinv_get_option( 'success_page' );
-	$pages[] = wpinv_get_option( 'failure_page' );
-	$pages[] = wpinv_get_option( 'invoice_history_page' );
-	$pages[] = wpinv_get_option( 'invoice_subscription_page' );
+    $pages   = array();
+    $pages[] = wpinv_get_option( 'success_page' );
+    $pages[] = wpinv_get_option( 'failure_page' );
+    $pages[] = wpinv_get_option( 'invoice_history_page' );
+    $pages[] = wpinv_get_option( 'invoice_subscription_page' );
 
-	if( !wpinv_is_checkout() && !is_page( $pages ) ) {
-		return;
-	}
+    if( !wpinv_is_checkout() && !is_page( $pages ) ) {
+        return;
+    }
 
-	echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
+    echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
 }
 add_action( 'wp_head', 'wpinv_checkout_meta_tags' );
 
 function wpinv_add_body_classes( $class ) {
-	$classes = (array)$class;
+    $classes = (array)$class;
 
-	if( wpinv_is_checkout() ) {
-		$classes[] = 'wpinv-checkout';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_checkout() ) {
+        $classes[] = 'wpinv-checkout';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_success_page() ) {
-		$classes[] = 'wpinv-success';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_success_page() ) {
+        $classes[] = 'wpinv-success';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_failed_transaction_page() ) {
-		$classes[] = 'wpinv-failed-transaction';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_failed_transaction_page() ) {
+        $classes[] = 'wpinv-failed-transaction';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_invoice_history_page() ) {
-		$classes[] = 'wpinv-history';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_invoice_history_page() ) {
+        $classes[] = 'wpinv-history';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_subscriptions_history_page() ) {
-		$classes[] = 'wpinv-subscription';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_subscriptions_history_page() ) {
+        $classes[] = 'wpinv-subscription';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_test_mode() ) {
-		$classes[] = 'wpinv-test-mode';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_test_mode() ) {
+        $classes[] = 'wpinv-test-mode';
+        $classes[] = 'wpinv-page';
+    }
 
-	return array_unique( $classes );
+    return array_unique( $classes );
 }
 add_filter( 'body_class', 'wpinv_add_body_classes' );
 
@@ -859,21 +859,21 @@ 
 
     $formatted_address = str_ireplace( array_keys( $replacements ), $replacements, $format );
     
-	// Remove unavailable tags.
+    // Remove unavailable tags.
     $formatted_address = preg_replace( "/\{\{\w+\}\}/", '', $formatted_address );
 
     // Clean up white space.
-	$formatted_address = preg_replace( '/  +/', ' ', trim( $formatted_address ) );
+    $formatted_address = preg_replace( '/  +/', ' ', trim( $formatted_address ) );
     $formatted_address = preg_replace( '/\n\n+/', "\n", $formatted_address );
     
     // Break newlines apart and remove empty lines/trim commas and white space.
-	$formatted_address = array_filter( array_map( 'wpinv_trim_formatted_address_line', explode( "\n", $formatted_address ) ) );
+    $formatted_address = array_filter( array_map( 'wpinv_trim_formatted_address_line', explode( "\n", $formatted_address ) ) );
 
     // Add html breaks.
-	$formatted_address = implode( $separator, $formatted_address );
+    $formatted_address = implode( $separator, $formatted_address );
 
-	// We're done!
-	return $formatted_address;
+    // We're done!
+    return $formatted_address;
     
 }
 
@@ -1075,7 +1075,7 @@ 
 }
 
 function wpinv_empty_cart_message() {
-	return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
+    return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
 }
 
 /**
@@ -1343,10 +1343,10 @@ 
 
     if ( 0 == count( $form->get_items() ) ) {
         echo aui()->alert(
-			array(
-				'type'    => 'warning',
-				'content' => __( 'No published items found', 'invoicing' ),
-			)
+            array(
+                'type'    => 'warning',
+                'content' => __( 'No published items found', 'invoicing' ),
+            )
         );
         return;
     }
@@ -1364,21 +1364,21 @@ 
     $invoice = wpinv_get_invoice( $invoice_id );
 
     if ( empty( $invoice ) ) {
-		echo aui()->alert(
-			array(
-				'type'    => 'warning',
-				'content' => __( 'Invoice not found', 'invoicing' ),
-			)
+        echo aui()->alert(
+            array(
+                'type'    => 'warning',
+                'content' => __( 'Invoice not found', 'invoicing' ),
+            )
         );
         return;
     }
 
     if ( $invoice->is_paid() ) {
-		echo aui()->alert(
-			array(
-				'type'    => 'warning',
-				'content' => __( 'Invoice has already been paid', 'invoicing' ),
-			)
+        echo aui()->alert(
+            array(
+                'type'    => 'warning',
+                'content' => __( 'Invoice has already been paid', 'invoicing' ),
+            )
         );
         return;
     }
@@ -1440,7 +1440,7 @@ 
         return "<button class='btn btn-primary getpaid-payment-button' type='button' data-form='$form'>$label</button>"; 
     }
 	
-	if ( ! empty( $items ) ) {
+    if ( ! empty( $items ) ) {
         $items  = esc_attr( $items );
         return "<button class='btn btn-primary getpaid-payment-button' type='button' data-item='$items'>$label</button>"; 
     }

Braces +9 added lines, -6 removed lines

@@ -179,8 +179,9 @@ 
 
 	// Setup possible parts
 	$templates = array();
-	if ( isset( $name ) )
-		$templates[] = $slug . '-' . $name . '.php';
+	if ( isset( $name ) ) {
+			$templates[] = $slug . '-' . $name . '.php';
+	}
 	$templates[] = $slug . '.php';
 
 	// Allow template parts to be filtered
@@ -198,8 +199,9 @@ 
 	foreach ( (array)$template_names as $template_name ) {
 
 		// Continue if template is empty
-		if ( empty( $template_name ) )
-			continue;
+		if ( empty( $template_name ) ) {
+					continue;
+		}
 
 		// Trim off any slashes from the template name
 		$template_name = ltrim( $template_name, '/' );
@@ -218,8 +220,9 @@ 
 		}
 	}
 
-	if ( ( true == $load ) && ! empty( $located ) )
-		load_template( $located, $require_once );
+	if ( ( true == $load ) && ! empty( $located ) ) {
+			load_template( $located, $require_once );
+	}
 
 	return $located;
 }

Spacing +436 added lines, -436 removed lines

@@ -4,99 +4,99 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Displays an invoice.
  * 
  * @param WPInv_Invoice $invoice.
  */
-function getpaid_invoice( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/invoice.php', compact( 'invoice' ) );
+function getpaid_invoice($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/invoice.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice', 'getpaid_invoice', 10 );
+add_action('getpaid_invoice', 'getpaid_invoice', 10);
 
 /**
  * Displays the invoice footer.
  */
-function getpaid_invoice_footer( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/footer.php', compact( 'invoice' ) );
+function getpaid_invoice_footer($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/footer.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_footer', 'getpaid_invoice_footer', 10 );
+add_action('getpaid_invoice_footer', 'getpaid_invoice_footer', 10);
 
 /**
  * Displays the invoice top bar.
  */
-function getpaid_invoice_header( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/header.php', compact( 'invoice' ) );
+function getpaid_invoice_header($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/header.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_header', 'getpaid_invoice_header', 10 );
+add_action('getpaid_invoice_header', 'getpaid_invoice_header', 10);
 
 /**
  * Displays actions on the left side of the header.
  */
-function getpaid_invoice_header_left_actions( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/header-left-actions.php', compact( 'invoice' ) );
+function getpaid_invoice_header_left_actions($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/header-left-actions.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_header_left', 'getpaid_invoice_header_left_actions', 10 );
+add_action('getpaid_invoice_header_left', 'getpaid_invoice_header_left_actions', 10);
 
 /**
  * Displays actions on the right side of the invoice top bar.
  */
-function getpaid_invoice_header_right_actions( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/header-right-actions.php', compact( 'invoice' ) );
+function getpaid_invoice_header_right_actions($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/header-right-actions.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_header_right', 'getpaid_invoice_header_right_actions', 10 );
+add_action('getpaid_invoice_header_right', 'getpaid_invoice_header_right_actions', 10);
 
 /**
  * Displays the invoice title, logo etc.
  */
-function getpaid_invoice_details_top( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/details-top.php', compact( 'invoice' ) );
+function getpaid_invoice_details_top($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/details-top.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_details', 'getpaid_invoice_details_top', 10 );
+add_action('getpaid_invoice_details', 'getpaid_invoice_details_top', 10);
 
 /**
  * Displays the company logo.
  */
-function getpaid_invoice_logo( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/invoice-logo.php', compact( 'invoice' ) );
+function getpaid_invoice_logo($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/invoice-logo.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_details_top_left', 'getpaid_invoice_logo' );
+add_action('getpaid_invoice_details_top_left', 'getpaid_invoice_logo');
 
 /**
  * Displays the type of invoice.
  */
-function getpaid_invoice_type( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/invoice-type.php', compact( 'invoice' ) );
+function getpaid_invoice_type($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/invoice-type.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_details_top_right', 'getpaid_invoice_type' );
+add_action('getpaid_invoice_details_top_right', 'getpaid_invoice_type');
 
 /**
  * Displays the invoice details.
  */
-function getpaid_invoice_details_main( $invoice ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/details.php', compact( 'invoice' ) );
+function getpaid_invoice_details_main($invoice) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/details.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_details', 'getpaid_invoice_details_main', 50 );
+add_action('getpaid_invoice_details', 'getpaid_invoice_details_main', 50);
 
 /**
  * Returns a path to the templates directory.
@@ -125,8 +125,8 @@ 
  * @param string $template_path The templates directory relative to the theme's root dir. Defaults to 'invoicing'.
  * @param string $default_path The root path to the default template. Defaults to invoicing/templates
  */
-function wpinv_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
-    return getpaid_template()->display_template( $template_name, $args, $template_path, $default_path );
+function wpinv_get_template($template_name, $args = array(), $template_path = '', $default_path = '') {
+    return getpaid_template()->display_template($template_name, $args, $template_path, $default_path);
 }
 
 /**
@@ -139,8 +139,8 @@ 
  * @param string $template_path The templates directory relative to the theme's root dir. Defaults to 'invoicing'.
  * @param string $default_path The root path to the default template. Defaults to invoicing/templates
  */
-function wpinv_get_template_html( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
-	return getpaid_template()->get_template( $template_name, $args, $template_path, $default_path );
+function wpinv_get_template_html($template_name, $args = array(), $template_path = '', $default_path = '') {
+	return getpaid_template()->get_template($template_name, $args, $template_path, $default_path);
 }
 
 /**
@@ -149,7 +149,7 @@ 
  * @return string
  */
 function wpinv_template_path() {
-    return apply_filters( 'wpinv_template_path', wpinv_get_theme_template_dir_name() );
+    return apply_filters('wpinv_template_path', wpinv_get_theme_template_dir_name());
 }
 
 /**
@@ -158,7 +158,7 @@ 
  * @return string
  */
 function wpinv_get_theme_template_dir_name() {
-	return trailingslashit( apply_filters( 'wpinv_templates_dir', 'invoicing' ) );
+	return trailingslashit(apply_filters('wpinv_templates_dir', 'invoicing'));
 }
 
 /**
@@ -170,56 +170,56 @@ 
  * @param string $template_path The template path relative to the theme's root dir. Defaults to 'invoicing'.
  * @param string $default_path The root path to the default template. Defaults to invoicing/templates
  */
-function wpinv_locate_template( $template_name, $template_path = '', $default_path = '' ) {
-    return getpaid_template()->locate_template( $template_name, $template_path, $default_path );
+function wpinv_locate_template($template_name, $template_path = '', $default_path = '') {
+    return getpaid_template()->locate_template($template_name, $template_path, $default_path);
 }
 
-function wpinv_get_template_part( $slug, $name = null, $load = true ) {
-	do_action( 'get_template_part_' . $slug, $slug, $name );
+function wpinv_get_template_part($slug, $name = null, $load = true) {
+	do_action('get_template_part_' . $slug, $slug, $name);
 
 	// Setup possible parts
 	$templates = array();
-	if ( isset( $name ) )
+	if (isset($name))
 		$templates[] = $slug . '-' . $name . '.php';
 	$templates[] = $slug . '.php';
 
 	// Allow template parts to be filtered
-	$templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
+	$templates = apply_filters('wpinv_get_template_part', $templates, $slug, $name);
 
 	// Return the part that is found
-	return wpinv_locate_tmpl( $templates, $load, false );
+	return wpinv_locate_tmpl($templates, $load, false);
 }
 
-function wpinv_locate_tmpl( $template_names, $load = false, $require_once = true ) {
+function wpinv_locate_tmpl($template_names, $load = false, $require_once = true) {
 	// No file found yet
 	$located = false;
 
 	// Try to find a template file
-	foreach ( (array)$template_names as $template_name ) {
+	foreach ((array) $template_names as $template_name) {
 
 		// Continue if template is empty
-		if ( empty( $template_name ) )
+		if (empty($template_name))
 			continue;
 
 		// Trim off any slashes from the template name
-		$template_name = ltrim( $template_name, '/' );
+		$template_name = ltrim($template_name, '/');
 
 		// try locating this template file by looping through the template paths
-		foreach( wpinv_get_theme_template_paths() as $template_path ) {
+		foreach (wpinv_get_theme_template_paths() as $template_path) {
 
-			if( file_exists( $template_path . $template_name ) ) {
+			if (file_exists($template_path . $template_name)) {
 				$located = $template_path . $template_name;
 				break;
 			}
 		}
 
-		if( !empty( $located ) ) {
+		if (!empty($located)) {
 			break;
 		}
 	}
 
-	if ( ( true == $load ) && ! empty( $located ) )
-		load_template( $located, $require_once );
+	if ((true == $load) && !empty($located))
+		load_template($located, $require_once);
 
 	return $located;
 }
@@ -228,127 +228,127 @@ 
 	$template_dir = wpinv_get_theme_template_dir_name();
 
 	$file_paths = array(
-		1 => trailingslashit( get_stylesheet_directory() ) . $template_dir,
-		10 => trailingslashit( get_template_directory() ) . $template_dir,
+		1 => trailingslashit(get_stylesheet_directory()) . $template_dir,
+		10 => trailingslashit(get_template_directory()) . $template_dir,
 		100 => wpinv_get_templates_dir()
 	);
 
-	$file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
+	$file_paths = apply_filters('wpinv_template_paths', $file_paths);
 
 	// sort the file paths based on priority
-	ksort( $file_paths, SORT_NUMERIC );
+	ksort($file_paths, SORT_NUMERIC);
 
-	return array_map( 'trailingslashit', $file_paths );
+	return array_map('trailingslashit', $file_paths);
 }
 
 function wpinv_checkout_meta_tags() {
 
 	$pages   = array();
-	$pages[] = wpinv_get_option( 'success_page' );
-	$pages[] = wpinv_get_option( 'failure_page' );
-	$pages[] = wpinv_get_option( 'invoice_history_page' );
-	$pages[] = wpinv_get_option( 'invoice_subscription_page' );
+	$pages[] = wpinv_get_option('success_page');
+	$pages[] = wpinv_get_option('failure_page');
+	$pages[] = wpinv_get_option('invoice_history_page');
+	$pages[] = wpinv_get_option('invoice_subscription_page');
 
-	if( !wpinv_is_checkout() && !is_page( $pages ) ) {
+	if (!wpinv_is_checkout() && !is_page($pages)) {
 		return;
 	}
 
 	echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
 }
-add_action( 'wp_head', 'wpinv_checkout_meta_tags' );
+add_action('wp_head', 'wpinv_checkout_meta_tags');
 
-function wpinv_add_body_classes( $class ) {
-	$classes = (array)$class;
+function wpinv_add_body_classes($class) {
+	$classes = (array) $class;
 
-	if( wpinv_is_checkout() ) {
+	if (wpinv_is_checkout()) {
 		$classes[] = 'wpinv-checkout';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_success_page() ) {
+	if (wpinv_is_success_page()) {
 		$classes[] = 'wpinv-success';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_failed_transaction_page() ) {
+	if (wpinv_is_failed_transaction_page()) {
 		$classes[] = 'wpinv-failed-transaction';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_invoice_history_page() ) {
+	if (wpinv_is_invoice_history_page()) {
 		$classes[] = 'wpinv-history';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_subscriptions_history_page() ) {
+	if (wpinv_is_subscriptions_history_page()) {
 		$classes[] = 'wpinv-subscription';
 		$classes[] = 'wpinv-page';
 	}
 
-	if( wpinv_is_test_mode() ) {
+	if (wpinv_is_test_mode()) {
 		$classes[] = 'wpinv-test-mode';
 		$classes[] = 'wpinv-page';
 	}
 
-	return array_unique( $classes );
+	return array_unique($classes);
 }
-add_filter( 'body_class', 'wpinv_add_body_classes' );
+add_filter('body_class', 'wpinv_add_body_classes');
 
-function wpinv_html_year_dropdown( $name = 'year', $selected = 0, $years_before = 5, $years_after = 0 ) {
-    $current     = date( 'Y' );
-    $start_year  = $current - absint( $years_before );
-    $end_year    = $current + absint( $years_after );
-    $selected    = empty( $selected ) ? date( 'Y' ) : $selected;
+function wpinv_html_year_dropdown($name = 'year', $selected = 0, $years_before = 5, $years_after = 0) {
+    $current     = date('Y');
+    $start_year  = $current - absint($years_before);
+    $end_year    = $current + absint($years_after);
+    $selected    = empty($selected) ? date('Y') : $selected;
     $options     = array();
 
-    while ( $start_year <= $end_year ) {
-        $options[ absint( $start_year ) ] = $start_year;
+    while ($start_year <= $end_year) {
+        $options[absint($start_year)] = $start_year;
         $start_year++;
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_month_dropdown( $name = 'month', $selected = 0 ) {
+function wpinv_html_month_dropdown($name = 'month', $selected = 0) {
 
     $options = array(
-        '1'  => __( 'January', 'invoicing' ),
-        '2'  => __( 'February', 'invoicing' ),
-        '3'  => __( 'March', 'invoicing' ),
-        '4'  => __( 'April', 'invoicing' ),
-        '5'  => __( 'May', 'invoicing' ),
-        '6'  => __( 'June', 'invoicing' ),
-        '7'  => __( 'July', 'invoicing' ),
-        '8'  => __( 'August', 'invoicing' ),
-        '9'  => __( 'September', 'invoicing' ),
-        '10' => __( 'October', 'invoicing' ),
-        '11' => __( 'November', 'invoicing' ),
-        '12' => __( 'December', 'invoicing' ),
+        '1'  => __('January', 'invoicing'),
+        '2'  => __('February', 'invoicing'),
+        '3'  => __('March', 'invoicing'),
+        '4'  => __('April', 'invoicing'),
+        '5'  => __('May', 'invoicing'),
+        '6'  => __('June', 'invoicing'),
+        '7'  => __('July', 'invoicing'),
+        '8'  => __('August', 'invoicing'),
+        '9'  => __('September', 'invoicing'),
+        '10' => __('October', 'invoicing'),
+        '11' => __('November', 'invoicing'),
+        '12' => __('December', 'invoicing'),
     );
 
     // If no month is selected, default to the current month
-    $selected = empty( $selected ) ? date( 'n' ) : $selected;
+    $selected = empty($selected) ? date('n') : $selected;
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $name,
         'selected'         => $selected,
         'options'          => $options,
         'show_option_all'  => false,
         'show_option_none' => false
-    ) );
+    ));
 
     return $output;
 }
 
-function wpinv_html_select( $args = array() ) {
+function wpinv_html_select($args = array()) {
     $defaults = array(
         'options'          => array(),
         'name'             => null,
@@ -357,8 +357,8 @@ 
         'selected'         => 0,
         'placeholder'      => null,
         'multiple'         => false,
-        'show_option_all'  => _x( 'All', 'all dropdown items', 'invoicing' ),
-        'show_option_none' => _x( 'None', 'no dropdown items', 'invoicing' ),
+        'show_option_all'  => _x('All', 'all dropdown items', 'invoicing'),
+        'show_option_none' => _x('None', 'no dropdown items', 'invoicing'),
         'data'             => array(),
         'onchange'         => null,
         'required'         => false,
@@ -366,74 +366,74 @@ 
         'readonly'         => false,
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $data_elements = '';
-    foreach ( $args['data'] as $key => $value ) {
-        $data_elements .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
+    foreach ($args['data'] as $key => $value) {
+        $data_elements .= ' data-' . esc_attr($key) . '="' . esc_attr($value) . '"';
     }
 
-    if( $args['multiple'] ) {
+    if ($args['multiple']) {
         $multiple = ' MULTIPLE';
     } else {
         $multiple = '';
     }
 
-    if( $args['placeholder'] ) {
+    if ($args['placeholder']) {
         $placeholder = $args['placeholder'];
     } else {
         $placeholder = '';
     }
     
     $options = '';
-    if( !empty( $args['onchange'] ) ) {
-        $options .= ' onchange="' . esc_attr( $args['onchange'] ) . '"';
+    if (!empty($args['onchange'])) {
+        $options .= ' onchange="' . esc_attr($args['onchange']) . '"';
     }
     
-    if( !empty( $args['required'] ) ) {
+    if (!empty($args['required'])) {
         $options .= ' required="required"';
     }
     
-    if( !empty( $args['disabled'] ) ) {
+    if (!empty($args['disabled'])) {
         $options .= ' disabled';
     }
     
-    if( !empty( $args['readonly'] ) ) {
+    if (!empty($args['readonly'])) {
         $options .= ' readonly';
     }
 
-    $class  = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
-    $output = '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] ) . '" class="wpinv-select ' . $class . '"' . $multiple . ' data-placeholder="' . $placeholder . '" ' . trim( $options ) . $data_elements . '>';
+    $class  = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
+    $output = '<select name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" class="wpinv-select ' . $class . '"' . $multiple . ' data-placeholder="' . $placeholder . '" ' . trim($options) . $data_elements . '>';
 
-    if ( $args['show_option_all'] ) {
-        if( $args['multiple'] ) {
-            $selected = selected( true, in_array( 0, $args['selected'] ), false );
+    if ($args['show_option_all']) {
+        if ($args['multiple']) {
+            $selected = selected(true, in_array(0, $args['selected']), false);
         } else {
-            $selected = selected( $args['selected'], 0, false );
+            $selected = selected($args['selected'], 0, false);
         }
-        $output .= '<option value="all"' . $selected . '>' . esc_html( $args['show_option_all'] ) . '</option>';
+        $output .= '<option value="all"' . $selected . '>' . esc_html($args['show_option_all']) . '</option>';
     }
 
-    if ( !empty( $args['options'] ) ) {
+    if (!empty($args['options'])) {
 
-        if ( $args['show_option_none'] ) {
-            if( $args['multiple'] ) {
-                $selected = selected( true, in_array( "", $args['selected'] ), false );
+        if ($args['show_option_none']) {
+            if ($args['multiple']) {
+                $selected = selected(true, in_array("", $args['selected']), false);
             } else {
-                $selected = selected( $args['selected'] === "", true, false );
+                $selected = selected($args['selected'] === "", true, false);
             }
-            $output .= '<option value=""' . $selected . '>' . esc_html( $args['show_option_none'] ) . '</option>';
+            $output .= '<option value=""' . $selected . '>' . esc_html($args['show_option_none']) . '</option>';
         }
 
-        foreach( $args['options'] as $key => $option ) {
+        foreach ($args['options'] as $key => $option) {
 
-            if( $args['multiple'] && is_array( $args['selected'] ) ) {
-                $selected = selected( true, (bool)in_array( $key, $args['selected'] ), false );
+            if ($args['multiple'] && is_array($args['selected'])) {
+                $selected = selected(true, (bool) in_array($key, $args['selected']), false);
             } else {
-                $selected = selected( $args['selected'], $key, false );
+                $selected = selected($args['selected'], $key, false);
             }
 
-            $output .= '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option ) . '</option>';
+            $output .= '<option value="' . esc_attr($key) . '"' . $selected . '>' . esc_html($option) . '</option>';
         }
     }
 
@@ -442,7 +442,7 @@ 
     return $output;
 }
 
-function wpinv_item_dropdown( $args = array() ) {
+function wpinv_item_dropdown($args = array()) {
     $defaults = array(
         'name'              => 'wpi_item',
         'id'                => 'wpi_item',
@@ -450,14 +450,14 @@ 
         'multiple'          => false,
         'selected'          => 0,
         'number'            => 100,
-        'placeholder'       => __( 'Choose a item', 'invoicing' ),
-        'data'              => array( 'search-type' => 'item' ),
+        'placeholder'       => __('Choose a item', 'invoicing'),
+        'data'              => array('search-type' => 'item'),
         'show_option_all'   => false,
         'show_option_none'  => false,
         'show_recurring'    => false,
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $item_args = array(
         'post_type'      => 'wpi_item',
@@ -466,44 +466,44 @@ 
         'posts_per_page' => $args['number']
     );
 
-    $item_args  = apply_filters( 'wpinv_item_dropdown_query_args', $item_args, $args, $defaults );
+    $item_args  = apply_filters('wpinv_item_dropdown_query_args', $item_args, $args, $defaults);
 
-    $items      = get_posts( $item_args );
+    $items      = get_posts($item_args);
     $options    = array();
-    if ( $items ) {
-        foreach ( $items as $item ) {
-            $title = esc_html( $item->post_title );
+    if ($items) {
+        foreach ($items as $item) {
+            $title = esc_html($item->post_title);
             
-            if ( !empty( $args['show_recurring'] ) ) {
-                $title .= wpinv_get_item_suffix( $item->ID, false );
+            if (!empty($args['show_recurring'])) {
+                $title .= wpinv_get_item_suffix($item->ID, false);
             }
             
-            $options[ absint( $item->ID ) ] = $title;
+            $options[absint($item->ID)] = $title;
         }
     }
 
     // This ensures that any selected items are included in the drop down
-    if( is_array( $args['selected'] ) ) {
-        foreach( $args['selected'] as $item ) {
-            if( ! in_array( $item, $options ) ) {
-                $title = get_the_title( $item );
-                if ( !empty( $args['show_recurring'] ) ) {
-                    $title .= wpinv_get_item_suffix( $item, false );
+    if (is_array($args['selected'])) {
+        foreach ($args['selected'] as $item) {
+            if (!in_array($item, $options)) {
+                $title = get_the_title($item);
+                if (!empty($args['show_recurring'])) {
+                    $title .= wpinv_get_item_suffix($item, false);
                 }
                 $options[$item] = $title;
             }
         }
-    } elseif ( is_numeric( $args['selected'] ) && $args['selected'] !== 0 ) {
-        if ( ! in_array( $args['selected'], $options ) ) {
-            $title = get_the_title( $args['selected'] );
-            if ( !empty( $args['show_recurring'] ) ) {
-                $title .= wpinv_get_item_suffix( $args['selected'], false );
+    } elseif (is_numeric($args['selected']) && $args['selected'] !== 0) {
+        if (!in_array($args['selected'], $options)) {
+            $title = get_the_title($args['selected']);
+            if (!empty($args['show_recurring'])) {
+                $title .= wpinv_get_item_suffix($args['selected'], false);
             }
-            $options[$args['selected']] = get_the_title( $args['selected'] );
+            $options[$args['selected']] = get_the_title($args['selected']);
         }
     }
 
-    $output = wpinv_html_select( array(
+    $output = wpinv_html_select(array(
         'name'             => $args['name'],
         'selected'         => $args['selected'],
         'id'               => $args['id'],
@@ -514,7 +514,7 @@ 
         'show_option_all'  => $args['show_option_all'],
         'show_option_none' => $args['show_option_none'],
         'data'             => $args['data'],
-    ) );
+    ));
 
     return $output;
 }
@@ -534,16 +534,16 @@ 
     );
 
     $options = array();
-    if ( $items ) {
-        foreach ( $items as $item ) {
-            $options[ $item->ID ] = esc_html( $item->post_title ) . wpinv_get_item_suffix( $item->ID, false );
+    if ($items) {
+        foreach ($items as $item) {
+            $options[$item->ID] = esc_html($item->post_title) . wpinv_get_item_suffix($item->ID, false);
         }
     }
 
     return $options;
 }
 
-function wpinv_html_checkbox( $args = array() ) {
+function wpinv_html_checkbox($args = array()) {
     $defaults = array(
         'name'     => null,
         'current'  => null,
@@ -554,17 +554,17 @@ 
         )
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $options = '';
-    if ( ! empty( $args['options']['disabled'] ) ) {
+    if (!empty($args['options']['disabled'])) {
         $options .= ' disabled="disabled"';
-    } elseif ( ! empty( $args['options']['readonly'] ) ) {
+    } elseif (!empty($args['options']['readonly'])) {
         $options .= ' readonly';
     }
 
-    $output = '<input type="checkbox"' . $options . ' name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['name'] ) . '" class="' . $class . ' ' . esc_attr( $args['name'] ) . '" ' . checked( 1, $args['current'], false ) . ' />';
+    $output = '<input type="checkbox"' . $options . ' name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['name']) . '" class="' . $class . ' ' . esc_attr($args['name']) . '" ' . checked(1, $args['current'], false) . ' />';
 
     return $output;
 }
@@ -572,9 +572,9 @@ 
 /**
  * Displays a hidden field.
  */
-function getpaid_hidden_field( $name, $value ) {
-    $name  = sanitize_text_field( $name );
-    $value = esc_attr( $value );
+function getpaid_hidden_field($name, $value) {
+    $name  = sanitize_text_field($name);
+    $value = esc_attr($value);
 
     echo "<input type='hidden' name='$name' value='$value' />";
 }
@@ -582,31 +582,31 @@ 
 /**
  * Displays a submit field.
  */
-function getpaid_submit_field( $value, $name = 'submit', $class = 'btn-primary' ) {
-    $name  = sanitize_text_field( $name );
-    $value = esc_attr( $value );
-    $class = esc_attr( $class );
+function getpaid_submit_field($value, $name = 'submit', $class = 'btn-primary') {
+    $name  = sanitize_text_field($name);
+    $value = esc_attr($value);
+    $class = esc_attr($class);
 
     echo "<input type='submit' name='$name' value='$value' class='btn $class' />";
 }
 
-function wpinv_html_text( $args = array() ) {
+function wpinv_html_text($args = array()) {
     // Backwards compatibility
-    if ( func_num_args() > 1 ) {
+    if (func_num_args() > 1) {
         $args = func_get_args();
 
         $name  = $args[0];
-        $value = isset( $args[1] ) ? $args[1] : '';
-        $label = isset( $args[2] ) ? $args[2] : '';
-        $desc  = isset( $args[3] ) ? $args[3] : '';
+        $value = isset($args[1]) ? $args[1] : '';
+        $label = isset($args[2]) ? $args[2] : '';
+        $desc  = isset($args[3]) ? $args[3] : '';
     }
 
     $defaults = array(
         'id'           => '',
-        'name'         => isset( $name )  ? $name  : 'text',
-        'value'        => isset( $value ) ? $value : null,
-        'label'        => isset( $label ) ? $label : null,
-        'desc'         => isset( $desc )  ? $desc  : null,
+        'name'         => isset($name) ? $name : 'text',
+        'value'        => isset($value) ? $value : null,
+        'label'        => isset($label) ? $label : null,
+        'desc'         => isset($desc) ? $desc : null,
         'placeholder'  => '',
         'class'        => 'regular-text',
         'disabled'     => false,
@@ -616,41 +616,41 @@ 
         'data'         => false
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $options = '';
-    if( $args['required'] ) {
+    if ($args['required']) {
         $options .= ' required="required"';
     }
-    if( $args['readonly'] ) {
+    if ($args['readonly']) {
         $options .= ' readonly';
     }
-    if( $args['readonly'] ) {
+    if ($args['readonly']) {
         $options .= ' readonly';
     }
 
     $data = '';
-    if ( !empty( $args['data'] ) ) {
-        foreach ( $args['data'] as $key => $value ) {
-            $data .= 'data-' . wpinv_sanitize_key( $key ) . '="' . esc_attr( $value ) . '" ';
+    if (!empty($args['data'])) {
+        foreach ($args['data'] as $key => $value) {
+            $data .= 'data-' . wpinv_sanitize_key($key) . '="' . esc_attr($value) . '" ';
         }
     }
 
-    $output = '<span id="wpinv-' . wpinv_sanitize_key( $args['name'] ) . '-wrap">';
-    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key( $args['id'] ) . '">' . esc_html( $args['label'] ) . '</label>';
-    if ( ! empty( $args['desc'] ) ) {
-        $output .= '<span class="wpinv-description">' . esc_html( $args['desc'] ) . '</span>';
+    $output = '<span id="wpinv-' . wpinv_sanitize_key($args['name']) . '-wrap">';
+    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key($args['id']) . '">' . esc_html($args['label']) . '</label>';
+    if (!empty($args['desc'])) {
+        $output .= '<span class="wpinv-description">' . esc_html($args['desc']) . '</span>';
     }
 
-    $output .= '<input type="text" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['id'] )  . '" autocomplete="' . esc_attr( $args['autocomplete'] )  . '" value="' . esc_attr( $args['value'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" class="' . $class . '" ' . $data . ' ' . trim( $options ) . '/>';
+    $output .= '<input type="text" name="' . esc_attr($args['name']) . '" id="' . esc_attr($args['id']) . '" autocomplete="' . esc_attr($args['autocomplete']) . '" value="' . esc_attr($args['value']) . '" placeholder="' . esc_attr($args['placeholder']) . '" class="' . $class . '" ' . $data . ' ' . trim($options) . '/>';
 
     $output .= '</span>';
 
     return $output;
 }
 
-function wpinv_html_textarea( $args = array() ) {
+function wpinv_html_textarea($args = array()) {
     $defaults = array(
         'name'        => 'textarea',
         'value'       => null,
@@ -661,31 +661,31 @@ 
         'placeholder' => '',
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
+    $class = implode(' ', array_map('sanitize_html_class', explode(' ', $args['class'])));
     $disabled = '';
-    if( $args['disabled'] ) {
+    if ($args['disabled']) {
         $disabled = ' disabled="disabled"';
     }
 
-    $output = '<span id="wpinv-' . wpinv_sanitize_key( $args['name'] ) . '-wrap">';
-    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key( $args['name'] ) . '">' . esc_html( $args['label'] ) . '</label>';
-    $output .= '<textarea name="' . esc_attr( $args['name'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" id="' . wpinv_sanitize_key( $args['name'] ) . '" class="' . $class . '"' . $disabled . '>' . esc_attr( $args['value'] ) . '</textarea>';
+    $output = '<span id="wpinv-' . wpinv_sanitize_key($args['name']) . '-wrap">';
+    $output .= '<label class="wpinv-label" for="' . wpinv_sanitize_key($args['name']) . '">' . esc_html($args['label']) . '</label>';
+    $output .= '<textarea name="' . esc_attr($args['name']) . '" placeholder="' . esc_attr($args['placeholder']) . '" id="' . wpinv_sanitize_key($args['name']) . '" class="' . $class . '"' . $disabled . '>' . esc_attr($args['value']) . '</textarea>';
 
-    if ( ! empty( $args['desc'] ) ) {
-        $output .= '<span class="wpinv-description">' . esc_html( $args['desc'] ) . '</span>';
+    if (!empty($args['desc'])) {
+        $output .= '<span class="wpinv-description">' . esc_html($args['desc']) . '</span>';
     }
     $output .= '</span>';
 
     return $output;
 }
 
-function wpinv_html_ajax_user_search( $args = array() ) {
+function wpinv_html_ajax_user_search($args = array()) {
     $defaults = array(
         'name'        => 'user_id',
         'value'       => null,
-        'placeholder' => __( 'Enter username', 'invoicing' ),
+        'placeholder' => __('Enter username', 'invoicing'),
         'label'       => null,
         'desc'        => null,
         'class'       => '',
@@ -694,13 +694,13 @@ 
         'data'        => false
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
     $args['class'] = 'wpinv-ajax-user-search ' . $args['class'];
 
     $output  = '<span class="wpinv_user_search_wrap">';
-        $output .= wpinv_html_text( $args );
-        $output .= '<span class="wpinv_user_search_results hidden"><a class="wpinv-ajax-user-cancel" title="' . __( 'Cancel', 'invoicing' ) . '" aria-label="' . __( 'Cancel', 'invoicing' ) . '" href="#">x</a><span></span></span>';
+        $output .= wpinv_html_text($args);
+        $output .= '<span class="wpinv_user_search_results hidden"><a class="wpinv-ajax-user-cancel" title="' . __('Cancel', 'invoicing') . '" aria-label="' . __('Cancel', 'invoicing') . '" href="#">x</a><span></span></span>';
     $output .= '</span>';
 
     return $output;
@@ -711,20 +711,20 @@ 
  * 
  * @param string $template the template that is currently being used.
  */
-function wpinv_template( $template ) {
+function wpinv_template($template) {
     global $post;
 
-    if ( ! is_admin() && ( is_single() || is_404() ) && ! empty( $post->ID ) && getpaid_is_invoice_post_type( get_post_type( $post->ID ) ) ) {
+    if (!is_admin() && (is_single() || is_404()) && !empty($post->ID) && getpaid_is_invoice_post_type(get_post_type($post->ID))) {
 
         // If the user can view this invoice, display it.
-        if ( wpinv_user_can_view_invoice( $post->ID ) ) {
+        if (wpinv_user_can_view_invoice($post->ID)) {
 
-            return wpinv_get_template_part( 'wpinv-invoice-print', false, false );
+            return wpinv_get_template_part('wpinv-invoice-print', false, false);
 
         // Else display an error message.
         } else {
 
-            return wpinv_get_template_part( 'wpinv-invalid-access', false, false );
+            return wpinv_get_template_part('wpinv-invalid-access', false, false);
 
         }
 
@@ -732,24 +732,24 @@ 
 
     return $template;
 }
-add_filter( 'template_include', 'wpinv_template', 10, 1 );
+add_filter('template_include', 'wpinv_template', 10, 1);
 
 function wpinv_get_business_address() {
     $business_address   = wpinv_store_address();
-    $business_address   = !empty( $business_address ) ? wpautop( wp_kses_post( $business_address ) ) : '';
+    $business_address   = !empty($business_address) ? wpautop(wp_kses_post($business_address)) : '';
     
     $business_address = $business_address ? '<div class="address">' . $business_address . '</div>' : '';
     
-    return apply_filters( 'wpinv_get_business_address', $business_address );
+    return apply_filters('wpinv_get_business_address', $business_address);
 }
 
 /**
  * Displays the company address.
  */
 function wpinv_display_from_address() {
-    wpinv_get_template( 'invoice/company-address.php' );
+    wpinv_get_template('invoice/company-address.php');
 }
-add_action( 'getpaid_invoice_details_left', 'wpinv_display_from_address', 10 );
+add_action('getpaid_invoice_details_left', 'wpinv_display_from_address', 10);
 
 /**
  * Generates a watermark text for an invoice.
@@ -757,9 +757,9 @@ 
  * @param WPInv_Invoice $invoice
  * @return string
  */
-function wpinv_watermark( $invoice ) {
-    $watermark = wpinv_get_watermark( $invoice );
-    return apply_filters( 'wpinv_get_watermark', $watermark, $invoice );
+function wpinv_watermark($invoice) {
+    $watermark = wpinv_get_watermark($invoice);
+    return apply_filters('wpinv_get_watermark', $watermark, $invoice);
 }
 
 /**
@@ -768,37 +768,37 @@ 
  * @param WPInv_Invoice $invoice
  * @return string
  */
-function wpinv_get_watermark( $invoice ) {
+function wpinv_get_watermark($invoice) {
     return $invoice->get_status_nicename();
 }
 
 /**
  * @deprecated
  */
-function wpinv_display_invoice_details( $invoice ) {
-    return getpaid_invoice_meta( $invoice );
+function wpinv_display_invoice_details($invoice) {
+    return getpaid_invoice_meta($invoice);
 }
 
 /**
  * Displays invoice meta.
  */
-function getpaid_invoice_meta( $invoice ) {
+function getpaid_invoice_meta($invoice) {
 
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Ensure that we have an invoice.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return;
     }
 
     // Get the invoice meta.
-    $meta = getpaid_get_invoice_meta( $invoice );
+    $meta = getpaid_get_invoice_meta($invoice);
 
     // Display the meta.
-    wpinv_get_template( 'invoice/invoice-meta.php', compact( 'invoice', 'meta' ) );
+    wpinv_get_template('invoice/invoice-meta.php', compact('invoice', 'meta'));
 
 }
-add_action( 'getpaid_invoice_details_right', 'getpaid_invoice_meta', 10 );
+add_action('getpaid_invoice_details_right', 'getpaid_invoice_meta', 10);
 
 /**
  * Retrieves the address markup to use on Invoices.
@@ -810,29 +810,29 @@ 
  * @param  string $separator How to separate address lines.
  * @return string
  */
-function wpinv_get_invoice_address_markup( $billing_details, $separator = '<br/>' ) {
+function wpinv_get_invoice_address_markup($billing_details, $separator = '<br/>') {
 
     // Retrieve the address markup...
-    $country= empty( $billing_details['country'] ) ? '' : $billing_details['country'];
-    $format = wpinv_get_full_address_format( $country );
+    $country = empty($billing_details['country']) ? '' : $billing_details['country'];
+    $format = wpinv_get_full_address_format($country);
 
     // ... and the replacements.
-    $replacements = wpinv_get_invoice_address_replacements( $billing_details );
+    $replacements = wpinv_get_invoice_address_replacements($billing_details);
 
-    $formatted_address = str_ireplace( array_keys( $replacements ), $replacements, $format );
+    $formatted_address = str_ireplace(array_keys($replacements), $replacements, $format);
     
 	// Remove unavailable tags.
-    $formatted_address = preg_replace( "/\{\{\w+\}\}/", '', $formatted_address );
+    $formatted_address = preg_replace("/\{\{\w+\}\}/", '', $formatted_address);
 
     // Clean up white space.
-	$formatted_address = preg_replace( '/  +/', ' ', trim( $formatted_address ) );
-    $formatted_address = preg_replace( '/\n\n+/', "\n", $formatted_address );
+	$formatted_address = preg_replace('/  +/', ' ', trim($formatted_address));
+    $formatted_address = preg_replace('/\n\n+/', "\n", $formatted_address);
     
     // Break newlines apart and remove empty lines/trim commas and white space.
-	$formatted_address = array_filter( array_map( 'wpinv_trim_formatted_address_line', explode( "\n", $formatted_address ) ) );
+	$formatted_address = array_filter(array_map('wpinv_trim_formatted_address_line', explode("\n", $formatted_address)));
 
     // Add html breaks.
-	$formatted_address = implode( $separator, $formatted_address );
+	$formatted_address = implode($separator, $formatted_address);
 
 	// We're done!
 	return $formatted_address;
@@ -844,88 +844,88 @@ 
  * 
  * @param WPInv_Invoice $invoice
  */
-function wpinv_display_to_address( $invoice = 0 ) {
-    if ( ! empty( $invoice ) ) {
-        wpinv_get_template( 'invoice/billing-address.php', compact( 'invoice' ) );
+function wpinv_display_to_address($invoice = 0) {
+    if (!empty($invoice)) {
+        wpinv_get_template('invoice/billing-address.php', compact('invoice'));
     }
 }
-add_action( 'getpaid_invoice_details_left', 'wpinv_display_to_address', 40 );
+add_action('getpaid_invoice_details_left', 'wpinv_display_to_address', 40);
 
 
 /**
  * Displays invoice line items.
  */
-function wpinv_display_line_items( $invoice_id = 0 ) {
+function wpinv_display_line_items($invoice_id = 0) {
 
     // Prepare the invoice.
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
     // Abort if there is no invoice.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return;
     }
 
     // Line item columns.
-    $columns = getpaid_invoice_item_columns( $invoice );
-    $columns = apply_filters( 'getpaid_invoice_line_items_table_columns', $columns, $invoice );
+    $columns = getpaid_invoice_item_columns($invoice);
+    $columns = apply_filters('getpaid_invoice_line_items_table_columns', $columns, $invoice);
 
-    wpinv_get_template( 'invoice/line-items.php', compact( 'invoice', 'columns' ) );
+    wpinv_get_template('invoice/line-items.php', compact('invoice', 'columns'));
 }
-add_action( 'getpaid_invoice_line_items', 'wpinv_display_line_items', 10 );
+add_action('getpaid_invoice_line_items', 'wpinv_display_line_items', 10);
 
 /**
  * Displays invoice notices on invoices.
  */
 function wpinv_display_invoice_notice() {
 
-    $label  = wpinv_get_option( 'vat_invoice_notice_label' );
-    $notice = wpinv_get_option( 'vat_invoice_notice' );
+    $label  = wpinv_get_option('vat_invoice_notice_label');
+    $notice = wpinv_get_option('vat_invoice_notice');
 
-    if ( empty( $label ) && empty( $notice ) ) {
+    if (empty($label) && empty($notice)) {
         return;
     }
 
     echo '<div class="mt-4 mb-4 wpinv-vat-notice">';
 
-    if ( ! empty( $label ) ) {
-        $label = sanitize_text_field( $label );
+    if (!empty($label)) {
+        $label = sanitize_text_field($label);
         echo "<h5>$label</h5>";
     }
 
-    if ( ! empty( $notice ) ) {
-        echo '<small class="form-text text-muted">' . wpautop( wptexturize( $notice ) ) . '</small>';
+    if (!empty($notice)) {
+        echo '<small class="form-text text-muted">' . wpautop(wptexturize($notice)) . '</small>';
     }
 
     echo '</div>';
 }
-add_action( 'getpaid_invoice_line_items', 'wpinv_display_invoice_notice', 100 );
+add_action('getpaid_invoice_line_items', 'wpinv_display_invoice_notice', 100);
 
 /**
  * @param WPInv_Invoice $invoice
  */
-function wpinv_display_invoice_notes( $invoice ) {
+function wpinv_display_invoice_notes($invoice) {
 
     // Retrieve the notes.
-    $notes = wpinv_get_invoice_notes( $invoice->get_id(), 'customer' );
+    $notes = wpinv_get_invoice_notes($invoice->get_id(), 'customer');
 
     // Abort if we have non.
-    if ( empty( $notes ) ) {
+    if (empty($notes)) {
         return;
     }
 
     // Echo the note.
     echo '<div class="getpaid-invoice-notes-wrapper position-relative my-4">';
-    echo '<h2 class="getpaid-invoice-notes-title mb-1 p-0 h4">' . __( 'Notes', 'invoicing' ) .'</h2>';
+    echo '<h2 class="getpaid-invoice-notes-title mb-1 p-0 h4">' . __('Notes', 'invoicing') . '</h2>';
     echo '<ul class="getpaid-invoice-notes text-break overflow-auto list-unstyled p-0 m-0">';
 
-    foreach( $notes as $note ) {
-        wpinv_get_invoice_note_line_item( $note );
+    foreach ($notes as $note) {
+        wpinv_get_invoice_note_line_item($note);
     }
 
     echo '</ul>';
     echo '</div>';
 }
-add_action( 'getpaid_invoice_line_items', 'wpinv_display_invoice_notes', 60 );
+add_action('getpaid_invoice_line_items', 'wpinv_display_invoice_notes', 60);
 
 /**
  * Loads scripts on our invoice templates.
@@ -933,31 +933,31 @@ 
 function wpinv_display_style() {
 
     // Make sure that all scripts have been loaded.
-    if ( ! did_action( 'wp_enqueue_scripts' ) ) {
-        do_action( 'wp_enqueue_scripts' );
+    if (!did_action('wp_enqueue_scripts')) {
+        do_action('wp_enqueue_scripts');
     }
 
     // Register the invoices style.
-    wp_register_style( 'wpinv-single-style', WPINV_PLUGIN_URL . 'assets/css/invoice.css', array(), filemtime( WPINV_PLUGIN_DIR . 'assets/css/invoice.css' ) );
+    wp_register_style('wpinv-single-style', WPINV_PLUGIN_URL . 'assets/css/invoice.css', array(), filemtime(WPINV_PLUGIN_DIR . 'assets/css/invoice.css'));
 
     // Load required styles
-    wp_print_styles( 'wpinv-single-style' );
-    wp_print_styles( 'ayecode-ui' );
+    wp_print_styles('wpinv-single-style');
+    wp_print_styles('ayecode-ui');
 
     // Maybe load custom css.
-    $custom_css = wpinv_get_option( 'template_custom_css' );
+    $custom_css = wpinv_get_option('template_custom_css');
 
-    if ( isset( $custom_css ) && ! empty( $custom_css ) ) {
-        $custom_css     = wp_kses( $custom_css, array( '\'', '\"' ) );
-        $custom_css     = str_replace( '&gt;', '>', $custom_css );
+    if (isset($custom_css) && !empty($custom_css)) {
+        $custom_css     = wp_kses($custom_css, array('\'', '\"'));
+        $custom_css     = str_replace('&gt;', '>', $custom_css);
         echo '<style type="text/css">';
         echo $custom_css;
         echo '</style>';
     }
 
 }
-add_action( 'wpinv_invoice_print_head', 'wpinv_display_style' );
-add_action( 'wpinv_invalid_invoice_head', 'wpinv_display_style' );
+add_action('wpinv_invoice_print_head', 'wpinv_display_style');
+add_action('wpinv_invalid_invoice_head', 'wpinv_display_style');
 
 
 /**
@@ -969,41 +969,41 @@ 
     // Retrieve the current invoice.
     $invoice_id = getpaid_get_current_invoice_id();
 
-    if ( empty( $invoice_id ) ) {
+    if (empty($invoice_id)) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'Invalid invoice', 'invoicing' ),
+                'content' => __('Invalid invoice', 'invoicing'),
             )
         );
 
     }
 
     // Can the user view this invoice?
-    if ( ! wpinv_user_can_view_invoice( $invoice_id ) ) {
+    if (!wpinv_user_can_view_invoice($invoice_id)) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'You are not allowed to view this invoice', 'invoicing' ),
+                'content' => __('You are not allowed to view this invoice', 'invoicing'),
             )
         );
 
     }
 
     // Ensure that it is not yet paid for.
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
     // Maybe mark it as viewed.
-    getpaid_maybe_mark_invoice_as_viewed( $invoice );
+    getpaid_maybe_mark_invoice_as_viewed($invoice);
 
-    if ( $invoice->is_paid() ) {
+    if ($invoice->is_paid()) {
 
         return aui()->alert(
             array(
                 'type'    => 'success',
-                'content' => __( 'This invoice has already been paid.', 'invoicing' ),
+                'content' => __('This invoice has already been paid.', 'invoicing'),
             )
         );
 
@@ -1013,14 +1013,14 @@ 
     $wpi_checkout_id = $invoice_id;
 
     // We'll display this invoice via the default form.
-    $form = new GetPaid_Payment_Form( wpinv_get_default_payment_form() );
+    $form = new GetPaid_Payment_Form(wpinv_get_default_payment_form());
 
-    if ( 0 == $form->get_id() ) {
+    if (0 == $form->get_id()) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'Error loading the payment form', 'invoicing' ),
+                'content' => __('Error loading the payment form', 'invoicing'),
             )
         );
 
@@ -1028,7 +1028,7 @@ 
 
     // Set the invoice.
     $form->invoice = $invoice;
-    $form->set_items( $invoice->get_items() );
+    $form->set_items($invoice->get_items());
 
     // Generate the html.
     return $form->get_html();
@@ -1036,7 +1036,7 @@ 
 }
 
 function wpinv_empty_cart_message() {
-	return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
+	return apply_filters('wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __('Your cart is empty.', 'invoicing') . '</span>');
 }
 
 /**
@@ -1053,71 +1053,71 @@ 
         )
     );
 }
-add_action( 'wpinv_cart_empty', 'wpinv_empty_checkout_cart' );
+add_action('wpinv_cart_empty', 'wpinv_empty_checkout_cart');
 
 /**
  * Filters the receipt page.
  */
-function wpinv_filter_success_page_content( $content ) {
+function wpinv_filter_success_page_content($content) {
 
     // Ensure this is our page.
-    if ( isset( $_GET['payment-confirm'] ) && wpinv_is_success_page() ) {
+    if (isset($_GET['payment-confirm']) && wpinv_is_success_page()) {
 
-        $gateway = sanitize_text_field( $_GET['payment-confirm'] );
-        return apply_filters( "wpinv_payment_confirm_$gateway", $content );
+        $gateway = sanitize_text_field($_GET['payment-confirm']);
+        return apply_filters("wpinv_payment_confirm_$gateway", $content);
 
     }
 
     return $content;
 }
-add_filter( 'the_content', 'wpinv_filter_success_page_content', 99999 );
+add_filter('the_content', 'wpinv_filter_success_page_content', 99999);
 
-function wpinv_invoice_link( $invoice_id ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_invoice_link($invoice_id) {
+    $invoice = wpinv_get_invoice($invoice_id);
 
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return NULL;
     }
 
-    $invoice_link = '<a href="' . esc_url( $invoice->get_view_url() ) . '">' . $invoice->get_number() . '</a>';
+    $invoice_link = '<a href="' . esc_url($invoice->get_view_url()) . '">' . $invoice->get_number() . '</a>';
 
-    return apply_filters( 'wpinv_get_invoice_link', $invoice_link, $invoice );
+    return apply_filters('wpinv_get_invoice_link', $invoice_link, $invoice);
 }
 
-function wpinv_get_invoice_note_line_item( $note, $echo = true ) {
-    if ( empty( $note ) ) {
+function wpinv_get_invoice_note_line_item($note, $echo = true) {
+    if (empty($note)) {
         return NULL;
     }
 
-    if ( is_int( $note ) ) {
-        $note = get_comment( $note );
+    if (is_int($note)) {
+        $note = get_comment($note);
     }
 
-    if ( !( is_object( $note ) && is_a( $note, 'WP_Comment' ) ) ) {
+    if (!(is_object($note) && is_a($note, 'WP_Comment'))) {
         return NULL;
     }
 
-    $note_classes   = array( 'note' );
-    $note_classes[] = get_comment_meta( $note->comment_ID, '_wpi_customer_note', true ) ? 'customer-note' : '';
+    $note_classes   = array('note');
+    $note_classes[] = get_comment_meta($note->comment_ID, '_wpi_customer_note', true) ? 'customer-note' : '';
     $note_classes[] = $note->comment_author === 'System' ? 'system-note' : '';
-    $note_classes   = apply_filters( 'wpinv_invoice_note_class', array_filter( $note_classes ), $note );
-    $note_classes   = !empty( $note_classes ) ? implode( ' ', $note_classes ) : '';
+    $note_classes   = apply_filters('wpinv_invoice_note_class', array_filter($note_classes), $note);
+    $note_classes   = !empty($note_classes) ? implode(' ', $note_classes) : '';
 
     ob_start();
     ?>
-    <li rel="<?php echo absint( $note->comment_ID ) ; ?>" class="<?php echo esc_attr( $note_classes ); ?> mb-2">
+    <li rel="<?php echo absint($note->comment_ID); ?>" class="<?php echo esc_attr($note_classes); ?> mb-2">
         <div class="note_content">
 
-            <?php echo wptexturize( wp_kses_post( $note->comment_content ) ); ?>
+            <?php echo wptexturize(wp_kses_post($note->comment_content)); ?>
 
-            <?php if ( ! is_admin() ) : ?>
+            <?php if (!is_admin()) : ?>
                 <em class="small form-text text-muted mt-0">
                     <?php
                         printf(
-                            __( '%1$s - %2$s at %3$s', 'invoicing' ),
+                            __('%1$s - %2$s at %3$s', 'invoicing'),
                             $note->comment_author,
-                            getpaid_format_date_value( $note->comment_date ),
-                            date_i18n( get_option( 'time_format' ), strtotime( $note->comment_date ) )
+                            getpaid_format_date_value($note->comment_date),
+                            date_i18n(get_option('time_format'), strtotime($note->comment_date))
                         );
                     ?>
                 </em>
@@ -1125,21 +1125,21 @@ 
 
         </div>
 
-        <?php if ( is_admin() ) : ?>
+        <?php if (is_admin()) : ?>
 
             <p class="meta px-4 py-2">
-                <abbr class="exact-date" title="<?php echo esc_attr( $note->comment_date ); ?>">
+                <abbr class="exact-date" title="<?php echo esc_attr($note->comment_date); ?>">
                     <?php
                         printf(
-                            __( '%1$s - %2$s at %3$s', 'invoicing' ),
+                            __('%1$s - %2$s at %3$s', 'invoicing'),
                             $note->comment_author,
-                            getpaid_format_date_value( $note->comment_date ),
-                            date_i18n( get_option( 'time_format' ), strtotime( $note->comment_date ) )
+                            getpaid_format_date_value($note->comment_date),
+                            date_i18n(get_option('time_format'), strtotime($note->comment_date))
                         );
                     ?>
                 </abbr>&nbsp;&nbsp;
-                <?php if ( $note->comment_author !== 'System' && wpinv_current_user_can_manage_invoicing() ) { ?>
-                    <a href="#" class="delete_note"><?php _e( 'Delete note', 'invoicing' ); ?></a>
+                <?php if ($note->comment_author !== 'System' && wpinv_current_user_can_manage_invoicing()) { ?>
+                    <a href="#" class="delete_note"><?php _e('Delete note', 'invoicing'); ?></a>
                 <?php } ?>
             </p>
 
@@ -1148,9 +1148,9 @@ 
     </li>
     <?php
     $note_content = ob_get_clean();
-    $note_content = apply_filters( 'wpinv_get_invoice_note_line_item', $note_content, $note, $echo );
+    $note_content = apply_filters('wpinv_get_invoice_note_line_item', $note_content, $note, $echo);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $note_content;
     } else {
         return $note_content;
@@ -1164,21 +1164,21 @@ 
  * @return string
  */
 function wpinv_get_policy_text() {
-    $privacy_page_id = get_option( 'wp_page_for_privacy_policy', 0 );
+    $privacy_page_id = get_option('wp_page_for_privacy_policy', 0);
 
-    $text = wpinv_get_option('invoicing_privacy_checkout_message', sprintf( __( 'Your personal data will be used to process your invoice, payment and for other purposes described in our %s.', 'invoicing' ), '[wpinv_privacy_policy]' ));
+    $text = wpinv_get_option('invoicing_privacy_checkout_message', sprintf(__('Your personal data will be used to process your invoice, payment and for other purposes described in our %s.', 'invoicing'), '[wpinv_privacy_policy]'));
 
-    if(!$privacy_page_id){
-        $privacy_page_id = wpinv_get_option( 'privacy_page', 0 );
+    if (!$privacy_page_id) {
+        $privacy_page_id = wpinv_get_option('privacy_page', 0);
     }
 
-    $privacy_link    = $privacy_page_id ? '<a href="' . esc_url( get_permalink( $privacy_page_id ) ) . '" class="wpinv-privacy-policy-link" target="_blank">' . __( 'privacy policy', 'invoicing' ) . '</a>' : __( 'privacy policy', 'invoicing' );
+    $privacy_link = $privacy_page_id ? '<a href="' . esc_url(get_permalink($privacy_page_id)) . '" class="wpinv-privacy-policy-link" target="_blank">' . __('privacy policy', 'invoicing') . '</a>' : __('privacy policy', 'invoicing');
 
     $find_replace = array(
         '[wpinv_privacy_policy]' => $privacy_link,
     );
 
-    $privacy_text = str_replace( array_keys( $find_replace ), array_values( $find_replace ), $text );
+    $privacy_text = str_replace(array_keys($find_replace), array_values($find_replace), $text);
 
     return wp_kses_post(wpautop($privacy_text));
 }
@@ -1186,21 +1186,21 @@ 
 function wpinv_oxygen_fix_conflict() {
     global $ct_ignore_post_types;
 
-    if ( ! is_array( $ct_ignore_post_types ) ) {
+    if (!is_array($ct_ignore_post_types)) {
         $ct_ignore_post_types = array();
     }
 
-    $post_types = array( 'wpi_discount', 'wpi_invoice', 'wpi_item', 'wpi_payment_form' );
+    $post_types = array('wpi_discount', 'wpi_invoice', 'wpi_item', 'wpi_payment_form');
 
-    foreach ( $post_types as $post_type ) {
+    foreach ($post_types as $post_type) {
         $ct_ignore_post_types[] = $post_type;
 
         // Ignore post type
-        add_filter( 'pre_option_oxygen_vsb_ignore_post_type_' . $post_type, '__return_true', 999 );
+        add_filter('pre_option_oxygen_vsb_ignore_post_type_' . $post_type, '__return_true', 999);
     }
 
-    remove_filter( 'template_include', 'wpinv_template', 10, 1 );
-    add_filter( 'template_include', 'wpinv_template', 999, 1 );
+    remove_filter('template_include', 'wpinv_template', 10, 1);
+    add_filter('template_include', 'wpinv_template', 999, 1);
 }
 
 /**
@@ -1208,10 +1208,10 @@ 
  * 
  * @param GetPaid_Payment_Form $form
  */
-function getpaid_display_payment_form( $form ) {
+function getpaid_display_payment_form($form) {
 
-    if ( is_numeric( $form ) ) {
-        $form = new GetPaid_Payment_Form( $form );
+    if (is_numeric($form)) {
+        $form = new GetPaid_Payment_Form($form);
     }
 
     $form->display();
@@ -1221,55 +1221,55 @@ 
 /**
  * Helper function to display a item payment form on the frontend.
  */
-function getpaid_display_item_payment_form( $items ) {
+function getpaid_display_item_payment_form($items) {
 
-    $form = new GetPaid_Payment_Form( wpinv_get_default_payment_form() );
-    $form->set_items( $items );
+    $form = new GetPaid_Payment_Form(wpinv_get_default_payment_form());
+    $form->set_items($items);
 
-    if ( 0 == count( $form->get_items() ) ) {
+    if (0 == count($form->get_items())) {
         echo aui()->alert(
 			array(
 				'type'    => 'warning',
-				'content' => __( 'No published items found', 'invoicing' ),
+				'content' => __('No published items found', 'invoicing'),
 			)
         );
         return;
     }
 
-    $form_items = esc_attr( getpaid_convert_items_to_string( $items ) );
+    $form_items = esc_attr(getpaid_convert_items_to_string($items));
     $form_items = "<input type='hidden' name='getpaid-form-items' value='$form_items' />";
-    $form->display( $form_items );
+    $form->display($form_items);
 }
 
 /**
  * Helper function to display an invoice payment form on the frontend.
  */
-function getpaid_display_invoice_payment_form( $invoice_id ) {
+function getpaid_display_invoice_payment_form($invoice_id) {
 
-    $invoice = wpinv_get_invoice( $invoice_id );
+    $invoice = wpinv_get_invoice($invoice_id);
 
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
 		echo aui()->alert(
 			array(
 				'type'    => 'warning',
-				'content' => __( 'Invoice not found', 'invoicing' ),
+				'content' => __('Invoice not found', 'invoicing'),
 			)
         );
         return;
     }
 
-    if ( $invoice->is_paid() ) {
+    if ($invoice->is_paid()) {
 		echo aui()->alert(
 			array(
 				'type'    => 'warning',
-				'content' => __( 'Invoice has already been paid', 'invoicing' ),
+				'content' => __('Invoice has already been paid', 'invoicing'),
 			)
         );
         return;
     }
 
-    $form = new GetPaid_Payment_Form( wpinv_get_default_payment_form() );
-    $form->set_items( $invoice->get_items() );
+    $form = new GetPaid_Payment_Form(wpinv_get_default_payment_form());
+    $form->set_items($invoice->get_items());
 
     $form->display();
 }
@@ -1277,23 +1277,23 @@ 
 /**
  * Helper function to convert item string to array.
  */
-function getpaid_convert_items_to_array( $items ) {
-    $items    = array_filter( array_map( 'trim', explode( ',', $items ) ) );
+function getpaid_convert_items_to_array($items) {
+    $items    = array_filter(array_map('trim', explode(',', $items)));
     $prepared = array();
 
-    foreach ( $items as $item ) {
-        $data = array_map( 'trim', explode( '|', $item ) );
+    foreach ($items as $item) {
+        $data = array_map('trim', explode('|', $item));
 
-        if ( empty( $data[0] ) || ! is_numeric( $data[0] ) ) {
+        if (empty($data[0]) || !is_numeric($data[0])) {
             continue;
         }
 
         $quantity = 1;
-        if ( isset( $data[1] ) && is_numeric( $data[1] ) ) {
+        if (isset($data[1]) && is_numeric($data[1])) {
             $quantity = (int) $data[1];
         }
 
-        $prepared[ $data[0] ] = $quantity;
+        $prepared[$data[0]] = $quantity;
 
     }
 
@@ -1303,13 +1303,13 @@ 
 /**
  * Helper function to convert item array to string.
  */
-function getpaid_convert_items_to_string( $items ) {
+function getpaid_convert_items_to_string($items) {
     $prepared = array();
 
-    foreach ( $items as $item => $quantity ) {
+    foreach ($items as $item => $quantity) {
         $prepared[] = "$item|$quantity";
     }
-    return implode( ',', $prepared );
+    return implode(',', $prepared);
 }
 
 /**
@@ -1317,21 +1317,21 @@ 
  * 
  * Provide a label and one of $form, $items or $invoice.
  */
-function getpaid_get_payment_button( $label, $form = null, $items = null, $invoice = null ) {
-    $label = sanitize_text_field( $label );
+function getpaid_get_payment_button($label, $form = null, $items = null, $invoice = null) {
+    $label = sanitize_text_field($label);
 
-    if ( ! empty( $form ) ) {
-        $form  = esc_attr( $form );
+    if (!empty($form)) {
+        $form = esc_attr($form);
         return "<button class='btn btn-primary getpaid-payment-button' type='button' data-form='$form'>$label</button>"; 
     }
 	
-	if ( ! empty( $items ) ) {
-        $items  = esc_attr( $items );
+	if (!empty($items)) {
+        $items = esc_attr($items);
         return "<button class='btn btn-primary getpaid-payment-button' type='button' data-item='$items'>$label</button>"; 
     }
     
-    if ( ! empty( $invoice ) ) {
-        $invoice  = esc_attr( $invoice );
+    if (!empty($invoice)) {
+        $invoice = esc_attr($invoice);
         return "<button class='btn btn-primary getpaid-payment-button' type='button' data-invoice='$invoice'>$label</button>"; 
     }
 
@@ -1342,17 +1342,17 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_the_invoice_description( $invoice ) {
+function getpaid_the_invoice_description($invoice) {
     $description = $invoice->get_description();
 
-    if ( empty( $description ) ) {
+    if (empty($description)) {
         return;
     }
 
-    $description = wp_kses_post( $description );
+    $description = wp_kses_post($description);
     echo "<small class='getpaid-invoice-description text-dark p-2 form-text'><em>$description</em></small>";
 }
-add_action( 'getpaid_invoice_line_items', 'getpaid_the_invoice_description', 100 );
+add_action('getpaid_invoice_line_items', 'getpaid_the_invoice_description', 100);
 
 /**
  * Render element on a form.
@@ -1360,60 +1360,60 @@ 
  * @param array $element
  * @param GetPaid_Payment_Form $form
  */
-function getpaid_payment_form_element( $element, $form ) {
+function getpaid_payment_form_element($element, $form) {
 
     // Set up the args.
-    $element_type    = trim( $element['type'] );
+    $element_type    = trim($element['type']);
     $element['form'] = $form;
-    extract( $element );
+    extract($element);
 
     // Try to locate the appropriate template.
-    $located = wpinv_locate_template( "payment-forms/elements/$element_type.php" );
+    $located = wpinv_locate_template("payment-forms/elements/$element_type.php");
     
     // Abort if this is not our element.
-    if ( empty( $located ) || ! file_exists( $located ) ) {
+    if (empty($located) || !file_exists($located)) {
         return;
     }
 
     // Generate the class and id of the element.
-    $wrapper_class = 'getpaid-payment-form-element-' . trim( esc_attr( $element_type ) );
-    $id            = isset( $id ) ? $id : uniqid( 'gp' );
+    $wrapper_class = 'getpaid-payment-form-element-' . trim(esc_attr($element_type));
+    $id            = isset($id) ? $id : uniqid('gp');
 
     // Echo the opening wrapper.
     echo "<div class='getpaid-payment-form-element $wrapper_class'>";
 
     // Fires before displaying a given element type's content.
-    do_action( "getpaid_before_payment_form_{$element_type}_element", $element, $form );
+    do_action("getpaid_before_payment_form_{$element_type}_element", $element, $form);
 
     // Include the template for the element.
     include $located;
 
     // Fires after displaying a given element type's content.
-    do_action( "getpaid_payment_form_{$element_type}_element", $element, $form );
+    do_action("getpaid_payment_form_{$element_type}_element", $element, $form);
 
     // Echo the closing wrapper.
     echo '</div>';
 }
-add_action( 'getpaid_payment_form_element', 'getpaid_payment_form_element', 10, 2 );
+add_action('getpaid_payment_form_element', 'getpaid_payment_form_element', 10, 2);
 
 /**
  * Render an element's edit page.
  *
  * @param WP_Post $post
  */
-function getpaid_payment_form_edit_element_template( $post ) {
+function getpaid_payment_form_edit_element_template($post) {
 
     // Retrieve all elements.
-    $all_elements = wp_list_pluck( wpinv_get_data( 'payment-form-elements' ), 'type' );
+    $all_elements = wp_list_pluck(wpinv_get_data('payment-form-elements'), 'type');
 
-    foreach ( $all_elements as $element ) {
+    foreach ($all_elements as $element) {
 
         // Try to locate the appropriate template.
-        $element = sanitize_key( $element );
-        $located = wpinv_locate_template( "payment-forms-admin/edit/$element.php" );
+        $element = sanitize_key($element);
+        $located = wpinv_locate_template("payment-forms-admin/edit/$element.php");
 
         // Continue if this is not our element.
-        if ( empty( $located ) || ! file_exists( $located ) ) {
+        if (empty($located) || !file_exists($located)) {
             continue;
         }
 
@@ -1424,7 +1424,7 @@ 
     }
 
 }
-add_action( 'getpaid_payment_form_edit_element_template', 'getpaid_payment_form_edit_element_template' );
+add_action('getpaid_payment_form_edit_element_template', 'getpaid_payment_form_edit_element_template');
 
 /**
  * Render an element's preview.
@@ -1433,16 +1433,16 @@ 
 function getpaid_payment_form_render_element_preview_template() {
 
     // Retrieve all elements.
-    $all_elements = wp_list_pluck( wpinv_get_data( 'payment-form-elements' ), 'type' );
+    $all_elements = wp_list_pluck(wpinv_get_data('payment-form-elements'), 'type');
 
-    foreach ( $all_elements as $element ) {
+    foreach ($all_elements as $element) {
 
         // Try to locate the appropriate template.
-        $element = sanitize_key( $element );
-        $located = wpinv_locate_template( "payment-forms-admin/previews/$element.php" );
+        $element = sanitize_key($element);
+        $located = wpinv_locate_template("payment-forms-admin/previews/$element.php");
 
         // Continue if this is not our element.
-        if ( empty( $located ) || ! file_exists( $located ) ) {
+        if (empty($located) || !file_exists($located)) {
             continue;
         }
 
@@ -1453,7 +1453,7 @@ 
     }
 
 }
-add_action( 'wpinv_payment_form_render_element_template', 'getpaid_payment_form_render_element_preview_template' );
+add_action('wpinv_payment_form_render_element_template', 'getpaid_payment_form_render_element_preview_template');
 
 /**
  * Shows a list of gateways that support recurring payments.
@@ -1461,17 +1461,17 @@ 
 function wpinv_get_recurring_gateways_text() {
     $gateways = array();
 
-    foreach ( wpinv_get_payment_gateways() as $key => $gateway ) {
-        if ( wpinv_gateway_support_subscription( $key ) ) {
-            $gateways[] = sanitize_text_field( $gateway['admin_label'] );
+    foreach (wpinv_get_payment_gateways() as $key => $gateway) {
+        if (wpinv_gateway_support_subscription($key)) {
+            $gateways[] = sanitize_text_field($gateway['admin_label']);
         }
     }
 
-    if ( empty( $gateways ) ) {
-        return "<span class='form-text text-danger'>" . __( 'No active gateways support subscription payments.', 'invoicing' ) ."</span>";
+    if (empty($gateways)) {
+        return "<span class='form-text text-danger'>" . __('No active gateways support subscription payments.', 'invoicing') . "</span>";
     }
 
-    return "<span class='form-text text-muted'>" . wp_sprintf( __( 'Subscription payments only supported by: %s', 'invoicing' ), implode( ', ', $gateways ) ) ."</span>";
+    return "<span class='form-text text-muted'>" . wp_sprintf(__('Subscription payments only supported by: %s', 'invoicing'), implode(', ', $gateways)) . "</span>";
 
 }
 
@@ -1481,7 +1481,7 @@ 
  * @return GetPaid_Template
  */
 function getpaid_template() {
-    return getpaid()->get( 'template' );
+    return getpaid()->get('template');
 }
 
 /**
@@ -1490,23 +1490,23 @@ 
  * @param array args
  * @return string
  */
-function getpaid_paginate_links( $args ) {
+function getpaid_paginate_links($args) {
 
     $args['type']     = 'array';
     $args['mid_size'] = 1;
-    $pages        = paginate_links( $args );
+    $pages = paginate_links($args);
 
-    if ( ! is_array( $pages ) ) {
+    if (!is_array($pages)) {
         return '';
     }
 
     $_pages = array();
-    foreach ( $pages as $page ) {
-        $_pages[] = str_replace( 'page-numbers', 'page-link text-decoration-none', $page );
+    foreach ($pages as $page) {
+        $_pages[] = str_replace('page-numbers', 'page-link text-decoration-none', $page);
     }
 
     $links  = "<nav>\n\t<ul class='pagination justify-content-end m-0'>\n\t\t<li class='page-item'>";
-    $links .= join( "</li>\n\t\t<li class='page-item'>", $_pages );
+    $links .= join("</li>\n\t\t<li class='page-item'>", $_pages);
     $links .= "</li>\n\t</ul>\n</nav>\n";
 
     return $links;
@@ -1519,21 +1519,21 @@ 
  * @param string state
  * @return string
  */
-function getpaid_get_states_select_markup( $country, $state, $placeholder, $label, $help_text, $required = false, $wrapper_class = 'col-12', $field_name = 'wpinv_state' ) {
+function getpaid_get_states_select_markup($country, $state, $placeholder, $label, $help_text, $required = false, $wrapper_class = 'col-12', $field_name = 'wpinv_state') {
 
-    $states = wpinv_get_country_states( $country );
-    $uniqid = uniqid( '_' );
+    $states = wpinv_get_country_states($country);
+    $uniqid = uniqid('_');
 
-    if ( ! empty( $states ) ) {
+    if (!empty($states)) {
 
-        return aui()->select( array(
+        return aui()->select(array(
             'options'          => $states,
-            'name'             => esc_attr( $field_name ),
-            'id'               => sanitize_html_class( $field_name ) . $uniqid,
-            'value'            => sanitize_text_field( $state ),
+            'name'             => esc_attr($field_name),
+            'id'               => sanitize_html_class($field_name) . $uniqid,
+            'value'            => sanitize_text_field($state),
             'placeholder'      => $placeholder,
             'required'         => $required,
-            'label'            => wp_kses_post( $label ),
+            'label'            => wp_kses_post($label),
             'label_type'       => 'vertical',
             'help_text'        => $help_text,
             'class'            => 'getpaid-address-field wpinv_state',
@@ -1545,14 +1545,14 @@ 
 
     return aui()->input(
         array(
-            'name'        => esc_attr( $field_name ),
-            'id'          => sanitize_html_class( $field_name ) . $uniqid,
+            'name'        => esc_attr($field_name),
+            'id'          => sanitize_html_class($field_name) . $uniqid,
             'placeholder' => $placeholder,
             'required'    => $required,
-            'label'       => wp_kses_post( $label ),
+            'label'       => wp_kses_post($label),
             'label_type'  => 'vertical',
             'help_text'   => $help_text,
-            'value'       => sanitize_text_field( $state ),
+            'value'       => sanitize_text_field($state),
             'class'       => 'getpaid-address-field wpinv_state',
             'wrap_class'  => "$wrapper_class getpaid-address-field-wrapper__state",
             'label_class' => 'getpaid-address-field-label getpaid-address-field-label__state',
@@ -1567,16 +1567,16 @@ 
  * @param array $element
  * @return string
  */
-function getpaid_get_form_element_grid_class( $element ) {
+function getpaid_get_form_element_grid_class($element) {
 
     $class = "col-12";
-    $width = empty( $element['grid_width'] ) ? 'full' : $element['grid_width'];
+    $width = empty($element['grid_width']) ? 'full' : $element['grid_width'];
 
-    if ( $width == 'half' ) {
+    if ($width == 'half') {
         $class = "col-12 col-md-6";
     }
 
-    if ( $width == 'third' ) {
+    if ($width == 'third') {
         $class = "col-12 col-md-4";
     }
 

templates/invoice-history.php

Indentation +59 added lines, -59 removed lines

@@ -40,86 +40,86 @@ 
 				<tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
 					<?php
 
-						foreach ( wpinv_get_user_invoices_columns( $post_type ) as $column_id => $column_name ) :
+                        foreach ( wpinv_get_user_invoices_columns( $post_type ) as $column_id => $column_name ) :
 
-							$column_id = sanitize_html_class( $column_id );
-							$class     = empty( $column_name['class'] ) ? '' : sanitize_html_class( $column_name['class'] );
+                            $column_id = sanitize_html_class( $column_id );
+                            $class     = empty( $column_name['class'] ) ? '' : sanitize_html_class( $column_name['class'] );
 
-							echo "<td class='$column_id $class'>";
-							switch ( $column_id ) {
+                            echo "<td class='$column_id $class'>";
+                            switch ( $column_id ) {
 
-								case 'invoice-number':
-									echo wpinv_invoice_link( $invoice );
-									break;
+                                case 'invoice-number':
+                                    echo wpinv_invoice_link( $invoice );
+                                    break;
 
-								case 'created-date':
-									echo getpaid_format_date_value( $invoice->get_date_created() );
-									break;
+                                case 'created-date':
+                                    echo getpaid_format_date_value( $invoice->get_date_created() );
+                                    break;
 
-								case 'payment-date':
+                                case 'payment-date':
 
-									if ( $invoice->needs_payment() ) {
-										echo "&mdash;";
-									} else {
-										echo getpaid_format_date_value( $invoice->get_date_completed() );
-									}
+                                    if ( $invoice->needs_payment() ) {
+                                        echo "&mdash;";
+                                    } else {
+                                        echo getpaid_format_date_value( $invoice->get_date_completed() );
+                                    }
 
-									break;
+                                    break;
 
-								case 'invoice-status':
-									echo $invoice->get_status_label_html();
+                                case 'invoice-status':
+                                    echo $invoice->get_status_label_html();
 
-									break;
+                                    break;
 
-								case 'invoice-total':
-									echo wpinv_price( wpinv_format_amount( $invoice->get_total() ) );
+                                case 'invoice-total':
+                                    echo wpinv_price( wpinv_format_amount( $invoice->get_total() ) );
 
-									break;
+                                    break;
 
-								case 'invoice-actions':
+                                case 'invoice-actions':
 
-									$actions = array(
+                                    $actions = array(
 
-										'pay'       => array(
-											'url'   => $invoice->get_checkout_payment_url(),
-											'name'  => __( 'Pay Now', 'invoicing' ),
+                                        'pay'       => array(
+                                            'url'   => $invoice->get_checkout_payment_url(),
+                                            'name'  => __( 'Pay Now', 'invoicing' ),
                                             'class' => 'btn-success'
-										),
+                                        ),
 
                                         'print'     => array(
-											'url'   => $invoice->get_view_url(),
-											'name'  => __( 'View', 'invoicing' ),
+                                            'url'   => $invoice->get_view_url(),
+                                            'name'  => __( 'View', 'invoicing' ),
                                             'class' => 'btn-secondary',
                                             'attrs' => 'target="_blank"'
-										)
-									);
+                                        )
+                                    );
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
-									}
+                                    if ( ! $invoice->needs_payment() ) {
+                                        unset( $actions['pay'] );
+                                    }
 
-									$actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice, $post_type );
+                                    $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice, $post_type );
 
-									foreach ( $actions as $key => $action ) {
-										$class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
-										echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm btn-block ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
-									}
+                                    foreach ( $actions as $key => $action ) {
+                                        $class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
+                                        echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm btn-block ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
+                                    }
 
-									break;
+                                    break;
 
-								default:
-									do_action( "wpinv_user_invoices_column_$column_id", $invoice );
-									break;
+                                default:
+                                    do_action( "wpinv_user_invoices_column_$column_id", $invoice );
+                                    break;
 
 
-							}
+                            }
 
-							do_action( "wpinv_user_invoices_column_after_$column_id", $invoice );
+                            do_action( "wpinv_user_invoices_column_after_$column_id", $invoice );
 
-							echo '</td>';
+                            echo '</td>';
 
-						endforeach;
-					?>
+                        endforeach;
+                    ?>
 				</tr>
 
 			<?php endforeach; ?>
@@ -132,14 +132,14 @@ 
 	<?php if ( 1 < $invoices->max_num_pages ) : ?>
 		<div class="invoicing-Pagination">
 			<?php
-			$big = 999999;
-
-			echo paginate_links( array(
-				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
-				'format'  => '?paged=%#%',
-				'total'   => $invoices->max_num_pages,
-			) );
-			?>
+            $big = 999999;
+
+            echo paginate_links( array(
+                'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+                'format'  => '?paged=%#%',
+                'total'   => $invoices->max_num_pages,
+            ) );
+            ?>
 		</div>
 	<?php endif; ?>
 

Spacing +32 added lines, -32 removed lines

@@ -7,25 +7,25 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Current page.
-$current_page   = empty( $_GET[ 'page' ] ) ? 1 : absint( $_GET[ 'page' ] );
+$current_page = empty($_GET['page']) ? 1 : absint($_GET['page']);
 
 // Fires before displaying user invoices.
-do_action( 'wpinv_before_user_invoices', $invoices->invoices, $invoices->total, $invoices->max_num_pages, $post_type );
+do_action('wpinv_before_user_invoices', $invoices->invoices, $invoices->total, $invoices->max_num_pages, $post_type);
 
 ?>
 
-	<table class="table table-bordered table-hover getpaid-user-invoices <?php echo sanitize_html_class( $post_type ); ?>">
+	<table class="table table-bordered table-hover getpaid-user-invoices <?php echo sanitize_html_class($post_type); ?>">
 
 
 		<thead>
 			<tr>
 
-				<?php foreach ( wpinv_get_user_invoices_columns( $post_type ) as $column_id => $column_name ) : ?>
-					<th class="<?php echo sanitize_html_class( $column_id ); ?> <?php echo ( ! empty( $column_name['class'] ) ? sanitize_html_class( $column_name['class'] ) : '');?> border-bottom-0">
-						<span class="nobr"><?php echo esc_html( $column_name['title'] ); ?></span>
+				<?php foreach (wpinv_get_user_invoices_columns($post_type) as $column_id => $column_name) : ?>
+					<th class="<?php echo sanitize_html_class($column_id); ?> <?php echo (!empty($column_name['class']) ? sanitize_html_class($column_name['class']) : ''); ?> border-bottom-0">
+						<span class="nobr"><?php echo esc_html($column_name['title']); ?></span>
 					</th>
 				<?php endforeach; ?>
 
@@ -35,33 +35,33 @@ 
 
 
 		<tbody>
-			<?php foreach ( $invoices->invoices as $invoice ) : ?>
+			<?php foreach ($invoices->invoices as $invoice) : ?>
 
 				<tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
 					<?php
 
-						foreach ( wpinv_get_user_invoices_columns( $post_type ) as $column_id => $column_name ) :
+						foreach (wpinv_get_user_invoices_columns($post_type) as $column_id => $column_name) :
 
-							$column_id = sanitize_html_class( $column_id );
-							$class     = empty( $column_name['class'] ) ? '' : sanitize_html_class( $column_name['class'] );
+							$column_id = sanitize_html_class($column_id);
+							$class     = empty($column_name['class']) ? '' : sanitize_html_class($column_name['class']);
 
 							echo "<td class='$column_id $class'>";
-							switch ( $column_id ) {
+							switch ($column_id) {
 
 								case 'invoice-number':
-									echo wpinv_invoice_link( $invoice );
+									echo wpinv_invoice_link($invoice);
 									break;
 
 								case 'created-date':
-									echo getpaid_format_date_value( $invoice->get_date_created() );
+									echo getpaid_format_date_value($invoice->get_date_created());
 									break;
 
 								case 'payment-date':
 
-									if ( $invoice->needs_payment() ) {
+									if ($invoice->needs_payment()) {
 										echo "&mdash;";
 									} else {
-										echo getpaid_format_date_value( $invoice->get_date_completed() );
+										echo getpaid_format_date_value($invoice->get_date_completed());
 									}
 
 									break;
@@ -72,7 +72,7 @@ 
 									break;
 
 								case 'invoice-total':
-									echo wpinv_price( wpinv_format_amount( $invoice->get_total() ) );
+									echo wpinv_price(wpinv_format_amount($invoice->get_total()));
 
 									break;
 
@@ -82,39 +82,39 @@ 
 
 										'pay'       => array(
 											'url'   => $invoice->get_checkout_payment_url(),
-											'name'  => __( 'Pay Now', 'invoicing' ),
+											'name'  => __('Pay Now', 'invoicing'),
                                             'class' => 'btn-success'
 										),
 
                                         'print'     => array(
 											'url'   => $invoice->get_view_url(),
-											'name'  => __( 'View', 'invoicing' ),
+											'name'  => __('View', 'invoicing'),
                                             'class' => 'btn-secondary',
                                             'attrs' => 'target="_blank"'
 										)
 									);
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
+									if (!$invoice->needs_payment()) {
+										unset($actions['pay']);
 									}
 
-									$actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice, $post_type );
+									$actions = apply_filters('wpinv_user_invoices_actions', $actions, $invoice, $post_type);
 
-									foreach ( $actions as $key => $action ) {
+									foreach ($actions as $key => $action) {
 										$class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
-										echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm btn-block ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
+										echo '<a href="' . esc_url($action['url']) . '" class="btn btn-sm btn-block ' . $class . ' ' . sanitize_html_class($key) . '" ' . (!empty($action['attrs']) ? $action['attrs'] : '') . '>' . $action['name'] . '</a>';
 									}
 
 									break;
 
 								default:
-									do_action( "wpinv_user_invoices_column_$column_id", $invoice );
+									do_action("wpinv_user_invoices_column_$column_id", $invoice);
 									break;
 
 
 							}
 
-							do_action( "wpinv_user_invoices_column_after_$column_id", $invoice );
+							do_action("wpinv_user_invoices_column_after_$column_id", $invoice);
 
 							echo '</td>';
 
@@ -127,20 +127,20 @@ 
 		</tbody>
 	</table>
 
-	<?php do_action( 'wpinv_before_user_invoices_pagination' ); ?>
+	<?php do_action('wpinv_before_user_invoices_pagination'); ?>
 
-	<?php if ( 1 < $invoices->max_num_pages ) : ?>
+	<?php if (1 < $invoices->max_num_pages) : ?>
 		<div class="invoicing-Pagination">
 			<?php
 			$big = 999999;
 
-			echo paginate_links( array(
-				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+			echo paginate_links(array(
+				'base'    => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 				'format'  => '?paged=%#%',
 				'total'   => $invoices->max_num_pages,
-			) );
+			));
 			?>
 		</div>
 	<?php endif; ?>
 
-<?php do_action( 'wpinv_after_user_invoices', $invoices->invoices, $invoices->total, $invoices->max_num_pages, $post_type  ); ?>
+<?php do_action('wpinv_after_user_invoices', $invoices->invoices, $invoices->total, $invoices->max_num_pages, $post_type); ?>

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

Indentation +1002 added lines, -1002 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -11,1012 +11,1012 @@ 
  */
 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,
-			'label'      => '',
-			'label_after'=> false,
-			'label_class'=> '',
-			'label_type' => '', // 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
-		);
-
-		/**
-		 * 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']
-			);
-
-			// 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.
-			}
-
-			// 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'] .= ' aui-flatpickr bg-initial ';
-				$args['class'] .= ' bg-initial ';
-
-				$args['extra_attributes']['data-aui-init'] = 'flatpickr';
-				// enqueue the script
-				$aui_settings = AyeCode_UI_Settings::instance();
-				$aui_settings->enqueue_flatpickr();
-			}
-
-
-			// 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 .= ' value="'.sanitize_text_field($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="'.$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 .= ' >';
-
-
-			// label
-			if(!empty($args['label'])){
-				if($type == 'file'){$label_args['class'] .= 'custom-file-label';}
-				elseif($type == 'checkbox'){$label_args['class'] .= 'custom-control-label';}
-				$label = self::label( $label_args, $type );
-			}
-
-			// help text
-			if(!empty($args['help_text'])){
-				$help_text = AUI_Component_Helper::help_text($args['help_text']);
-			}
-
-
-			// set help text in the correct possition
-			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'){
-				$wrap_class = $args['switch'] ? 'custom-switch' : 'custom-checkbox';
-				$output = self::wrap( array(
-					'content' => $output,
-					'class'   => 'custom-control '.$wrap_class
-				) );
-
-				if($args['label_type']=='horizontal'){
-					$output = '<div class="col-sm-2 col-form-label"></div><div class="col-sm-10">' . $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" 
+    /**
+     * 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,
+            'label'      => '',
+            'label_after'=> false,
+            'label_class'=> '',
+            'label_type' => '', // 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
+        );
+
+        /**
+         * 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']
+            );
+
+            // 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.
+            }
+
+            // 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'] .= ' aui-flatpickr bg-initial ';
+                $args['class'] .= ' bg-initial ';
+
+                $args['extra_attributes']['data-aui-init'] = 'flatpickr';
+                // enqueue the script
+                $aui_settings = AyeCode_UI_Settings::instance();
+                $aui_settings->enqueue_flatpickr();
+            }
+
+
+            // 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 .= ' value="'.sanitize_text_field($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="'.$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 .= ' >';
+
+
+            // label
+            if(!empty($args['label'])){
+                if($type == 'file'){$label_args['class'] .= 'custom-file-label';}
+                elseif($type == 'checkbox'){$label_args['class'] .= 'custom-control-label';}
+                $label = self::label( $label_args, $type );
+            }
+
+            // help text
+            if(!empty($args['help_text'])){
+                $help_text = AUI_Component_Helper::help_text($args['help_text']);
+            }
+
+
+            // set help text in the correct possition
+            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'){
+                $wrap_class = $args['switch'] ? 'custom-switch' : 'custom-checkbox';
+                $output = self::wrap( array(
+                    'content' => $output,
+                    'class'   => 'custom-control '.$wrap_class
+                ) );
+
+                if($args['label_type']=='horizontal'){
+                    $output = '<div class="col-sm-2 col-form-label"></div><div class="col-sm-10">' . $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' : '';
-				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' && $type != 'checkbox'){
-				$output = self::wrap( array(
-					'content' => $output,
-					'class'   => 'col-sm-10',
-				) );
-			}
-
-			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']
-				));
-			}
-
-
-
-		}
-
-		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' => '', // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'help_text'  => '',
-			'validation_text'   => '',
-			'validation_pattern' => '',
-			'no_wrap'    => false,
-			'rows'      => '',
-			'wysiwyg'   => false,
-			'element_require'   => '', // [%element_id%] == "1"
-		);
-
-		/**
-		 * 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']
-			);
-			$output .= self::label( $label_args );
-		}
-
-		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
-			$output .= '<div class="col-sm-10">';
-		}
-
-		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="'.sanitize_html_class($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="'.$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.'" ';
-
-
-			// close tag
-			$output .= ' >';
-
-			// value
-			if(!empty($args['value'])){
-				$output .= sanitize_textarea_field($args['value']);
-			}
-
-			// closing tag
-			$output .= '</textarea>';
-
-		}
-
-		if(!empty($args['label']) && $label_after){
-			$label_args = array(
-				'title'=> $args['label'],
-				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
-				'label_type' => $args['label_type']
-			);
-			$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']
-			));
-		}
-
-
-		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
-		);
-
-		/**
-		 * 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 .= ' col-sm-2 col-form-label';
-			}
-
-			// open
-			$output .= '<label ';
-
-			// for
-			if(!empty($args['for'])){
-				$output .= ' for="'.sanitize_text_field($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'   => '',
-		);
-
-		/**
-		 * 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.'" ';
-
-			// 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_left_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.'">'.$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 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' => '', // 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,
-			'element_require'   => '', // [%element_id%] == "1"
-			'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 = '';
-
-		// 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;
-		}
-
-		// 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']
-			);
-			$output .= self::label($label_args);
-		}
-
-		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
-			$output .= '<div class="col-sm-10">';
-		}
-
-		// open/type
-		$output .= '<select ';
-
-		// style
-		if($is_select2){
-			$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'] : '';
-							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);
-							}
-
-							$output .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $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);
-							}
-						}
-						$output .= '<option value="'.esc_attr($val).'" '.$selected.'>'.esc_attr($name).'</option>';
-					}
-				}
-			}
-
-		}
-
-		// closing tag
-		$output .= '</select>';
-
-		if(!empty($args['label']) && $label_after){
-			$label_args = array(
-				'title'=> $args['label'],
-				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
-				'label_type' => $args['label_type']
-			);
-			$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']){
-			$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']
-			));
-		}
-
-
-		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' => '', // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'inline'     => true,
-			'required'   => false,
-			'options'    => array(),
-			'icon'       => '',
-			'no_wrap'    => false,
-			'element_require'   => '', // [%element_id%] == "1"
-			'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 );
-
-		// 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']
-		);
-
-		$output = '';
-
-
-
-		// label before
-		if(!empty($args['label'])){
-			$output .= self::label( $label_args, 'radio' );
-		}
-
-		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
-			$output .= '<div class="col-sm-10">';
-		}
-
-		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++;
-			}
-		}
-
-		// 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']
-		));
-
-
-		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 .= ' value="'.sanitize_text_field($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';
-			$output = self::wrap(array(
-				'content' => $output,
-				'class' => $wrap_class
-			));
-		}
-
-
-		return $output;
-	}
+            }
+
+            // 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' && $type != 'checkbox'){
+                $output = self::wrap( array(
+                    'content' => $output,
+                    'class'   => 'col-sm-10',
+                ) );
+            }
+
+            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']
+                ));
+            }
+
+
+
+        }
+
+        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' => '', // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'help_text'  => '',
+            'validation_text'   => '',
+            'validation_pattern' => '',
+            'no_wrap'    => false,
+            'rows'      => '',
+            'wysiwyg'   => false,
+            'element_require'   => '', // [%element_id%] == "1"
+        );
+
+        /**
+         * 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']
+            );
+            $output .= self::label( $label_args );
+        }
+
+        // maybe horizontal label
+        if($args['label_type']=='horizontal'){
+            $output .= '<div class="col-sm-10">';
+        }
+
+        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="'.sanitize_html_class($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="'.$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.'" ';
+
+
+            // close tag
+            $output .= ' >';
+
+            // value
+            if(!empty($args['value'])){
+                $output .= sanitize_textarea_field($args['value']);
+            }
+
+            // closing tag
+            $output .= '</textarea>';
+
+        }
+
+        if(!empty($args['label']) && $label_after){
+            $label_args = array(
+                'title'=> $args['label'],
+                'for'=> $args['id'],
+                'class' => $args['label_class']." ",
+                'label_type' => $args['label_type']
+            );
+            $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']
+            ));
+        }
+
+
+        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
+        );
+
+        /**
+         * 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 .= ' col-sm-2 col-form-label';
+            }
+
+            // open
+            $output .= '<label ';
+
+            // for
+            if(!empty($args['for'])){
+                $output .= ' for="'.sanitize_text_field($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'   => '',
+        );
+
+        /**
+         * 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.'" ';
+
+            // 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_left_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.'">'.$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 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' => '', // 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,
+            'element_require'   => '', // [%element_id%] == "1"
+            '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 = '';
+
+        // 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;
+        }
+
+        // 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']
+            );
+            $output .= self::label($label_args);
+        }
+
+        // maybe horizontal label
+        if($args['label_type']=='horizontal'){
+            $output .= '<div class="col-sm-10">';
+        }
+
+        // open/type
+        $output .= '<select ';
+
+        // style
+        if($is_select2){
+            $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'] : '';
+                            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);
+                            }
+
+                            $output .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $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);
+                            }
+                        }
+                        $output .= '<option value="'.esc_attr($val).'" '.$selected.'>'.esc_attr($name).'</option>';
+                    }
+                }
+            }
+
+        }
+
+        // closing tag
+        $output .= '</select>';
+
+        if(!empty($args['label']) && $label_after){
+            $label_args = array(
+                'title'=> $args['label'],
+                'for'=> $args['id'],
+                'class' => $args['label_class']." ",
+                'label_type' => $args['label_type']
+            );
+            $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']){
+            $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']
+            ));
+        }
+
+
+        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' => '', // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'inline'     => true,
+            'required'   => false,
+            'options'    => array(),
+            'icon'       => '',
+            'no_wrap'    => false,
+            'element_require'   => '', // [%element_id%] == "1"
+            '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 );
+
+        // 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']
+        );
+
+        $output = '';
+
+
+
+        // label before
+        if(!empty($args['label'])){
+            $output .= self::label( $label_args, 'radio' );
+        }
+
+        // maybe horizontal label
+        if($args['label_type']=='horizontal'){
+            $output .= '<div class="col-sm-10">';
+        }
+
+        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++;
+            }
+        }
+
+        // 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']
+        ));
+
+
+        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 .= ' value="'.sanitize_text_field($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';
+            $output = self::wrap(array(
+                'content' => $output,
+                'class' => $wrap_class
+            ));
+        }
+
+
+        return $output;
+    }
 
 }
\ No newline at end of file

Spacing +208 added lines, -208 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'       => '',
@@ -52,13 +52,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 = '';
@@ -66,24 +66,24 @@ 
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
 
 			// 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.
 			}
 
 			// 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'] .= ' aui-flatpickr bg-initial ';
 				$args['class'] .= ' bg-initial ';
@@ -99,65 +99,65 @@ 
 			$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 .= ' value="'.sanitize_text_field($args['value']).'" ';
+			if (!empty($args['value'])) {
+				$output .= ' value="' . sanitize_text_field($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="'.$args['validation_pattern'].'" ';
+			if (!empty($args['validation_pattern'])) {
+				$output .= ' pattern="' . $args['validation_pattern'] . '" ';
 			}
 
 			// step (for numbers)
-			if(!empty($args['step'])){
-				$output .= ' step="'.$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'] ) : '';
-			$output .= ' class="form-control '.$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'])){
+			if (!empty($args['extra_attributes'])) {
 				$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 			}
 
@@ -166,40 +166,40 @@ 
 
 
 			// label
-			if(!empty($args['label'])){
-				if($type == 'file'){$label_args['class'] .= 'custom-file-label';}
-				elseif($type == 'checkbox'){$label_args['class'] .= 'custom-control-label';}
-				$label = self::label( $label_args, $type );
+			if (!empty($args['label'])) {
+				if ($type == 'file') {$label_args['class'] .= 'custom-file-label'; }
+				elseif ($type == 'checkbox') {$label_args['class'] .= 'custom-control-label'; }
+				$label = self::label($label_args, $type);
 			}
 
 			// help text
-			if(!empty($args['help_text'])){
+			if (!empty($args['help_text'])) {
 				$help_text = AUI_Component_Helper::help_text($args['help_text']);
 			}
 
 
 			// set help text in the correct possition
-			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') {
 				$wrap_class = $args['switch'] ? 'custom-switch' : 'custom-checkbox';
-				$output = self::wrap( array(
+				$output = self::wrap(array(
 					'content' => $output,
-					'class'   => 'custom-control '.$wrap_class
-				) );
+					'class'   => 'custom-control ' . $wrap_class
+				));
 
-				if($args['label_type']=='horizontal'){
+				if ($args['label_type'] == 'horizontal') {
 					$output = '<div class="col-sm-2 col-form-label"></div><div class="col-sm-10">' . $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
@@ -213,49 +213,49 @@ 
 			}
 
 			// input group wraps
-			if($args['input_group_left'] || $args['input_group_right']){
+			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']) {
+					$output = self::wrap(array(
 						'content' => $output,
-						'class'   => $args['input_group_left_inside'] ? 'input-group-inside position-relative'.$w100  : 'input-group',
+						'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',
+						'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' && $type != 'checkbox'){
-				$output = self::wrap( array(
+			if ($args['label_type'] == 'horizontal' && $type != 'checkbox') {
+				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => 'col-sm-10',
-				) );
+				));
 			}
 
-			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;
+				$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,
@@ -278,7 +278,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function textarea($args = array()){
+	public static function textarea($args = array()) {
 		$defaults = array(
 			'name'       => '',
 			'class'      => '',
@@ -304,43 +304,43 @@ 
 		/**
 		 * 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'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
-			$output .= self::label( $label_args );
+			$output .= self::label($label_args);
 		}
 
 		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '<div class="col-sm-10">';
 		}
 
-		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';
@@ -354,69 +354,69 @@ 
 			);
 
 			// 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{
+		} else {
 
 			// open
 			$output .= '<textarea ';
 
 			// name
-			if(!empty($args['name'])){
-				$output .= ' name="'.sanitize_html_class($args['name']).'" ';
+			if (!empty($args['name'])) {
+				$output .= ' name="' . sanitize_html_class($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="'.$args['validation_pattern'].'" ';
+			if (!empty($args['validation_pattern'])) {
+				$output .= ' pattern="' . $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'] : '';
-			$output .= ' class="form-control '.$class.'" ';
+			$output .= ' class="form-control ' . $class . '" ';
 
 
 			// close tag
 			$output .= ' >';
 
 			// value
-			if(!empty($args['value'])){
+			if (!empty($args['value'])) {
 				$output .= sanitize_textarea_field($args['value']);
 			}
 
@@ -425,32 +425,32 @@ 
 
 		}
 
-		if(!empty($args['label']) && $label_after){
+		if (!empty($args['label']) && $label_after) {
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
-			$output .= self::label( $label_args );
+			$output .= self::label($label_args);
 		}
 
 		// help text
-		if(!empty($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']){
-			$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;
+		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,
@@ -463,7 +463,7 @@ 
 		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',
@@ -475,20 +475,20 @@ 
 		/**
 		 * 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'];
+			} else {
+				$class = 'sr-only ' . $args['class'];
 			}
 
 			// maybe horizontal
-			if($args['label_type']=='horizontal' && $type != 'checkbox'){
+			if ($args['label_type'] == 'horizontal' && $type != 'checkbox') {
 				$class .= ' col-sm-2 col-form-label';
 			}
 
@@ -496,20 +496,20 @@ 
 			$output .= '<label ';
 
 			// for
-			if(!empty($args['for'])){
-				$output .= ' for="'.sanitize_text_field($args['for']).'" ';
+			if (!empty($args['for'])) {
+				$output .= ' for="' . sanitize_text_field($args['for']) . '" ';
 			}
 
 			// class
-			$class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
-			$output .= ' class="'.$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'])){
+			if (!empty($args['title'])) {
 				$output .= wp_kses_post($args['title']);
 			}
 
@@ -530,7 +530,7 @@ 
 	 *
 	 * @return string
 	 */
-	public static function wrap($args = array()){
+	public static function wrap($args = array()) {
 		$defaults = array(
 			'type'       => 'div',
 			'class'      => 'form-group',
@@ -546,55 +546,55 @@ 
 		/**
 		 * 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'])){
+			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'] ) : '';
-			$output .= ' class="'.$class.'" ';
+			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes($args['class']) : '';
+			$output .= ' class="' . $class . '" ';
 
 			// close wrap
 			$output .= ' >';
 
 
 			// Input group left
-			if(!empty($args['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>';
+				$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'])){
+			if (!empty($args['input_group_right'])) {
 				$position_class = !empty($args['input_group_left_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.'">'.$input_group_right.'</div>';
+				$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 . '">' . $input_group_right . '</div>';
 			}
 
 
 			// close wrap
-			$output .= '</'.sanitize_html_class($args['type']).'>';
+			$output .= '</' . sanitize_html_class($args['type']) . '>';
 
 
-		}else{
+		} else {
 			$output = $args['content'];
 		}
 
@@ -608,7 +608,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function select($args = array()){
+	public static function select($args = array()) {
 		$defaults = array(
 			'class'      => '',
 			'wrap_class' => '',
@@ -634,11 +634,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' ){$args['label_type'] = 'hidden';}
+		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'];
@@ -647,47 +647,47 @@ 
 		$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'])){
+		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;
 		}
 
 		// 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'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
 			$output .= self::label($label_args);
 		}
 
 		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '<div class="col-sm-10">';
 		}
 
@@ -695,32 +695,32 @@ 
 		$output .= '<select ';
 
 		// style
-		if($is_select2){
+		if ($is_select2) {
 			$output .= " style='width:100%;' ";
 		}
 
 		// element require
-		if(!empty($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);
+		$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'])){
+		if (!empty($args['id'])) {
 			$output .= AUI_Component_Helper::id($args['id']);
 		}
 
 		// title
-		if(!empty($args['title'])){
+		if (!empty($args['title'])) {
 			$output .= AUI_Component_Helper::title($args['title']);
 		}
 
@@ -731,17 +731,17 @@ 
 		$output .= AUI_Component_Helper::aria_attributes($args);
 
 		// extra attributes
-		if(!empty($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 ';
 		}
 
@@ -749,21 +749,21 @@ 
 		$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){
+			} else {
+				foreach ($args['options'] as $val => $name) {
 					$selected = '';
-					if(is_array($name)){
+					if (is_array($name)) {
 						if (isset($name['optgroup']) && ($name['optgroup'] == 'start' || $name['optgroup'] == 'end')) {
 							$option_label = isset($name['label']) ? $name['label'] : '';
 
@@ -771,23 +771,23 @@ 
 						} else {
 							$option_label = isset($name['label']) ? $name['label'] : '';
 							$option_value = isset($name['value']) ? $name['value'] : '';
-							if(!empty($args['multiple']) && !empty($args['value']) && is_array($args['value']) ){
+							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'])) {
+								$selected = selected($option_value, stripslashes_deep($args['value']), false);
 							}
 
 							$output .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $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);
+					} 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);
 							}
 						}
-						$output .= '<option value="'.esc_attr($val).'" '.$selected.'>'.esc_attr($name).'</option>';
+						$output .= '<option value="' . esc_attr($val) . '" ' . $selected . '>' . esc_attr($name) . '</option>';
 					}
 				}
 			}
@@ -797,31 +797,31 @@ 
 		// closing tag
 		$output .= '</select>';
 
-		if(!empty($args['label']) && $label_after){
+		if (!empty($args['label']) && $label_after) {
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
 			$output .= self::label($label_args);
 		}
 
 		// help text
-		if(!empty($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']){
-			$wrap_class = $args['label_type']=='horizontal' ? 'form-group row' : 'form-group';
-			$wrap_class = !empty($args['wrap_class']) ? $wrap_class." ".$args['wrap_class'] : $wrap_class;
+		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,
@@ -841,7 +841,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio($args = array()){
+	public static function radio($args = array()) {
 		$defaults = array(
 			'class'      => '',
 			'wrap_class' => '',
@@ -864,14 +864,14 @@ 
 		/**
 		 * 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' ){$args['label_type'] = 'horizontal';}
+		if ($args['label_type'] == 'floating') {$args['label_type'] = 'horizontal'; }
 
 		$label_args = array(
 			'title'=> $args['label'],
-			'class' => $args['label_class']." pt-0 ",
+			'class' => $args['label_class'] . " pt-0 ",
 			'label_type' => $args['label_type']
 		);
 
@@ -880,36 +880,36 @@ 
 
 
 		// 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'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '<div class="col-sm-10">';
 		}
 
-		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);
+				$output .= self::radio_option($option_args, $count);
 				$count++;
 			}
 		}
 
 		// 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;
+		$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,
@@ -928,7 +928,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'         => '',
@@ -946,7 +946,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 = '';
 
@@ -957,27 +957,27 @@ 
 		$output .= ' class="form-check-input" ';
 
 		// name
-		if(!empty($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'])){
+		if (!empty($args['title'])) {
 			$output .= AUI_Component_Helper::title($args['title']);
 		}
 
 		// value
-		if(isset($args['value'])){
-			$output .= ' value="'.sanitize_text_field($args['value']).'" ';
+		if (isset($args['value'])) {
+			$output .= ' value="' . sanitize_text_field($args['value']) . '" ';
 		}
 
 		// checked, for radio and checkboxes
-		if( $args['checked'] ){
+		if ($args['checked']) {
 			$output .= ' checked ';
 		}
 
@@ -988,12 +988,12 @@ 
 		$output .= AUI_Component_Helper::aria_attributes($args);
 
 		// extra attributes
-		if(!empty($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 ';
 		}
 
@@ -1001,13 +1001,13 @@ 
 		$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');
+		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']){
+		if (!$args['no_wrap']) {
 			$wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
 			$output = self::wrap(array(
 				'content' => $output,

Braces +15 added lines, -16 removed lines

@@ -80,10 +80,10 @@ 
 			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'] .= ' aui-flatpickr bg-initial ';
 				$args['class'] .= ' bg-initial ';
@@ -167,8 +167,7 @@ 
 
 			// label
 			if(!empty($args['label'])){
-				if($type == 'file'){$label_args['class'] .= 'custom-file-label';}
-				elseif($type == 'checkbox'){$label_args['class'] .= 'custom-control-label';}
+				if($type == 'file'){$label_args['class'] .= 'custom-file-label';} elseif($type == 'checkbox'){$label_args['class'] .= 'custom-control-label';}
 				$label = self::label( $label_args, $type );
 			}
 
@@ -189,7 +188,7 @@ 
 					'content' => $output,
 					'class'   => 'form-group custom-file'
 				) );
-			}elseif($type == 'checkbox'){
+			} elseif($type == 'checkbox'){
 				$wrap_class = $args['switch'] ? 'custom-switch' : 'custom-checkbox';
 				$output = self::wrap( array(
 					'content' => $output,
@@ -199,7 +198,7 @@ 
 				if($args['label_type']=='horizontal'){
 					$output = '<div class="col-sm-2 col-form-label"></div><div class="col-sm-10">' . $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
@@ -325,7 +324,7 @@ 
 
 		// label
 		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label']) && !$label_after){
+		} elseif(!empty($args['label']) && !$label_after){
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
@@ -360,7 +359,7 @@ 
 
 			wp_editor( $content, $editor_id, $settings );
 			$output .= ob_get_clean();
-		}else{
+		} else{
 
 			// open
 			$output .= '<textarea ';
@@ -483,7 +482,7 @@ 
 			// 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{
+			} else{
 				$class = 'sr-only '.$args['class'];
 			}
 
@@ -594,7 +593,7 @@ 
 			$output .= '</'.sanitize_html_class($args['type']).'>';
 
 
-		}else{
+		} else{
 			$output = $args['content'];
 		}
 
@@ -657,7 +656,7 @@ 
 		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;
 		}
 
@@ -676,7 +675,7 @@ 
 
 		// label
 		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label']) && !$label_after){
+		} elseif(!empty($args['label']) && !$label_after){
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
@@ -751,7 +750,7 @@ 
 		// 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'])){
+		} elseif($is_select2 && !empty($args['placeholder'])){
 			$output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
 		}
 
@@ -760,7 +759,7 @@ 
 
 			if(!is_array($args['options'])){
 				$output .= $args['options']; // not the preferred way but an option
-			}else{
+			} else{
 				foreach($args['options'] as $val => $name){
 					$selected = '';
 					if(is_array($name)){
@@ -779,7 +778,7 @@ 
 
 							$output .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
 						}
-					}else{
+					} else{
 						if(!empty($args['value'])){
 							if(is_array($args['value'])){
 								$selected = in_array($val,$args['value']) ? 'selected="selected"' : '';
@@ -1002,7 +1001,7 @@ 
 
 		// label
 		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label'])){
+		} elseif(!empty($args['label'])){
 			$output .= self::label(array('title'=>$args['label'],'for'=>$args['id'].$count,'class'=>'form-check-label'),'radio');
 		}
 

templates/payment-forms/form.php

Spacing +21 added lines, -21 removed lines

@@ -7,44 +7,44 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Make sure that the form is active.
-if ( ! $form->is_active() ) {
+if (!$form->is_active()) {
     echo aui()->alert(
         array(
             'type'    => 'warning',
-            'content' => __( 'This payment form is no longer active', 'invoicing' ),
+            'content' => __('This payment form is no longer active', 'invoicing'),
         )
     );
     return;
 }
 
 // Fires before displaying a payment form.
-do_action( 'getpaid_before_payment_form', $form );
+do_action('getpaid_before_payment_form', $form);
 ?>
 
-<form class='getpaid-payment-form getpaid-payment-form-<?php echo absint( $form->get_id() ); ?> bsui' method='POST' data-key='<?php echo uniqid('gpf'); ?>'>
+<form class='getpaid-payment-form getpaid-payment-form-<?php echo absint($form->get_id()); ?> bsui' method='POST' data-key='<?php echo uniqid('gpf'); ?>'>
 
 
     <?php 
     
         // Fires when printing the top of a payment form.
-        do_action( 'getpaid_payment_form_top', $form );
+        do_action('getpaid_payment_form_top', $form);
 
         // And the optional invoice id.
-        if ( ! empty( $form->invoice ) ) {
-            echo getpaid_hidden_field( 'invoice_id', $form->invoice->get_id() );
+        if (!empty($form->invoice)) {
+            echo getpaid_hidden_field('invoice_id', $form->invoice->get_id());
         }
 
         // We also want to include the form id.
-        echo getpaid_hidden_field( 'form_id', $form->get_id() );
+        echo getpaid_hidden_field('form_id', $form->get_id());
 
         // And an indication that this is a payment form submission.
-        echo getpaid_hidden_field( 'getpaid_payment_form_submission', '1' );
+        echo getpaid_hidden_field('getpaid_payment_form_submission', '1');
 
         // Fires before displaying payment form elements.
-        do_action( 'getpaid_payment_form_before_elements', $form );
+        do_action('getpaid_payment_form_before_elements', $form);
 
         // Display the elements.
         ?>
@@ -52,13 +52,13 @@ 
             <div class="row">
                 <?php
 
-                    foreach ( $form->get_elements() as $element ) {
+                    foreach ($form->get_elements() as $element) {
 
-                        if ( isset( $element['type'] ) ) {
-                            $grid_class = esc_attr( getpaid_get_form_element_grid_class( $element ) );
+                        if (isset($element['type'])) {
+                            $grid_class = esc_attr(getpaid_get_form_element_grid_class($element));
                             echo "<div class='$grid_class'>";
-                            do_action( 'getpaid_payment_form_element', $element, $form );
-                            do_action( "getpaid_payment_form_element_{$element['type']}_template", $element, $form );
+                            do_action('getpaid_payment_form_element', $element, $form);
+                            do_action("getpaid_payment_form_element_{$element['type']}_template", $element, $form);
                             echo "</div>";
                         }
 
@@ -70,16 +70,16 @@ 
 
         <?php
         // Fires after displaying payment form elements.
-        do_action( 'getpaid_payment_form_after_elements', $form );
+        do_action('getpaid_payment_form_after_elements', $form);
 
         echo "<div class='getpaid-payment-form-errors alert alert-danger d-none'></div>";
 
-        if ( wpinv_current_user_can_manage_invoicing() ) {
+        if (wpinv_current_user_can_manage_invoicing()) {
 
             edit_post_link(
-                __( 'Edit this form.', 'invoicing' ),
+                __('Edit this form.', 'invoicing'),
                 '<small class="form-text text-muted">',
-                '&nbsp;' . __( 'This is only visible to website administators.', 'invoicing' ) . '</small>',
+                '&nbsp;' . __('This is only visible to website administators.', 'invoicing') . '</small>',
                 $form->get_id(),
                 'text-danger'
             );
@@ -94,4 +94,4 @@ 
 <?php
 
 // Fires after displaying a payment form.
-do_action( 'getpaid_after_payment_form', $form );
+do_action('getpaid_after_payment_form', $form);

templates/payment-forms-admin/edit/pay_button.php

Spacing +17 added lines, -17 removed lines

@@ -7,44 +7,44 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Button Text', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Button Text', 'invoicing'); ?></span>
         <input v-model='active_form_element.label' class='form-control' type="text"/>
-        <small class="form-text text-muted"><?php _e( '%price% will be replaced by the total payable amount', 'invoicing' ); ?></small>
+        <small class="form-text text-muted"><?php _e('%price% will be replaced by the total payable amount', 'invoicing'); ?></small>
     </label>
 </div>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Free Checkout Text', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Free Checkout Text', 'invoicing'); ?></span>
         <input v-model='active_form_element.free' class='form-control' type="text"/>
-        <small class="form-text text-muted"><?php _e( 'The text to display if the total payable amount is zero', 'invoicing' ); ?></small>
+        <small class="form-text text-muted"><?php _e('The text to display if the total payable amount is zero', 'invoicing'); ?></small>
     </label>
 </div>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Help Text', 'invoicing' ); ?></span>
-        <textarea placeholder='<?php esc_attr_e( 'Add some help text for this field', 'invoicing' ); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
+        <span><?php esc_html_e('Help Text', 'invoicing'); ?></span>
+        <textarea placeholder='<?php esc_attr_e('Add some help text for this field', 'invoicing'); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
     </label>
 </div>
 
 <div class='form-group'>
-    <label :for="active_form_element.id + '_edit_type'"><?php esc_html_e( 'Button Type', 'invoicing' ) ?></label>
+    <label :for="active_form_element.id + '_edit_type'"><?php esc_html_e('Button Type', 'invoicing') ?></label>
     <select class='form-control custom-select' :id="active_form_element.id + '_edit_type'" v-model='active_form_element.class'>
-        <option value='btn-primary'><?php esc_html_e( 'Primary', 'invoicing' ); ?></option>
-        <option value='btn-secondary'><?php esc_html_e( 'Secondary', 'invoicing' ); ?></option>
-        <option value='btn-success'><?php esc_html_e( 'Success', 'invoicing' ); ?></option>
-        <option value='btn-danger'><?php esc_html_e( 'Danger', 'invoicing' ); ?></option>
-        <option value='btn-warning'><?php esc_html_e( 'Warning', 'invoicing' ); ?></option>
-        <option value='btn-info'><?php esc_html_e( 'Info', 'invoicing' ); ?></option>
-        <option value='btn-light'><?php esc_html_e( 'Light', 'invoicing' ); ?></option>
-        <option value='btn-dark'><?php esc_html_e( 'Dark', 'invoicing' ); ?></option>
-        <option value='btn-link'><?php esc_html_e( 'Link', 'invoicing' ); ?></option>
+        <option value='btn-primary'><?php esc_html_e('Primary', 'invoicing'); ?></option>
+        <option value='btn-secondary'><?php esc_html_e('Secondary', 'invoicing'); ?></option>
+        <option value='btn-success'><?php esc_html_e('Success', 'invoicing'); ?></option>
+        <option value='btn-danger'><?php esc_html_e('Danger', 'invoicing'); ?></option>
+        <option value='btn-warning'><?php esc_html_e('Warning', 'invoicing'); ?></option>
+        <option value='btn-info'><?php esc_html_e('Info', 'invoicing'); ?></option>
+        <option value='btn-light'><?php esc_html_e('Light', 'invoicing'); ?></option>
+        <option value='btn-dark'><?php esc_html_e('Dark', 'invoicing'); ?></option>
+        <option value='btn-link'><?php esc_html_e('Link', 'invoicing'); ?></option>
     </select>
 </div>

includes/wpinv-address-functions.php

Indentation +88 added lines, -88 removed lines

@@ -13,9 +13,9 @@ 
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+    $country = wpinv_get_option( 'default_country', 'UK' );
 
-	return apply_filters( 'wpinv_default_country', $country );
+    return apply_filters( 'wpinv_default_country', $country );
 }
 
 /**
@@ -26,7 +26,7 @@ 
  */
 function wpinv_sanitize_country( $country ) {
 
-	// Enure the country is specified
+    // Enure the country is specified
     if ( empty( $country ) ) {
         $country = wpinv_get_default_country();
     }
@@ -56,9 +56,9 @@ 
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', '' );
+    $state = wpinv_get_option( 'default_state', '' );
 
-	return apply_filters( 'wpinv_default_state', $state );
+    return apply_filters( 'wpinv_default_state', $state );
 }
 
 function wpinv_state_name( $state_code = '', $country_code = '' ) {
@@ -288,11 +288,11 @@ 
 
     $country = wpinv_sanitize_country( $country );
     
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
-			return $continent_code;
-		}
-	}
+    foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
+        if ( false !== array_search( $country, $countries, true ) ) {
+            return $continent_code;
+        }
+    }
 
     return '';
     
@@ -584,30 +584,30 @@ 
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
-		$_POST['country'] = wpinv_get_default_country();
-	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+    if( empty( $_POST['country'] ) ) {
+        $_POST['country'] = wpinv_get_default_country();
+    }
+    $states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+    if( !empty( $states ) ) {
+        $sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
         
         $args = array(
-			'name'    => $sanitized_field_name,
-			'id'      => $sanitized_field_name,
-			'class'   => $sanitized_field_name . 'custom-select wpinv-select wpi_select2',
-			'options' => array_merge( array( '' => '' ), $states ),
-			'show_option_all'  => false,
-			'show_option_none' => false
-		);
-
-		$response = wpinv_html_select( $args );
-
-	} else {
-		$response = 'nostates';
-	}
+            'name'    => $sanitized_field_name,
+            'id'      => $sanitized_field_name,
+            'class'   => $sanitized_field_name . 'custom-select wpinv-select wpi_select2',
+            'options' => array_merge( array( '' => '' ), $states ),
+            'show_option_all'  => false,
+            'show_option_none' => false
+        );
+
+        $response = wpinv_html_select( $args );
+
+    } else {
+        $response = 'nostates';
+    }
 
-	return $response;
+    return $response;
 }
 
 function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
@@ -625,46 +625,46 @@ 
  */
 function wpinv_get_address_formats() {
 
-		return apply_filters( 'wpinv_localisation_address_formats',
-			array(
-				'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
-				'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
-				'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
-				'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
-				'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
-				'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
-				'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
-				'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
-				'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
-				'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
-				'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
-				'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
-				'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
-				'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
-				'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
-				'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
-				'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
-				'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
-			)
-		);
+        return apply_filters( 'wpinv_localisation_address_formats',
+            array(
+                'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
+                'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
+                'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
+                'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
+                'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
+                'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
+                'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
+                'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
+                'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
+                'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
+                'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
+                'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
+                'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
+                'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
+                'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
+                'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
+                'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
+                'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
+            )
+        );
 }
 
 /**
@@ -681,21 +681,21 @@ 
     }
 
     // Get all formats.
-	$formats = wpinv_get_address_formats();
+    $formats = wpinv_get_address_formats();
 
-	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+    // Get format for the specified country.
+    $format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
     
     /**
-	 * Filters the address format to use on Invoices.
+     * Filters the address format to use on Invoices.
      * 
      * New lines will be replaced by a `br` element. Double new lines will be replaced by a paragraph. HTML tags are allowed.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string $format  The address format to use.
+     *
+     * @since 1.0.13
+     *
+     * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
-	 */
+     */
     return apply_filters( 'wpinv_get_full_address_format', $format, $country );
 }
 
@@ -716,8 +716,8 @@ 
         'country'           => '',
         'zip'               => '',
         'first_name'        => '',
-		'last_name'         => '',
-		'company'           => '',
+        'last_name'         => '',
+        'company'           => '',
     );
 
     $args    = map_deep( wp_parse_args( $billing_details, $default_args ), 'trim' );
@@ -738,14 +738,14 @@ 
     $args['country_code']= $country;
 
     /**
-	 * Filters the address format replacements to use on Invoices.
+     * Filters the address format replacements to use on Invoices.
      * 
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param array $replacements  The address replacements to use.
+     *
+     * @since 1.0.13
+     *
+     * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
-	 */
+     */
     $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
 
     $return = array();
@@ -768,5 +768,5 @@ 
  * @return string
  */
 function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+    return trim( $line, ', ' );
 }
\ No newline at end of file

Spacing +139 added lines, -139 removed lines

@@ -7,15 +7,15 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+	$country = wpinv_get_option('default_country', 'UK');
 
-	return apply_filters( 'wpinv_default_country', $country );
+	return apply_filters('wpinv_default_country', $country);
 }
 
 /**
@@ -23,8 +23,8 @@ 
  *
  * @return string
  */
-function getpaid_get_ip_country( $ip_address = '' ) {
-    $country = GetPaid_Geolocation::geolocate_ip( $ip_address, true );
+function getpaid_get_ip_country($ip_address = '') {
+    $country = GetPaid_Geolocation::geolocate_ip($ip_address, true);
     return $country['country'];
 }
 
@@ -34,59 +34,59 @@ 
  * @param string $country The country code to sanitize
  * @return array
  */
-function wpinv_sanitize_country( $country ) {
+function wpinv_sanitize_country($country) {
 
 	// Enure the country is specified
-    if ( empty( $country ) ) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
-    return trim( wpinv_utf8_strtoupper( $country ) );
+    return trim(wpinv_utf8_strtoupper($country));
 
 }
 
-function wpinv_is_base_country( $country ) {
+function wpinv_is_base_country($country) {
     $base_country = wpinv_get_default_country();
     
-    if ( $base_country === 'UK' ) {
+    if ($base_country === 'UK') {
         $base_country = 'GB';
     }
-    if ( $country == 'UK' ) {
+    if ($country == 'UK') {
         $country = 'GB';
     }
 
-    return ( $country && $country === $base_country ) ? true : false;
+    return ($country && $country === $base_country) ? true : false;
 }
 
-function wpinv_country_name( $country_code = '' ) { 
+function wpinv_country_name($country_code = '') { 
     $countries = wpinv_get_country_list();
     $country_code = $country_code == 'UK' ? 'GB' : $country_code;
-    $country = isset( $countries[$country_code] ) ? $countries[$country_code] : $country_code;
+    $country = isset($countries[$country_code]) ? $countries[$country_code] : $country_code;
 
-    return apply_filters( 'wpinv_country_name', $country, $country_code );
+    return apply_filters('wpinv_country_name', $country, $country_code);
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', '' );
+	$state = wpinv_get_option('default_state', '');
 
-	return apply_filters( 'wpinv_default_state', $state );
+	return apply_filters('wpinv_default_state', $state);
 }
 
-function wpinv_state_name( $state_code = '', $country_code = '' ) {
+function wpinv_state_name($state_code = '', $country_code = '') {
     $state = $state_code;
     
-    if ( !empty( $country_code ) ) {
-        $states = wpinv_get_country_states( $country_code );
+    if (!empty($country_code)) {
+        $states = wpinv_get_country_states($country_code);
         
-        $state = !empty( $states ) && isset( $states[$state_code] ) ? $states[$state_code] : $state;
+        $state = !empty($states) && isset($states[$state_code]) ? $states[$state_code] : $state;
     }
 
-    return apply_filters( 'wpinv_state_name', $state, $state_code, $country_code );
+    return apply_filters('wpinv_state_name', $state, $state_code, $country_code);
 }
 
 function wpinv_store_address() {
-    $address = wpinv_get_option( 'store_address', '' );
+    $address = wpinv_get_option('store_address', '');
 
-    return apply_filters( 'wpinv_store_address', $address );
+    return apply_filters('wpinv_store_address', $address);
 }
 
 /**
@@ -94,24 +94,24 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_maybe_add_default_address( &$invoice ) {
+function getpaid_maybe_add_default_address(&$invoice) {
 
     $user_id = $invoice->get_user_id();
 
     // Abort if the invoice belongs to no one.
-    if ( empty( $user_id ) ) {
+    if (empty($user_id)) {
         return;
     }
 
     // Fill in defaults whenever necessary.
-    foreach ( wpinv_get_user_address( $user_id ) as $key => $value ) {
+    foreach (wpinv_get_user_address($user_id) as $key => $value) {
 
-        if ( is_callable( $invoice, "get_$key" ) ) {
-            $current = call_user_func( array( $invoice, "get_$key" ) );
+        if (is_callable($invoice, "get_$key")) {
+            $current = call_user_func(array($invoice, "get_$key"));
 
-            if ( empty( $current ) ) {
+            if (empty($current)) {
                 $method = "set_$key";
-                $invoice->$method( $value );
+                $invoice->$method($value);
             }
 
         }
@@ -130,16 +130,16 @@ 
     return apply_filters(
         'getpaid_user_address_fields',
         array(
-            'first_name' => __( 'First Name', 'invoicing' ),
-            'last_name'  => __( 'Last Name', 'invoicing' ),
-            'country'    => __( 'Country', 'invoicing' ),
-            'state'      => __( 'State', 'invoicing' ),
-            'city'       => __( 'City', 'invoicing' ),
-            'zip'        => __( 'Zip/Postal Code', 'invoicing' ),
-            'address'    => __( 'Address', 'invoicing' ),
-            'phone'      => __( 'Phone Number', 'invoicing' ),
-            'company'    => __( 'Company', 'invoicing' ),
-            'vat_number' => __( 'VAT Number', 'invoicing' ),
+            'first_name' => __('First Name', 'invoicing'),
+            'last_name'  => __('Last Name', 'invoicing'),
+            'country'    => __('Country', 'invoicing'),
+            'state'      => __('State', 'invoicing'),
+            'city'       => __('City', 'invoicing'),
+            'zip'        => __('Zip/Postal Code', 'invoicing'),
+            'address'    => __('Address', 'invoicing'),
+            'phone'      => __('Phone Number', 'invoicing'),
+            'company'    => __('Company', 'invoicing'),
+            'vat_number' => __('VAT Number', 'invoicing'),
         )
     );
 
@@ -150,8 +150,8 @@ 
  * 
  * @return bool
  */
-function getpaid_is_address_field_whitelisted( $key ) {
-    return array_key_exists( $key, getpaid_user_address_fields() );
+function getpaid_is_address_field_whitelisted($key) {
+    return array_key_exists($key, getpaid_user_address_fields());
 }
 
 /**
@@ -161,24 +161,24 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_save_invoice_user_address( $invoice ) {
+function getpaid_save_invoice_user_address($invoice) {
 
     // Retrieve the invoice.
-    $invoice = wpinv_get_invoice( $invoice );
+    $invoice = wpinv_get_invoice($invoice);
 
     // Abort if it does not exist.
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return;
     }
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-        if ( is_callable( array( $invoice, "get_$field" ) ) ) {
-            $value = call_user_func( array( $invoice, "get_$field" ) );
+        if (is_callable(array($invoice, "get_$field"))) {
+            $value = call_user_func(array($invoice, "get_$field"));
 
             // Only save if it is not empty.
-            if ( ! empty( $value ) ) {
-                update_user_meta( $invoice->get_user_id(), '_wpinv_' . $field, $value );
+            if (!empty($value)) {
+                update_user_meta($invoice->get_user_id(), '_wpinv_' . $field, $value);
             }
 
         }
@@ -186,8 +186,8 @@ 
     }
 
 }
-add_action( 'getpaid_new_invoice', 'getpaid_save_invoice_user_address' );
-add_action( 'getpaid_update_invoice', 'getpaid_save_invoice_user_address' );
+add_action('getpaid_new_invoice', 'getpaid_save_invoice_user_address');
+add_action('getpaid_update_invoice', 'getpaid_save_invoice_user_address');
 
 /**
  * Retrieves a saved user address.
@@ -196,14 +196,14 @@ 
  * @param bool $with_default Whether or not we should use the default country and state.
  * @return array
  */
-function wpinv_get_user_address( $user_id = 0, $with_default = true ) {
+function wpinv_get_user_address($user_id = 0, $with_default = true) {
 
     // Prepare the user id.
-    $user_id   = empty( $user_id ) ? get_current_user_id() : $user_id;
-    $user_info = get_userdata( $user_id );
+    $user_id   = empty($user_id) ? get_current_user_id() : $user_id;
+    $user_info = get_userdata($user_id);
 
     // Abort if non exists.
-    if ( empty( $user_info ) ) {
+    if (empty($user_info)) {
         return array();
     }
 
@@ -213,11 +213,11 @@ 
         'email'   => $user_info->user_email,
     );
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
-        $address[$field] = getpaid_get_user_address_field( $user_id, $field );
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
+        $address[$field] = getpaid_get_user_address_field($user_id, $field);
     }
 
-    if ( ! $with_default ) {
+    if (!$with_default) {
         return $address;
     }
 
@@ -228,7 +228,7 @@ 
         'state'      => wpinv_get_default_country(),
     );
 
-    return getpaid_array_merge_if_empty( $address, $defaults );
+    return getpaid_array_merge_if_empty($address, $defaults);
 
 }
 
@@ -239,7 +239,7 @@ 
  * @param string $field The field to use.
  * @return string|null
  */
-function getpaid_get_user_address_field( $user_id, $field ) {
+function getpaid_get_user_address_field($user_id, $field) {
 
     $prefixes = array(
         '_wpinv_',
@@ -247,15 +247,15 @@ 
         ''
     );
 
-    foreach ( $prefixes as $prefix ) {
+    foreach ($prefixes as $prefix) {
 
         // Meta table.
-        $value = get_user_meta( $user_id, $prefix . $field, true );
+        $value = get_user_meta($user_id, $prefix . $field, true);
         
         // UWP table.
-        $value = ( empty( $value ) && function_exists( 'uwp_get_usermeta' ) ) ? uwp_get_usermeta( $user_id, $prefix . $field ) : $value;
+        $value = (empty($value) && function_exists('uwp_get_usermeta')) ? uwp_get_usermeta($user_id, $prefix . $field) : $value;
 
-        if ( ! empty( $value ) ) {
+        if (!empty($value)) {
             return $value;
         }
 
@@ -272,16 +272,16 @@ 
  * @param string $return What to return.
  * @return array
  */
-function wpinv_get_continents( $return = 'all' ) {
+function wpinv_get_continents($return = 'all') {
 
-    $continents = wpinv_get_data( 'continents' );
+    $continents = wpinv_get_data('continents');
 
-    switch( $return ) {
+    switch ($return) {
         case 'name' :
-            return wp_list_pluck( $continents, 'name' );
+            return wp_list_pluck($continents, 'name');
             break;
         case 'countries' :
-            return wp_list_pluck( $continents, 'countries' );
+            return wp_list_pluck($continents, 'countries');
             break;
         default :
             return $continents;
@@ -297,12 +297,12 @@ 
  * @param string $country Country code. If no code is specified, defaults to the default country.
  * @return string
  */
-function wpinv_get_continent_code_for_country( $country = false ) {
+function wpinv_get_continent_code_for_country($country = false) {
 
-    $country = wpinv_sanitize_country( $country );
+    $country = wpinv_sanitize_country($country);
     
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
+	foreach (wpinv_get_continents('countries') as $continent_code => $countries) {
+		if (false !== array_search($country, $countries, true)) {
 			return $continent_code;
 		}
 	}
@@ -318,13 +318,13 @@ 
  * @param string $country Country code. If no code is specified, defaults to the default country.
  * @return array
  */
-function wpinv_get_country_calling_code( $country = null) {
+function wpinv_get_country_calling_code($country = null) {
 
-    $country = wpinv_sanitize_country( $country );
-    $codes   = wpinv_get_data( 'phone-codes' );
-    $code    = isset( $codes[ $country ] ) ? $codes[ $country ] : '';
+    $country = wpinv_sanitize_country($country);
+    $codes   = wpinv_get_data('phone-codes');
+    $code    = isset($codes[$country]) ? $codes[$country] : '';
 
-    if ( is_array( $code ) ) {
+    if (is_array($code)) {
         return $code[0];
     }
     return $code;
@@ -337,8 +337,8 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return array
  */
-function wpinv_get_country_list( $first_empty = false ) {
-    return wpinv_maybe_add_empty_option( apply_filters( 'wpinv_countries', wpinv_get_data( 'countries' ) ), $first_empty );
+function wpinv_get_country_list($first_empty = false) {
+    return wpinv_maybe_add_empty_option(apply_filters('wpinv_countries', wpinv_get_data('countries')), $first_empty);
 }
 
 /**
@@ -348,22 +348,22 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return array
  */
-function wpinv_get_country_states( $country = null, $first_empty = false ) {
+function wpinv_get_country_states($country = null, $first_empty = false) {
     
     // Prepare the country.
-    $country = wpinv_sanitize_country( $country );
+    $country = wpinv_sanitize_country($country);
 
     // Fetch all states.
-    $all_states = wpinv_get_data( 'states' );
+    $all_states = wpinv_get_data('states');
 
     // Fetch the specified country's states.
-    $states     = isset( $all_states[ $country ] ) ? $all_states[ $country ] : array() ;
-    $states     = apply_filters( "wpinv_{$country}_states", $states );
-    $states     = apply_filters( 'wpinv_country_states', $states, $country );
+    $states     = isset($all_states[$country]) ? $all_states[$country] : array();
+    $states     = apply_filters("wpinv_{$country}_states", $states);
+    $states     = apply_filters('wpinv_country_states', $states, $country);
 
-    asort( $states );
+    asort($states);
      
-    return wpinv_maybe_add_empty_option( $states, $first_empty );
+    return wpinv_maybe_add_empty_option($states, $first_empty);
 }
 
 /**
@@ -373,7 +373,7 @@ 
  * @return array
  */
 function wpinv_get_us_states_list() {
-    return apply_filters( 'wpinv_usa_states', wpinv_get_country_states( 'US' ) );
+    return apply_filters('wpinv_usa_states', wpinv_get_country_states('US'));
 }
 
 /**
@@ -383,7 +383,7 @@ 
  * @return array
  */
 function wpinv_get_canada_states_list() {
-    return apply_filters( 'wpinv_canada_provinces', wpinv_get_country_states( 'CA' ) );
+    return apply_filters('wpinv_canada_provinces', wpinv_get_country_states('CA'));
 }
 
 /**
@@ -393,7 +393,7 @@ 
  * @return array
  */
 function wpinv_get_australia_states_list() {
-    return apply_filters( 'wpinv_australia_states', wpinv_get_country_states( 'AU' ) );
+    return apply_filters('wpinv_australia_states', wpinv_get_country_states('AU'));
 }
 
 /**
@@ -403,7 +403,7 @@ 
  * @return array
  */
 function wpinv_get_bangladesh_states_list() {
-    return apply_filters( 'wpinv_bangladesh_states', wpinv_get_country_states( 'BD' ) );
+    return apply_filters('wpinv_bangladesh_states', wpinv_get_country_states('BD'));
 }
 
 /**
@@ -413,7 +413,7 @@ 
  * @return array
  */
 function wpinv_get_brazil_states_list() {
-    return apply_filters( 'wpinv_brazil_states', wpinv_get_country_states( 'BR' ) );
+    return apply_filters('wpinv_brazil_states', wpinv_get_country_states('BR'));
 }
 
 /**
@@ -423,7 +423,7 @@ 
  * @return array
  */
 function wpinv_get_bulgaria_states_list() {
-    return apply_filters( 'wpinv_bulgaria_states', wpinv_get_country_states( 'BG' ) );
+    return apply_filters('wpinv_bulgaria_states', wpinv_get_country_states('BG'));
 }
 
 /**
@@ -433,7 +433,7 @@ 
  * @return array
  */
 function wpinv_get_hong_kong_states_list() {
-    return apply_filters( 'wpinv_hong_kong_states', wpinv_get_country_states( 'HK' ) );
+    return apply_filters('wpinv_hong_kong_states', wpinv_get_country_states('HK'));
 }
 
 /**
@@ -443,7 +443,7 @@ 
  * @return array
  */
 function wpinv_get_hungary_states_list() {
-    return apply_filters( 'wpinv_hungary_states', wpinv_get_country_states( 'HU' ) );
+    return apply_filters('wpinv_hungary_states', wpinv_get_country_states('HU'));
 }
 
 /**
@@ -453,7 +453,7 @@ 
  * @return array
  */
 function wpinv_get_japan_states_list() {
-    return apply_filters( 'wpinv_japan_states', wpinv_get_country_states( 'JP' ) );
+    return apply_filters('wpinv_japan_states', wpinv_get_country_states('JP'));
 }
 
 /**
@@ -463,7 +463,7 @@ 
  * @return array
  */
 function wpinv_get_china_states_list() {
-    return apply_filters( 'wpinv_china_states', wpinv_get_country_states( 'CN' ) );
+    return apply_filters('wpinv_china_states', wpinv_get_country_states('CN'));
 }
 
 /**
@@ -473,7 +473,7 @@ 
  * @return array
  */
 function wpinv_get_new_zealand_states_list() {
-    return apply_filters( 'wpinv_new_zealand_states', wpinv_get_country_states( 'NZ' ) );
+    return apply_filters('wpinv_new_zealand_states', wpinv_get_country_states('NZ'));
 }
 
 /**
@@ -483,7 +483,7 @@ 
  * @return array
  */
 function wpinv_get_peru_states_list() {
-    return apply_filters( 'wpinv_peru_states', wpinv_get_country_states( 'PE' ) );
+    return apply_filters('wpinv_peru_states', wpinv_get_country_states('PE'));
 }
 
 /**
@@ -493,7 +493,7 @@ 
  * @return array
  */
 function wpinv_get_indonesia_states_list() {
-    return apply_filters( 'wpinv_indonesia_states', wpinv_get_country_states( 'ID' ) );
+    return apply_filters('wpinv_indonesia_states', wpinv_get_country_states('ID'));
 }
 
 /**
@@ -503,7 +503,7 @@ 
  * @return array
  */
 function wpinv_get_india_states_list() {
-    return apply_filters( 'wpinv_india_states', wpinv_get_country_states( 'IN' ) );
+    return apply_filters('wpinv_india_states', wpinv_get_country_states('IN'));
 }
 
 /**
@@ -513,7 +513,7 @@ 
  * @return array
  */
 function wpinv_get_iran_states_list() {
-    return apply_filters( 'wpinv_iran_states', wpinv_get_country_states( 'IR' ) );
+    return apply_filters('wpinv_iran_states', wpinv_get_country_states('IR'));
 }
 
 /**
@@ -523,7 +523,7 @@ 
  * @return array
  */
 function wpinv_get_italy_states_list() {
-    return apply_filters( 'wpinv_italy_states', wpinv_get_country_states( 'IT' ) );
+    return apply_filters('wpinv_italy_states', wpinv_get_country_states('IT'));
 }
 
 /**
@@ -533,7 +533,7 @@ 
  * @return array
  */
 function wpinv_get_malaysia_states_list() {
-    return apply_filters( 'wpinv_malaysia_states', wpinv_get_country_states( 'MY' ) );
+    return apply_filters('wpinv_malaysia_states', wpinv_get_country_states('MY'));
 }
 
 /**
@@ -543,7 +543,7 @@ 
  * @return array
  */
 function wpinv_get_mexico_states_list() {
-    return apply_filters( 'wpinv_mexico_states', wpinv_get_country_states( 'MX' ) );
+    return apply_filters('wpinv_mexico_states', wpinv_get_country_states('MX'));
 }
 
 /**
@@ -553,7 +553,7 @@ 
  * @return array
  */
 function wpinv_get_nepal_states_list() {
-    return apply_filters( 'wpinv_nepal_states', wpinv_get_country_states( 'NP' ) );
+    return apply_filters('wpinv_nepal_states', wpinv_get_country_states('NP'));
 }
 
 /**
@@ -563,7 +563,7 @@ 
  * @return array
  */
 function wpinv_get_south_africa_states_list() {
-    return apply_filters( 'wpinv_south_africa_states', wpinv_get_country_states( 'ZA' ) );
+    return apply_filters('wpinv_south_africa_states', wpinv_get_country_states('ZA'));
 }
 
 /**
@@ -573,7 +573,7 @@ 
  * @return array
  */
 function wpinv_get_thailand_states_list() {
-    return apply_filters( 'wpinv_thailand_states', wpinv_get_country_states( 'TH' ) );
+    return apply_filters('wpinv_thailand_states', wpinv_get_country_states('TH'));
 }
 
 /**
@@ -583,7 +583,7 @@ 
  * @return array
  */
 function wpinv_get_turkey_states_list() {
-    return apply_filters( 'wpinv_turkey_states', wpinv_get_country_states( 'TR' ) );
+    return apply_filters('wpinv_turkey_states', wpinv_get_country_states('TR'));
 }
 
 /**
@@ -593,28 +593,28 @@ 
  * @return array
  */
 function wpinv_get_spain_states_list() {
-    return apply_filters( 'wpinv_spain_states', wpinv_get_country_states( 'ES' ) );
+    return apply_filters('wpinv_spain_states', wpinv_get_country_states('ES'));
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
+	if (empty($_POST['country'])) {
 		$_POST['country'] = wpinv_get_default_country();
 	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+	$states = wpinv_get_country_states(sanitize_text_field($_POST['country']));
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+	if (!empty($states)) {
+		$sanitized_field_name = sanitize_text_field($_POST['field_name']);
         
         $args = array(
 			'name'    => $sanitized_field_name,
 			'id'      => $sanitized_field_name,
 			'class'   => $sanitized_field_name . 'custom-select wpinv-select wpi_select2',
-			'options' => array_merge( array( '' => '' ), $states ),
+			'options' => array_merge(array('' => ''), $states),
 			'show_option_all'  => false,
 			'show_option_none' => false
 		);
 
-		$response = wpinv_html_select( $args );
+		$response = wpinv_html_select($args);
 
 	} else {
 		$response = 'nostates';
@@ -623,10 +623,10 @@ 
 	return $response;
 }
 
-function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
-    $country = !empty( $country ) ? $country : wpinv_get_default_country();
+function wpinv_default_billing_country($country = '', $user_id = 0) {
+    $country = !empty($country) ? $country : wpinv_get_default_country();
     
-    return apply_filters( 'wpinv_default_billing_country', $country, $user_id );
+    return apply_filters('wpinv_default_billing_country', $country, $user_id);
 }
 
 /**
@@ -638,7 +638,7 @@ 
  */
 function wpinv_get_address_formats() {
 
-		return apply_filters( 'wpinv_localisation_address_formats',
+		return apply_filters('wpinv_localisation_address_formats',
 			array(
 				'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
 				'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
@@ -687,9 +687,9 @@ 
  * @see `wpinv_get_invoice_address_replacements`
  * @return string
  */
-function wpinv_get_full_address_format( $country = false) {
+function wpinv_get_full_address_format($country = false) {
 
-    if( empty( $country ) ) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
 
@@ -697,7 +697,7 @@ 
 	$formats = wpinv_get_address_formats();
 
 	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+	$format = ($country && isset($formats[$country])) ? $formats[$country] : $formats['default'];
     
     /**
 	 * Filters the address format to use on Invoices.
@@ -709,7 +709,7 @@ 
 	 * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
 	 */
-    return apply_filters( 'wpinv_get_full_address_format', $format, $country );
+    return apply_filters('wpinv_get_full_address_format', $format, $country);
 }
 
 /**
@@ -720,7 +720,7 @@ 
  * @param array $billing_details customer's billing details
  * @return array
  */
-function wpinv_get_invoice_address_replacements( $billing_details ) {
+function wpinv_get_invoice_address_replacements($billing_details) {
 
     $default_args = array(
         'address'           => '',
@@ -733,22 +733,22 @@ 
 		'company'           => '',
     );
 
-    $args    = map_deep( wp_parse_args( $billing_details, $default_args ), 'trim' );
+    $args    = map_deep(wp_parse_args($billing_details, $default_args), 'trim');
     $state   = $args['state'];
     $country = $args['country'];
 
     // Handle full country name.
-    $full_country = empty( $country ) ? $country : wpinv_country_name( $country );
+    $full_country = empty($country) ? $country : wpinv_country_name($country);
 
     // Handle full state name.
-    $full_state   = ( $country && $state ) ?  wpinv_state_name( $state, $country ) : $state;
+    $full_state   = ($country && $state) ?  wpinv_state_name($state, $country) : $state;
 
     $args['postcode']    = $args['zip'];
     $args['name']        = $args['first_name'] . ' ' . $args['last_name'];
     $args['state']       = $full_state;
     $args['state_code']  = $state;
     $args['country']     = $full_country;
-    $args['country_code']= $country;
+    $args['country_code'] = $country;
 
     /**
 	 * Filters the address format replacements to use on Invoices.
@@ -759,14 +759,14 @@ 
 	 * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
 	 */
-    $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
+    $replacements = apply_filters('wpinv_get_invoice_address_replacements', $args, $billing_details);
 
     $return = array();
 
-    foreach( $replacements as $key => $value ) {
-        $value  = is_scalar( $value ) ? trim( sanitize_text_field( $value ) ) : '';
+    foreach ($replacements as $key => $value) {
+        $value = is_scalar($value) ? trim(sanitize_text_field($value)) : '';
         $return['{{' . $key . '}}'] = $value;
-        $return['{{' . $key . '_upper}}'] = wpinv_utf8_strtoupper( $value );
+        $return['{{' . $key . '_upper}}'] = wpinv_utf8_strtoupper($value);
     }
 
     return $return;
@@ -780,6 +780,6 @@ 
  * @since 1.0.14
  * @return string
  */
-function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+function wpinv_trim_formatted_address_line($line) {
+	return trim($line, ', ');
 }
\ No newline at end of file

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

Indentation +860 added lines, -860 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,356 +21,356 @@ 
  */
 abstract class GetPaid_Data {
 
-	/**
-	 * ID for this object.
-	 *
-	 * @since 1.0.19
-	 * @var int
-	 */
-	protected $id = 0;
-
-	/**
-	 * Core data for this object. Name value pairs (name + default value).
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Core data changes for this object.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $changes = array();
-
-	/**
-	 * This is false until the object is read from the DB.
-	 *
-	 * @since 1.0.19
-	 * @var bool
-	 */
-	protected $object_read = false;
-
-	/**
-	 * This is the name of this object type.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	protected $object_type = 'data';
-
-	/**
-	 * Extra data for this object. Name value pairs (name + default value).
-	 * Used as a standard way for sub classes (like item types) to add
-	 * additional information to an inherited class.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $extra_data = array();
-
-	/**
-	 * Set to _data on construct so we can track and reset data if needed.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $default_data = array();
-
-	/**
-	 * Contains a reference to the data store for this class.
-	 *
-	 * @since 1.0.19
-	 * @var GetPaid_Data_Store
-	 */
-	protected $data_store;
-
-	/**
-	 * Stores meta in cache for future reads.
-	 * A group must be set to to enable caching.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	protected $cache_group = '';
-
-	/**
-	 * Stores the last error.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $last_error = '';
-
-	/**
-	 * Stores additional meta data.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $meta_data = null;
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param int|object|array|string $read ID to load from the DB (optional) or already queried data.
-	 */
-	public function __construct( $read = 0 ) {
-		$this->data         = array_merge( $this->data, $this->extra_data );
-		$this->default_data = $this->data;
-	}
-
-	/**
-	 * Only store the object ID to avoid serializing the data object instance.
-	 *
-	 * @return array
-	 */
-	public function __sleep() {
-		return array( 'id' );
-	}
-
-	/**
-	 * Re-run the constructor with the object ID.
-	 *
-	 * If the object no longer exists, remove the ID.
-	 */
-	public function __wakeup() {
-		$this->__construct( absint( $this->id ) );
-
-		if ( ! empty( $this->last_error ) ) {
-			$this->set_id( 0 );
-		}
-
-	}
-
-	/**
-	 * When the object is cloned, make sure meta is duplicated correctly.
-	 *
-	 * @since 1.0.19
-	 */
-	public function __clone() {
-		$this->maybe_read_meta_data();
-		if ( ! empty( $this->meta_data ) ) {
-			foreach ( $this->meta_data as $array_key => $meta ) {
-				$this->meta_data[ $array_key ] = clone $meta;
-				if ( ! empty( $meta->id ) ) {
-					$this->meta_data[ $array_key ]->id = null;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get the data store.
-	 *
-	 * @since  1.0.19
-	 * @return object
-	 */
-	public function get_data_store() {
-		return $this->data_store;
-	}
-
-	/**
-	 * Get the object type.
-	 *
-	 * @since  1.0.19
-	 * @return string
-	 */
-	public function get_object_type() {
-		return $this->object_type;
-	}
-
-	/**
-	 * Returns the unique ID for this object.
-	 *
-	 * @since  1.0.19
-	 * @return int
-	 */
-	public function get_id() {
-		return $this->id;
-	}
-
-	/**
-	 * Get form status.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
-    }
-
-	/**
-	 * Delete an object, set the ID to 0, and return result.
-	 *
-	 * @since  1.0.19
-	 * @param  bool $force_delete Should the data be deleted permanently.
-	 * @return bool result
-	 */
-	public function delete( $force_delete = false ) {
-		if ( $this->data_store && $this->get_id() ) {
-			$this->data_store->delete( $this, array( 'force_delete' => $force_delete ) );
-			$this->set_id( 0 );
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Save should create or update based on object existence.
-	 *
-	 * @since  1.0.19
-	 * @return int
-	 */
-	public function save() {
-		if ( ! $this->data_store ) {
-			return $this->get_id();
-		}
-
-		/**
-		 * Trigger action before saving to the DB. Allows you to adjust object props before save.
-		 *
-		 * @param GetPaid_Data          $this The object being saved.
-		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
-		 */
-		do_action( 'getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store );
-
-		if ( $this->get_id() ) {
-			$this->data_store->update( $this );
-		} else {
-			$this->data_store->create( $this );
-		}
-
-		/**
-		 * Trigger action after saving to the DB.
-		 *
-		 * @param GetPaid_Data          $this The object being saved.
-		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
-		 */
-		do_action( 'getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store );
-
-		return $this->get_id();
-	}
-
-	/**
-	 * Change data to JSON format.
-	 *
-	 * @since  1.0.19
-	 * @return string Data in JSON format.
-	 */
-	public function __toString() {
-		return wp_json_encode( $this->get_data() );
-	}
-
-	/**
-	 * Returns all data for this object.
-	 *
-	 * @since  1.0.19
-	 * @return array
-	 */
-	public function get_data() {
-		return array_merge( array( 'id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
-	}
-
-	/**
-	 * Returns array of expected data keys for this object.
-	 *
-	 * @since   1.0.19
-	 * @return array
-	 */
-	public function get_data_keys() {
-		return array_keys( $this->data );
-	}
-
-	/**
-	 * Returns all "extra" data keys for an object (for sub objects like item types).
-	 *
-	 * @since  1.0.19
-	 * @return array
-	 */
-	public function get_extra_data_keys() {
-		return array_keys( $this->extra_data );
-	}
-
-	/**
-	 * Filter null meta values from array.
-	 *
-	 * @since  1.0.19
-	 * @param mixed $meta Meta value to check.
-	 * @return bool
-	 */
-	protected function filter_null_meta( $meta ) {
-		return ! is_null( $meta->value );
-	}
-
-	/**
-	 * Get All Meta Data.
-	 *
-	 * @since 1.0.19
-	 * @return array of objects.
-	 */
-	public function get_meta_data() {
-		$this->maybe_read_meta_data();
-		return array_values( array_filter( $this->meta_data, array( $this, 'filter_null_meta' ) ) );
-	}
-
-	/**
-	 * Check if the key is an internal one.
-	 *
-	 * @since  1.0.19
-	 * @param  string $key Key to check.
-	 * @return bool   true if it's an internal key, false otherwise
-	 */
-	protected function is_internal_meta_key( $key ) {
-		$internal_meta_key = ! empty( $key ) && $this->data_store && in_array( $key, $this->data_store->get_internal_meta_keys(), true );
-
-		if ( ! $internal_meta_key ) {
-			return false;
-		}
-
-		$has_setter_or_getter = is_callable( array( $this, 'set_' . $key ) ) || is_callable( array( $this, 'get_' . $key ) );
-
-		if ( ! $has_setter_or_getter ) {
-			return false;
-		}
-
-		/* translators: %s: $key Key to check */
-		getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'getpaid' ), $key ), '1.0.19' );
-
-		return true;
-	}
-
-	/**
-	 * Magic method for setting data fields.
-	 *
-	 * This method does not update custom fields in the database.
-	 *
-	 * @since 1.0.19
-	 * @access public
-	 *
-	 */
-	public function __set( $key, $value ) {
-
-		if ( 'id' == strtolower( $key ) ) {
-			return $this->set_id( $value );
-		}
-
-		if ( method_exists( $this, "set_$key") ) {
-
-			/* translators: %s: $key Key to set */
-			getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'getpaid' ), $key ), '1.0.19' );
-
-			call_user_func( array( $this, "set_$key" ), $value );
-		} else {
-			$this->set_prop( $key, $value );
-		}
-
-	}
-
-	/**
+    /**
+     * ID for this object.
+     *
+     * @since 1.0.19
+     * @var int
+     */
+    protected $id = 0;
+
+    /**
+     * Core data for this object. Name value pairs (name + default value).
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * Core data changes for this object.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $changes = array();
+
+    /**
+     * This is false until the object is read from the DB.
+     *
+     * @since 1.0.19
+     * @var bool
+     */
+    protected $object_read = false;
+
+    /**
+     * This is the name of this object type.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    protected $object_type = 'data';
+
+    /**
+     * Extra data for this object. Name value pairs (name + default value).
+     * Used as a standard way for sub classes (like item types) to add
+     * additional information to an inherited class.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $extra_data = array();
+
+    /**
+     * Set to _data on construct so we can track and reset data if needed.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $default_data = array();
+
+    /**
+     * Contains a reference to the data store for this class.
+     *
+     * @since 1.0.19
+     * @var GetPaid_Data_Store
+     */
+    protected $data_store;
+
+    /**
+     * Stores meta in cache for future reads.
+     * A group must be set to to enable caching.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    protected $cache_group = '';
+
+    /**
+     * Stores the last error.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $last_error = '';
+
+    /**
+     * Stores additional meta data.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $meta_data = null;
+
+    /**
+     * Default constructor.
+     *
+     * @param int|object|array|string $read ID to load from the DB (optional) or already queried data.
+     */
+    public function __construct( $read = 0 ) {
+        $this->data         = array_merge( $this->data, $this->extra_data );
+        $this->default_data = $this->data;
+    }
+
+    /**
+     * Only store the object ID to avoid serializing the data object instance.
+     *
+     * @return array
+     */
+    public function __sleep() {
+        return array( 'id' );
+    }
+
+    /**
+     * Re-run the constructor with the object ID.
+     *
+     * If the object no longer exists, remove the ID.
+     */
+    public function __wakeup() {
+        $this->__construct( absint( $this->id ) );
+
+        if ( ! empty( $this->last_error ) ) {
+            $this->set_id( 0 );
+        }
+
+    }
+
+    /**
+     * When the object is cloned, make sure meta is duplicated correctly.
+     *
+     * @since 1.0.19
+     */
+    public function __clone() {
+        $this->maybe_read_meta_data();
+        if ( ! empty( $this->meta_data ) ) {
+            foreach ( $this->meta_data as $array_key => $meta ) {
+                $this->meta_data[ $array_key ] = clone $meta;
+                if ( ! empty( $meta->id ) ) {
+                    $this->meta_data[ $array_key ]->id = null;
+                }
+            }
+        }
+    }
+
+    /**
+     * Get the data store.
+     *
+     * @since  1.0.19
+     * @return object
+     */
+    public function get_data_store() {
+        return $this->data_store;
+    }
+
+    /**
+     * Get the object type.
+     *
+     * @since  1.0.19
+     * @return string
+     */
+    public function get_object_type() {
+        return $this->object_type;
+    }
+
+    /**
+     * Returns the unique ID for this object.
+     *
+     * @since  1.0.19
+     * @return int
+     */
+    public function get_id() {
+        return $this->id;
+    }
+
+    /**
+     * Get form status.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_status( $context = 'view' ) {
+        return $this->get_prop( 'status', $context );
+    }
+
+    /**
+     * Delete an object, set the ID to 0, and return result.
+     *
+     * @since  1.0.19
+     * @param  bool $force_delete Should the data be deleted permanently.
+     * @return bool result
+     */
+    public function delete( $force_delete = false ) {
+        if ( $this->data_store && $this->get_id() ) {
+            $this->data_store->delete( $this, array( 'force_delete' => $force_delete ) );
+            $this->set_id( 0 );
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Save should create or update based on object existence.
+     *
+     * @since  1.0.19
+     * @return int
+     */
+    public function save() {
+        if ( ! $this->data_store ) {
+            return $this->get_id();
+        }
+
+        /**
+         * Trigger action before saving to the DB. Allows you to adjust object props before save.
+         *
+         * @param GetPaid_Data          $this The object being saved.
+         * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
+         */
+        do_action( 'getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+        if ( $this->get_id() ) {
+            $this->data_store->update( $this );
+        } else {
+            $this->data_store->create( $this );
+        }
+
+        /**
+         * Trigger action after saving to the DB.
+         *
+         * @param GetPaid_Data          $this The object being saved.
+         * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
+         */
+        do_action( 'getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+        return $this->get_id();
+    }
+
+    /**
+     * Change data to JSON format.
+     *
+     * @since  1.0.19
+     * @return string Data in JSON format.
+     */
+    public function __toString() {
+        return wp_json_encode( $this->get_data() );
+    }
+
+    /**
+     * Returns all data for this object.
+     *
+     * @since  1.0.19
+     * @return array
+     */
+    public function get_data() {
+        return array_merge( array( 'id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
+    }
+
+    /**
+     * Returns array of expected data keys for this object.
+     *
+     * @since   1.0.19
+     * @return array
+     */
+    public function get_data_keys() {
+        return array_keys( $this->data );
+    }
+
+    /**
+     * Returns all "extra" data keys for an object (for sub objects like item types).
+     *
+     * @since  1.0.19
+     * @return array
+     */
+    public function get_extra_data_keys() {
+        return array_keys( $this->extra_data );
+    }
+
+    /**
+     * Filter null meta values from array.
+     *
+     * @since  1.0.19
+     * @param mixed $meta Meta value to check.
+     * @return bool
+     */
+    protected function filter_null_meta( $meta ) {
+        return ! is_null( $meta->value );
+    }
+
+    /**
+     * Get All Meta Data.
+     *
+     * @since 1.0.19
+     * @return array of objects.
+     */
+    public function get_meta_data() {
+        $this->maybe_read_meta_data();
+        return array_values( array_filter( $this->meta_data, array( $this, 'filter_null_meta' ) ) );
+    }
+
+    /**
+     * Check if the key is an internal one.
+     *
+     * @since  1.0.19
+     * @param  string $key Key to check.
+     * @return bool   true if it's an internal key, false otherwise
+     */
+    protected function is_internal_meta_key( $key ) {
+        $internal_meta_key = ! empty( $key ) && $this->data_store && in_array( $key, $this->data_store->get_internal_meta_keys(), true );
+
+        if ( ! $internal_meta_key ) {
+            return false;
+        }
+
+        $has_setter_or_getter = is_callable( array( $this, 'set_' . $key ) ) || is_callable( array( $this, 'get_' . $key ) );
+
+        if ( ! $has_setter_or_getter ) {
+            return false;
+        }
+
+        /* translators: %s: $key Key to check */
+        getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'getpaid' ), $key ), '1.0.19' );
+
+        return true;
+    }
+
+    /**
+     * Magic method for setting data fields.
+     *
+     * This method does not update custom fields in the database.
+     *
+     * @since 1.0.19
+     * @access public
+     *
+     */
+    public function __set( $key, $value ) {
+
+        if ( 'id' == strtolower( $key ) ) {
+            return $this->set_id( $value );
+        }
+
+        if ( method_exists( $this, "set_$key") ) {
+
+            /* translators: %s: $key Key to set */
+            getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'getpaid' ), $key ), '1.0.19' );
+
+            call_user_func( array( $this, "set_$key" ), $value );
+        } else {
+            $this->set_prop( $key, $value );
+        }
+
+    }
+
+    /**
      * Margic method for retrieving a property.
      */
     public function __get( $key ) {
@@ -378,10 +378,10 @@ 
         // Check if we have a helper method for that.
         if ( method_exists( $this, 'get_' . $key ) ) {
 
-			if ( 'post_type' != $key ) {
-				/* translators: %s: $key Key to set */
-				getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'getpaid' ), $key ), '1.0.19' );
-			}
+            if ( 'post_type' != $key ) {
+                /* translators: %s: $key Key to set */
+                getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'getpaid' ), $key ), '1.0.19' );
+            }
 
             return call_user_func( array( $this, 'get_' . $key ) );
         }
@@ -391,512 +391,512 @@ 
             return $this->post->$key;
         }
 
-		return $this->get_prop( $key );
-
-    }
-
-	/**
-	 * Get Meta Data by Key.
-	 *
-	 * @since  1.0.19
-	 * @param  string $key Meta Key.
-	 * @param  bool   $single return first found meta with key, or all with $key.
-	 * @param  string $context What the value is for. Valid values are view and edit.
-	 * @return mixed
-	 */
-	public function get_meta( $key = '', $single = true, $context = 'view' ) {
-
-		// Check if this is an internal meta key.
-		$_key = str_replace( '_wpinv', '', $key );
-		$_key = str_replace( 'wpinv', '', $_key );
-		if ( $this->is_internal_meta_key( $_key ) ) {
-			$function = 'get_' . $_key;
-
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}();
-			}
-		}
-
-		// Read the meta data if not yet read.
-		$this->maybe_read_meta_data();
-		$meta_data  = $this->get_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $meta_data, 'key' ), $key, true );
-		$value      = $single ? '' : array();
-
-		if ( ! empty( $array_keys ) ) {
-			// We don't use the $this->meta_data property directly here because we don't want meta with a null value (i.e. meta which has been deleted via $this->delete_meta_data()).
-			if ( $single ) {
-				$value = $meta_data[ current( $array_keys ) ]->value;
-			} else {
-				$value = array_intersect_key( $meta_data, array_flip( $array_keys ) );
-			}
-		}
-
-		if ( 'view' === $context ) {
-			$value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
-		}
-
-		return $value;
-	}
-
-	/**
-	 * See if meta data exists, since get_meta always returns a '' or array().
-	 *
-	 * @since  1.0.19
-	 * @param  string $key Meta Key.
-	 * @return boolean
-	 */
-	public function meta_exists( $key = '' ) {
-		$this->maybe_read_meta_data();
-		$array_keys = wp_list_pluck( $this->get_meta_data(), 'key' );
-		return in_array( $key, $array_keys, true );
-	}
-
-	/**
-	 * Set all meta data from array.
-	 *
-	 * @since 1.0.19
-	 * @param array $data Key/Value pairs.
-	 */
-	public function set_meta_data( $data ) {
-		if ( ! empty( $data ) && is_array( $data ) ) {
-			$this->maybe_read_meta_data();
-			foreach ( $data as $meta ) {
-				$meta = (array) $meta;
-				if ( isset( $meta['key'], $meta['value'], $meta['id'] ) ) {
-					$this->meta_data[] = new GetPaid_Meta_Data(
-						array(
-							'id'    => $meta['id'],
-							'key'   => $meta['key'],
-							'value' => $meta['value'],
-						)
-					);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Add meta data.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string       $key Meta key.
-	 * @param string|array $value Meta value.
-	 * @param bool         $unique Should this be a unique key?.
-	 */
-	public function add_meta_data( $key, $value, $unique = false ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
-			$function = 'set_' . $key;
-
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
-			}
-		}
-
-		$this->maybe_read_meta_data();
-		if ( $unique ) {
-			$this->delete_meta_data( $key );
-		}
-		$this->meta_data[] = new GetPaid_Meta_Data(
-			array(
-				'key'   => $key,
-				'value' => $value,
-			)
-		);
-	}
-
-	/**
-	 * Update meta data by key or ID, if provided.
-	 *
-	 * @since  1.0.19
-	 *
-	 * @param  string       $key Meta key.
-	 * @param  string|array $value Meta value.
-	 * @param  int          $meta_id Meta ID.
-	 */
-	public function update_meta_data( $key, $value, $meta_id = 0 ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
-			$function = 'set_' . $key;
-
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
-			}
-		}
-
-		$this->maybe_read_meta_data();
-
-		$array_key = false;
-
-		if ( $meta_id ) {
-			$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), $meta_id, true );
-			$array_key  = $array_keys ? current( $array_keys ) : false;
-		} else {
-			// Find matches by key.
-			$matches = array();
-			foreach ( $this->meta_data as $meta_data_array_key => $meta ) {
-				if ( $meta->key === $key ) {
-					$matches[] = $meta_data_array_key;
-				}
-			}
-
-			if ( ! empty( $matches ) ) {
-				// Set matches to null so only one key gets the new value.
-				foreach ( $matches as $meta_data_array_key ) {
-					$this->meta_data[ $meta_data_array_key ]->value = null;
-				}
-				$array_key = current( $matches );
-			}
-		}
-
-		if ( false !== $array_key ) {
-			$meta        = $this->meta_data[ $array_key ];
-			$meta->key   = $key;
-			$meta->value = $value;
-		} else {
-			$this->add_meta_data( $key, $value, true );
-		}
-	}
-
-	/**
-	 * Delete meta data.
-	 *
-	 * @since 1.0.19
-	 * @param string $key Meta key.
-	 */
-	public function delete_meta_data( $key ) {
-		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'key' ), $key, true );
-
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
-			}
-		}
-	}
-
-	/**
-	 * Delete meta data.
-	 *
-	 * @since 1.0.19
-	 * @param int $mid Meta ID.
-	 */
-	public function delete_meta_data_by_mid( $mid ) {
-		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), (int) $mid, true );
-
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
-			}
-		}
-	}
-
-	/**
-	 * Read meta data if null.
-	 *
-	 * @since 1.0.19
-	 */
-	protected function maybe_read_meta_data() {
-		if ( is_null( $this->meta_data ) ) {
-			$this->read_meta_data();
-		}
-	}
-
-	/**
-	 * Read Meta Data from the database. Ignore any internal properties.
-	 * Uses it's own caches because get_metadata does not provide meta_ids.
-	 *
-	 * @since 1.0.19
-	 * @param bool $force_read True to force a new DB read (and update cache).
-	 */
-	public function read_meta_data( $force_read = false ) {
-
-		// Reset meta data.
-		$this->meta_data = array();
-
-		// Maybe abort early.
-		if ( ! $this->get_id() || ! $this->data_store ) {
-			return;
-		}
-
-		// Only read from cache if the cache key is set.
-		$cache_key = null;
-		if ( ! $force_read && ! empty( $this->cache_group ) ) {
-			$cache_key     = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			$raw_meta_data = wp_cache_get( $cache_key, $this->cache_group );
-		}
-
-		// Should we force read?
-		if ( empty( $raw_meta_data ) ) {
-			$raw_meta_data = $this->data_store->read_meta( $this );
-
-			if ( ! empty( $cache_key ) ) {
-				wp_cache_set( $cache_key, $raw_meta_data, $this->cache_group );
-			}
-
-		}
-
-		// Set meta data.
-		if ( is_array( $raw_meta_data ) ) {
-
-			foreach ( $raw_meta_data as $meta ) {
-				$this->meta_data[] = new GetPaid_Meta_Data(
-					array(
-						'id'    => (int) $meta->meta_id,
-						'key'   => $meta->meta_key,
-						'value' => maybe_unserialize( $meta->meta_value ),
-					)
-				);
-			}
-
-		}
-
-	}
-
-	/**
-	 * Update Meta Data in the database.
-	 *
-	 * @since 1.0.19
-	 */
-	public function save_meta_data() {
-		if ( ! $this->data_store || is_null( $this->meta_data ) ) {
-			return;
-		}
-		foreach ( $this->meta_data as $array_key => $meta ) {
-			if ( is_null( $meta->value ) ) {
-				if ( ! empty( $meta->id ) ) {
-					$this->data_store->delete_meta( $this, $meta );
-					unset( $this->meta_data[ $array_key ] );
-				}
-			} elseif ( empty( $meta->id ) ) {
-				$meta->id = $this->data_store->add_meta( $this, $meta );
-				$meta->apply_changes();
-			} else {
-				if ( $meta->get_changes() ) {
-					$this->data_store->update_meta( $this, $meta );
-					$meta->apply_changes();
-				}
-			}
-		}
-		if ( ! empty( $this->cache_group ) ) {
-			$cache_key = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			wp_cache_delete( $cache_key, $this->cache_group );
-		}
-	}
-
-	/**
-	 * Set ID.
-	 *
-	 * @since 1.0.19
-	 * @param int $id ID.
-	 */
-	public function set_id( $id ) {
-		$this->id = absint( $id );
-	}
-
-	/**
-	 * Sets item status.
-	 *
-	 * @since 1.0.19
-	 * @param string $status New status.
-	 * @return array details of change.
-	 */
-	public function set_status( $status ) {
+        return $this->get_prop( $key );
+
+    }
+
+    /**
+     * Get Meta Data by Key.
+     *
+     * @since  1.0.19
+     * @param  string $key Meta Key.
+     * @param  bool   $single return first found meta with key, or all with $key.
+     * @param  string $context What the value is for. Valid values are view and edit.
+     * @return mixed
+     */
+    public function get_meta( $key = '', $single = true, $context = 'view' ) {
+
+        // Check if this is an internal meta key.
+        $_key = str_replace( '_wpinv', '', $key );
+        $_key = str_replace( 'wpinv', '', $_key );
+        if ( $this->is_internal_meta_key( $_key ) ) {
+            $function = 'get_' . $_key;
+
+            if ( is_callable( array( $this, $function ) ) ) {
+                return $this->{$function}();
+            }
+        }
+
+        // Read the meta data if not yet read.
+        $this->maybe_read_meta_data();
+        $meta_data  = $this->get_meta_data();
+        $array_keys = array_keys( wp_list_pluck( $meta_data, 'key' ), $key, true );
+        $value      = $single ? '' : array();
+
+        if ( ! empty( $array_keys ) ) {
+            // We don't use the $this->meta_data property directly here because we don't want meta with a null value (i.e. meta which has been deleted via $this->delete_meta_data()).
+            if ( $single ) {
+                $value = $meta_data[ current( $array_keys ) ]->value;
+            } else {
+                $value = array_intersect_key( $meta_data, array_flip( $array_keys ) );
+            }
+        }
+
+        if ( 'view' === $context ) {
+            $value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
+        }
+
+        return $value;
+    }
+
+    /**
+     * See if meta data exists, since get_meta always returns a '' or array().
+     *
+     * @since  1.0.19
+     * @param  string $key Meta Key.
+     * @return boolean
+     */
+    public function meta_exists( $key = '' ) {
+        $this->maybe_read_meta_data();
+        $array_keys = wp_list_pluck( $this->get_meta_data(), 'key' );
+        return in_array( $key, $array_keys, true );
+    }
+
+    /**
+     * Set all meta data from array.
+     *
+     * @since 1.0.19
+     * @param array $data Key/Value pairs.
+     */
+    public function set_meta_data( $data ) {
+        if ( ! empty( $data ) && is_array( $data ) ) {
+            $this->maybe_read_meta_data();
+            foreach ( $data as $meta ) {
+                $meta = (array) $meta;
+                if ( isset( $meta['key'], $meta['value'], $meta['id'] ) ) {
+                    $this->meta_data[] = new GetPaid_Meta_Data(
+                        array(
+                            'id'    => $meta['id'],
+                            'key'   => $meta['key'],
+                            'value' => $meta['value'],
+                        )
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * Add meta data.
+     *
+     * @since 1.0.19
+     *
+     * @param string       $key Meta key.
+     * @param string|array $value Meta value.
+     * @param bool         $unique Should this be a unique key?.
+     */
+    public function add_meta_data( $key, $value, $unique = false ) {
+        if ( $this->is_internal_meta_key( $key ) ) {
+            $function = 'set_' . $key;
+
+            if ( is_callable( array( $this, $function ) ) ) {
+                return $this->{$function}( $value );
+            }
+        }
+
+        $this->maybe_read_meta_data();
+        if ( $unique ) {
+            $this->delete_meta_data( $key );
+        }
+        $this->meta_data[] = new GetPaid_Meta_Data(
+            array(
+                'key'   => $key,
+                'value' => $value,
+            )
+        );
+    }
+
+    /**
+     * Update meta data by key or ID, if provided.
+     *
+     * @since  1.0.19
+     *
+     * @param  string       $key Meta key.
+     * @param  string|array $value Meta value.
+     * @param  int          $meta_id Meta ID.
+     */
+    public function update_meta_data( $key, $value, $meta_id = 0 ) {
+        if ( $this->is_internal_meta_key( $key ) ) {
+            $function = 'set_' . $key;
+
+            if ( is_callable( array( $this, $function ) ) ) {
+                return $this->{$function}( $value );
+            }
+        }
+
+        $this->maybe_read_meta_data();
+
+        $array_key = false;
+
+        if ( $meta_id ) {
+            $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), $meta_id, true );
+            $array_key  = $array_keys ? current( $array_keys ) : false;
+        } else {
+            // Find matches by key.
+            $matches = array();
+            foreach ( $this->meta_data as $meta_data_array_key => $meta ) {
+                if ( $meta->key === $key ) {
+                    $matches[] = $meta_data_array_key;
+                }
+            }
+
+            if ( ! empty( $matches ) ) {
+                // Set matches to null so only one key gets the new value.
+                foreach ( $matches as $meta_data_array_key ) {
+                    $this->meta_data[ $meta_data_array_key ]->value = null;
+                }
+                $array_key = current( $matches );
+            }
+        }
+
+        if ( false !== $array_key ) {
+            $meta        = $this->meta_data[ $array_key ];
+            $meta->key   = $key;
+            $meta->value = $value;
+        } else {
+            $this->add_meta_data( $key, $value, true );
+        }
+    }
+
+    /**
+     * Delete meta data.
+     *
+     * @since 1.0.19
+     * @param string $key Meta key.
+     */
+    public function delete_meta_data( $key ) {
+        $this->maybe_read_meta_data();
+        $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'key' ), $key, true );
+
+        if ( $array_keys ) {
+            foreach ( $array_keys as $array_key ) {
+                $this->meta_data[ $array_key ]->value = null;
+            }
+        }
+    }
+
+    /**
+     * Delete meta data.
+     *
+     * @since 1.0.19
+     * @param int $mid Meta ID.
+     */
+    public function delete_meta_data_by_mid( $mid ) {
+        $this->maybe_read_meta_data();
+        $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), (int) $mid, true );
+
+        if ( $array_keys ) {
+            foreach ( $array_keys as $array_key ) {
+                $this->meta_data[ $array_key ]->value = null;
+            }
+        }
+    }
+
+    /**
+     * Read meta data if null.
+     *
+     * @since 1.0.19
+     */
+    protected function maybe_read_meta_data() {
+        if ( is_null( $this->meta_data ) ) {
+            $this->read_meta_data();
+        }
+    }
+
+    /**
+     * Read Meta Data from the database. Ignore any internal properties.
+     * Uses it's own caches because get_metadata does not provide meta_ids.
+     *
+     * @since 1.0.19
+     * @param bool $force_read True to force a new DB read (and update cache).
+     */
+    public function read_meta_data( $force_read = false ) {
+
+        // Reset meta data.
+        $this->meta_data = array();
+
+        // Maybe abort early.
+        if ( ! $this->get_id() || ! $this->data_store ) {
+            return;
+        }
+
+        // Only read from cache if the cache key is set.
+        $cache_key = null;
+        if ( ! $force_read && ! empty( $this->cache_group ) ) {
+            $cache_key     = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
+            $raw_meta_data = wp_cache_get( $cache_key, $this->cache_group );
+        }
+
+        // Should we force read?
+        if ( empty( $raw_meta_data ) ) {
+            $raw_meta_data = $this->data_store->read_meta( $this );
+
+            if ( ! empty( $cache_key ) ) {
+                wp_cache_set( $cache_key, $raw_meta_data, $this->cache_group );
+            }
+
+        }
+
+        // Set meta data.
+        if ( is_array( $raw_meta_data ) ) {
+
+            foreach ( $raw_meta_data as $meta ) {
+                $this->meta_data[] = new GetPaid_Meta_Data(
+                    array(
+                        'id'    => (int) $meta->meta_id,
+                        'key'   => $meta->meta_key,
+                        'value' => maybe_unserialize( $meta->meta_value ),
+                    )
+                );
+            }
+
+        }
+
+    }
+
+    /**
+     * Update Meta Data in the database.
+     *
+     * @since 1.0.19
+     */
+    public function save_meta_data() {
+        if ( ! $this->data_store || is_null( $this->meta_data ) ) {
+            return;
+        }
+        foreach ( $this->meta_data as $array_key => $meta ) {
+            if ( is_null( $meta->value ) ) {
+                if ( ! empty( $meta->id ) ) {
+                    $this->data_store->delete_meta( $this, $meta );
+                    unset( $this->meta_data[ $array_key ] );
+                }
+            } elseif ( empty( $meta->id ) ) {
+                $meta->id = $this->data_store->add_meta( $this, $meta );
+                $meta->apply_changes();
+            } else {
+                if ( $meta->get_changes() ) {
+                    $this->data_store->update_meta( $this, $meta );
+                    $meta->apply_changes();
+                }
+            }
+        }
+        if ( ! empty( $this->cache_group ) ) {
+            $cache_key = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
+            wp_cache_delete( $cache_key, $this->cache_group );
+        }
+    }
+
+    /**
+     * Set ID.
+     *
+     * @since 1.0.19
+     * @param int $id ID.
+     */
+    public function set_id( $id ) {
+        $this->id = absint( $id );
+    }
+
+    /**
+     * Sets item status.
+     *
+     * @since 1.0.19
+     * @param string $status New status.
+     * @return array details of change.
+     */
+    public function set_status( $status ) {
         $old_status = $this->get_status();
 
-		$this->set_prop( 'status', $status );
-
-		return array(
-			'from' => $old_status,
-			'to'   => $status,
-		);
-    }
-
-	/**
-	 * Set all props to default values.
-	 *
-	 * @since 1.0.19
-	 */
-	public function set_defaults() {
-		$this->data    = $this->default_data;
-		$this->changes = array();
-		$this->set_object_read( false );
-	}
-
-	/**
-	 * Set object read property.
-	 *
-	 * @since 1.0.19
-	 * @param boolean $read Should read?.
-	 */
-	public function set_object_read( $read = true ) {
-		$this->object_read = (bool) $read;
-	}
-
-	/**
-	 * Get object read property.
-	 *
-	 * @since  1.0.19
-	 * @return boolean
-	 */
-	public function get_object_read() {
-		return (bool) $this->object_read;
-	}
-
-	/**
-	 * Set a collection of props in one go, collect any errors, and return the result.
-	 * Only sets using public methods.
-	 *
-	 * @since  1.0.19
-	 *
-	 * @param array  $props Key value pairs to set. Key is the prop and should map to a setter function name.
-	 * @param string $context In what context to run this.
-	 *
-	 * @return bool|WP_Error
-	 */
-	public function set_props( $props, $context = 'set' ) {
-		$errors = false;
-
-		foreach ( $props as $prop => $value ) {
-			try {
-				/**
-				 * Checks if the prop being set is allowed, and the value is not null.
-				 */
-				if ( is_null( $value ) || in_array( $prop, array( 'prop', 'date_prop', 'meta_data' ), true ) ) {
-					continue;
-				}
-				$setter = "set_$prop";
-
-				if ( is_callable( array( $this, $setter ) ) ) {
-					$this->{$setter}( $value );
-				}
-			} catch ( Exception $e ) {
-				if ( ! $errors ) {
-					$errors = new WP_Error();
-				}
-				$errors->add( $e->getCode(), $e->getMessage() );
-				$this->last_error = $e->getMessage();
-			}
-		}
-
-		return $errors && count( $errors->get_error_codes() ) ? $errors : true;
-	}
-
-	/**
-	 * Sets a prop for a setter method.
-	 *
-	 * This stores changes in a special array so we can track what needs saving
-	 * the the DB later.
-	 *
-	 * @since 1.0.19
-	 * @param string $prop Name of prop to set.
-	 * @param mixed  $value Value of the prop.
-	 */
-	protected function set_prop( $prop, $value ) {
-		if ( array_key_exists( $prop, $this->data ) ) {
-			if ( true === $this->object_read ) {
-				if ( $value !== $this->data[ $prop ] || array_key_exists( $prop, $this->changes ) ) {
-					$this->changes[ $prop ] = $value;
-				}
-			} else {
-				$this->data[ $prop ] = $value;
-			}
-		}
-	}
-
-	/**
-	 * Return data changes only.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function get_changes() {
-		return $this->changes;
-	}
-
-	/**
-	 * Merge changes with data and clear.
-	 *
-	 * @since 1.0.19
-	 */
-	public function apply_changes() {
-		$this->data    = array_replace_recursive( $this->data, $this->changes );
-		$this->changes = array();
-	}
-
-	/**
-	 * Prefix for action and filter hooks on data.
-	 *
-	 * @since  1.0.19
-	 * @return string
-	 */
-	protected function get_hook_prefix() {
-		return 'wpinv_get_' . $this->object_type . '_';
-	}
-
-	/**
-	 * Gets a prop for a getter method.
-	 *
-	 * Gets the value from either current pending changes, or the data itself.
-	 * Context controls what happens to the value before it's returned.
-	 *
-	 * @since  1.0.19
-	 * @param  string $prop Name of prop to get.
-	 * @param  string $context What the value is for. Valid values are view and edit.
-	 * @return mixed
-	 */
-	protected function get_prop( $prop, $context = 'view' ) {
-		$value = null;
-
-		if ( array_key_exists( $prop, $this->data ) ) {
-			$value = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : $this->data[ $prop ];
-
-			if ( 'view' === $context ) {
-				$value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
-			}
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Sets a date prop whilst handling formatting and datetime objects.
-	 *
-	 * @since 1.0.19
-	 * @param string         $prop Name of prop to set.
-	 * @param string|integer $value Value of the prop.
-	 */
-	protected function set_date_prop( $prop, $value ) {
-
-		if ( empty( $value ) ) {
-			$this->set_prop( $prop, null );
-			return;
-		}
-		$this->set_prop( $prop, $value );
-
-	}
-
-	/**
-	 * When invalid data is found, throw an exception unless reading from the DB.
-	 *
-	 * @since 1.0.19
-	 * @param string $code             Error code.
-	 * @param string $message          Error message.
-	 */
-	protected function error( $code, $message ) {
-		$this->last_error = $message;
-	}
-
-	/**
-	 * Checks if the object is saved in the database
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function exists() {
-		$id = $this->get_id();
-		return ! empty( $id );
-	}
+        $this->set_prop( 'status', $status );
+
+        return array(
+            'from' => $old_status,
+            'to'   => $status,
+        );
+    }
+
+    /**
+     * Set all props to default values.
+     *
+     * @since 1.0.19
+     */
+    public function set_defaults() {
+        $this->data    = $this->default_data;
+        $this->changes = array();
+        $this->set_object_read( false );
+    }
+
+    /**
+     * Set object read property.
+     *
+     * @since 1.0.19
+     * @param boolean $read Should read?.
+     */
+    public function set_object_read( $read = true ) {
+        $this->object_read = (bool) $read;
+    }
+
+    /**
+     * Get object read property.
+     *
+     * @since  1.0.19
+     * @return boolean
+     */
+    public function get_object_read() {
+        return (bool) $this->object_read;
+    }
+
+    /**
+     * Set a collection of props in one go, collect any errors, and return the result.
+     * Only sets using public methods.
+     *
+     * @since  1.0.19
+     *
+     * @param array  $props Key value pairs to set. Key is the prop and should map to a setter function name.
+     * @param string $context In what context to run this.
+     *
+     * @return bool|WP_Error
+     */
+    public function set_props( $props, $context = 'set' ) {
+        $errors = false;
+
+        foreach ( $props as $prop => $value ) {
+            try {
+                /**
+                 * Checks if the prop being set is allowed, and the value is not null.
+                 */
+                if ( is_null( $value ) || in_array( $prop, array( 'prop', 'date_prop', 'meta_data' ), true ) ) {
+                    continue;
+                }
+                $setter = "set_$prop";
+
+                if ( is_callable( array( $this, $setter ) ) ) {
+                    $this->{$setter}( $value );
+                }
+            } catch ( Exception $e ) {
+                if ( ! $errors ) {
+                    $errors = new WP_Error();
+                }
+                $errors->add( $e->getCode(), $e->getMessage() );
+                $this->last_error = $e->getMessage();
+            }
+        }
+
+        return $errors && count( $errors->get_error_codes() ) ? $errors : true;
+    }
+
+    /**
+     * Sets a prop for a setter method.
+     *
+     * This stores changes in a special array so we can track what needs saving
+     * the the DB later.
+     *
+     * @since 1.0.19
+     * @param string $prop Name of prop to set.
+     * @param mixed  $value Value of the prop.
+     */
+    protected function set_prop( $prop, $value ) {
+        if ( array_key_exists( $prop, $this->data ) ) {
+            if ( true === $this->object_read ) {
+                if ( $value !== $this->data[ $prop ] || array_key_exists( $prop, $this->changes ) ) {
+                    $this->changes[ $prop ] = $value;
+                }
+            } else {
+                $this->data[ $prop ] = $value;
+            }
+        }
+    }
+
+    /**
+     * Return data changes only.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function get_changes() {
+        return $this->changes;
+    }
+
+    /**
+     * Merge changes with data and clear.
+     *
+     * @since 1.0.19
+     */
+    public function apply_changes() {
+        $this->data    = array_replace_recursive( $this->data, $this->changes );
+        $this->changes = array();
+    }
+
+    /**
+     * Prefix for action and filter hooks on data.
+     *
+     * @since  1.0.19
+     * @return string
+     */
+    protected function get_hook_prefix() {
+        return 'wpinv_get_' . $this->object_type . '_';
+    }
+
+    /**
+     * Gets a prop for a getter method.
+     *
+     * Gets the value from either current pending changes, or the data itself.
+     * Context controls what happens to the value before it's returned.
+     *
+     * @since  1.0.19
+     * @param  string $prop Name of prop to get.
+     * @param  string $context What the value is for. Valid values are view and edit.
+     * @return mixed
+     */
+    protected function get_prop( $prop, $context = 'view' ) {
+        $value = null;
+
+        if ( array_key_exists( $prop, $this->data ) ) {
+            $value = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : $this->data[ $prop ];
+
+            if ( 'view' === $context ) {
+                $value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Sets a date prop whilst handling formatting and datetime objects.
+     *
+     * @since 1.0.19
+     * @param string         $prop Name of prop to set.
+     * @param string|integer $value Value of the prop.
+     */
+    protected function set_date_prop( $prop, $value ) {
+
+        if ( empty( $value ) ) {
+            $this->set_prop( $prop, null );
+            return;
+        }
+        $this->set_prop( $prop, $value );
+
+    }
+
+    /**
+     * When invalid data is found, throw an exception unless reading from the DB.
+     *
+     * @since 1.0.19
+     * @param string $code             Error code.
+     * @param string $message          Error message.
+     */
+    protected function error( $code, $message ) {
+        $this->last_error = $message;
+    }
+
+    /**
+     * Checks if the object is saved in the database
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function exists() {
+        $id = $this->get_id();
+        return ! empty( $id );
+    }
 
 }

Spacing +161 added lines, -161 removed lines

@@ -8,7 +8,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -117,8 +117,8 @@ 
 	 *
 	 * @param int|object|array|string $read ID to load from the DB (optional) or already queried data.
 	 */
-	public function __construct( $read = 0 ) {
-		$this->data         = array_merge( $this->data, $this->extra_data );
+	public function __construct($read = 0) {
+		$this->data         = array_merge($this->data, $this->extra_data);
 		$this->default_data = $this->data;
 	}
 
@@ -128,7 +128,7 @@ 
 	 * @return array
 	 */
 	public function __sleep() {
-		return array( 'id' );
+		return array('id');
 	}
 
 	/**
@@ -137,10 +137,10 @@ 
 	 * If the object no longer exists, remove the ID.
 	 */
 	public function __wakeup() {
-		$this->__construct( absint( $this->id ) );
+		$this->__construct(absint($this->id));
 
-		if ( ! empty( $this->last_error ) ) {
-			$this->set_id( 0 );
+		if (!empty($this->last_error)) {
+			$this->set_id(0);
 		}
 
 	}
@@ -152,11 +152,11 @@ 
 	 */
 	public function __clone() {
 		$this->maybe_read_meta_data();
-		if ( ! empty( $this->meta_data ) ) {
-			foreach ( $this->meta_data as $array_key => $meta ) {
-				$this->meta_data[ $array_key ] = clone $meta;
-				if ( ! empty( $meta->id ) ) {
-					$this->meta_data[ $array_key ]->id = null;
+		if (!empty($this->meta_data)) {
+			foreach ($this->meta_data as $array_key => $meta) {
+				$this->meta_data[$array_key] = clone $meta;
+				if (!empty($meta->id)) {
+					$this->meta_data[$array_key]->id = null;
 				}
 			}
 		}
@@ -199,8 +199,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
+	public function get_status($context = 'view') {
+		return $this->get_prop('status', $context);
     }
 
 	/**
@@ -210,10 +210,10 @@ 
 	 * @param  bool $force_delete Should the data be deleted permanently.
 	 * @return bool result
 	 */
-	public function delete( $force_delete = false ) {
-		if ( $this->data_store && $this->get_id() ) {
-			$this->data_store->delete( $this, array( 'force_delete' => $force_delete ) );
-			$this->set_id( 0 );
+	public function delete($force_delete = false) {
+		if ($this->data_store && $this->get_id()) {
+			$this->data_store->delete($this, array('force_delete' => $force_delete));
+			$this->set_id(0);
 			return true;
 		}
 		return false;
@@ -226,7 +226,7 @@ 
 	 * @return int
 	 */
 	public function save() {
-		if ( ! $this->data_store ) {
+		if (!$this->data_store) {
 			return $this->get_id();
 		}
 
@@ -236,12 +236,12 @@ 
 		 * @param GetPaid_Data          $this The object being saved.
 		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
 		 */
-		do_action( 'getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+		do_action('getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store);
 
-		if ( $this->get_id() ) {
-			$this->data_store->update( $this );
+		if ($this->get_id()) {
+			$this->data_store->update($this);
 		} else {
-			$this->data_store->create( $this );
+			$this->data_store->create($this);
 		}
 
 		/**
@@ -250,7 +250,7 @@ 
 		 * @param GetPaid_Data          $this The object being saved.
 		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
 		 */
-		do_action( 'getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store );
+		do_action('getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store);
 
 		return $this->get_id();
 	}
@@ -262,7 +262,7 @@ 
 	 * @return string Data in JSON format.
 	 */
 	public function __toString() {
-		return wp_json_encode( $this->get_data() );
+		return wp_json_encode($this->get_data());
 	}
 
 	/**
@@ -272,7 +272,7 @@ 
 	 * @return array
 	 */
 	public function get_data() {
-		return array_merge( array( 'id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
+		return array_merge(array('id' => $this->get_id()), $this->data, array('meta_data' => $this->get_meta_data()));
 	}
 
 	/**
@@ -282,7 +282,7 @@ 
 	 * @return array
 	 */
 	public function get_data_keys() {
-		return array_keys( $this->data );
+		return array_keys($this->data);
 	}
 
 	/**
@@ -292,7 +292,7 @@ 
 	 * @return array
 	 */
 	public function get_extra_data_keys() {
-		return array_keys( $this->extra_data );
+		return array_keys($this->extra_data);
 	}
 
 	/**
@@ -302,8 +302,8 @@ 
 	 * @param mixed $meta Meta value to check.
 	 * @return bool
 	 */
-	protected function filter_null_meta( $meta ) {
-		return ! is_null( $meta->value );
+	protected function filter_null_meta($meta) {
+		return !is_null($meta->value);
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	 */
 	public function get_meta_data() {
 		$this->maybe_read_meta_data();
-		return array_values( array_filter( $this->meta_data, array( $this, 'filter_null_meta' ) ) );
+		return array_values(array_filter($this->meta_data, array($this, 'filter_null_meta')));
 	}
 
 	/**
@@ -324,21 +324,21 @@ 
 	 * @param  string $key Key to check.
 	 * @return bool   true if it's an internal key, false otherwise
 	 */
-	protected function is_internal_meta_key( $key ) {
-		$internal_meta_key = ! empty( $key ) && $this->data_store && in_array( $key, $this->data_store->get_internal_meta_keys(), true );
+	protected function is_internal_meta_key($key) {
+		$internal_meta_key = !empty($key) && $this->data_store && in_array($key, $this->data_store->get_internal_meta_keys(), true);
 
-		if ( ! $internal_meta_key ) {
+		if (!$internal_meta_key) {
 			return false;
 		}
 
-		$has_setter_or_getter = is_callable( array( $this, 'set_' . $key ) ) || is_callable( array( $this, 'get_' . $key ) );
+		$has_setter_or_getter = is_callable(array($this, 'set_' . $key)) || is_callable(array($this, 'get_' . $key));
 
-		if ( ! $has_setter_or_getter ) {
+		if (!$has_setter_or_getter) {
 			return false;
 		}
 
 		/* translators: %s: $key Key to check */
-		getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'getpaid' ), $key ), '1.0.19' );
+		getpaid_doing_it_wrong(__FUNCTION__, sprintf(__('Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'getpaid'), $key), '1.0.19');
 
 		return true;
 	}
@@ -352,20 +352,20 @@ 
 	 * @access public
 	 *
 	 */
-	public function __set( $key, $value ) {
+	public function __set($key, $value) {
 
-		if ( 'id' == strtolower( $key ) ) {
-			return $this->set_id( $value );
+		if ('id' == strtolower($key)) {
+			return $this->set_id($value);
 		}
 
-		if ( method_exists( $this, "set_$key") ) {
+		if (method_exists($this, "set_$key")) {
 
 			/* translators: %s: $key Key to set */
-			getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'getpaid' ), $key ), '1.0.19' );
+			getpaid_doing_it_wrong(__FUNCTION__, sprintf(__('Object data such as "%s" should not be accessed directly. Use getters and setters.', 'getpaid'), $key), '1.0.19');
 
-			call_user_func( array( $this, "set_$key" ), $value );
+			call_user_func(array($this, "set_$key"), $value);
 		} else {
-			$this->set_prop( $key, $value );
+			$this->set_prop($key, $value);
 		}
 
 	}
@@ -373,25 +373,25 @@ 
 	/**
      * Margic method for retrieving a property.
      */
-    public function __get( $key ) {
+    public function __get($key) {
 
         // Check if we have a helper method for that.
-        if ( method_exists( $this, 'get_' . $key ) ) {
+        if (method_exists($this, 'get_' . $key)) {
 
-			if ( 'post_type' != $key ) {
+			if ('post_type' != $key) {
 				/* translators: %s: $key Key to set */
-				getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'getpaid' ), $key ), '1.0.19' );
+				getpaid_doing_it_wrong(__FUNCTION__, sprintf(__('Object data such as "%s" should not be accessed directly. Use getters and setters.', 'getpaid'), $key), '1.0.19');
 			}
 
-            return call_user_func( array( $this, 'get_' . $key ) );
+            return call_user_func(array($this, 'get_' . $key));
         }
 
         // Check if the key is in the associated $post object.
-        if ( ! empty( $this->post ) && isset( $this->post->$key ) ) {
+        if (!empty($this->post) && isset($this->post->$key)) {
             return $this->post->$key;
         }
 
-		return $this->get_prop( $key );
+		return $this->get_prop($key);
 
     }
 
@@ -404,15 +404,15 @@ 
 	 * @param  string $context What the value is for. Valid values are view and edit.
 	 * @return mixed
 	 */
-	public function get_meta( $key = '', $single = true, $context = 'view' ) {
+	public function get_meta($key = '', $single = true, $context = 'view') {
 
 		// Check if this is an internal meta key.
-		$_key = str_replace( '_wpinv', '', $key );
-		$_key = str_replace( 'wpinv', '', $_key );
-		if ( $this->is_internal_meta_key( $_key ) ) {
+		$_key = str_replace('_wpinv', '', $key);
+		$_key = str_replace('wpinv', '', $_key);
+		if ($this->is_internal_meta_key($_key)) {
 			$function = 'get_' . $_key;
 
-			if ( is_callable( array( $this, $function ) ) ) {
+			if (is_callable(array($this, $function))) {
 				return $this->{$function}();
 			}
 		}
@@ -420,20 +420,20 @@ 
 		// Read the meta data if not yet read.
 		$this->maybe_read_meta_data();
 		$meta_data  = $this->get_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $meta_data, 'key' ), $key, true );
+		$array_keys = array_keys(wp_list_pluck($meta_data, 'key'), $key, true);
 		$value      = $single ? '' : array();
 
-		if ( ! empty( $array_keys ) ) {
+		if (!empty($array_keys)) {
 			// We don't use the $this->meta_data property directly here because we don't want meta with a null value (i.e. meta which has been deleted via $this->delete_meta_data()).
-			if ( $single ) {
-				$value = $meta_data[ current( $array_keys ) ]->value;
+			if ($single) {
+				$value = $meta_data[current($array_keys)]->value;
 			} else {
-				$value = array_intersect_key( $meta_data, array_flip( $array_keys ) );
+				$value = array_intersect_key($meta_data, array_flip($array_keys));
 			}
 		}
 
-		if ( 'view' === $context ) {
-			$value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
+		if ('view' === $context) {
+			$value = apply_filters($this->get_hook_prefix() . $key, $value, $this);
 		}
 
 		return $value;
@@ -446,10 +446,10 @@ 
 	 * @param  string $key Meta Key.
 	 * @return boolean
 	 */
-	public function meta_exists( $key = '' ) {
+	public function meta_exists($key = '') {
 		$this->maybe_read_meta_data();
-		$array_keys = wp_list_pluck( $this->get_meta_data(), 'key' );
-		return in_array( $key, $array_keys, true );
+		$array_keys = wp_list_pluck($this->get_meta_data(), 'key');
+		return in_array($key, $array_keys, true);
 	}
 
 	/**
@@ -458,12 +458,12 @@ 
 	 * @since 1.0.19
 	 * @param array $data Key/Value pairs.
 	 */
-	public function set_meta_data( $data ) {
-		if ( ! empty( $data ) && is_array( $data ) ) {
+	public function set_meta_data($data) {
+		if (!empty($data) && is_array($data)) {
 			$this->maybe_read_meta_data();
-			foreach ( $data as $meta ) {
+			foreach ($data as $meta) {
 				$meta = (array) $meta;
-				if ( isset( $meta['key'], $meta['value'], $meta['id'] ) ) {
+				if (isset($meta['key'], $meta['value'], $meta['id'])) {
 					$this->meta_data[] = new GetPaid_Meta_Data(
 						array(
 							'id'    => $meta['id'],
@@ -485,18 +485,18 @@ 
 	 * @param string|array $value Meta value.
 	 * @param bool         $unique Should this be a unique key?.
 	 */
-	public function add_meta_data( $key, $value, $unique = false ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
+	public function add_meta_data($key, $value, $unique = false) {
+		if ($this->is_internal_meta_key($key)) {
 			$function = 'set_' . $key;
 
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
+			if (is_callable(array($this, $function))) {
+				return $this->{$function}($value);
 			}
 		}
 
 		$this->maybe_read_meta_data();
-		if ( $unique ) {
-			$this->delete_meta_data( $key );
+		if ($unique) {
+			$this->delete_meta_data($key);
 		}
 		$this->meta_data[] = new GetPaid_Meta_Data(
 			array(
@@ -515,12 +515,12 @@ 
 	 * @param  string|array $value Meta value.
 	 * @param  int          $meta_id Meta ID.
 	 */
-	public function update_meta_data( $key, $value, $meta_id = 0 ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
+	public function update_meta_data($key, $value, $meta_id = 0) {
+		if ($this->is_internal_meta_key($key)) {
 			$function = 'set_' . $key;
 
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
+			if (is_callable(array($this, $function))) {
+				return $this->{$function}($value);
 			}
 		}
 
@@ -528,33 +528,33 @@ 
 
 		$array_key = false;
 
-		if ( $meta_id ) {
-			$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), $meta_id, true );
-			$array_key  = $array_keys ? current( $array_keys ) : false;
+		if ($meta_id) {
+			$array_keys = array_keys(wp_list_pluck($this->meta_data, 'id'), $meta_id, true);
+			$array_key  = $array_keys ? current($array_keys) : false;
 		} else {
 			// Find matches by key.
 			$matches = array();
-			foreach ( $this->meta_data as $meta_data_array_key => $meta ) {
-				if ( $meta->key === $key ) {
+			foreach ($this->meta_data as $meta_data_array_key => $meta) {
+				if ($meta->key === $key) {
 					$matches[] = $meta_data_array_key;
 				}
 			}
 
-			if ( ! empty( $matches ) ) {
+			if (!empty($matches)) {
 				// Set matches to null so only one key gets the new value.
-				foreach ( $matches as $meta_data_array_key ) {
-					$this->meta_data[ $meta_data_array_key ]->value = null;
+				foreach ($matches as $meta_data_array_key) {
+					$this->meta_data[$meta_data_array_key]->value = null;
 				}
-				$array_key = current( $matches );
+				$array_key = current($matches);
 			}
 		}
 
-		if ( false !== $array_key ) {
-			$meta        = $this->meta_data[ $array_key ];
+		if (false !== $array_key) {
+			$meta        = $this->meta_data[$array_key];
 			$meta->key   = $key;
 			$meta->value = $value;
 		} else {
-			$this->add_meta_data( $key, $value, true );
+			$this->add_meta_data($key, $value, true);
 		}
 	}
 
@@ -564,13 +564,13 @@ 
 	 * @since 1.0.19
 	 * @param string $key Meta key.
 	 */
-	public function delete_meta_data( $key ) {
+	public function delete_meta_data($key) {
 		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'key' ), $key, true );
+		$array_keys = array_keys(wp_list_pluck($this->meta_data, 'key'), $key, true);
 
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
+		if ($array_keys) {
+			foreach ($array_keys as $array_key) {
+				$this->meta_data[$array_key]->value = null;
 			}
 		}
 	}
@@ -581,13 +581,13 @@ 
 	 * @since 1.0.19
 	 * @param int $mid Meta ID.
 	 */
-	public function delete_meta_data_by_mid( $mid ) {
+	public function delete_meta_data_by_mid($mid) {
 		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), (int) $mid, true );
+		$array_keys = array_keys(wp_list_pluck($this->meta_data, 'id'), (int) $mid, true);
 
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
+		if ($array_keys) {
+			foreach ($array_keys as $array_key) {
+				$this->meta_data[$array_key]->value = null;
 			}
 		}
 	}
@@ -598,7 +598,7 @@ 
 	 * @since 1.0.19
 	 */
 	protected function maybe_read_meta_data() {
-		if ( is_null( $this->meta_data ) ) {
+		if (is_null($this->meta_data)) {
 			$this->read_meta_data();
 		}
 	}
@@ -610,42 +610,42 @@ 
 	 * @since 1.0.19
 	 * @param bool $force_read True to force a new DB read (and update cache).
 	 */
-	public function read_meta_data( $force_read = false ) {
+	public function read_meta_data($force_read = false) {
 
 		// Reset meta data.
 		$this->meta_data = array();
 
 		// Maybe abort early.
-		if ( ! $this->get_id() || ! $this->data_store ) {
+		if (!$this->get_id() || !$this->data_store) {
 			return;
 		}
 
 		// Only read from cache if the cache key is set.
 		$cache_key = null;
-		if ( ! $force_read && ! empty( $this->cache_group ) ) {
-			$cache_key     = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			$raw_meta_data = wp_cache_get( $cache_key, $this->cache_group );
+		if (!$force_read && !empty($this->cache_group)) {
+			$cache_key     = GetPaid_Cache_Helper::get_cache_prefix($this->cache_group) . GetPaid_Cache_Helper::get_cache_prefix('object_' . $this->get_id()) . 'object_meta_' . $this->get_id();
+			$raw_meta_data = wp_cache_get($cache_key, $this->cache_group);
 		}
 
 		// Should we force read?
-		if ( empty( $raw_meta_data ) ) {
-			$raw_meta_data = $this->data_store->read_meta( $this );
+		if (empty($raw_meta_data)) {
+			$raw_meta_data = $this->data_store->read_meta($this);
 
-			if ( ! empty( $cache_key ) ) {
-				wp_cache_set( $cache_key, $raw_meta_data, $this->cache_group );
+			if (!empty($cache_key)) {
+				wp_cache_set($cache_key, $raw_meta_data, $this->cache_group);
 			}
 
 		}
 
 		// Set meta data.
-		if ( is_array( $raw_meta_data ) ) {
+		if (is_array($raw_meta_data)) {
 
-			foreach ( $raw_meta_data as $meta ) {
+			foreach ($raw_meta_data as $meta) {
 				$this->meta_data[] = new GetPaid_Meta_Data(
 					array(
 						'id'    => (int) $meta->meta_id,
 						'key'   => $meta->meta_key,
-						'value' => maybe_unserialize( $meta->meta_value ),
+						'value' => maybe_unserialize($meta->meta_value),
 					)
 				);
 			}
@@ -660,28 +660,28 @@ 
 	 * @since 1.0.19
 	 */
 	public function save_meta_data() {
-		if ( ! $this->data_store || is_null( $this->meta_data ) ) {
+		if (!$this->data_store || is_null($this->meta_data)) {
 			return;
 		}
-		foreach ( $this->meta_data as $array_key => $meta ) {
-			if ( is_null( $meta->value ) ) {
-				if ( ! empty( $meta->id ) ) {
-					$this->data_store->delete_meta( $this, $meta );
-					unset( $this->meta_data[ $array_key ] );
+		foreach ($this->meta_data as $array_key => $meta) {
+			if (is_null($meta->value)) {
+				if (!empty($meta->id)) {
+					$this->data_store->delete_meta($this, $meta);
+					unset($this->meta_data[$array_key]);
 				}
-			} elseif ( empty( $meta->id ) ) {
-				$meta->id = $this->data_store->add_meta( $this, $meta );
+			} elseif (empty($meta->id)) {
+				$meta->id = $this->data_store->add_meta($this, $meta);
 				$meta->apply_changes();
 			} else {
-				if ( $meta->get_changes() ) {
-					$this->data_store->update_meta( $this, $meta );
+				if ($meta->get_changes()) {
+					$this->data_store->update_meta($this, $meta);
 					$meta->apply_changes();
 				}
 			}
 		}
-		if ( ! empty( $this->cache_group ) ) {
-			$cache_key = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			wp_cache_delete( $cache_key, $this->cache_group );
+		if (!empty($this->cache_group)) {
+			$cache_key = GetPaid_Cache_Helper::get_cache_prefix($this->cache_group) . GetPaid_Cache_Helper::get_cache_prefix('object_' . $this->get_id()) . 'object_meta_' . $this->get_id();
+			wp_cache_delete($cache_key, $this->cache_group);
 		}
 	}
 
@@ -691,8 +691,8 @@ 
 	 * @since 1.0.19
 	 * @param int $id ID.
 	 */
-	public function set_id( $id ) {
-		$this->id = absint( $id );
+	public function set_id($id) {
+		$this->id = absint($id);
 	}
 
 	/**
@@ -702,10 +702,10 @@ 
 	 * @param string $status New status.
 	 * @return array details of change.
 	 */
-	public function set_status( $status ) {
+	public function set_status($status) {
         $old_status = $this->get_status();
 
-		$this->set_prop( 'status', $status );
+		$this->set_prop('status', $status);
 
 		return array(
 			'from' => $old_status,
@@ -721,7 +721,7 @@ 
 	public function set_defaults() {
 		$this->data    = $this->default_data;
 		$this->changes = array();
-		$this->set_object_read( false );
+		$this->set_object_read(false);
 	}
 
 	/**
@@ -730,7 +730,7 @@ 
 	 * @since 1.0.19
 	 * @param boolean $read Should read?.
 	 */
-	public function set_object_read( $read = true ) {
+	public function set_object_read($read = true) {
 		$this->object_read = (bool) $read;
 	}
 
@@ -755,32 +755,32 @@ 
 	 *
 	 * @return bool|WP_Error
 	 */
-	public function set_props( $props, $context = 'set' ) {
+	public function set_props($props, $context = 'set') {
 		$errors = false;
 
-		foreach ( $props as $prop => $value ) {
+		foreach ($props as $prop => $value) {
 			try {
 				/**
 				 * Checks if the prop being set is allowed, and the value is not null.
 				 */
-				if ( is_null( $value ) || in_array( $prop, array( 'prop', 'date_prop', 'meta_data' ), true ) ) {
+				if (is_null($value) || in_array($prop, array('prop', 'date_prop', 'meta_data'), true)) {
 					continue;
 				}
 				$setter = "set_$prop";
 
-				if ( is_callable( array( $this, $setter ) ) ) {
-					$this->{$setter}( $value );
+				if (is_callable(array($this, $setter))) {
+					$this->{$setter}($value);
 				}
-			} catch ( Exception $e ) {
-				if ( ! $errors ) {
+			} catch (Exception $e) {
+				if (!$errors) {
 					$errors = new WP_Error();
 				}
-				$errors->add( $e->getCode(), $e->getMessage() );
+				$errors->add($e->getCode(), $e->getMessage());
 				$this->last_error = $e->getMessage();
 			}
 		}
 
-		return $errors && count( $errors->get_error_codes() ) ? $errors : true;
+		return $errors && count($errors->get_error_codes()) ? $errors : true;
 	}
 
 	/**
@@ -793,14 +793,14 @@ 
 	 * @param string $prop Name of prop to set.
 	 * @param mixed  $value Value of the prop.
 	 */
-	protected function set_prop( $prop, $value ) {
-		if ( array_key_exists( $prop, $this->data ) ) {
-			if ( true === $this->object_read ) {
-				if ( $value !== $this->data[ $prop ] || array_key_exists( $prop, $this->changes ) ) {
-					$this->changes[ $prop ] = $value;
+	protected function set_prop($prop, $value) {
+		if (array_key_exists($prop, $this->data)) {
+			if (true === $this->object_read) {
+				if ($value !== $this->data[$prop] || array_key_exists($prop, $this->changes)) {
+					$this->changes[$prop] = $value;
 				}
 			} else {
-				$this->data[ $prop ] = $value;
+				$this->data[$prop] = $value;
 			}
 		}
 	}
@@ -821,7 +821,7 @@ 
 	 * @since 1.0.19
 	 */
 	public function apply_changes() {
-		$this->data    = array_replace_recursive( $this->data, $this->changes );
+		$this->data    = array_replace_recursive($this->data, $this->changes);
 		$this->changes = array();
 	}
 
@@ -846,14 +846,14 @@ 
 	 * @param  string $context What the value is for. Valid values are view and edit.
 	 * @return mixed
 	 */
-	protected function get_prop( $prop, $context = 'view' ) {
+	protected function get_prop($prop, $context = 'view') {
 		$value = null;
 
-		if ( array_key_exists( $prop, $this->data ) ) {
-			$value = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : $this->data[ $prop ];
+		if (array_key_exists($prop, $this->data)) {
+			$value = array_key_exists($prop, $this->changes) ? $this->changes[$prop] : $this->data[$prop];
 
-			if ( 'view' === $context ) {
-				$value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
+			if ('view' === $context) {
+				$value = apply_filters($this->get_hook_prefix() . $prop, $value, $this);
 			}
 		}
 
@@ -867,13 +867,13 @@ 
 	 * @param string         $prop Name of prop to set.
 	 * @param string|integer $value Value of the prop.
 	 */
-	protected function set_date_prop( $prop, $value ) {
+	protected function set_date_prop($prop, $value) {
 
-		if ( empty( $value ) ) {
-			$this->set_prop( $prop, null );
+		if (empty($value)) {
+			$this->set_prop($prop, null);
 			return;
 		}
-		$this->set_prop( $prop, $value );
+		$this->set_prop($prop, $value);
 
 	}
 
@@ -884,7 +884,7 @@ 
 	 * @param string $code             Error code.
 	 * @param string $message          Error message.
 	 */
-	protected function error( $code, $message ) {
+	protected function error($code, $message) {
 		$this->last_error = $message;
 	}
 
@@ -896,7 +896,7 @@ 
 	 */
 	public function exists() {
 		$id = $this->get_id();
-		return ! empty( $id );
+		return !empty($id);
 	}
 
 }