AyeCode / invoicing

includes/admin/class-getpaid-post-types-admin.php

Indentation +795 added lines, -795 removed lines

@@ -13,738 +13,738 @@ 
 class GetPaid_Post_Types_Admin {
 
     /**
-	 * Hook in methods.
-	 */
-	public static function init() {
-
-		// Init metaboxes.
-		GetPaid_Metaboxes::init();
-
-		// Filter the post updated messages.
-		add_filter( 'post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages' );
-
-		// Filter post actions.
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2 );
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::filter_invoice_row_actions', 90, 2 );
-
-		// Invoice table columns.
-		add_filter( 'manage_wpi_invoice_posts_columns', array( __CLASS__, 'invoice_columns' ), 100 );
-		add_action( 'manage_wpi_invoice_posts_custom_column', array( __CLASS__, 'display_invoice_columns' ), 10, 2 );
-		add_filter( 'bulk_actions-edit-wpi_invoice', array( __CLASS__, 'invoice_bulk_actions' ) );
-		add_filter( 'handle_bulk_actions-edit-wpi_invoice', array( __CLASS__, 'handle_invoice_bulk_actions' ), 10, 3 );
-
-		// Items table columns.
-		add_filter( 'manage_wpi_item_posts_columns', array( __CLASS__, 'item_columns' ), 100 );
-		add_filter( 'manage_edit-wpi_item_sortable_columns', array( __CLASS__, 'sortable_item_columns' ), 20 );
-		add_action( 'manage_wpi_item_posts_custom_column', array( __CLASS__, 'display_item_columns' ), 10, 2 );
-		add_action( 'restrict_manage_posts', array( __CLASS__, 'add_item_filters' ), 100 );
-		add_action( 'parse_query', array( __CLASS__, 'filter_item_query' ), 100 );
-		add_action( 'request', array( __CLASS__, 'reorder_items' ), 100 );
-
-		// Payment forms columns.
-		add_filter( 'manage_wpi_payment_form_posts_columns', array( __CLASS__, 'payment_form_columns' ), 100 );
-		add_action( 'manage_wpi_payment_form_posts_custom_column', array( __CLASS__, 'display_payment_form_columns' ), 10, 2 );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_payment_form_state' ), 10, 2 );
-
-		// Discount table columns.
-		add_filter( 'manage_wpi_discount_posts_columns', array( __CLASS__, 'discount_columns' ), 100 );
-		add_filter( 'bulk_actions-edit-wpi_discount', '__return_empty_array', 100 );
-
-		// Deleting posts.
-		add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_discount_state' ), 10, 2 );
-
-		add_filter( 'display_post_states', array( __CLASS__, 'add_display_post_states' ), 10, 2 );
-	}
-
-	/**
-	 * Post updated messages.
-	 */
-	public static function post_updated_messages( $messages ) {
-		global $post;
-
-		$messages['wpi_discount'] = array(
-			0  => '',
-			1  => __( 'Discount updated.', 'invoicing' ),
-			2  => __( 'Custom field updated.', 'invoicing' ),
-			3  => __( 'Custom field deleted.', 'invoicing' ),
-			4  => __( 'Discount updated.', 'invoicing' ),
-			5  => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6  => __( 'Discount updated.', 'invoicing' ),
-			7  => __( 'Discount saved.', 'invoicing' ),
-			8  => __( 'Discount submitted.', 'invoicing' ),
-			9  => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10 => __( 'Discount draft updated.', 'invoicing' ),
-		);
-
-		$messages['wpi_payment_form'] = array(
-			0  => '',
-			1  => __( 'Payment Form updated.', 'invoicing' ),
-			2  => __( 'Custom field updated.', 'invoicing' ),
-			3  => __( 'Custom field deleted.', 'invoicing' ),
-			4  => __( 'Payment Form updated.', 'invoicing' ),
-			5  => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6  => __( 'Payment Form updated.', 'invoicing' ),
-			7  => __( 'Payment Form saved.', 'invoicing' ),
-			8  => __( 'Payment Form submitted.', 'invoicing' ),
-			9  => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10 => __( 'Payment Form draft updated.', 'invoicing' ),
-		);
-
-		return $messages;
-
-	}
-
-	/**
-	 * Post row actions.
-	 */
-	public static function post_row_actions( $actions, $post ) {
-
-		$post = get_post( $post );
-
-		// We do not want to edit the default payment form.
-		if ( 'wpi_payment_form' == $post->post_type ) {
-
-			if ( wpinv_get_default_payment_form() === $post->ID ) {
-				unset( $actions['trash'] );
-				unset( $actions['inline hide-if-no-js'] );
-			}
-
-			$actions['duplicate'] = sprintf(
-				'<a href="%1$s">%2$s</a>',
-				esc_url(
-					wp_nonce_url(
-						add_query_arg(
-							array(
-								'getpaid-admin-action' => 'duplicate_form',
-								'form_id'              => $post->ID,
-							)
-						),
-						'getpaid-nonce',
-						'getpaid-nonce'
-					)
-				),
-				esc_html( __( 'Duplicate', 'invoicing' ) )
-			);
-
-			$actions['reset'] = sprintf(
-				'<a href="%1$s" style="color: #800">%2$s</a>',
-				esc_url(
-					wp_nonce_url(
-						add_query_arg(
-							array(
-								'getpaid-admin-action' => 'reset_form_stats',
-								'form_id'              => $post->ID,
-							)
-						),
-						'getpaid-nonce',
-						'getpaid-nonce'
-					)
-				),
-				esc_html( __( 'Reset Stats', 'invoicing' ) )
-			);
-		}
-
-		// Link to item payment form.
-		if ( 'wpi_item' == $post->post_type ) {
-			if ( getpaid_item_type_supports( get_post_meta( $post->ID, '_wpinv_type', true ), 'buy_now' ) ) {
-				$actions['buy'] = sprintf(
-					'<a href="%1$s">%2$s</a>',
-					esc_url( getpaid_embed_url( false, $post->ID . '|0' ) ),
-					esc_html( __( 'Buy', 'invoicing' ) )
-				);
-			}
-		}
-
-		return $actions;
-	}
-
-	/**
+     * Hook in methods.
+     */
+    public static function init() {
+
+        // Init metaboxes.
+        GetPaid_Metaboxes::init();
+
+        // Filter the post updated messages.
+        add_filter( 'post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages' );
+
+        // Filter post actions.
+        add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2 );
+        add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::filter_invoice_row_actions', 90, 2 );
+
+        // Invoice table columns.
+        add_filter( 'manage_wpi_invoice_posts_columns', array( __CLASS__, 'invoice_columns' ), 100 );
+        add_action( 'manage_wpi_invoice_posts_custom_column', array( __CLASS__, 'display_invoice_columns' ), 10, 2 );
+        add_filter( 'bulk_actions-edit-wpi_invoice', array( __CLASS__, 'invoice_bulk_actions' ) );
+        add_filter( 'handle_bulk_actions-edit-wpi_invoice', array( __CLASS__, 'handle_invoice_bulk_actions' ), 10, 3 );
+
+        // Items table columns.
+        add_filter( 'manage_wpi_item_posts_columns', array( __CLASS__, 'item_columns' ), 100 );
+        add_filter( 'manage_edit-wpi_item_sortable_columns', array( __CLASS__, 'sortable_item_columns' ), 20 );
+        add_action( 'manage_wpi_item_posts_custom_column', array( __CLASS__, 'display_item_columns' ), 10, 2 );
+        add_action( 'restrict_manage_posts', array( __CLASS__, 'add_item_filters' ), 100 );
+        add_action( 'parse_query', array( __CLASS__, 'filter_item_query' ), 100 );
+        add_action( 'request', array( __CLASS__, 'reorder_items' ), 100 );
+
+        // Payment forms columns.
+        add_filter( 'manage_wpi_payment_form_posts_columns', array( __CLASS__, 'payment_form_columns' ), 100 );
+        add_action( 'manage_wpi_payment_form_posts_custom_column', array( __CLASS__, 'display_payment_form_columns' ), 10, 2 );
+        add_filter( 'display_post_states', array( __CLASS__, 'filter_payment_form_state' ), 10, 2 );
+
+        // Discount table columns.
+        add_filter( 'manage_wpi_discount_posts_columns', array( __CLASS__, 'discount_columns' ), 100 );
+        add_filter( 'bulk_actions-edit-wpi_discount', '__return_empty_array', 100 );
+
+        // Deleting posts.
+        add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
+        add_filter( 'display_post_states', array( __CLASS__, 'filter_discount_state' ), 10, 2 );
+
+        add_filter( 'display_post_states', array( __CLASS__, 'add_display_post_states' ), 10, 2 );
+    }
+
+    /**
+     * Post updated messages.
+     */
+    public static function post_updated_messages( $messages ) {
+        global $post;
+
+        $messages['wpi_discount'] = array(
+            0  => '',
+            1  => __( 'Discount updated.', 'invoicing' ),
+            2  => __( 'Custom field updated.', 'invoicing' ),
+            3  => __( 'Custom field deleted.', 'invoicing' ),
+            4  => __( 'Discount updated.', 'invoicing' ),
+            5  => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+            6  => __( 'Discount updated.', 'invoicing' ),
+            7  => __( 'Discount saved.', 'invoicing' ),
+            8  => __( 'Discount submitted.', 'invoicing' ),
+            9  => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
+            10 => __( 'Discount draft updated.', 'invoicing' ),
+        );
+
+        $messages['wpi_payment_form'] = array(
+            0  => '',
+            1  => __( 'Payment Form updated.', 'invoicing' ),
+            2  => __( 'Custom field updated.', 'invoicing' ),
+            3  => __( 'Custom field deleted.', 'invoicing' ),
+            4  => __( 'Payment Form updated.', 'invoicing' ),
+            5  => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+            6  => __( 'Payment Form updated.', 'invoicing' ),
+            7  => __( 'Payment Form saved.', 'invoicing' ),
+            8  => __( 'Payment Form submitted.', 'invoicing' ),
+            9  => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
+            10 => __( 'Payment Form draft updated.', 'invoicing' ),
+        );
+
+        return $messages;
+
+    }
+
+    /**
+     * Post row actions.
+     */
+    public static function post_row_actions( $actions, $post ) {
+
+        $post = get_post( $post );
+
+        // We do not want to edit the default payment form.
+        if ( 'wpi_payment_form' == $post->post_type ) {
+
+            if ( wpinv_get_default_payment_form() === $post->ID ) {
+                unset( $actions['trash'] );
+                unset( $actions['inline hide-if-no-js'] );
+            }
+
+            $actions['duplicate'] = sprintf(
+                '<a href="%1$s">%2$s</a>',
+                esc_url(
+                    wp_nonce_url(
+                        add_query_arg(
+                            array(
+                                'getpaid-admin-action' => 'duplicate_form',
+                                'form_id'              => $post->ID,
+                            )
+                        ),
+                        'getpaid-nonce',
+                        'getpaid-nonce'
+                    )
+                ),
+                esc_html( __( 'Duplicate', 'invoicing' ) )
+            );
+
+            $actions['reset'] = sprintf(
+                '<a href="%1$s" style="color: #800">%2$s</a>',
+                esc_url(
+                    wp_nonce_url(
+                        add_query_arg(
+                            array(
+                                'getpaid-admin-action' => 'reset_form_stats',
+                                'form_id'              => $post->ID,
+                            )
+                        ),
+                        'getpaid-nonce',
+                        'getpaid-nonce'
+                    )
+                ),
+                esc_html( __( 'Reset Stats', 'invoicing' ) )
+            );
+        }
+
+        // Link to item payment form.
+        if ( 'wpi_item' == $post->post_type ) {
+            if ( getpaid_item_type_supports( get_post_meta( $post->ID, '_wpinv_type', true ), 'buy_now' ) ) {
+                $actions['buy'] = sprintf(
+                    '<a href="%1$s">%2$s</a>',
+                    esc_url( getpaid_embed_url( false, $post->ID . '|0' ) ),
+                    esc_html( __( 'Buy', 'invoicing' ) )
+                );
+            }
+        }
+
+        return $actions;
+    }
+
+    /**
      * Remove bulk edit option from admin side quote listing
      *
      * @since    1.0.0
      * @param array $actions post actions
-	 * @param WP_Post $post
+     * @param WP_Post $post
      * @return array $actions actions without edit option
      */
     public static function filter_invoice_row_actions( $actions, $post ) {
 
         if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
 
-			$actions = array();
-			$invoice = new WPInv_Invoice( $post );
-
-			$actions['edit'] = sprintf(
-				'<a href="%1$s">%2$s</a>',
-				esc_url( get_edit_post_link( $invoice->get_id() ) ),
-				esc_html( __( 'Edit', 'invoicing' ) )
-			);
-
-			if ( ! $invoice->is_draft() ) {
-
-				$actions['view'] = sprintf(
-					'<a href="%1$s">%2$s</a>',
-					esc_url( $invoice->get_view_url() ),
-					sprintf(
-						// translators: %s is the invoice type
-						esc_html__( 'View %s', 'invoicing' ),
-						getpaid_get_post_type_label( $invoice->get_post_type(), false )
-					)
-				);
-
-				$actions['send'] = sprintf(
-					'<a href="%1$s">%2$s</a>',
-					esc_url(
-						wp_nonce_url(
-							add_query_arg(
-								array(
-									'getpaid-admin-action' => 'send_invoice',
-									'invoice_id'           => $invoice->get_id(),
-								)
-							),
-							'getpaid-nonce',
-							'getpaid-nonce'
-						)
-					),
-					esc_html( __( 'Send to Customer', 'invoicing' ) )
-				);
-
-			}
-
-			$actions['duplicate'] = sprintf(
-				'<a href="%1$s">%2$s</a>',
-				esc_url(
-					wp_nonce_url(
-						add_query_arg(
-							array(
-								'getpaid-admin-action' => 'duplicate_invoice',
-								'invoice_id'           => $post->ID,
-							)
-						),
-						'getpaid-nonce',
-						'getpaid-nonce'
-					)
-				),
-				esc_html( __( 'Duplicate', 'invoicing' ) )
-			);
+            $actions = array();
+            $invoice = new WPInv_Invoice( $post );
+
+            $actions['edit'] = sprintf(
+                '<a href="%1$s">%2$s</a>',
+                esc_url( get_edit_post_link( $invoice->get_id() ) ),
+                esc_html( __( 'Edit', 'invoicing' ) )
+            );
+
+            if ( ! $invoice->is_draft() ) {
+
+                $actions['view'] = sprintf(
+                    '<a href="%1$s">%2$s</a>',
+                    esc_url( $invoice->get_view_url() ),
+                    sprintf(
+                        // translators: %s is the invoice type
+                        esc_html__( 'View %s', 'invoicing' ),
+                        getpaid_get_post_type_label( $invoice->get_post_type(), false )
+                    )
+                );
+
+                $actions['send'] = sprintf(
+                    '<a href="%1$s">%2$s</a>',
+                    esc_url(
+                        wp_nonce_url(
+                            add_query_arg(
+                                array(
+                                    'getpaid-admin-action' => 'send_invoice',
+                                    'invoice_id'           => $invoice->get_id(),
+                                )
+                            ),
+                            'getpaid-nonce',
+                            'getpaid-nonce'
+                        )
+                    ),
+                    esc_html( __( 'Send to Customer', 'invoicing' ) )
+                );
+
+            }
+
+            $actions['duplicate'] = sprintf(
+                '<a href="%1$s">%2$s</a>',
+                esc_url(
+                    wp_nonce_url(
+                        add_query_arg(
+                            array(
+                                'getpaid-admin-action' => 'duplicate_invoice',
+                                'invoice_id'           => $post->ID,
+                            )
+                        ),
+                        'getpaid-nonce',
+                        'getpaid-nonce'
+                    )
+                ),
+                esc_html( __( 'Duplicate', 'invoicing' ) )
+            );
 
         }
 
         return $actions;
-	}
-
-	/**
-	 * Returns an array of invoice table columns.
-	 */
-	public static function invoice_columns( $columns ) {
-
-		$columns = array(
-			'cb'           => $columns['cb'],
-			'number'       => __( 'Invoice', 'invoicing' ),
-			'customer'     => __( 'Customer', 'invoicing' ),
-			'invoice_date' => __( 'Created', 'invoicing' ),
-			'payment_date' => __( 'Completed', 'invoicing' ),
-			'amount'       => __( 'Amount', 'invoicing' ),
-			'recurring'    => __( 'Recurring', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
-		);
-
-		return apply_filters( 'wpi_invoice_table_columns', $columns );
-	}
-
-	/**
-	 * Displays invoice table columns.
-	 */
-	public static function display_invoice_columns( $column_name, $post_id ) {
-
-		$invoice = new WPInv_Invoice( $post_id );
-
-		switch ( $column_name ) {
-
-			case 'invoice_date':
-				$date_time = esc_attr( $invoice->get_created_date() );
-				$date      = esc_html( getpaid_format_date_value( $date_time, '&mdash;', true ) );
-				echo wp_kses_post( "<span title='$date_time'>$date</span>" );
-				break;
-
-			case 'payment_date':
-				if ( $invoice->is_paid() ) {
-					$date_time = esc_attr( $invoice->get_completed_date() );
-					$date      = esc_html( getpaid_format_date_value( $date_time, '&mdash;', true ) );
-					echo wp_kses_post( "<span title='$date_time'>$date</span>" );
-				} else {
-					echo '&mdash;';
-				}
-
-				break;
-
-			case 'amount':
-				$amount = $invoice->get_total();
-				$formated_amount = wp_kses_post( wpinv_price( $amount, $invoice->get_currency() ) );
-
-				if ( $invoice->is_refunded() ) {
-					$refunded_amount = wpinv_price( 0, $invoice->get_currency() );
-					echo wp_kses_post( "<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>" );
-				} else {
-
-					$discount = $invoice->get_total_discount();
-
-					if ( ! empty( $discount ) ) {
-						$new_amount = wpinv_price( $amount + $discount, $invoice->get_currency() );
-						echo wp_kses_post( "<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>" );
-					} else {
-						echo wp_kses_post( $formated_amount );
-					}
-				}
-
-				break;
-
-			case 'status':
-				$status       = esc_html( $invoice->get_status() );
-				$status_label = esc_html( $invoice->get_status_nicename() );
-
-				// If it is paid, show the gateway title.
-				if ( $invoice->is_paid() ) {
-					$gateway = esc_html( $invoice->get_gateway_title() );
-					$gateway = wp_sprintf( esc_attr__( 'Paid via %s', 'invoicing' ), esc_html( $gateway ) );
-
-					echo wp_kses_post( "<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>" );
-				} else {
-					echo wp_kses_post( "<mark class='getpaid-invoice-status $status'><span>$status_label</span></mark>" );
-				}
-
-				// If it is not paid, display the overdue and view status.
-				if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
-
-					// Invoice view status.
-					if ( wpinv_is_invoice_viewed( $invoice->get_id() ) ) {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="' . esc_attr__( 'Viewed by Customer', 'invoicing' ) . '"></i>';
-					} else {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="' . esc_attr__( 'Not Viewed by Customer', 'invoicing' ) . '"></i>';
-					}
-
-					// Display the overview status.
-					if ( wpinv_get_option( 'overdue_active' ) ) {
-						$due_date = $invoice->get_due_date();
-						$fomatted = getpaid_format_date( $due_date );
-
-						if ( ! empty( $fomatted ) ) {
-							$date = wp_sprintf(
-								// translators: %s is the due date.
-								__( 'Due %s', 'invoicing' ),
-								$fomatted
-							);
-							echo wp_kses_post( "<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>" );
-						}
-					}
-				}
-
-				break;
-
-			case 'recurring':
-				if ( $invoice->is_recurring() ) {
-					echo '<i class="fa fa-check" style="color:#43850a;"></i>';
-				} else {
-					echo '<i class="fa fa-times" style="color:#616161;"></i>';
-				}
-				break;
-
-			case 'number':
-				$edit_link       = esc_url( get_edit_post_link( $invoice->get_id() ) );
-				$invoice_number  = esc_html( $invoice->get_number() );
-				$invoice_details = esc_attr__( 'View Invoice Details', 'invoicing' );
-
-				echo wp_kses_post( "<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>" );
-
-				do_action( 'getpaid_admin_table_invoice_number_column', $invoice );
-				break;
-
-			case 'customer':
-				$customer_name = $invoice->get_user_full_name();
-
-				if ( empty( $customer_name ) ) {
-					$customer_name = $invoice->get_email();
-				}
-
-				if ( ! empty( $customer_name ) ) {
-					$customer_details = esc_attr__( 'View Customer Details', 'invoicing' );
-					$view_link        = esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), admin_url( 'user-edit.php' ) ) );
-					echo wp_kses_post( "<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>" );
-				} else {
-					echo '<div>&mdash;</div>';
-				}
-
-				break;
-
-		}
-
-	}
-
-	/**
-	 * Displays invoice bulk actions.
-	 */
-	public static function invoice_bulk_actions( $actions ) {
-		$actions['resend-invoice'] = __( 'Send to Customer', 'invoicing' );
-		return $actions;
-	}
-
-	/**
-	 * Processes invoice bulk actions.
-	 */
-	public static function handle_invoice_bulk_actions( $redirect_url, $action, $post_ids ) {
-
-		if ( 'resend-invoice' === $action ) {
-			foreach ( $post_ids as $post_id ) {
-				getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $post_id ), true );
-			}
-		}
-
-		return $redirect_url;
-
-	}
-
-	/**
-	 * Returns an array of payment forms table columns.
-	 */
-	public static function payment_form_columns( $columns ) {
-
-		$columns = array(
-			'cb'        => $columns['cb'],
-			'title'     => __( 'Name', 'invoicing' ),
-			'shortcode' => __( 'Shortcode', 'invoicing' ),
-			'earnings'  => __( 'Revenue', 'invoicing' ),
-			'refunds'   => __( 'Refunded', 'invoicing' ),
-			'items'     => __( 'Items', 'invoicing' ),
-			'date'      => __( 'Date', 'invoicing' ),
-		);
-
-		return apply_filters( 'wpi_payment_form_table_columns', $columns );
-
-	}
-
-	/**
-	 * Displays payment form table columns.
-	 */
-	public static function display_payment_form_columns( $column_name, $post_id ) {
-
-		// Retrieve the payment form.
-		$form = new GetPaid_Payment_Form( $post_id );
-
-		switch ( $column_name ) {
-
-			case 'earnings':
-				echo wp_kses_post( wpinv_price( $form->get_earned() ) );
-				break;
-
-			case 'refunds':
-				echo wp_kses_post( wpinv_price( $form->get_refunded() ) );
-				break;
-
-			case 'refunds':
-				echo wp_kses_post( wpinv_price( $form->get_refunded() ) );
-				break;
-
-			case 'shortcode':
-				if ( $form->is_default() ) {
-					echo '&mdash;';
-				} else {
-					echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr( $form->get_id() ) . ']" style="width: 100%;" readonly/>';
-				}
-
-				break;
+    }
+
+    /**
+     * Returns an array of invoice table columns.
+     */
+    public static function invoice_columns( $columns ) {
+
+        $columns = array(
+            'cb'           => $columns['cb'],
+            'number'       => __( 'Invoice', 'invoicing' ),
+            'customer'     => __( 'Customer', 'invoicing' ),
+            'invoice_date' => __( 'Created', 'invoicing' ),
+            'payment_date' => __( 'Completed', 'invoicing' ),
+            'amount'       => __( 'Amount', 'invoicing' ),
+            'recurring'    => __( 'Recurring', 'invoicing' ),
+            'status'       => __( 'Status', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpi_invoice_table_columns', $columns );
+    }
+
+    /**
+     * Displays invoice table columns.
+     */
+    public static function display_invoice_columns( $column_name, $post_id ) {
+
+        $invoice = new WPInv_Invoice( $post_id );
+
+        switch ( $column_name ) {
+
+            case 'invoice_date':
+                $date_time = esc_attr( $invoice->get_created_date() );
+                $date      = esc_html( getpaid_format_date_value( $date_time, '&mdash;', true ) );
+                echo wp_kses_post( "<span title='$date_time'>$date</span>" );
+                break;
+
+            case 'payment_date':
+                if ( $invoice->is_paid() ) {
+                    $date_time = esc_attr( $invoice->get_completed_date() );
+                    $date      = esc_html( getpaid_format_date_value( $date_time, '&mdash;', true ) );
+                    echo wp_kses_post( "<span title='$date_time'>$date</span>" );
+                } else {
+                    echo '&mdash;';
+                }
+
+                break;
+
+            case 'amount':
+                $amount = $invoice->get_total();
+                $formated_amount = wp_kses_post( wpinv_price( $amount, $invoice->get_currency() ) );
+
+                if ( $invoice->is_refunded() ) {
+                    $refunded_amount = wpinv_price( 0, $invoice->get_currency() );
+                    echo wp_kses_post( "<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>" );
+                } else {
+
+                    $discount = $invoice->get_total_discount();
+
+                    if ( ! empty( $discount ) ) {
+                        $new_amount = wpinv_price( $amount + $discount, $invoice->get_currency() );
+                        echo wp_kses_post( "<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>" );
+                    } else {
+                        echo wp_kses_post( $formated_amount );
+                    }
+                }
+
+                break;
+
+            case 'status':
+                $status       = esc_html( $invoice->get_status() );
+                $status_label = esc_html( $invoice->get_status_nicename() );
+
+                // If it is paid, show the gateway title.
+                if ( $invoice->is_paid() ) {
+                    $gateway = esc_html( $invoice->get_gateway_title() );
+                    $gateway = wp_sprintf( esc_attr__( 'Paid via %s', 'invoicing' ), esc_html( $gateway ) );
+
+                    echo wp_kses_post( "<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>" );
+                } else {
+                    echo wp_kses_post( "<mark class='getpaid-invoice-status $status'><span>$status_label</span></mark>" );
+                }
+
+                // If it is not paid, display the overdue and view status.
+                if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+
+                    // Invoice view status.
+                    if ( wpinv_is_invoice_viewed( $invoice->get_id() ) ) {
+                        echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="' . esc_attr__( 'Viewed by Customer', 'invoicing' ) . '"></i>';
+                    } else {
+                        echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="' . esc_attr__( 'Not Viewed by Customer', 'invoicing' ) . '"></i>';
+                    }
+
+                    // Display the overview status.
+                    if ( wpinv_get_option( 'overdue_active' ) ) {
+                        $due_date = $invoice->get_due_date();
+                        $fomatted = getpaid_format_date( $due_date );
+
+                        if ( ! empty( $fomatted ) ) {
+                            $date = wp_sprintf(
+                                // translators: %s is the due date.
+                                __( 'Due %s', 'invoicing' ),
+                                $fomatted
+                            );
+                            echo wp_kses_post( "<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>" );
+                        }
+                    }
+                }
+
+                break;
+
+            case 'recurring':
+                if ( $invoice->is_recurring() ) {
+                    echo '<i class="fa fa-check" style="color:#43850a;"></i>';
+                } else {
+                    echo '<i class="fa fa-times" style="color:#616161;"></i>';
+                }
+                break;
+
+            case 'number':
+                $edit_link       = esc_url( get_edit_post_link( $invoice->get_id() ) );
+                $invoice_number  = esc_html( $invoice->get_number() );
+                $invoice_details = esc_attr__( 'View Invoice Details', 'invoicing' );
+
+                echo wp_kses_post( "<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>" );
+
+                do_action( 'getpaid_admin_table_invoice_number_column', $invoice );
+                break;
+
+            case 'customer':
+                $customer_name = $invoice->get_user_full_name();
+
+                if ( empty( $customer_name ) ) {
+                    $customer_name = $invoice->get_email();
+                }
+
+                if ( ! empty( $customer_name ) ) {
+                    $customer_details = esc_attr__( 'View Customer Details', 'invoicing' );
+                    $view_link        = esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), admin_url( 'user-edit.php' ) ) );
+                    echo wp_kses_post( "<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>" );
+                } else {
+                    echo '<div>&mdash;</div>';
+                }
+
+                break;
 
-			case 'items':
-				$items = $form->get_items();
-
-				if ( $form->is_default() || empty( $items ) ) {
-					echo '&mdash;';
-					return;
-				}
-
-				$_items = array();
-
-				foreach ( $items as $item ) {
-					$url = $item->get_edit_url();
-
-					if ( empty( $url ) ) {
-						$_items[] = esc_html( $item->get_name() );
-					} else {
-						$_items[] = sprintf(
-							'<a href="%s">%s</a>',
-							esc_url( $url ),
-							esc_html( $item->get_name() )
-						);
-					}
+        }
+
+    }
+
+    /**
+     * Displays invoice bulk actions.
+     */
+    public static function invoice_bulk_actions( $actions ) {
+        $actions['resend-invoice'] = __( 'Send to Customer', 'invoicing' );
+        return $actions;
+    }
+
+    /**
+     * Processes invoice bulk actions.
+     */
+    public static function handle_invoice_bulk_actions( $redirect_url, $action, $post_ids ) {
+
+        if ( 'resend-invoice' === $action ) {
+            foreach ( $post_ids as $post_id ) {
+                getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $post_id ), true );
+            }
+        }
+
+        return $redirect_url;
+
+    }
+
+    /**
+     * Returns an array of payment forms table columns.
+     */
+    public static function payment_form_columns( $columns ) {
+
+        $columns = array(
+            'cb'        => $columns['cb'],
+            'title'     => __( 'Name', 'invoicing' ),
+            'shortcode' => __( 'Shortcode', 'invoicing' ),
+            'earnings'  => __( 'Revenue', 'invoicing' ),
+            'refunds'   => __( 'Refunded', 'invoicing' ),
+            'items'     => __( 'Items', 'invoicing' ),
+            'date'      => __( 'Date', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpi_payment_form_table_columns', $columns );
+
+    }
+
+    /**
+     * Displays payment form table columns.
+     */
+    public static function display_payment_form_columns( $column_name, $post_id ) {
+
+        // Retrieve the payment form.
+        $form = new GetPaid_Payment_Form( $post_id );
+
+        switch ( $column_name ) {
+
+            case 'earnings':
+                echo wp_kses_post( wpinv_price( $form->get_earned() ) );
+                break;
+
+            case 'refunds':
+                echo wp_kses_post( wpinv_price( $form->get_refunded() ) );
+                break;
+
+            case 'refunds':
+                echo wp_kses_post( wpinv_price( $form->get_refunded() ) );
+                break;
+
+            case 'shortcode':
+                if ( $form->is_default() ) {
+                    echo '&mdash;';
+                } else {
+                    echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr( $form->get_id() ) . ']" style="width: 100%;" readonly/>';
+                }
+
+                break;
+
+            case 'items':
+                $items = $form->get_items();
+
+                if ( $form->is_default() || empty( $items ) ) {
+                    echo '&mdash;';
+                    return;
+                }
+
+                $_items = array();
+
+                foreach ( $items as $item ) {
+                    $url = $item->get_edit_url();
+
+                    if ( empty( $url ) ) {
+                        $_items[] = esc_html( $item->get_name() );
+                    } else {
+                        $_items[] = sprintf(
+                            '<a href="%s">%s</a>',
+                            esc_url( $url ),
+                            esc_html( $item->get_name() )
+                        );
+                    }
 }
 
-				echo wp_kses_post( implode( '<br>', $_items ) );
+                echo wp_kses_post( implode( '<br>', $_items ) );
+
+                break;
+
+        }
+
+    }
+
+    /**
+     * Filters post states.
+     */
+    public static function filter_payment_form_state( $post_states, $post ) {
+
+        if ( 'wpi_payment_form' === $post->post_type && wpinv_get_default_payment_form() === $post->ID ) {
+            $post_states['default_form'] = __( 'Default Payment Form', 'invoicing' );
+        }
+
+        return $post_states;
+
+    }
+
+    /**
+     * Returns an array of coupon table columns.
+     */
+    public static function discount_columns( $columns ) {
+
+        $columns = array(
+            'cb'          => $columns['cb'],
+            'title'       => __( 'Name', 'invoicing' ),
+            'code'        => __( 'Code', 'invoicing' ),
+            'amount'      => __( 'Amount', 'invoicing' ),
+            'usage'       => __( 'Usage / Limit', 'invoicing' ),
+            'start_date'  => __( 'Start Date', 'invoicing' ),
+            'expiry_date' => __( 'Expiry Date', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpi_discount_table_columns', $columns );
+    }
 
-				break;
+    /**
+     * Filters post states.
+     */
+    public static function filter_discount_state( $post_states, $post ) {
 
-		}
+        if ( 'wpi_discount' === $post->post_type ) {
 
-	}
+            $discount = new WPInv_Discount( $post );
 
-	/**
-	 * Filters post states.
-	 */
-	public static function filter_payment_form_state( $post_states, $post ) {
+            $status = $discount->is_expired() ? 'expired' : $discount->get_status();
 
-		if ( 'wpi_payment_form' === $post->post_type && wpinv_get_default_payment_form() === $post->ID ) {
-			$post_states['default_form'] = __( 'Default Payment Form', 'invoicing' );
-		}
+            if ( 'publish' !== $status ) {
+                return array(
+                    'discount_status' => wpinv_discount_status( $status ),
+                );
+            }
+
+            return array();
+
+        }
+
+        return $post_states;
 
-		return $post_states;
+    }
 
-	}
+    /**
+     * Returns an array of items table columns.
+     */
+    public static function item_columns( $columns ) {
+
+        $columns = array(
+            'cb'        => $columns['cb'],
+            'title'     => __( 'Name', 'invoicing' ),
+            'price'     => __( 'Price', 'invoicing' ),
+            'vat_rule'  => __( 'Tax Rule', 'invoicing' ),
+            'vat_class' => __( 'Tax Class', 'invoicing' ),
+            'type'      => __( 'Type', 'invoicing' ),
+            'shortcode' => __( 'Shortcode', 'invoicing' ),
+        );
+
+        if ( ! wpinv_use_taxes() ) {
+            unset( $columns['vat_rule'] );
+            unset( $columns['vat_class'] );
+        }
 
-	/**
-	 * Returns an array of coupon table columns.
-	 */
-	public static function discount_columns( $columns ) {
+        return apply_filters( 'wpi_item_table_columns', $columns );
+    }
 
-		$columns = array(
-			'cb'          => $columns['cb'],
-			'title'       => __( 'Name', 'invoicing' ),
-			'code'        => __( 'Code', 'invoicing' ),
-			'amount'      => __( 'Amount', 'invoicing' ),
-			'usage'       => __( 'Usage / Limit', 'invoicing' ),
-			'start_date'  => __( 'Start Date', 'invoicing' ),
-			'expiry_date' => __( 'Expiry Date', 'invoicing' ),
-		);
+    /**
+     * Returns an array of sortable items table columns.
+     */
+    public static function sortable_item_columns( $columns ) {
+
+        return array_merge(
+            $columns,
+            array(
+                'price'     => 'price',
+                'vat_rule'  => 'vat_rule',
+                'vat_class' => 'vat_class',
+                'type'      => 'type',
+            )
+        );
 
-		return apply_filters( 'wpi_discount_table_columns', $columns );
-	}
+    }
 
-	/**
-	 * Filters post states.
-	 */
-	public static function filter_discount_state( $post_states, $post ) {
+    /**
+     * Displays items table columns.
+     */
+    public static function display_item_columns( $column_name, $post_id ) {
 
-		if ( 'wpi_discount' === $post->post_type ) {
+        $item = new WPInv_Item( $post_id );
 
-			$discount = new WPInv_Discount( $post );
+        switch ( $column_name ) {
 
-			$status = $discount->is_expired() ? 'expired' : $discount->get_status();
+            case 'price':
+                if ( ! $item->is_recurring() ) {
+                    echo wp_kses_post( $item->get_the_price() );
+                    break;
+                }
 
-			if ( 'publish' !== $status ) {
-				return array(
-					'discount_status' => wpinv_discount_status( $status ),
-				);
-			}
+                $price = wp_sprintf(
+                    __( '%1$s / %2$s', 'invoicing' ),
+                    $item->get_the_price(),
+                    getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' )
+                );
 
-			return array();
+                if ( $item->get_the_price() == $item->get_the_initial_price() ) {
+                    echo wp_kses_post( $price );
+                    break;
+                }
 
-		}
+                echo wp_kses_post( $item->get_the_initial_price() );
 
-		return $post_states;
+                echo '<span class="meta">' . wp_sprintf( esc_html__( 'then %s', 'invoicing' ), wp_kses_post( $price ) ) . '</span>';
+                break;
 
-	}
+            case 'vat_rule':
+                echo wp_kses_post( getpaid_get_tax_rule_label( $item->get_vat_rule() ) );
+                break;
 
-	/**
-	 * Returns an array of items table columns.
-	 */
-	public static function item_columns( $columns ) {
+            case 'vat_class':
+                echo wp_kses_post( getpaid_get_tax_class_label( $item->get_vat_class() ) );
+                break;
 
-		$columns = array(
-			'cb'        => $columns['cb'],
-			'title'     => __( 'Name', 'invoicing' ),
-			'price'     => __( 'Price', 'invoicing' ),
-			'vat_rule'  => __( 'Tax Rule', 'invoicing' ),
-			'vat_class' => __( 'Tax Class', 'invoicing' ),
-			'type'      => __( 'Type', 'invoicing' ),
-			'shortcode' => __( 'Shortcode', 'invoicing' ),
-		);
+            case 'shortcode':
+                if ( $item->is_type( array( '', 'fee', 'custom' ) ) ) {
+                    echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr( $item->get_id() ) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
+                } else {
+                    echo '&mdash;';
+                }
 
-		if ( ! wpinv_use_taxes() ) {
-			unset( $columns['vat_rule'] );
-			unset( $columns['vat_class'] );
-		}
+                break;
 
-		return apply_filters( 'wpi_item_table_columns', $columns );
-	}
+            case 'type':
+                echo wp_kses_post( wpinv_item_type( $item->get_id() ) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>' );
+                break;
 
-	/**
-	 * Returns an array of sortable items table columns.
-	 */
-	public static function sortable_item_columns( $columns ) {
-
-		return array_merge(
-			$columns,
-			array(
-				'price'     => 'price',
-				'vat_rule'  => 'vat_rule',
-				'vat_class' => 'vat_class',
-				'type'      => 'type',
-			)
-		);
-
-	}
-
-	/**
-	 * Displays items table columns.
-	 */
-	public static function display_item_columns( $column_name, $post_id ) {
-
-		$item = new WPInv_Item( $post_id );
-
-		switch ( $column_name ) {
-
-			case 'price':
-				if ( ! $item->is_recurring() ) {
-					echo wp_kses_post( $item->get_the_price() );
-					break;
-				}
-
-				$price = wp_sprintf(
-					__( '%1$s / %2$s', 'invoicing' ),
-					$item->get_the_price(),
-					getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' )
-				);
-
-				if ( $item->get_the_price() == $item->get_the_initial_price() ) {
-					echo wp_kses_post( $price );
-					break;
-				}
-
-				echo wp_kses_post( $item->get_the_initial_price() );
-
-				echo '<span class="meta">' . wp_sprintf( esc_html__( 'then %s', 'invoicing' ), wp_kses_post( $price ) ) . '</span>';
-				break;
-
-			case 'vat_rule':
-				echo wp_kses_post( getpaid_get_tax_rule_label( $item->get_vat_rule() ) );
-				break;
-
-			case 'vat_class':
-				echo wp_kses_post( getpaid_get_tax_class_label( $item->get_vat_class() ) );
-				break;
-
-			case 'shortcode':
-				if ( $item->is_type( array( '', 'fee', 'custom' ) ) ) {
-					echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr( $item->get_id() ) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
-				} else {
-					echo '&mdash;';
-				}
-
-				break;
-
-			case 'type':
-				echo wp_kses_post( wpinv_item_type( $item->get_id() ) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>' );
-				break;
-
-		}
-
-	}
-
-	/**
-	 * Lets users filter items using taxes.
-	 */
-	public static function add_item_filters( $post_type ) {
-
-		// Abort if we're not dealing with items.
-		if ( 'wpi_item' !== $post_type ) {
-			return;
-		}
-
-		// Filter by vat rules.
-		if ( wpinv_use_taxes() ) {
-
-			// Sanitize selected vat rule.
-			$vat_rule   = '';
-			$vat_rules  = getpaid_get_tax_rules();
-			if ( isset( $_GET['vat_rule'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$vat_rule   = sanitize_text_field( $_GET['vat_rule'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			}
-
-			// Filter by VAT rule.
-			wpinv_html_select(
-				array(
-					'options'          => array_merge(
-						array(
-							'' => __( 'All Tax Rules', 'invoicing' ),
-						),
-						$vat_rules
-					),
-					'name'             => 'vat_rule',
-					'id'               => 'vat_rule',
-					'selected'         => in_array( $vat_rule, array_keys( $vat_rules ), true ) ? $vat_rule : '',
-					'show_option_all'  => false,
-					'show_option_none' => false,
-				)
-			);
-
-			// Filter by VAT class.
-
-			// Sanitize selected vat rule.
-			$vat_class   = '';
-			$vat_classes = getpaid_get_tax_classes();
-			if ( isset( $_GET['vat_class'] ) ) {  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$vat_class   = sanitize_text_field( $_GET['vat_class'] );  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			}
-
-			wpinv_html_select(
-				array(
-					'options'          => array_merge(
-						array(
-							'' => __( 'All Tax Classes', 'invoicing' ),
-						),
-						$vat_classes
-					),
-					'name'             => 'vat_class',
-					'id'               => 'vat_class',
-					'selected'         => in_array( $vat_class, array_keys( $vat_classes ), true ) ? $vat_class : '',
-					'show_option_all'  => false,
-					'show_option_none' => false,
-				)
-			);
-
-		}
-
-		// Filter by item type.
-		$type   = '';
-		if ( isset( $_GET['type'] ) ) {  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$type   = sanitize_text_field( $_GET['type'] );  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		}
-
-		wpinv_html_select(
-			array(
-				'options'          => array_merge(
-					array(
-						'' => __( 'All item types', 'invoicing' ),
-					),
-					wpinv_get_item_types()
-				),
-				'name'             => 'type',
-				'id'               => 'type',
-				'selected'         => in_array( $type, wpinv_item_types(), true ) ? $type : '',
-				'show_option_all'  => false,
-				'show_option_none' => false,
-			)
-		);
-
-	}
-
-	/**
-	 * Filters the item query.
-	 */
-	public static function filter_item_query( $query ) {
-
-		// modify the query only if it admin and main query.
-		if ( ! ( is_admin() && $query->is_main_query() ) ) {
-			return $query;
-		}
-
-		// we want to modify the query for our items.
-		if ( empty( $query->query['post_type'] ) || 'wpi_item' !== $query->query['post_type'] ) {
-			return $query;
-		}
-
-		if ( empty( $query->query_vars['meta_query'] ) ) {
-			$query->query_vars['meta_query'] = array();
-		}
-
-		// Filter vat rule type
+        }
+
+    }
+
+    /**
+     * Lets users filter items using taxes.
+     */
+    public static function add_item_filters( $post_type ) {
+
+        // Abort if we're not dealing with items.
+        if ( 'wpi_item' !== $post_type ) {
+            return;
+        }
+
+        // Filter by vat rules.
+        if ( wpinv_use_taxes() ) {
+
+            // Sanitize selected vat rule.
+            $vat_rule   = '';
+            $vat_rules  = getpaid_get_tax_rules();
+            if ( isset( $_GET['vat_rule'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                $vat_rule   = sanitize_text_field( $_GET['vat_rule'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            }
+
+            // Filter by VAT rule.
+            wpinv_html_select(
+                array(
+                    'options'          => array_merge(
+                        array(
+                            '' => __( 'All Tax Rules', 'invoicing' ),
+                        ),
+                        $vat_rules
+                    ),
+                    'name'             => 'vat_rule',
+                    'id'               => 'vat_rule',
+                    'selected'         => in_array( $vat_rule, array_keys( $vat_rules ), true ) ? $vat_rule : '',
+                    'show_option_all'  => false,
+                    'show_option_none' => false,
+                )
+            );
+
+            // Filter by VAT class.
+
+            // Sanitize selected vat rule.
+            $vat_class   = '';
+            $vat_classes = getpaid_get_tax_classes();
+            if ( isset( $_GET['vat_class'] ) ) {  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                $vat_class   = sanitize_text_field( $_GET['vat_class'] );  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            }
+
+            wpinv_html_select(
+                array(
+                    'options'          => array_merge(
+                        array(
+                            '' => __( 'All Tax Classes', 'invoicing' ),
+                        ),
+                        $vat_classes
+                    ),
+                    'name'             => 'vat_class',
+                    'id'               => 'vat_class',
+                    'selected'         => in_array( $vat_class, array_keys( $vat_classes ), true ) ? $vat_class : '',
+                    'show_option_all'  => false,
+                    'show_option_none' => false,
+                )
+            );
+
+        }
+
+        // Filter by item type.
+        $type   = '';
+        if ( isset( $_GET['type'] ) ) {  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            $type   = sanitize_text_field( $_GET['type'] );  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        }
+
+        wpinv_html_select(
+            array(
+                'options'          => array_merge(
+                    array(
+                        '' => __( 'All item types', 'invoicing' ),
+                    ),
+                    wpinv_get_item_types()
+                ),
+                'name'             => 'type',
+                'id'               => 'type',
+                'selected'         => in_array( $type, wpinv_item_types(), true ) ? $type : '',
+                'show_option_all'  => false,
+                'show_option_none' => false,
+            )
+        );
+
+    }
+
+    /**
+     * Filters the item query.
+     */
+    public static function filter_item_query( $query ) {
+
+        // modify the query only if it admin and main query.
+        if ( ! ( is_admin() && $query->is_main_query() ) ) {
+            return $query;
+        }
+
+        // we want to modify the query for our items.
+        if ( empty( $query->query['post_type'] ) || 'wpi_item' !== $query->query['post_type'] ) {
+            return $query;
+        }
+
+        if ( empty( $query->query_vars['meta_query'] ) ) {
+            $query->query_vars['meta_query'] = array();
+        }
+
+        // Filter vat rule type
         if ( ! empty( $_GET['vat_rule'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_vat_rule',
@@ -769,101 +769,101 @@ 
                 'value'   => sanitize_text_field( $_GET['type'] ), // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 'compare' => '=',
             );
-		}
-
-		$query->query_vars['meta_query'][] = array(
-			'key'     => '_wpinv_one_time',
-			'compare' => 'NOT EXISTS',
-		);
-	}
-
-	/**
-	 * Reorders items.
-	 */
-	public static function reorder_items( $vars ) {
-		global $typenow;
-
-		if ( 'wpi_item' !== $typenow || empty( $vars['orderby'] ) ) {
-			return $vars;
-		}
-
-		// By item type.
-		if ( 'type' === $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_type',
-					'orderby'  => 'meta_value',
-				)
-			);
-		}
-
-		// By vat class.
-		if ( 'vat_class' === $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_vat_class',
-					'orderby'  => 'meta_value',
-				)
-			);
-		}
-
-		// By vat rule.
-		if ( 'vat_rule' === $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_vat_rule',
-					'orderby'  => 'meta_value',
-				)
-			);
-		}
-
-		// By price.
-		if ( 'price' === $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_price',
-					'orderby'  => 'meta_value_num',
-				)
-			);
-		}
-
-		return $vars;
-
-	}
-
-	/**
-	 * Fired when deleting a post.
-	 */
-	public static function delete_post( $post_id ) {
-
-		switch ( get_post_type( $post_id ) ) {
-
-			case 'wpi_item':
-				do_action( 'getpaid_before_delete_item', new WPInv_Item( $post_id ) );
-				break;
-
-			case 'wpi_payment_form':
-				do_action( 'getpaid_before_delete_payment_form', new GetPaid_Payment_Form( $post_id ) );
-				break;
-
-			case 'wpi_discount':
-				do_action( 'getpaid_before_delete_discount', new WPInv_Discount( $post_id ) );
-				break;
-
-			case 'wpi_invoice':
-				$invoice = new WPInv_Invoice( $post_id );
-				do_action( 'getpaid_before_delete_invoice', $invoice );
-				$invoice->get_data_store()->delete_items( $invoice );
-				$invoice->get_data_store()->delete_special_fields( $invoice );
-				break;
-		}
-	}
-
-	/**
+        }
+
+        $query->query_vars['meta_query'][] = array(
+            'key'     => '_wpinv_one_time',
+            'compare' => 'NOT EXISTS',
+        );
+    }
+
+    /**
+     * Reorders items.
+     */
+    public static function reorder_items( $vars ) {
+        global $typenow;
+
+        if ( 'wpi_item' !== $typenow || empty( $vars['orderby'] ) ) {
+            return $vars;
+        }
+
+        // By item type.
+        if ( 'type' === $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_type',
+                    'orderby'  => 'meta_value',
+                )
+            );
+        }
+
+        // By vat class.
+        if ( 'vat_class' === $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_vat_class',
+                    'orderby'  => 'meta_value',
+                )
+            );
+        }
+
+        // By vat rule.
+        if ( 'vat_rule' === $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_vat_rule',
+                    'orderby'  => 'meta_value',
+                )
+            );
+        }
+
+        // By price.
+        if ( 'price' === $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_price',
+                    'orderby'  => 'meta_value_num',
+                )
+            );
+        }
+
+        return $vars;
+
+    }
+
+    /**
+     * Fired when deleting a post.
+     */
+    public static function delete_post( $post_id ) {
+
+        switch ( get_post_type( $post_id ) ) {
+
+            case 'wpi_item':
+                do_action( 'getpaid_before_delete_item', new WPInv_Item( $post_id ) );
+                break;
+
+            case 'wpi_payment_form':
+                do_action( 'getpaid_before_delete_payment_form', new GetPaid_Payment_Form( $post_id ) );
+                break;
+
+            case 'wpi_discount':
+                do_action( 'getpaid_before_delete_discount', new WPInv_Discount( $post_id ) );
+                break;
+
+            case 'wpi_invoice':
+                $invoice = new WPInv_Invoice( $post_id );
+                do_action( 'getpaid_before_delete_invoice', $invoice );
+                $invoice->get_data_store()->delete_items( $invoice );
+                $invoice->get_data_store()->delete_special_fields( $invoice );
+                break;
+        }
+    }
+
+    /**
      * Add a post display state for special GetPaid pages in the page list table.
      *
      * @param array   $post_states An array of post display states.
@@ -877,21 +877,21 @@ 
             $post_states['getpaid_success_page'] = __( 'GetPaid Receipt Page', 'invoicing' );
         }
 
-		foreach ( getpaid_get_invoice_post_types() as $post_type => $label ) {
+        foreach ( getpaid_get_invoice_post_types() as $post_type => $label ) {
 
-			if ( wpinv_get_option( "{$post_type}_history_page", 0 ) == $post->ID ) {
-				$post_states[ "getpaid_{$post_type}_history_page" ] = sprintf(
-					__( 'GetPaid %s History Page', 'invoicing' ),
-					$label
-				);
-			}
+            if ( wpinv_get_option( "{$post_type}_history_page", 0 ) == $post->ID ) {
+                $post_states[ "getpaid_{$post_type}_history_page" ] = sprintf(
+                    __( 'GetPaid %s History Page', 'invoicing' ),
+                    $label
+                );
+            }
 }
 
-		if ( wpinv_get_option( 'invoice_subscription_page', 0 ) == $post->ID ) {
+        if ( wpinv_get_option( 'invoice_subscription_page', 0 ) == $post->ID ) {
             $post_states['getpaid_invoice_subscription_page'] = __( 'GetPaid Subscription Page', 'invoicing' );
         }
 
-		if ( wpinv_get_option( 'checkout_page', 0 ) == $post->ID ) {
+        if ( wpinv_get_option( 'checkout_page', 0 ) == $post->ID ) {
             $post_states['getpaid_checkout_page'] = __( 'GetPaid Checkout Page', 'invoicing' );
         }
 

includes/wpinv-item-functions.php

Indentation +32 added lines, -32 removed lines

@@ -57,21 +57,21 @@ 
     $args = wp_parse_args(
         $args,
         array(
-			'status'     => array( 'publish' ),
-			'limit'      => get_option( 'posts_per_page' ),
-			'page'       => 1,
-			'exclude'    => array(),
-			'orderby'    => 'date',
-			'order'      => 'DESC',
-			'type'       => wpinv_item_types(),
-			'meta_query' => array(
+            'status'     => array( 'publish' ),
+            'limit'      => get_option( 'posts_per_page' ),
+            'page'       => 1,
+            'exclude'    => array(),
+            'orderby'    => 'date',
+            'order'      => 'DESC',
+            'type'       => wpinv_item_types(),
+            'meta_query' => array(
                 array(
                     'key'     => '_wpinv_one_time',
                     'compare' => 'NOT EXISTS',
                 ),
             ),
-			'return'     => 'objects',
-			'paginate'   => false,
+            'return'     => 'objects',
+            'paginate'   => false,
         )
     );
 
@@ -211,9 +211,9 @@ 
 
 function wpinv_get_item_types() {
     $item_types = array(
-		'custom' => __( 'Standard', 'invoicing' ),
-		'fee'    => __( 'Fee', 'invoicing' ),
-	);
+        'custom' => __( 'Standard', 'invoicing' ),
+        'fee'    => __( 'Fee', 'invoicing' ),
+    );
     return apply_filters( 'wpinv_get_item_types', $item_types );
 }
 
@@ -255,16 +255,16 @@ 
     $args = array();
     if ( $post_ids ) {
         $args = array(
-			'fields' => 'ids',
-		);
+            'fields' => 'ids',
+        );
     }
 
     $args = array_merge(
         $args,
         array(
             'post_type'  => 'wpi_item',
-			'orderby'    => 'rand',
-			'post_count' => $num,
+            'orderby'    => 'rand',
+            'post_count' => $num,
             'meta_query' => array(
                 array(
                     'key'     => '_wpinv_one_time',
@@ -439,10 +439,10 @@ 
     $bill_times_less = $bill_times - 1;
 
     if ( ! empty( $bill_times ) ) {
-		$bill_times = $item->get_recurring_interval() * $bill_times;
+        $bill_times = $item->get_recurring_interval() * $bill_times;
         $bill_times_less = getpaid_get_subscription_period_label( $item->get_recurring_period(), $bill_times - $item->get_recurring_interval() );
-		$bill_times = getpaid_get_subscription_period_label( $item->get_recurring_period(), $bill_times );
-	}
+        $bill_times = getpaid_get_subscription_period_label( $item->get_recurring_period(), $bill_times );
+    }
 
     if ( $item instanceof GetPaid_Form_Item && false === $_initial_price ) {
         $initial_price   = wpinv_price( $item->get_sub_total(), $currency );
@@ -587,19 +587,19 @@ 
  * @return bool Whether the item type supports the given feature.
  */
 function getpaid_item_type_supports( $item_type, $feature, $item_ID = 0 ) {
-	$supports = false;
+    $supports = false;
 
-	if ( ! is_scalar( $item_type ) ) {
-		return $supports;
-	}
+    if ( ! is_scalar( $item_type ) ) {
+        return $supports;
+    }
 
-	switch ( $feature ) {
-		case 'buy_now':
-			if ( '' === $item_type || 'fee' === $item_type || 'custom' === $item_type ) {
-				$supports = true;
-			}
-			break;
-	}
+    switch ( $feature ) {
+        case 'buy_now':
+            if ( '' === $item_type || 'fee' === $item_type || 'custom' === $item_type ) {
+                $supports = true;
+            }
+            break;
+    }
 
-	return apply_filters( 'getpaid_item_type_supports', $supports, $item_type, $feature, $item_ID );
+    return apply_filters( 'getpaid_item_type_supports', $supports, $item_type, $feature, $item_ID );
 }
\ No newline at end of file

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

Indentation +1268 added lines, -1268 removed lines

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

includes/admin/subscriptions.php

Indentation +482 added lines, -482 removed lines

@@ -14,7 +14,7 @@ 
  */
 function wpinv_subscriptions_page() {
 
-	?>
+    ?>
 
 	<div class="wrap">
 		<h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
@@ -22,28 +22,28 @@ 
 
 			<?php
 
-				// Verify user permissions.
-				if ( ! wpinv_current_user_can_manage_invoicing() ) {
+                // Verify user permissions.
+                if ( ! wpinv_current_user_can_manage_invoicing() ) {
 
-				aui()->alert(
+                aui()->alert(
                     array(
-						'type'    => 'danger',
-						'content' => __( 'You are not permitted to view this page.', 'invoicing' ),
-					),
-					true
+                        'type'    => 'danger',
+                        'content' => __( 'You are not permitted to view this page.', 'invoicing' ),
+                    ),
+                    true
                 );
 
-				} elseif ( ! empty( $_GET['id'] ) && is_numeric( $_GET['id'] ) ) {
+                } elseif ( ! empty( $_GET['id'] ) && is_numeric( $_GET['id'] ) ) {
 
-				// Display a single subscription.
-				wpinv_recurring_subscription_details();
-				} else {
+                // Display a single subscription.
+                wpinv_recurring_subscription_details();
+                } else {
 
-				// Display a list of available subscriptions.
-				getpaid_print_subscriptions_list();
-				}
+                // Display a list of available subscriptions.
+                getpaid_print_subscriptions_list();
+                }
 
-			?>
+            ?>
 
 		</div>
 	</div>
@@ -60,10 +60,10 @@ 
  */
 function getpaid_print_subscriptions_list() {
 
-	$subscribers_table = new WPInv_Subscriptions_List_Table();
-	$subscribers_table->prepare_items();
+    $subscribers_table = new WPInv_Subscriptions_List_Table();
+    $subscribers_table->prepare_items();
 
-	?>
+    ?>
 	<?php $subscribers_table->views(); ?>
 	<form id="subscribers-filter" class="bsui" method="get">
 		<input type="hidden" name="page" value="wpinv-subscriptions" />
@@ -82,42 +82,42 @@ 
  */
 function wpinv_recurring_subscription_details() {
 
-	// Fetch the subscription.
-	$sub = new WPInv_Subscription( (int) $_GET['id'] );
-	if ( ! $sub->exists() ) {
+    // Fetch the subscription.
+    $sub = new WPInv_Subscription( (int) $_GET['id'] );
+    if ( ! $sub->exists() ) {
 
-		aui()->alert(
-			array(
-				'type'    => 'danger',
-				'content' => __( 'Subscription not found.', 'invoicing' ),
-			),
-			true
-		);
+        aui()->alert(
+            array(
+                'type'    => 'danger',
+                'content' => __( 'Subscription not found.', 'invoicing' ),
+            ),
+            true
+        );
 
-		return;
-	}
+        return;
+    }
 
-	// Use metaboxes to display the subscription details.
-	add_meta_box( 'getpaid_admin_subscription_details_metabox', __( 'Subscription Details', 'invoicing' ), 'getpaid_admin_subscription_details_metabox', get_current_screen(), 'normal', 'high' );
-	add_meta_box( 'getpaid_admin_subscription_update_metabox', __( 'Change Status', 'invoicing' ), 'getpaid_admin_subscription_update_metabox', get_current_screen(), 'side' );
+    // Use metaboxes to display the subscription details.
+    add_meta_box( 'getpaid_admin_subscription_details_metabox', __( 'Subscription Details', 'invoicing' ), 'getpaid_admin_subscription_details_metabox', get_current_screen(), 'normal', 'high' );
+    add_meta_box( 'getpaid_admin_subscription_update_metabox', __( 'Change Status', 'invoicing' ), 'getpaid_admin_subscription_update_metabox', get_current_screen(), 'side' );
 
-	$subscription_id     = $sub->get_id();
-	$subscription_groups = getpaid_get_invoice_subscription_groups( $sub->get_parent_invoice_id() );
-	$subscription_group  = wp_list_filter( $subscription_groups, compact( 'subscription_id' ) );
+    $subscription_id     = $sub->get_id();
+    $subscription_groups = getpaid_get_invoice_subscription_groups( $sub->get_parent_invoice_id() );
+    $subscription_group  = wp_list_filter( $subscription_groups, compact( 'subscription_id' ) );
 
-	if ( 1 < count( $subscription_groups ) ) {
-		add_meta_box( 'getpaid_admin_subscription_related_subscriptions_metabox', __( 'Related Subscriptions', 'invoicing' ), 'getpaid_admin_subscription_related_subscriptions_metabox', get_current_screen(), 'advanced' );
-	}
+    if ( 1 < count( $subscription_groups ) ) {
+        add_meta_box( 'getpaid_admin_subscription_related_subscriptions_metabox', __( 'Related Subscriptions', 'invoicing' ), 'getpaid_admin_subscription_related_subscriptions_metabox', get_current_screen(), 'advanced' );
+    }
 
-	if ( ! empty( $subscription_group ) ) {
-		add_meta_box( 'getpaid_admin_subscription_item_details_metabox', __( 'Subscription Items', 'invoicing' ), 'getpaid_admin_subscription_item_details_metabox', get_current_screen(), 'normal', 'low' );
-	}
+    if ( ! empty( $subscription_group ) ) {
+        add_meta_box( 'getpaid_admin_subscription_item_details_metabox', __( 'Subscription Items', 'invoicing' ), 'getpaid_admin_subscription_item_details_metabox', get_current_screen(), 'normal', 'low' );
+    }
 
-	add_meta_box( 'getpaid_admin_subscription_invoice_details_metabox', __( 'Related Invoices', 'invoicing' ), 'getpaid_admin_subscription_invoice_details_metabox', get_current_screen(), 'advanced' );
+    add_meta_box( 'getpaid_admin_subscription_invoice_details_metabox', __( 'Related Invoices', 'invoicing' ), 'getpaid_admin_subscription_invoice_details_metabox', get_current_screen(), 'advanced' );
 
-	do_action( 'getpaid_admin_single_subscription_register_metabox', $sub );
+    do_action( 'getpaid_admin_single_subscription_register_metabox', $sub );
 
-	?>
+    ?>
 
 		<form method="post" action="<?php echo esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $sub->get_id() ) ) ); ?>">
 
@@ -157,49 +157,49 @@ 
  */
 function getpaid_admin_subscription_details_metabox( $sub ) {
 
-	// Subscription items.
-	$subscription_group = getpaid_get_invoice_subscription_group( $sub->get_parent_invoice_id(), $sub->get_id() );
-	$items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
-
-	// Prepare subscription detail columns.
-	$fields = apply_filters(
-		'getpaid_subscription_admin_page_fields',
-		array(
-			'subscription' => __( 'Subscription', 'invoicing' ),
-			'customer'     => __( 'Customer', 'invoicing' ),
-			'amount'       => __( 'Amount', 'invoicing' ),
-			'start_date'   => __( 'Start Date', 'invoicing' ),
-			'renews_on'    => __( 'Next Payment', 'invoicing' ),
-			'renewals'     => __( 'Collected Payments', 'invoicing' ),
-			'item'         => $items_count > 1 ? __( 'Items', 'invoicing' ) : __( 'Item', 'invoicing' ),
-			'gateway'      => __( 'Payment Method', 'invoicing' ),
-			'profile_id'   => __( 'Profile ID', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
-		)
-	);
-
-	if ( ! $sub->is_active() ) {
-
-		if ( isset( $fields['renews_on'] ) ) {
-			unset( $fields['renews_on'] );
-		}
-
-		if ( isset( $fields['gateway'] ) ) {
-			unset( $fields['gateway'] );
-		}
-	} elseif ( $sub->is_last_renewal() ) {
-
-		if ( isset( $fields['renews_on'] ) ) {
-			$fields['renews_on'] = __( 'End Date', 'invoicing' );
-		}
-	}
-
-	$profile_id = $sub->get_profile_id();
-	if ( empty( $profile_id ) && isset( $fields['profile_id'] ) ) {
-		unset( $fields['profile_id'] );
-	}
-
-	?>
+    // Subscription items.
+    $subscription_group = getpaid_get_invoice_subscription_group( $sub->get_parent_invoice_id(), $sub->get_id() );
+    $items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
+
+    // Prepare subscription detail columns.
+    $fields = apply_filters(
+        'getpaid_subscription_admin_page_fields',
+        array(
+            'subscription' => __( 'Subscription', 'invoicing' ),
+            'customer'     => __( 'Customer', 'invoicing' ),
+            'amount'       => __( 'Amount', 'invoicing' ),
+            'start_date'   => __( 'Start Date', 'invoicing' ),
+            'renews_on'    => __( 'Next Payment', 'invoicing' ),
+            'renewals'     => __( 'Collected Payments', 'invoicing' ),
+            'item'         => $items_count > 1 ? __( 'Items', 'invoicing' ) : __( 'Item', 'invoicing' ),
+            'gateway'      => __( 'Payment Method', 'invoicing' ),
+            'profile_id'   => __( 'Profile ID', 'invoicing' ),
+            'status'       => __( 'Status', 'invoicing' ),
+        )
+    );
+
+    if ( ! $sub->is_active() ) {
+
+        if ( isset( $fields['renews_on'] ) ) {
+            unset( $fields['renews_on'] );
+        }
+
+        if ( isset( $fields['gateway'] ) ) {
+            unset( $fields['gateway'] );
+        }
+    } elseif ( $sub->is_last_renewal() ) {
+
+        if ( isset( $fields['renews_on'] ) ) {
+            $fields['renews_on'] = __( 'End Date', 'invoicing' );
+        }
+    }
+
+    $profile_id = $sub->get_profile_id();
+    if ( empty( $profile_id ) && isset( $fields['profile_id'] ) ) {
+        unset( $fields['profile_id'] );
+    }
+
+    ?>
 
 		<table class="table table-borderless" style="font-size: 14px;">
 			<tbody>
@@ -233,20 +233,20 @@ 
  */
 function getpaid_admin_subscription_metabox_display_customer( $subscription ) {
 
-	$username = __( '(Missing User)', 'invoicing' );
+    $username = __( '(Missing User)', 'invoicing' );
 
-	$user = get_userdata( $subscription->get_customer_id() );
-	if ( $user ) {
+    $user = get_userdata( $subscription->get_customer_id() );
+    if ( $user ) {
 
-		$username = sprintf(
-			'<a href="user-edit.php?user_id=%s">%s</a>',
-			absint( $user->ID ),
-			! empty( $user->display_name ) ? esc_html( $user->display_name ) : sanitize_email( $user->user_email )
-		);
+        $username = sprintf(
+            '<a href="user-edit.php?user_id=%s">%s</a>',
+            absint( $user->ID ),
+            ! empty( $user->display_name ) ? esc_html( $user->display_name ) : sanitize_email( $user->user_email )
+        );
 
-	}
+    }
 
-	echo wp_kses_post( $username );
+    echo wp_kses_post( $username );
 }
 add_action( 'getpaid_subscription_admin_display_customer', 'getpaid_admin_subscription_metabox_display_customer' );
 
@@ -256,8 +256,8 @@ 
  * @param WPInv_Subscription $subscription
  */
 function getpaid_admin_subscription_metabox_display_amount( $subscription ) {
-	$amount    = getpaid_get_formatted_subscription_amount( $subscription );
-	echo wp_kses_post( "<span>$amount</span>" );
+    $amount    = getpaid_get_formatted_subscription_amount( $subscription );
+    echo wp_kses_post( "<span>$amount</span>" );
 }
 add_action( 'getpaid_subscription_admin_display_amount', 'getpaid_admin_subscription_metabox_display_amount' );
 
@@ -268,11 +268,11 @@ 
  */
 function getpaid_admin_subscription_metabox_display_id( $subscription ) {
 
-	printf(
-		'<a href="%s">#%s</a>',
-		esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $subscription->get_id() ) ) ),
-		absint( $subscription->get_id() )
-	);
+    printf(
+        '<a href="%s">#%s</a>',
+        esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $subscription->get_id() ) ) ),
+        absint( $subscription->get_id() )
+    );
 
 }
 add_action( 'getpaid_subscription_admin_display_subscription', 'getpaid_admin_subscription_metabox_display_id' );
@@ -284,24 +284,24 @@ 
  */
 function getpaid_admin_subscription_metabox_display_start_date( $subscription ) {
 
-	if ( $subscription->has_status( 'active trialling' ) && getpaid_payment_gateway_supports( $subscription->get_gateway(), 'subscription_date_change' ) ) {
-		aui()->input(
-			array(
-				'type'        => 'text',
-				'id'          => 'wpinv_subscription_date_created',
-				'name'        => 'wpinv_subscription_date_created',
-				'label'       => __( 'Start Date', 'invoicing' ),
-				'label_type'  => 'hidden',
-				'placeholder' => 'YYYY-MM-DD',
-				'value'       => esc_attr( $subscription->get_date_created( 'edit' ) ),
-				'no_wrap'     => true,
-				'size'        => 'sm',
-			),
-			true
-		);
-	} else {
-		echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
-	}
+    if ( $subscription->has_status( 'active trialling' ) && getpaid_payment_gateway_supports( $subscription->get_gateway(), 'subscription_date_change' ) ) {
+        aui()->input(
+            array(
+                'type'        => 'text',
+                'id'          => 'wpinv_subscription_date_created',
+                'name'        => 'wpinv_subscription_date_created',
+                'label'       => __( 'Start Date', 'invoicing' ),
+                'label_type'  => 'hidden',
+                'placeholder' => 'YYYY-MM-DD',
+                'value'       => esc_attr( $subscription->get_date_created( 'edit' ) ),
+                'no_wrap'     => true,
+                'size'        => 'sm',
+            ),
+            true
+        );
+    } else {
+        echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
+    }
 
 }
 add_action( 'getpaid_subscription_admin_display_start_date', 'getpaid_admin_subscription_metabox_display_start_date' );
@@ -313,24 +313,24 @@ 
  */
 function getpaid_admin_subscription_metabox_display_renews_on( $subscription ) {
 
-	if ( $subscription->has_status( 'active trialling' ) && getpaid_payment_gateway_supports( $subscription->get_gateway(), 'subscription_date_change' ) ) {
-		aui()->input(
-			array(
-				'type'        => 'text',
-				'id'          => 'wpinv_subscription_expiration',
-				'name'        => 'wpinv_subscription_expiration',
-				'label'       => __( 'Renews On', 'invoicing' ),
-				'label_type'  => 'hidden',
-				'placeholder' => 'YYYY-MM-DD',
-				'value'       => esc_attr( $subscription->get_expiration( 'edit' ) ),
-				'no_wrap'     => true,
-				'size'        => 'sm',
-			),
-			true
-		);
-	} else {
-		echo esc_html( getpaid_format_date_value( $subscription->get_expiration() ) );
-	}
+    if ( $subscription->has_status( 'active trialling' ) && getpaid_payment_gateway_supports( $subscription->get_gateway(), 'subscription_date_change' ) ) {
+        aui()->input(
+            array(
+                'type'        => 'text',
+                'id'          => 'wpinv_subscription_expiration',
+                'name'        => 'wpinv_subscription_expiration',
+                'label'       => __( 'Renews On', 'invoicing' ),
+                'label_type'  => 'hidden',
+                'placeholder' => 'YYYY-MM-DD',
+                'value'       => esc_attr( $subscription->get_expiration( 'edit' ) ),
+                'no_wrap'     => true,
+                'size'        => 'sm',
+            ),
+            true
+        );
+    } else {
+        echo esc_html( getpaid_format_date_value( $subscription->get_expiration() ) );
+    }
 }
 add_action( 'getpaid_subscription_admin_display_renews_on', 'getpaid_admin_subscription_metabox_display_renews_on' );
 
@@ -341,32 +341,32 @@ 
  */
 function getpaid_admin_subscription_metabox_display_renewals( $subscription ) {
 
-	$max_bills    = $subscription->get_bill_times();
-	$times_billed = (int) $subscription->get_times_billed();
-
-	if ( $subscription->has_status( 'active trialling' ) && getpaid_payment_gateway_supports( $subscription->get_gateway(), 'subscription_bill_times_change' ) ) {
-		aui()->input(
-			array(
-				'type'             => 'number',
-				'id'               => 'wpinv_subscription_max_bill_times',
-				'name'             => 'wpinv_subscription_max_bill_times',
-				'label'            => __( 'Maximum bill times', 'invoicing' ),
-				'label_type'       => 'hidden',
-				'placeholder'      => __( 'Unlimited', 'invoicing' ),
-				'value'            => empty( $max_bills ) ? '' : (int) $max_bills,
-				'no_wrap'          => true,
-				'size'             => 'sm',
-				'input_group_left' => sprintf(
-					// translators: %d: Number of times billed
-					__( '%d of', 'invoicing' ),
-					$times_billed
-				),
-			),
-			true
-		);
-	} else {
-		echo esc_html( $times_billed ) . ' / ' . ( empty( $max_bills ) ? '&infin;' : (int) $max_bills );
-	}
+    $max_bills    = $subscription->get_bill_times();
+    $times_billed = (int) $subscription->get_times_billed();
+
+    if ( $subscription->has_status( 'active trialling' ) && getpaid_payment_gateway_supports( $subscription->get_gateway(), 'subscription_bill_times_change' ) ) {
+        aui()->input(
+            array(
+                'type'             => 'number',
+                'id'               => 'wpinv_subscription_max_bill_times',
+                'name'             => 'wpinv_subscription_max_bill_times',
+                'label'            => __( 'Maximum bill times', 'invoicing' ),
+                'label_type'       => 'hidden',
+                'placeholder'      => __( 'Unlimited', 'invoicing' ),
+                'value'            => empty( $max_bills ) ? '' : (int) $max_bills,
+                'no_wrap'          => true,
+                'size'             => 'sm',
+                'input_group_left' => sprintf(
+                    // translators: %d: Number of times billed
+                    __( '%d of', 'invoicing' ),
+                    $times_billed
+                ),
+            ),
+            true
+        );
+    } else {
+        echo esc_html( $times_billed ) . ' / ' . ( empty( $max_bills ) ? '&infin;' : (int) $max_bills );
+    }
 }
 add_action( 'getpaid_subscription_admin_display_renewals', 'getpaid_admin_subscription_metabox_display_renewals' );
 
@@ -378,13 +378,13 @@ 
  */
 function getpaid_admin_subscription_metabox_display_item( $subscription, $subscription_group = false ) {
 
-	if ( empty( $subscription_group ) ) {
-		echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
-		return;
-	}
+    if ( empty( $subscription_group ) ) {
+        echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
+        return;
+    }
 
-	$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-	echo wp_kses_post( implode( ' | ', $markup ) );
+    $markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
+    echo wp_kses_post( implode( ' | ', $markup ) );
 
 }
 add_action( 'getpaid_subscription_admin_display_item', 'getpaid_admin_subscription_metabox_display_item', 10, 2 );
@@ -396,13 +396,13 @@ 
  */
 function getpaid_admin_subscription_metabox_display_gateway( $subscription ) {
 
-	$gateway = $subscription->get_gateway();
+    $gateway = $subscription->get_gateway();
 
-	if ( ! empty( $gateway ) ) {
-		echo esc_html( wpinv_get_gateway_admin_label( $gateway ) );
-	} else {
-		echo '&mdash;';
-	}
+    if ( ! empty( $gateway ) ) {
+        echo esc_html( wpinv_get_gateway_admin_label( $gateway ) );
+    } else {
+        echo '&mdash;';
+    }
 
 }
 add_action( 'getpaid_subscription_admin_display_gateway', 'getpaid_admin_subscription_metabox_display_gateway' );
@@ -413,7 +413,7 @@ 
  * @param WPInv_Subscription $subscription
  */
 function getpaid_admin_subscription_metabox_display_status( $subscription ) {
-	echo wp_kses_post( $subscription->get_status_label_html() );
+    echo wp_kses_post( $subscription->get_status_label_html() );
 }
 add_action( 'getpaid_subscription_admin_display_status', 'getpaid_admin_subscription_metabox_display_status' );
 
@@ -424,28 +424,28 @@ 
  */
 function getpaid_admin_subscription_metabox_display_profile_id( $subscription ) {
 
-	$profile_id = $subscription->get_profile_id();
-
-	aui()->input(
-		array(
-			'type'              => 'text',
-			'id'                => 'wpinv_subscription_profile_id',
-			'name'              => 'wpinv_subscription_profile_id',
-			'label'             => __( 'Profile Id', 'invoicing' ),
-			'label_type'        => 'hidden',
-			'placeholder'       => __( 'Profile Id', 'invoicing' ),
-			'value'             => esc_attr( $profile_id ),
-			'input_group_right' => '',
-			'no_wrap'           => true,
-			'size'              => 'sm',
-		),
-		true
-	);
-
-	$url = apply_filters( 'getpaid_remote_subscription_profile_url', '', $subscription );
-	if ( ! empty( $url ) ) {
-		echo '&nbsp;<a href="' . esc_url_raw( $url ) . '" title="' . esc_attr__( 'View in Gateway', 'invoicing' ) . '" target="_blank"><i class="fas fa-external-link-alt fa-xs fa-fw align-top"></i></a>';
-	}
+    $profile_id = $subscription->get_profile_id();
+
+    aui()->input(
+        array(
+            'type'              => 'text',
+            'id'                => 'wpinv_subscription_profile_id',
+            'name'              => 'wpinv_subscription_profile_id',
+            'label'             => __( 'Profile Id', 'invoicing' ),
+            'label_type'        => 'hidden',
+            'placeholder'       => __( 'Profile Id', 'invoicing' ),
+            'value'             => esc_attr( $profile_id ),
+            'input_group_right' => '',
+            'no_wrap'           => true,
+            'size'              => 'sm',
+        ),
+        true
+    );
+
+    $url = apply_filters( 'getpaid_remote_subscription_profile_url', '', $subscription );
+    if ( ! empty( $url ) ) {
+        echo '&nbsp;<a href="' . esc_url_raw( $url ) . '" title="' . esc_attr__( 'View in Gateway', 'invoicing' ) . '" target="_blank"><i class="fas fa-external-link-alt fa-xs fa-fw align-top"></i></a>';
+    }
 
 }
 add_action( 'getpaid_subscription_admin_display_profile_id', 'getpaid_admin_subscription_metabox_display_profile_id' );
@@ -457,40 +457,40 @@ 
  */
 function getpaid_admin_subscription_update_metabox( $subscription ) {
 
-	?>
+    ?>
 	<div class="mt-3">
 
 		<?php
-			aui()->select(
-				array(
-					'options'   => getpaid_get_subscription_statuses(),
-					'name'      => 'subscription_status',
-					'id'        => 'subscription_status_update_select',
-					'required'  => true,
-					'no_wrap'   => false,
-					'label'     => __( 'Subscription Status', 'invoicing' ),
-					'help_text' => __( 'Updating the status will trigger related actions and hooks', 'invoicing' ),
-					'select2'   => true,
-					'value'     => $subscription->get_status( 'edit' ),
-				),
-				true
-			);
-		?>
+            aui()->select(
+                array(
+                    'options'   => getpaid_get_subscription_statuses(),
+                    'name'      => 'subscription_status',
+                    'id'        => 'subscription_status_update_select',
+                    'required'  => true,
+                    'no_wrap'   => false,
+                    'label'     => __( 'Subscription Status', 'invoicing' ),
+                    'help_text' => __( 'Updating the status will trigger related actions and hooks', 'invoicing' ),
+                    'select2'   => true,
+                    'value'     => $subscription->get_status( 'edit' ),
+                ),
+                true
+            );
+        ?>
 
 		<div class="mt-2 px-3 py-2 bg-light border-top" style="margin: -12px;">
 
 		<?php
-			submit_button( __( 'Update', 'invoicing' ), 'primary', 'submit', false );
+            submit_button( __( 'Update', 'invoicing' ), 'primary', 'submit', false );
 
-			$url    = wp_nonce_url( add_query_arg( 'getpaid-admin-action', 'subscription_manual_renew' ), 'getpaid-nonce', 'getpaid-nonce' );
-			$anchor = __( 'Renew Subscription', 'invoicing' );
-			$title  = esc_attr__( 'Are you sure you want to extend the subscription and generate a new invoice that will be automatically marked as paid?', 'invoicing' );
+            $url    = wp_nonce_url( add_query_arg( 'getpaid-admin-action', 'subscription_manual_renew' ), 'getpaid-nonce', 'getpaid-nonce' );
+            $anchor = __( 'Renew Subscription', 'invoicing' );
+            $title  = esc_attr__( 'Are you sure you want to extend the subscription and generate a new invoice that will be automatically marked as paid?', 'invoicing' );
 
-			if ( $subscription->is_active() ) {
-			echo "<a href='" . esc_url( $url ) . "' class='float-right text-muted' onclick='return confirm(\"" . esc_attr( $title ) . "\")'>" . esc_html( $anchor ) . "</a>";
-			}
+            if ( $subscription->is_active() ) {
+            echo "<a href='" . esc_url( $url ) . "' class='float-right text-muted' onclick='return confirm(\"" . esc_attr( $title ) . "\")'>" . esc_html( $anchor ) . "</a>";
+            }
 
-	echo '</div></div>';
+    echo '</div></div>';
 }
 
 /**
@@ -501,33 +501,33 @@ 
  */
 function getpaid_admin_subscription_invoice_details_metabox( $subscription, $strict = true ) {
 
-	$columns = apply_filters(
-		'getpaid_subscription_related_invoices_columns',
-		array(
-			'invoice'      => __( 'Invoice', 'invoicing' ),
-			'relationship' => __( 'Relationship', 'invoicing' ),
-			'date'         => __( 'Date', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
-			'total'        => __( 'Total', 'invoicing' ),
-		),
-		$subscription
-	);
-
-	// Prepare the invoices.
-	$payments = $subscription->get_child_payments( ! is_admin() );
-	$parent   = $subscription->get_parent_invoice();
-
-	if ( $parent->exists() ) {
-		$payments = array_merge( array( $parent ), $payments );
-	}
-
-	$table_class = 'w-100 bg-white';
-
-	if ( ! is_admin() ) {
-		$table_class = 'table table-bordered';
-	}
-
-	?>
+    $columns = apply_filters(
+        'getpaid_subscription_related_invoices_columns',
+        array(
+            'invoice'      => __( 'Invoice', 'invoicing' ),
+            'relationship' => __( 'Relationship', 'invoicing' ),
+            'date'         => __( 'Date', 'invoicing' ),
+            'status'       => __( 'Status', 'invoicing' ),
+            'total'        => __( 'Total', 'invoicing' ),
+        ),
+        $subscription
+    );
+
+    // Prepare the invoices.
+    $payments = $subscription->get_child_payments( ! is_admin() );
+    $parent   = $subscription->get_parent_invoice();
+
+    if ( $parent->exists() ) {
+        $payments = array_merge( array( $parent ), $payments );
+    }
+
+    $table_class = 'w-100 bg-white';
+
+    if ( ! is_admin() ) {
+        $table_class = 'table table-bordered';
+    }
+
+    ?>
 		<div class="m-0" style="overflow: auto;">
 
 			<table class="<?php echo esc_attr( $table_class ); ?>">
@@ -535,10 +535,10 @@ 
 				<thead>
 					<tr>
 						<?php
-							foreach ( $columns as $key => $label ) {
-							echo "<th class='subscription-invoice-field-" . esc_attr( $key ) . " bg-light p-2 text-left color-dark font-weight-bold'>" . esc_html( $label ) . "</th>";
-							}
-						?>
+                            foreach ( $columns as $key => $label ) {
+                            echo "<th class='subscription-invoice-field-" . esc_attr( $key ) . " bg-light p-2 text-left color-dark font-weight-bold'>" . esc_html( $label ) . "</th>";
+                            }
+                        ?>
 					</tr>
 				</thead>
 
@@ -554,72 +554,72 @@ 
 
 					<?php
 
-						foreach ( $payments as $payment ) :
+                        foreach ( $payments as $payment ) :
 
-						// Ensure that we have an invoice.
-						$payment = new WPInv_Invoice( $payment );
+                        // Ensure that we have an invoice.
+                        $payment = new WPInv_Invoice( $payment );
 
-						// Abort if the invoice is invalid...
-						if ( ! $payment->exists() ) {
-							continue;
-							}
+                        // Abort if the invoice is invalid...
+                        if ( ! $payment->exists() ) {
+                            continue;
+                            }
 
-						// ... or belongs to a different subscription.
-						if ( $strict && $payment->is_renewal() && $payment->get_subscription_id() && $payment->get_subscription_id() != $subscription->get_id() ) {
-							continue;
-							}
+                        // ... or belongs to a different subscription.
+                        if ( $strict && $payment->is_renewal() && $payment->get_subscription_id() && $payment->get_subscription_id() != $subscription->get_id() ) {
+                            continue;
+                            }
 
-						echo '<tr>';
+                        echo '<tr>';
 
-						foreach ( array_keys( $columns ) as $key ) {
+                        foreach ( array_keys( $columns ) as $key ) {
 
-							echo "<td class='p-2 text-left'>";
+                            echo "<td class='p-2 text-left'>";
 
-								switch ( $key ) {
+                                switch ( $key ) {
 
-								case 'total':
-										echo '<strong>';
-										wpinv_the_price( $payment->get_total(), $payment->get_currency() );
-										echo '</strong>';
-									break;
+                                case 'total':
+                                        echo '<strong>';
+                                        wpinv_the_price( $payment->get_total(), $payment->get_currency() );
+                                        echo '</strong>';
+                                    break;
 
-								case 'relationship':
-										echo $payment->is_renewal() ? esc_html__( 'Renewal Invoice', 'invoicing' ) : esc_html__( 'Initial Invoice', 'invoicing' );
-									break;
+                                case 'relationship':
+                                        echo $payment->is_renewal() ? esc_html__( 'Renewal Invoice', 'invoicing' ) : esc_html__( 'Initial Invoice', 'invoicing' );
+                                    break;
 
-								case 'date':
-									echo esc_html( getpaid_format_date_value( $payment->get_date_created() ) );
-									break;
+                                case 'date':
+                                    echo esc_html( getpaid_format_date_value( $payment->get_date_created() ) );
+                                    break;
 
-								case 'status':
-										$status = $payment->get_status_nicename();
-										if ( is_admin() ) {
-										$status = $payment->get_status_label_html();
-										}
+                                case 'status':
+                                        $status = $payment->get_status_nicename();
+                                        if ( is_admin() ) {
+                                        $status = $payment->get_status_label_html();
+                                        }
 
-										echo wp_kses_post( $status );
-									break;
+                                        echo wp_kses_post( $status );
+                                    break;
 
-								case 'invoice':
-										$link    = esc_url( get_edit_post_link( $payment->get_id() ) );
+                                case 'invoice':
+                                        $link    = esc_url( get_edit_post_link( $payment->get_id() ) );
 
-										if ( ! is_admin() ) {
-										$link = esc_url( $payment->get_view_url() );
-										}
+                                        if ( ! is_admin() ) {
+                                        $link = esc_url( $payment->get_view_url() );
+                                        }
 
-										$invoice = esc_html( $payment->get_number() );
-										echo wp_kses_post( "<a href='$link'>$invoice</a>" );
-									break;
-										}
+                                        $invoice = esc_html( $payment->get_number() );
+                                        echo wp_kses_post( "<a href='$link'>$invoice</a>" );
+                                    break;
+                                        }
 
-								echo '</td>';
+                                echo '</td>';
 
-							}
+                            }
 
-						echo '</tr>';
+                        echo '</tr>';
 
-						endforeach;
-					?>
+                        endforeach;
+                    ?>
 
 				</tbody>
 
@@ -637,42 +637,42 @@ 
  */
 function getpaid_admin_subscription_item_details_metabox( $subscription ) {
 
-	// Fetch the subscription group.
-	$subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_payment_id(), $subscription->get_id() );
+    // Fetch the subscription group.
+    $subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_payment_id(), $subscription->get_id() );
 
-	if ( empty( $subscription_group ) || empty( $subscription_group['items'] ) ) {
-		return;
-	}
+    if ( empty( $subscription_group ) || empty( $subscription_group['items'] ) ) {
+        return;
+    }
 
-	// Prepare table columns.
-	$columns = apply_filters(
-		'getpaid_subscription_item_details_columns',
-		array(
-			'item_name' => __( 'Item', 'invoicing' ),
-			'price'     => __( 'Price', 'invoicing' ),
-			'tax'       => __( 'Tax', 'invoicing' ),
-			'discount'  => __( 'Discount', 'invoicing' ),
-			//'initial'      => __( 'Initial Amount', 'invoicing' ),
-			'recurring' => __( 'Subtotal', 'invoicing' ),
-		),
-		$subscription
-	);
+    // Prepare table columns.
+    $columns = apply_filters(
+        'getpaid_subscription_item_details_columns',
+        array(
+            'item_name' => __( 'Item', 'invoicing' ),
+            'price'     => __( 'Price', 'invoicing' ),
+            'tax'       => __( 'Tax', 'invoicing' ),
+            'discount'  => __( 'Discount', 'invoicing' ),
+            //'initial'      => __( 'Initial Amount', 'invoicing' ),
+            'recurring' => __( 'Subtotal', 'invoicing' ),
+        ),
+        $subscription
+    );
 
-	// Prepare the invoices.
+    // Prepare the invoices.
 
-	$invoice = $subscription->get_parent_invoice();
+    $invoice = $subscription->get_parent_invoice();
 
-	if ( ( ! wpinv_use_taxes() || ! $invoice->is_taxable() ) && isset( $columns['tax'] ) ) {
-		unset( $columns['tax'] );
-	}
+    if ( ( ! wpinv_use_taxes() || ! $invoice->is_taxable() ) && isset( $columns['tax'] ) ) {
+        unset( $columns['tax'] );
+    }
 
-	$table_class = 'w-100 bg-white';
+    $table_class = 'w-100 bg-white';
 
-	if ( ! is_admin() ) {
-		$table_class = 'table table-bordered';
-	}
+    if ( ! is_admin() ) {
+        $table_class = 'table table-bordered';
+    }
 
-	?>
+    ?>
 		<div class="m-0" style="overflow: auto;">
 
 			<table class="<?php echo esc_attr( $table_class ); ?>">
@@ -681,10 +681,10 @@ 
 					<tr>
 						<?php
 
-							foreach ( $columns as $key => $label ) {
-							echo "<th class='subscription-item-field-" . esc_attr( $key ) . " bg-light p-2 text-left color-dark font-weight-bold'>" . esc_html( $label ) . "</th>";
-							}
-						?>
+                            foreach ( $columns as $key => $label ) {
+                            echo "<th class='subscription-item-field-" . esc_attr( $key ) . " bg-light p-2 text-left color-dark font-weight-bold'>" . esc_html( $label ) . "</th>";
+                            }
+                        ?>
 					</tr>
 				</thead>
 
@@ -692,106 +692,106 @@ 
 
 					<?php
 
-						foreach ( $subscription_group['items'] as $subscription_group_item ) :
+                        foreach ( $subscription_group['items'] as $subscription_group_item ) :
 
-						echo '<tr>';
+                        echo '<tr>';
 
-						foreach ( array_keys( $columns ) as $key ) {
+                        foreach ( array_keys( $columns ) as $key ) {
 
-							$class = 'text-left';
+                            $class = 'text-left';
 
-							echo "<td class='p-2 text-left'>";
+                            echo "<td class='p-2 text-left'>";
 
-								switch ( $key ) {
+                                switch ( $key ) {
 
-								case 'item_name':
-										$item_name = get_the_title( $subscription_group_item['item_id'] );
-										$item_name = empty( $item_name ) ? $subscription_group_item['item_name'] : $item_name;
+                                case 'item_name':
+                                        $item_name = get_the_title( $subscription_group_item['item_id'] );
+                                        $item_name = empty( $item_name ) ? $subscription_group_item['item_name'] : $item_name;
 
-										if ( $invoice->get_template() == 'amount' || 1 == (float) $subscription_group_item['quantity'] ) {
-										echo esc_html( $item_name );
-										} else {
-										printf( '%1$s x %2$d', esc_html( $item_name ), (float) $subscription_group_item['quantity'] );
-											}
+                                        if ( $invoice->get_template() == 'amount' || 1 == (float) $subscription_group_item['quantity'] ) {
+                                        echo esc_html( $item_name );
+                                        } else {
+                                        printf( '%1$s x %2$d', esc_html( $item_name ), (float) $subscription_group_item['quantity'] );
+                                            }
 
-									break;
+                                    break;
 
-								case 'price':
-									wpinv_the_price( $subscription_group_item['item_price'], $invoice->get_currency() );
-									break;
+                                case 'price':
+                                    wpinv_the_price( $subscription_group_item['item_price'], $invoice->get_currency() );
+                                    break;
 
-								case 'tax':
-									wpinv_the_price( $subscription_group_item['tax'], $invoice->get_currency() );
-									break;
+                                case 'tax':
+                                    wpinv_the_price( $subscription_group_item['tax'], $invoice->get_currency() );
+                                    break;
 
-								case 'discount':
-									wpinv_the_price( $subscription_group_item['discount'], $invoice->get_currency() );
-									break;
+                                case 'discount':
+                                    wpinv_the_price( $subscription_group_item['discount'], $invoice->get_currency() );
+                                    break;
 
-								case 'initial':
-									wpinv_the_price( $subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency() );
-									break;
+                                case 'initial':
+                                    wpinv_the_price( $subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency() );
+                                    break;
 
-								case 'recurring':
-										echo wp_kses_post( '<strong>' . wpinv_price( $subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency() ) . '</strong>' );
-									break;
+                                case 'recurring':
+                                        echo wp_kses_post( '<strong>' . wpinv_price( $subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency() ) . '</strong>' );
+                                    break;
 
-										}
+                                        }
 
-								echo '</td>';
+                                echo '</td>';
 
-							}
+                            }
 
-						echo '</tr>';
+                        echo '</tr>';
 
-						endforeach;
+                        endforeach;
 
-						foreach ( $subscription_group['fees'] as $subscription_group_fee ) :
+                        foreach ( $subscription_group['fees'] as $subscription_group_fee ) :
 
-						echo '<tr>';
+                        echo '<tr>';
 
-						foreach ( array_keys( $columns ) as $key ) {
+                        foreach ( array_keys( $columns ) as $key ) {
 
-							$class = 'text-left';
+                            $class = 'text-left';
 
-							echo "<td class='p-2 text-left'>";
+                            echo "<td class='p-2 text-left'>";
 
-								switch ( $key ) {
+                                switch ( $key ) {
 
-								case 'item_name':
-										echo esc_html( $subscription_group_fee['name'] );
-									break;
+                                case 'item_name':
+                                        echo esc_html( $subscription_group_fee['name'] );
+                                    break;
 
-								case 'price':
-									wpinv_the_price( $subscription_group_fee['initial_fee'], $invoice->get_currency() );
-									break;
+                                case 'price':
+                                    wpinv_the_price( $subscription_group_fee['initial_fee'], $invoice->get_currency() );
+                                    break;
 
-								case 'tax':
-									echo '&mdash;';
-									break;
+                                case 'tax':
+                                    echo '&mdash;';
+                                    break;
 
-								case 'discount':
-										echo '&mdash;';
-									break;
+                                case 'discount':
+                                        echo '&mdash;';
+                                    break;
 
-								case 'initial':
-									wpinv_the_price( $subscription_group_fee['initial_fee'], $invoice->get_currency() );
-									break;
+                                case 'initial':
+                                    wpinv_the_price( $subscription_group_fee['initial_fee'], $invoice->get_currency() );
+                                    break;
 
-								case 'recurring':
-										echo wp_kses_post( '<strong>' . wpinv_price( $subscription_group_fee['recurring_fee'], $invoice->get_currency() ) . '</strong>' );
-									break;
+                                case 'recurring':
+                                        echo wp_kses_post( '<strong>' . wpinv_price( $subscription_group_fee['recurring_fee'], $invoice->get_currency() ) . '</strong>' );
+                                    break;
 
-										}
+                                        }
 
-								echo '</td>';
+                                echo '</td>';
 
-							}
+                            }
 
-						echo '</tr>';
+                        echo '</tr>';
 
-						endforeach;
-					?>
+                        endforeach;
+                    ?>
 
 				</tbody>
 
@@ -810,38 +810,38 @@ 
  */
 function getpaid_admin_subscription_related_subscriptions_metabox( $subscription, $skip_current = true ) {
 
-	// Fetch the subscription groups.
-	$subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_payment_id() );
-
-	if ( empty( $subscription_groups ) ) {
-		return;
-	}
-
-	// Prepare table columns.
-	$columns = apply_filters(
-		'getpaid_subscription_related_subscriptions_columns',
-		array(
-			'subscription' => __( 'Subscription', 'invoicing' ),
-			'start_date'   => __( 'Start Date', 'invoicing' ),
-			'renewal_date' => __( 'Next Payment', 'invoicing' ),
-			'renewals'     => __( 'Payments', 'invoicing' ),
-			'item'         => __( 'Items', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
-		),
-		$subscription
-	);
-
-	if ( $subscription->get_status() == 'pending' ) {
-		unset( $columns['start_date'], $columns['renewal_date'] );
-	}
-
-	$table_class = 'w-100 bg-white';
-
-	if ( ! is_admin() ) {
-		$table_class = 'table table-bordered';
-	}
-
-	?>
+    // Fetch the subscription groups.
+    $subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_payment_id() );
+
+    if ( empty( $subscription_groups ) ) {
+        return;
+    }
+
+    // Prepare table columns.
+    $columns = apply_filters(
+        'getpaid_subscription_related_subscriptions_columns',
+        array(
+            'subscription' => __( 'Subscription', 'invoicing' ),
+            'start_date'   => __( 'Start Date', 'invoicing' ),
+            'renewal_date' => __( 'Next Payment', 'invoicing' ),
+            'renewals'     => __( 'Payments', 'invoicing' ),
+            'item'         => __( 'Items', 'invoicing' ),
+            'status'       => __( 'Status', 'invoicing' ),
+        ),
+        $subscription
+    );
+
+    if ( $subscription->get_status() == 'pending' ) {
+        unset( $columns['start_date'], $columns['renewal_date'] );
+    }
+
+    $table_class = 'w-100 bg-white';
+
+    if ( ! is_admin() ) {
+        $table_class = 'table table-bordered';
+    }
+
+    ?>
 		<div class="m-0" style="overflow: auto;">
 
 			<table class="<?php echo esc_attr( $table_class ); ?>">
@@ -850,10 +850,10 @@ 
 					<tr>
 						<?php
 
-							foreach ( $columns as $key => $label ) {
-							echo "<th class='related-subscription-field-" . esc_attr( $key ) . " bg-light p-2 text-left color-dark font-weight-bold'>" . esc_html( $label ) . "</th>";
-							}
-						?>
+                            foreach ( $columns as $key => $label ) {
+                            echo "<th class='related-subscription-field-" . esc_attr( $key ) . " bg-light p-2 text-left color-dark font-weight-bold'>" . esc_html( $label ) . "</th>";
+                            }
+                        ?>
 					</tr>
 				</thead>
 
@@ -861,74 +861,74 @@ 
 
 					<?php
 
-						foreach ( $subscription_groups as $subscription_group ) :
+                        foreach ( $subscription_groups as $subscription_group ) :
 
-						// Do not list current subscription.
-						if ( $skip_current && (int) $subscription_group['subscription_id'] === $subscription->get_id() ) {
-							continue;
-							}
+                        // Do not list current subscription.
+                        if ( $skip_current && (int) $subscription_group['subscription_id'] === $subscription->get_id() ) {
+                            continue;
+                            }
 
-						// Ensure the subscription exists.
-						$_suscription = new WPInv_Subscription( $subscription_group['subscription_id'] );
+                        // Ensure the subscription exists.
+                        $_suscription = new WPInv_Subscription( $subscription_group['subscription_id'] );
 
-						if ( ! $_suscription->exists() ) {
-							continue;
-							}
+                        if ( ! $_suscription->exists() ) {
+                            continue;
+                            }
 
-						echo '<tr>';
+                        echo '<tr>';
 
-						foreach ( array_keys( $columns ) as $key ) {
+                        foreach ( array_keys( $columns ) as $key ) {
 
-							$class = 'text-left';
+                            $class = 'text-left';
 
-							echo "<td class='p-2 text-left'>";
+                            echo "<td class='p-2 text-left'>";
 
-								switch ( $key ) {
+                                switch ( $key ) {
 
-								case 'status':
-										echo wp_kses_post( $_suscription->get_status_label_html() );
-									break;
+                                case 'status':
+                                        echo wp_kses_post( $_suscription->get_status_label_html() );
+                                    break;
 
-								case 'item':
-											$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-											echo wp_kses_post( implode( ' | ', $markup ) );
-									break;
+                                case 'item':
+                                            $markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
+                                            echo wp_kses_post( implode( ' | ', $markup ) );
+                                    break;
 
-								case 'renewals':
-									$max_bills = $_suscription->get_bill_times();
-									echo ( (int) $_suscription->get_times_billed() ) . ' / ' . ( empty( $max_bills ) ? '&infin;' : (int) $max_bills );
-									break;
+                                case 'renewals':
+                                    $max_bills = $_suscription->get_bill_times();
+                                    echo ( (int) $_suscription->get_times_billed() ) . ' / ' . ( empty( $max_bills ) ? '&infin;' : (int) $max_bills );
+                                    break;
 
-								case 'renewal_date':
-										echo $_suscription->is_active() ? esc_html( getpaid_format_date_value( $_suscription->get_expiration() ) ) : '&mdash;';
-									break;
+                                case 'renewal_date':
+                                        echo $_suscription->is_active() ? esc_html( getpaid_format_date_value( $_suscription->get_expiration() ) ) : '&mdash;';
+                                    break;
 
-								case 'start_date':
-										echo 'pending' == $_suscription->get_status() ? '&mdash;' : esc_html( getpaid_format_date_value( $_suscription->get_date_created() ) );
-									break;
+                                case 'start_date':
+                                        echo 'pending' == $_suscription->get_status() ? '&mdash;' : esc_html( getpaid_format_date_value( $_suscription->get_date_created() ) );
+                                    break;
 
-								case 'subscription':
-										$url = is_admin() ? admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $_suscription->get_id() ) ) : $_suscription->get_view_url();
-										printf(
+                                case 'subscription':
+                                        $url = is_admin() ? admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $_suscription->get_id() ) ) : $_suscription->get_view_url();
+                                        printf(
                                             '%1$s#%2$s%3$s',
                                             '<a href="' . esc_url( $url ) . '">',
                                             '<strong>' . intval( $_suscription->get_id() ) . '</strong>',
-											'</a>'
+                                            '</a>'
                                         );
 
-											echo wp_kses_post( WPInv_Subscriptions_List_Table::column_amount( $_suscription ) );
-									break;
+                                            echo wp_kses_post( WPInv_Subscriptions_List_Table::column_amount( $_suscription ) );
+                                    break;
 
-										}
+                                        }
 
-								echo '</td>';
+                                echo '</td>';
 
-							}
+                            }
 
-						echo '</tr>';
+                        echo '</tr>';
 
-						endforeach;
-					?>
+                        endforeach;
+                    ?>
 
 				</tbody>
 

includes/admin/class-getpaid-admin-profile.php

Indentation +185 added lines, -185 removed lines

@@ -5,129 +5,129 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 if ( ! class_exists( 'GetPaid_Admin_Profile', false ) ) :
 
-	/**
-	 * GetPaid_Admin_Profile Class.
-	 */
-	class GetPaid_Admin_Profile {
-
-		/**
-		 * Hook in tabs.
-		 */
-		public function __construct() {
-			add_action( 'show_user_profile', array( $this, 'add_customer_meta_fields' ), 100 );
-			add_action( 'edit_user_profile', array( $this, 'add_customer_meta_fields' ), 100 );
-
-			add_action( 'personal_options_update', array( $this, 'save_customer_meta_fields' ) );
-			add_action( 'edit_user_profile_update', array( $this, 'save_customer_meta_fields' ) );
-		}
-
-		/**
-		 * Get Address Fields for the edit user pages.
-		 *
-		 * @return array Fields to display which are filtered through invoicing_customer_meta_fields before being returned
-		 */
-		public function get_customer_meta_fields() {
-
-			$show_fields = apply_filters(
-				'getpaid_customer_meta_fields',
-				array(
-					'billing' => array(
-						'title'  => __( 'Billing Details (GetPaid)', 'invoicing' ),
-						'fields' => array(
-							'_wpinv_first_name' => array(
-								'label'       => __( 'First name', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_last_name'  => array(
-								'label'       => __( 'Last name', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_company'    => array(
-								'label'       => __( 'Company', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_company_id' => array(
-								'label'       => __( 'Company ID', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_address'    => array(
-								'label'       => __( 'Address', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_city'       => array(
-								'label'       => __( 'City', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_zip'        => array(
-								'label'       => __( 'Postcode / ZIP', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_country'    => array(
-								'label'       => __( 'Country / Region', 'invoicing' ),
-								'description' => '',
-								'class'       => 'getpaid_js_field-country',
-								'type'        => 'select',
-								'options'     => array( '' => __( 'Select a country / region…', 'invoicing' ) ) + wpinv_get_country_list(),
-							),
-							'_wpinv_state'      => array(
-								'label'       => __( 'State / County', 'invoicing' ),
-								'description' => __( 'State / County or state code', 'invoicing' ),
-								'class'       => 'getpaid_js_field-state regular-text',
-							),
-							'_wpinv_phone'      => array(
-								'label'       => __( 'Phone', 'invoicing' ),
-								'description' => '',
-							),
-							'_wpinv_vat_number' => array(
-								'label'       => __( 'VAT Number', 'invoicing' ),
-								'description' => '',
-							),
-						),
-					),
-				)
-			);
-			return $show_fields;
-		}
-
-		/**
-		 * Show Address Fields on edit user pages.
-		 *
-		 * @param WP_User $user
-		 */
-		public function add_customer_meta_fields( $user ) {
-			if ( ! apply_filters( 'getpaid_current_user_can_edit_customer_meta_fields', current_user_can( 'manage_options' ), $user->ID ) ) {
-				return;
-			}
-
-			$show_fields = $this->get_customer_meta_fields();
-
-			$customer = getpaid_get_customer_by_user_id( (int) $user->ID );
-
-			foreach ( $show_fields as $fieldset_key => $fieldset ) :
-				if ( ! wpinv_use_taxes() && isset( $fieldset['fields']['_wpinv_vat_number'] ) ) {
-					unset( $fieldset['fields']['_wpinv_vat_number'] );
-				}
-				?>
+    /**
+     * GetPaid_Admin_Profile Class.
+     */
+    class GetPaid_Admin_Profile {
+
+        /**
+         * Hook in tabs.
+         */
+        public function __construct() {
+            add_action( 'show_user_profile', array( $this, 'add_customer_meta_fields' ), 100 );
+            add_action( 'edit_user_profile', array( $this, 'add_customer_meta_fields' ), 100 );
+
+            add_action( 'personal_options_update', array( $this, 'save_customer_meta_fields' ) );
+            add_action( 'edit_user_profile_update', array( $this, 'save_customer_meta_fields' ) );
+        }
+
+        /**
+         * Get Address Fields for the edit user pages.
+         *
+         * @return array Fields to display which are filtered through invoicing_customer_meta_fields before being returned
+         */
+        public function get_customer_meta_fields() {
+
+            $show_fields = apply_filters(
+                'getpaid_customer_meta_fields',
+                array(
+                    'billing' => array(
+                        'title'  => __( 'Billing Details (GetPaid)', 'invoicing' ),
+                        'fields' => array(
+                            '_wpinv_first_name' => array(
+                                'label'       => __( 'First name', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_last_name'  => array(
+                                'label'       => __( 'Last name', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_company'    => array(
+                                'label'       => __( 'Company', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_company_id' => array(
+                                'label'       => __( 'Company ID', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_address'    => array(
+                                'label'       => __( 'Address', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_city'       => array(
+                                'label'       => __( 'City', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_zip'        => array(
+                                'label'       => __( 'Postcode / ZIP', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_country'    => array(
+                                'label'       => __( 'Country / Region', 'invoicing' ),
+                                'description' => '',
+                                'class'       => 'getpaid_js_field-country',
+                                'type'        => 'select',
+                                'options'     => array( '' => __( 'Select a country / region…', 'invoicing' ) ) + wpinv_get_country_list(),
+                            ),
+                            '_wpinv_state'      => array(
+                                'label'       => __( 'State / County', 'invoicing' ),
+                                'description' => __( 'State / County or state code', 'invoicing' ),
+                                'class'       => 'getpaid_js_field-state regular-text',
+                            ),
+                            '_wpinv_phone'      => array(
+                                'label'       => __( 'Phone', 'invoicing' ),
+                                'description' => '',
+                            ),
+                            '_wpinv_vat_number' => array(
+                                'label'       => __( 'VAT Number', 'invoicing' ),
+                                'description' => '',
+                            ),
+                        ),
+                    ),
+                )
+            );
+            return $show_fields;
+        }
+
+        /**
+         * Show Address Fields on edit user pages.
+         *
+         * @param WP_User $user
+         */
+        public function add_customer_meta_fields( $user ) {
+            if ( ! apply_filters( 'getpaid_current_user_can_edit_customer_meta_fields', current_user_can( 'manage_options' ), $user->ID ) ) {
+                return;
+            }
+
+            $show_fields = $this->get_customer_meta_fields();
+
+            $customer = getpaid_get_customer_by_user_id( (int) $user->ID );
+
+            foreach ( $show_fields as $fieldset_key => $fieldset ) :
+                if ( ! wpinv_use_taxes() && isset( $fieldset['fields']['_wpinv_vat_number'] ) ) {
+                    unset( $fieldset['fields']['_wpinv_vat_number'] );
+                }
+                ?>
 				<h2><?php echo esc_html( $fieldset['title'] ); ?></h2>
 				<table class="form-table" id="<?php echo esc_attr( 'getpaid-fieldset-' . $fieldset_key ); ?>">
 					<?php foreach ( $fieldset['fields'] as $key => $field ) :
-						if ( ! empty( $customer ) ) {
-							if ( strpos( $key, '_wpinv_' ) === 0 ) {
-								$save_key = substr( $key , 7 );
-							} else {
-								$save_key = $key;
-							}
-
-							$value = $customer->get( $save_key );
-						} else {
-							$value = $this->get_user_meta( $user->ID, $key );
-						}
-						?>
+                        if ( ! empty( $customer ) ) {
+                            if ( strpos( $key, '_wpinv_' ) === 0 ) {
+                                $save_key = substr( $key , 7 );
+                            } else {
+                                $save_key = $key;
+                            }
+
+                            $value = $customer->get( $save_key );
+                        } else {
+                            $value = $this->get_user_meta( $user->ID, $key );
+                        }
+                        ?>
 						<tr>
 							<th>
 								<label for="<?php echo esc_attr( $key ); ?>"><?php echo esc_html( $field['label'] ); ?></label>
@@ -150,75 +150,75 @@ 
 					<?php endforeach; ?>
 				</table>
 				<?php
-			endforeach;
-		}
-
-		/**
-		 * Save Address Fields on edit user pages.
-		 *
-		 * @param int $user_id User ID of the user being saved
-		 */
-		public function save_customer_meta_fields( $user_id ) {
-			if ( ! apply_filters( 'getpaid_current_user_can_edit_customer_meta_fields', current_user_can( 'manage_options' ), $user_id ) ) {
-				return;
-			}
-
-			$save_fields = $this->get_customer_meta_fields();
-			$save_data = array();
-
-			foreach ( $save_fields as $fieldset ) {
-				foreach ( $fieldset['fields'] as $key => $field ) {
-					if ( strpos( $key, '_wpinv_' ) === 0 ) {
-						$save_key = substr( $key , 7 );
-					} else {
-						$save_key = $key;
-					}
-
-					if ( $save_key && isset( $field['type'] ) && 'checkbox' === $field['type'] ) {
-						$save_data[ $save_key ] = ! empty( $_POST[ $key ] ) ? true : false;
-					} else if ( $save_key && isset( $_POST[ $key ] ) ) {
-						$save_data[ $save_key ] = wpinv_clean( $_POST[ $key ] );
-					}
-				}
-			}
-
-			if ( empty( $save_data ) ) {
-				return;
-			}
-
-			$customer = getpaid_get_customer_by_user_id( (int) $user_id );
-
-			if ( empty( $customer ) ) {
-				$customer = new GetPaid_Customer( 0 );
-				$customer->clone_user( (int) $user_id );
-			}
-
-			foreach ( $save_data as $key => $value ) {
-				$customer->set( $key, $value );
-			}
-
-			$customer->save();
-		}
-
-		/**
-		 * Get user meta for a given key, with fallbacks to core user info for pre-existing fields.
-		 *
-		 * @since 3.1.0
-		 * @param int    $user_id User ID of the user being edited
-		 * @param string $key     Key for user meta field
-		 * @return string
-		 */
-		protected function get_user_meta( $user_id, $key ) {
-			$value           = get_user_meta( $user_id, $key, true );
-			$existing_fields = array( '_wpinv_first_name', '_wpinv_last_name' );
-
-			if ( ! $value && in_array( $key, $existing_fields ) ) {
-				$value = get_user_meta( $user_id, str_replace( '_wpinv_', '', $key ), true );
-			}
-
-			return $value;
-		}
-	}
+            endforeach;
+        }
+
+        /**
+         * Save Address Fields on edit user pages.
+         *
+         * @param int $user_id User ID of the user being saved
+         */
+        public function save_customer_meta_fields( $user_id ) {
+            if ( ! apply_filters( 'getpaid_current_user_can_edit_customer_meta_fields', current_user_can( 'manage_options' ), $user_id ) ) {
+                return;
+            }
+
+            $save_fields = $this->get_customer_meta_fields();
+            $save_data = array();
+
+            foreach ( $save_fields as $fieldset ) {
+                foreach ( $fieldset['fields'] as $key => $field ) {
+                    if ( strpos( $key, '_wpinv_' ) === 0 ) {
+                        $save_key = substr( $key , 7 );
+                    } else {
+                        $save_key = $key;
+                    }
+
+                    if ( $save_key && isset( $field['type'] ) && 'checkbox' === $field['type'] ) {
+                        $save_data[ $save_key ] = ! empty( $_POST[ $key ] ) ? true : false;
+                    } else if ( $save_key && isset( $_POST[ $key ] ) ) {
+                        $save_data[ $save_key ] = wpinv_clean( $_POST[ $key ] );
+                    }
+                }
+            }
+
+            if ( empty( $save_data ) ) {
+                return;
+            }
+
+            $customer = getpaid_get_customer_by_user_id( (int) $user_id );
+
+            if ( empty( $customer ) ) {
+                $customer = new GetPaid_Customer( 0 );
+                $customer->clone_user( (int) $user_id );
+            }
+
+            foreach ( $save_data as $key => $value ) {
+                $customer->set( $key, $value );
+            }
+
+            $customer->save();
+        }
+
+        /**
+         * Get user meta for a given key, with fallbacks to core user info for pre-existing fields.
+         *
+         * @since 3.1.0
+         * @param int    $user_id User ID of the user being edited
+         * @param string $key     Key for user meta field
+         * @return string
+         */
+        protected function get_user_meta( $user_id, $key ) {
+            $value           = get_user_meta( $user_id, $key, true );
+            $existing_fields = array( '_wpinv_first_name', '_wpinv_last_name' );
+
+            if ( ! $value && in_array( $key, $existing_fields ) ) {
+                $value = get_user_meta( $user_id, str_replace( '_wpinv_', '', $key ), true );
+            }
+
+            return $value;
+        }
+    }
 
 endif;
 

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

Indentation +18 added lines, -18 removed lines

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

vendor/ayecode/wp-ayecode-ui/includes/inc/bs-conversion.php

Indentation +66 added lines, -66 removed lines

@@ -14,76 +14,76 @@
  * @return array|mixed|string|string[]
  */
 function aui_bs_convert_sd_output( $output, $instance = '', $args = '', $sd = '' ) {
-	global $aui_bs5;
+    global $aui_bs5;
 
-	if ( $aui_bs5 ) {
-		$convert = array(
-			'"ml-' => '"ms-',
-			'"mr-' => '"me-',
-			'"pl-' => '"ps-',
-			'"pr-' => '"pe-',
-			"'ml-" => "'ms-",
-			"'mr-" => "'me-",
-			"'pl-" => "'ps-",
-			"'pr-" => "'pe-",
-			' ml-' => ' ms-',
-			' mr-' => ' me-',
-			' pl-' => ' ps-',
-			' pr-' => ' pe-',
-			'.ml-' => '.ms-',
-			'.mr-' => '.me-',
-			'.pl-' => '.ps-',
-			'.pr-' => '.pe-',
-			' form-row' => ' row',
-			' embed-responsive-item' => '',
-			' embed-responsive' => ' ratio',
-			'-1by1'    => '-1x1',
-			'-4by3'    => '-4x3',
-			'-16by9'    => '-16x9',
-			'-21by9'    => '-21x9',
-			'geodir-lightbox-image' => 'aui-lightbox-image',
-			'geodir-lightbox-iframe' => 'aui-lightbox-iframe',
-			' badge-'   => ' text-bg-',
-			'form-group'   => 'mb-3',
-			'custom-select'   => 'form-select',
-			'float-left'   => 'float-start',
-			'float-right'   => 'float-end',
-			'text-left'    => 'text-start',
-			'text-sm-left'    => 'text-sm-start',
-			'text-md-left'    => 'text-md-start',
-			'text-lg-left'    => 'text-lg-start',
-			'text-right'    => 'text-end',
-			'text-sm-right'    => 'text-sm-end',
-			'text-md-right'    => 'text-md-end',
-			'text-lg-right'    => 'text-lg-end',
-			'border-right'    => 'border-end',
-			'border-left'    => 'border-start',
-			'font-weight-'  => 'fw-',
-			'btn-block'     => 'w-100',
-			'rounded-left'  => 'rounded-start',
-			'rounded-right'  => 'rounded-end',
-			'font-italic' => 'fst-italic',
+    if ( $aui_bs5 ) {
+        $convert = array(
+            '"ml-' => '"ms-',
+            '"mr-' => '"me-',
+            '"pl-' => '"ps-',
+            '"pr-' => '"pe-',
+            "'ml-" => "'ms-",
+            "'mr-" => "'me-",
+            "'pl-" => "'ps-",
+            "'pr-" => "'pe-",
+            ' ml-' => ' ms-',
+            ' mr-' => ' me-',
+            ' pl-' => ' ps-',
+            ' pr-' => ' pe-',
+            '.ml-' => '.ms-',
+            '.mr-' => '.me-',
+            '.pl-' => '.ps-',
+            '.pr-' => '.pe-',
+            ' form-row' => ' row',
+            ' embed-responsive-item' => '',
+            ' embed-responsive' => ' ratio',
+            '-1by1'    => '-1x1',
+            '-4by3'    => '-4x3',
+            '-16by9'    => '-16x9',
+            '-21by9'    => '-21x9',
+            'geodir-lightbox-image' => 'aui-lightbox-image',
+            'geodir-lightbox-iframe' => 'aui-lightbox-iframe',
+            ' badge-'   => ' text-bg-',
+            'form-group'   => 'mb-3',
+            'custom-select'   => 'form-select',
+            'float-left'   => 'float-start',
+            'float-right'   => 'float-end',
+            'text-left'    => 'text-start',
+            'text-sm-left'    => 'text-sm-start',
+            'text-md-left'    => 'text-md-start',
+            'text-lg-left'    => 'text-lg-start',
+            'text-right'    => 'text-end',
+            'text-sm-right'    => 'text-sm-end',
+            'text-md-right'    => 'text-md-end',
+            'text-lg-right'    => 'text-lg-end',
+            'border-right'    => 'border-end',
+            'border-left'    => 'border-start',
+            'font-weight-'  => 'fw-',
+            'btn-block'     => 'w-100',
+            'rounded-left'  => 'rounded-start',
+            'rounded-right'  => 'rounded-end',
+            'font-italic' => 'fst-italic',
 
 //			'custom-control custom-checkbox'    => 'form-check',
-			// data
-			' data-toggle=' => ' data-bs-toggle=',
-			'data-ride=' => 'data-bs-ride=',
-			'data-controlnav=' => 'data-bs-controlnav=',
-			'data-slide='   => 'data-bs-slide=',
-			'data-slide-to=' => 'data-bs-slide-to=',
-			'data-target='  => 'data-bs-target=',
-			'data-dismiss="modal"'  => 'data-bs-dismiss="modal"',
-			'class="close"' => 'class="btn-close"',
-			'<span aria-hidden="true">&times;</span>' => '',
-		);
-		$output  = str_replace(
-			array_keys( $convert ),
-			array_values( $convert ),
-			$output
-		);
-	}
+            // data
+            ' data-toggle=' => ' data-bs-toggle=',
+            'data-ride=' => 'data-bs-ride=',
+            'data-controlnav=' => 'data-bs-controlnav=',
+            'data-slide='   => 'data-bs-slide=',
+            'data-slide-to=' => 'data-bs-slide-to=',
+            'data-target='  => 'data-bs-target=',
+            'data-dismiss="modal"'  => 'data-bs-dismiss="modal"',
+            'class="close"' => 'class="btn-close"',
+            '<span aria-hidden="true">&times;</span>' => '',
+        );
+        $output  = str_replace(
+            array_keys( $convert ),
+            array_values( $convert ),
+            $output
+        );
+    }
 
-	return $output;
+    return $output;
 }
 
 add_filter( 'wp_super_duper_widget_output', 'aui_bs_convert_sd_output', 10, 4 ); //$output, $instance, $args, $this

vendor/ayecode/wp-ayecode-ui/includes/ayecode-ui-settings.php

Indentation +1975 added lines, -1975 removed lines

@@ -13,7 +13,7 @@ 
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,480 +21,480 @@ 
  */
 if ( ! class_exists( 'AyeCode_UI_Settings' ) ) {
 
-	/**
-	 * A Class to be able to change settings for Font Awesome.
-	 *
-	 * Class AyeCode_UI_Settings
-	 * @ver 1.0.0
-	 * @todo decide how to implement textdomain
-	 */
-	class AyeCode_UI_Settings {
-
-		/**
-		 * Class version version.
-		 *
-		 * @var string
-		 */
-		public $version = '0.2.20';
-
-		/**
-		 * Class textdomain.
-		 *
-		 * @var string
-		 */
-		public $textdomain = 'aui';
-
-		/**
-		 * Latest version of Bootstrap at time of publish published.
-		 *
-		 * @var string
-		 */
-		public $latest = "5.2.2";
-
-		/**
-		 * Current version of select2 being used.
-		 *
-		 * @var string
-		 */
-		public $select2_version = "4.0.11";
-
-		/**
-		 * The title.
-		 *
-		 * @var string
-		 */
-		public $name = 'AyeCode UI';
-
-		/**
-		 * The relative url to the assets.
-		 *
-		 * @var string
-		 */
-		public $url = '';
-
-		/**
-		 * Holds the settings values.
-		 *
-		 * @var array
-		 */
-		private $settings;
-
-		/**
-		 * AyeCode_UI_Settings instance.
-		 *
-		 * @access private
-		 * @since  1.0.0
-		 * @var    AyeCode_UI_Settings There can be only one!
-		 */
-		private static $instance = null;
-
-
-		/**
-		 * Main AyeCode_UI_Settings Instance.
-		 *
-		 * Ensures only one instance of AyeCode_UI_Settings is loaded or can be loaded.
-		 *
-		 * @since 1.0.0
-		 * @static
-		 * @return AyeCode_UI_Settings - Main instance.
-		 */
-		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
-
-				self::$instance = new AyeCode_UI_Settings;
-
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
-
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
-
-					// Maybe show example page
-					add_action( 'template_redirect', array( self::$instance,'maybe_show_examples' ) );
-
-					if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
-						add_filter( 'sd_aui_colors', array( self::$instance,'sd_aui_colors' ), 10, 3 );
-					}
-				}
+    /**
+     * A Class to be able to change settings for Font Awesome.
+     *
+     * Class AyeCode_UI_Settings
+     * @ver 1.0.0
+     * @todo decide how to implement textdomain
+     */
+    class AyeCode_UI_Settings {
+
+        /**
+         * Class version version.
+         *
+         * @var string
+         */
+        public $version = '0.2.20';
+
+        /**
+         * Class textdomain.
+         *
+         * @var string
+         */
+        public $textdomain = 'aui';
 
-				add_action( 'customize_register', array( self::$instance, 'customizer_settings' ));
+        /**
+         * Latest version of Bootstrap at time of publish published.
+         *
+         * @var string
+         */
+        public $latest = "5.2.2";
+
+        /**
+         * Current version of select2 being used.
+         *
+         * @var string
+         */
+        public $select2_version = "4.0.11";
 
-				do_action( 'ayecode_ui_settings_loaded' );
-			}
+        /**
+         * The title.
+         *
+         * @var string
+         */
+        public $name = 'AyeCode UI';
 
-			return self::$instance;
-		}
+        /**
+         * The relative url to the assets.
+         *
+         * @var string
+         */
+        public $url = '';
 
-		/**
-		 * Add custom colors to the color selector.
-		 *
-		 * @param $theme_colors
-		 * @param $include_outlines
-		 * @param $include_branding
-		 *
-		 * @return mixed
-		 */
-		public function sd_aui_colors( $theme_colors, $include_outlines, $include_branding ){
+        /**
+         * Holds the settings values.
+         *
+         * @var array
+         */
+        private $settings;
 
+        /**
+         * AyeCode_UI_Settings instance.
+         *
+         * @access private
+         * @since  1.0.0
+         * @var    AyeCode_UI_Settings There can be only one!
+         */
+        private static $instance = null;
 
-			$setting = wp_get_global_settings();
 
-			if(!empty($setting['color']['palette']['custom'])){
-				foreach($setting['color']['palette']['custom'] as $color){
-					$theme_colors[$color['slug']] = esc_attr($color['name']);
-				}
-			}
-
-			return $theme_colors;
-		}
-
-		/**
-		 * Setup some constants.
-		 */
-		public function constants(){
-			define( 'AUI_PRIMARY_COLOR_ORIGINAL', "#1e73be" );
-			define( 'AUI_SECONDARY_COLOR_ORIGINAL', '#6c757d' );
-			define( 'AUI_INFO_COLOR_ORIGINAL', '#17a2b8' );
-			define( 'AUI_WARNING_COLOR_ORIGINAL', '#ffc107' );
-			define( 'AUI_DANGER_COLOR_ORIGINAL', '#dc3545' );
-			define( 'AUI_SUCCESS_COLOR_ORIGINAL', '#44c553' );
-			define( 'AUI_LIGHT_COLOR_ORIGINAL', '#f8f9fa' );
-			define( 'AUI_DARK_COLOR_ORIGINAL', '#343a40' );
-			define( 'AUI_WHITE_COLOR_ORIGINAL', '#fff' );
-			define( 'AUI_PURPLE_COLOR_ORIGINAL', '#ad6edd' );
-			define( 'AUI_SALMON_COLOR_ORIGINAL', '#ff977a' );
-			define( 'AUI_CYAN_COLOR_ORIGINAL', '#35bdff' );
-			define( 'AUI_GRAY_COLOR_ORIGINAL', '#ced4da' );
-			define( 'AUI_INDIGO_COLOR_ORIGINAL', '#502c6c' );
-			define( 'AUI_ORANGE_COLOR_ORIGINAL', '#orange' );
-			define( 'AUI_BLACK_COLOR_ORIGINAL', '#000' );
-
-			if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
-				define( 'AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_SECONDARY_COLOR' ) ) {
-				define( 'AUI_SECONDARY_COLOR', AUI_SECONDARY_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_INFO_COLOR' ) ) {
-				define( 'AUI_INFO_COLOR', AUI_INFO_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_WARNING_COLOR' ) ) {
-				define( 'AUI_WARNING_COLOR', AUI_WARNING_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_DANGER_COLOR' ) ) {
-				define( 'AUI_DANGER_COLOR', AUI_DANGER_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_SUCCESS_COLOR' ) ) {
-				define( 'AUI_SUCCESS_COLOR', AUI_SUCCESS_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_LIGHT_COLOR' ) ) {
-				define( 'AUI_LIGHT_COLOR', AUI_LIGHT_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_DARK_COLOR' ) ) {
-				define( 'AUI_DARK_COLOR', AUI_DARK_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_WHITE_COLOR' ) ) {
-				define( 'AUI_WHITE_COLOR', AUI_WHITE_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_PURPLE_COLOR' ) ) {
-				define( 'AUI_PURPLE_COLOR', AUI_PURPLE_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_SALMON_COLOR' ) ) {
-				define( 'AUI_SALMON_COLOR', AUI_SALMON_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_CYAN_COLOR' ) ) {
-				define( 'AUI_CYAN_COLOR', AUI_CYAN_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_GRAY_COLOR' ) ) {
-				define( 'AUI_GRAY_COLOR', AUI_GRAY_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_INDIGO_COLOR' ) ) {
-				define( 'AUI_INDIGO_COLOR', AUI_INDIGO_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_ORANGE_COLOR' ) ) {
-				define( 'AUI_ORANGE_COLOR', AUI_ORANGE_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_BLACK_COLOR' ) ) {
-				define( 'AUI_BLACK_COLOR', AUI_BLACK_COLOR_ORIGINAL );
-			}
-
-		}
-
-		public static function get_colors( $original = false){
-
-			if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
-				return array();
-			}
-			if ( $original ) {
-				return array(
-					'primary'   => AUI_PRIMARY_COLOR_ORIGINAL,
-					'secondary' => AUI_SECONDARY_COLOR_ORIGINAL,
-					'info'      => AUI_INFO_COLOR_ORIGINAL,
-					'warning'   => AUI_WARNING_COLOR_ORIGINAL,
-					'danger'    => AUI_DANGER_COLOR_ORIGINAL,
-					'success'   => AUI_SUCCESS_COLOR_ORIGINAL,
-					'light'     => AUI_LIGHT_COLOR_ORIGINAL,
-					'dark'      => AUI_DARK_COLOR_ORIGINAL,
-					'white'     => AUI_WHITE_COLOR_ORIGINAL,
-					'purple'    => AUI_PURPLE_COLOR_ORIGINAL,
-					'salmon'    => AUI_SALMON_COLOR_ORIGINAL,
-					'cyan'      => AUI_CYAN_COLOR_ORIGINAL,
-					'gray'      => AUI_GRAY_COLOR_ORIGINAL,
-					'indigo'    => AUI_INDIGO_COLOR_ORIGINAL,
-					'orange'    => AUI_ORANGE_COLOR_ORIGINAL,
-					'black'     => AUI_BLACK_COLOR_ORIGINAL,
-				);
-			}
-
-			return array(
-				'primary'   => AUI_PRIMARY_COLOR,
-				'secondary' => AUI_SECONDARY_COLOR,
-				'info'      => AUI_INFO_COLOR,
-				'warning'   => AUI_WARNING_COLOR,
-				'danger'    => AUI_DANGER_COLOR,
-				'success'   => AUI_SUCCESS_COLOR,
-				'light'     => AUI_LIGHT_COLOR,
-				'dark'      => AUI_DARK_COLOR,
-				'white'     => AUI_WHITE_COLOR,
-				'purple'    => AUI_PURPLE_COLOR,
-				'salmon'    => AUI_SALMON_COLOR,
-				'cyan'      => AUI_CYAN_COLOR,
-				'gray'      => AUI_GRAY_COLOR,
-				'indigo'    => AUI_INDIGO_COLOR,
-				'orange'    => AUI_ORANGE_COLOR,
-				'black'     => AUI_BLACK_COLOR,
-			);
-		}
-
-		/**
-		 * Add admin body class to show when BS5 is active.
-		 *
-		 * @param $classes
-		 *
-		 * @return mixed
-		 */
-		public function add_bs5_admin_body_class( $classes = '' ) {
-			$classes .= ' aui_bs5';
-
-			return $classes;
-		}
-
-		/**
-		 * Add a body class to show when BS5 is active.
-		 *
-		 * @param $classes
-		 *
-		 * @return mixed
-		 */
-		public function add_bs5_body_class( $classes ) {
-			$classes[] = 'aui_bs5';
-
-			return $classes;
-		}
-
-		/**
-		 * Initiate the settings and add the required action hooks.
-		 */
-		public function init() {
+        /**
+         * Main AyeCode_UI_Settings Instance.
+         *
+         * Ensures only one instance of AyeCode_UI_Settings is loaded or can be loaded.
+         *
+         * @since 1.0.0
+         * @static
+         * @return AyeCode_UI_Settings - Main instance.
+         */
+        public static function instance() {
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
+
+                self::$instance = new AyeCode_UI_Settings;
+
+                add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+
+                if ( is_admin() ) {
+                    add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
+                    add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
+
+                    // Maybe show example page
+                    add_action( 'template_redirect', array( self::$instance,'maybe_show_examples' ) );
+
+                    if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
+                        add_filter( 'sd_aui_colors', array( self::$instance,'sd_aui_colors' ), 10, 3 );
+                    }
+                }
+
+                add_action( 'customize_register', array( self::$instance, 'customizer_settings' ));
+
+                do_action( 'ayecode_ui_settings_loaded' );
+            }
+
+            return self::$instance;
+        }
+
+        /**
+         * Add custom colors to the color selector.
+         *
+         * @param $theme_colors
+         * @param $include_outlines
+         * @param $include_branding
+         *
+         * @return mixed
+         */
+        public function sd_aui_colors( $theme_colors, $include_outlines, $include_branding ){
+
+
+            $setting = wp_get_global_settings();
+
+            if(!empty($setting['color']['palette']['custom'])){
+                foreach($setting['color']['palette']['custom'] as $color){
+                    $theme_colors[$color['slug']] = esc_attr($color['name']);
+                }
+            }
+
+            return $theme_colors;
+        }
+
+        /**
+         * Setup some constants.
+         */
+        public function constants(){
+            define( 'AUI_PRIMARY_COLOR_ORIGINAL', "#1e73be" );
+            define( 'AUI_SECONDARY_COLOR_ORIGINAL', '#6c757d' );
+            define( 'AUI_INFO_COLOR_ORIGINAL', '#17a2b8' );
+            define( 'AUI_WARNING_COLOR_ORIGINAL', '#ffc107' );
+            define( 'AUI_DANGER_COLOR_ORIGINAL', '#dc3545' );
+            define( 'AUI_SUCCESS_COLOR_ORIGINAL', '#44c553' );
+            define( 'AUI_LIGHT_COLOR_ORIGINAL', '#f8f9fa' );
+            define( 'AUI_DARK_COLOR_ORIGINAL', '#343a40' );
+            define( 'AUI_WHITE_COLOR_ORIGINAL', '#fff' );
+            define( 'AUI_PURPLE_COLOR_ORIGINAL', '#ad6edd' );
+            define( 'AUI_SALMON_COLOR_ORIGINAL', '#ff977a' );
+            define( 'AUI_CYAN_COLOR_ORIGINAL', '#35bdff' );
+            define( 'AUI_GRAY_COLOR_ORIGINAL', '#ced4da' );
+            define( 'AUI_INDIGO_COLOR_ORIGINAL', '#502c6c' );
+            define( 'AUI_ORANGE_COLOR_ORIGINAL', '#orange' );
+            define( 'AUI_BLACK_COLOR_ORIGINAL', '#000' );
+
+            if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
+                define( 'AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_SECONDARY_COLOR' ) ) {
+                define( 'AUI_SECONDARY_COLOR', AUI_SECONDARY_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_INFO_COLOR' ) ) {
+                define( 'AUI_INFO_COLOR', AUI_INFO_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_WARNING_COLOR' ) ) {
+                define( 'AUI_WARNING_COLOR', AUI_WARNING_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_DANGER_COLOR' ) ) {
+                define( 'AUI_DANGER_COLOR', AUI_DANGER_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_SUCCESS_COLOR' ) ) {
+                define( 'AUI_SUCCESS_COLOR', AUI_SUCCESS_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_LIGHT_COLOR' ) ) {
+                define( 'AUI_LIGHT_COLOR', AUI_LIGHT_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_DARK_COLOR' ) ) {
+                define( 'AUI_DARK_COLOR', AUI_DARK_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_WHITE_COLOR' ) ) {
+                define( 'AUI_WHITE_COLOR', AUI_WHITE_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_PURPLE_COLOR' ) ) {
+                define( 'AUI_PURPLE_COLOR', AUI_PURPLE_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_SALMON_COLOR' ) ) {
+                define( 'AUI_SALMON_COLOR', AUI_SALMON_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_CYAN_COLOR' ) ) {
+                define( 'AUI_CYAN_COLOR', AUI_CYAN_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_GRAY_COLOR' ) ) {
+                define( 'AUI_GRAY_COLOR', AUI_GRAY_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_INDIGO_COLOR' ) ) {
+                define( 'AUI_INDIGO_COLOR', AUI_INDIGO_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_ORANGE_COLOR' ) ) {
+                define( 'AUI_ORANGE_COLOR', AUI_ORANGE_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_BLACK_COLOR' ) ) {
+                define( 'AUI_BLACK_COLOR', AUI_BLACK_COLOR_ORIGINAL );
+            }
+
+        }
+
+        public static function get_colors( $original = false){
+
+            if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
+                return array();
+            }
+            if ( $original ) {
+                return array(
+                    'primary'   => AUI_PRIMARY_COLOR_ORIGINAL,
+                    'secondary' => AUI_SECONDARY_COLOR_ORIGINAL,
+                    'info'      => AUI_INFO_COLOR_ORIGINAL,
+                    'warning'   => AUI_WARNING_COLOR_ORIGINAL,
+                    'danger'    => AUI_DANGER_COLOR_ORIGINAL,
+                    'success'   => AUI_SUCCESS_COLOR_ORIGINAL,
+                    'light'     => AUI_LIGHT_COLOR_ORIGINAL,
+                    'dark'      => AUI_DARK_COLOR_ORIGINAL,
+                    'white'     => AUI_WHITE_COLOR_ORIGINAL,
+                    'purple'    => AUI_PURPLE_COLOR_ORIGINAL,
+                    'salmon'    => AUI_SALMON_COLOR_ORIGINAL,
+                    'cyan'      => AUI_CYAN_COLOR_ORIGINAL,
+                    'gray'      => AUI_GRAY_COLOR_ORIGINAL,
+                    'indigo'    => AUI_INDIGO_COLOR_ORIGINAL,
+                    'orange'    => AUI_ORANGE_COLOR_ORIGINAL,
+                    'black'     => AUI_BLACK_COLOR_ORIGINAL,
+                );
+            }
+
+            return array(
+                'primary'   => AUI_PRIMARY_COLOR,
+                'secondary' => AUI_SECONDARY_COLOR,
+                'info'      => AUI_INFO_COLOR,
+                'warning'   => AUI_WARNING_COLOR,
+                'danger'    => AUI_DANGER_COLOR,
+                'success'   => AUI_SUCCESS_COLOR,
+                'light'     => AUI_LIGHT_COLOR,
+                'dark'      => AUI_DARK_COLOR,
+                'white'     => AUI_WHITE_COLOR,
+                'purple'    => AUI_PURPLE_COLOR,
+                'salmon'    => AUI_SALMON_COLOR,
+                'cyan'      => AUI_CYAN_COLOR,
+                'gray'      => AUI_GRAY_COLOR,
+                'indigo'    => AUI_INDIGO_COLOR,
+                'orange'    => AUI_ORANGE_COLOR,
+                'black'     => AUI_BLACK_COLOR,
+            );
+        }
+
+        /**
+         * Add admin body class to show when BS5 is active.
+         *
+         * @param $classes
+         *
+         * @return mixed
+         */
+        public function add_bs5_admin_body_class( $classes = '' ) {
+            $classes .= ' aui_bs5';
+
+            return $classes;
+        }
+
+        /**
+         * Add a body class to show when BS5 is active.
+         *
+         * @param $classes
+         *
+         * @return mixed
+         */
+        public function add_bs5_body_class( $classes ) {
+            $classes[] = 'aui_bs5';
+
+            return $classes;
+        }
+
+        /**
+         * Initiate the settings and add the required action hooks.
+         */
+        public function init() {
             global $aui_bs5;
 
-			// Maybe fix settings
-			if ( ! empty( $_REQUEST['aui-fix-admin'] ) && !empty($_REQUEST['nonce']) && wp_verify_nonce( $_REQUEST['nonce'], "aui-fix-admin" ) ) {
-				$db_settings = get_option( 'ayecode-ui-settings' );
-				if ( ! empty( $db_settings ) ) {
-					$db_settings['css_backend'] = 'compatibility';
-					$db_settings['js_backend'] = 'core-popper';
-					update_option( 'ayecode-ui-settings', $db_settings );
-					wp_safe_redirect(admin_url("options-general.php?page=ayecode-ui-settings&updated=true"));
-				}
-			}
+            // Maybe fix settings
+            if ( ! empty( $_REQUEST['aui-fix-admin'] ) && !empty($_REQUEST['nonce']) && wp_verify_nonce( $_REQUEST['nonce'], "aui-fix-admin" ) ) {
+                $db_settings = get_option( 'ayecode-ui-settings' );
+                if ( ! empty( $db_settings ) ) {
+                    $db_settings['css_backend'] = 'compatibility';
+                    $db_settings['js_backend'] = 'core-popper';
+                    update_option( 'ayecode-ui-settings', $db_settings );
+                    wp_safe_redirect(admin_url("options-general.php?page=ayecode-ui-settings&updated=true"));
+                }
+            }
 
-			$this->constants();
-			$this->settings = $this->get_settings();
-			$this->url = $this->get_url();
+            $this->constants();
+            $this->settings = $this->get_settings();
+            $this->url = $this->get_url();
 
             // define the version
-			$aui_bs5 = $this->settings['bs_ver'] === '5';
-
-			if ( $aui_bs5 ) {
-				include_once( dirname( __FILE__ ) . '/inc/bs-conversion.php' );
-				add_filter( 'admin_body_class', array( $this, 'add_bs5_admin_body_class' ), 99, 1 );
-				add_filter( 'body_class', array( $this, 'add_bs5_body_class' ) );
-			}
-
-			/**
-			 * Maybe load CSS
-			 *
-			 * We load super early in case there is a theme version that might change the colors
-			 */
-			if ( $this->settings['css'] ) {
-				$priority = $this->is_bs3_compat() ? 100 : 1;
+            $aui_bs5 = $this->settings['bs_ver'] === '5';
+
+            if ( $aui_bs5 ) {
+                include_once( dirname( __FILE__ ) . '/inc/bs-conversion.php' );
+                add_filter( 'admin_body_class', array( $this, 'add_bs5_admin_body_class' ), 99, 1 );
+                add_filter( 'body_class', array( $this, 'add_bs5_body_class' ) );
+            }
+
+            /**
+             * Maybe load CSS
+             *
+             * We load super early in case there is a theme version that might change the colors
+             */
+            if ( $this->settings['css'] ) {
+                $priority = $this->is_bs3_compat() ? 100 : 1;
                 $priority = $aui_bs5 ? 10 : $priority;
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), $priority );
-			}
-			if ( $this->settings['css_backend'] && $this->load_admin_scripts() ) {
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
-			}
-
-			// maybe load JS
-			if ( $this->settings['js'] ) {
-				$priority = $this->is_bs3_compat() ? 100 : 1;
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), $priority );
-			}
-			if ( $this->settings['js_backend'] && $this->load_admin_scripts() ) {
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 1 );
-			}
-
-			// Maybe set the HTML font size
-			if ( $this->settings['html_font_size'] ) {
-				add_action( 'wp_footer', array( $this, 'html_font_size' ), 10 );
-			}
-
-			// Maybe show backend style error
-			if( $this->settings['css_backend'] != 'compatibility' || $this->settings['js_backend'] != 'core-popper' ){
-				add_action( 'admin_notices', array( $this, 'show_admin_style_notice' ) );
-			}
-
-		}
-
-		/**
-		 * Show admin notice if backend scripts not loaded.
-		 */
-		public function show_admin_style_notice(){
-			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings&aui-fix-admin=true&nonce=".wp_create_nonce('aui-fix-admin'));
-			$button = '<a href="'.esc_url($fix_url).'" class="button-primary">Fix Now</a>';
-			$message = __( '<b>Style Issue:</b> AyeCode UI is disable or set wrong.')." " .$button;
-			echo '<div class="notice notice-error aui-settings-error-notice"><p>'. wp_kses_post( $message ).'</p></div>';
-		}
-
-		/**
-		 * Check if we should load the admin scripts or not.
-		 *
-		 * @return bool
-		 */
-		public function load_admin_scripts(){
-			$result = true;
-
-			// check if specifically disabled
-			if(!empty($this->settings['disable_admin'])){
-				$url_parts = explode("\n",$this->settings['disable_admin']);
-				foreach($url_parts as $part){
-					if( strpos($_SERVER['REQUEST_URI'], trim($part)) !== false ){
-						return false; // return early, no point checking further
-					}
-				}
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Add a html font size to the footer.
-		 */
-		public function html_font_size(){
-			$this->settings = $this->get_settings();
-			echo "<style>html{font-size:".absint($this->settings['html_font_size'])."px;}</style>";
-		}
-
-		/**
-		 * Check if the current admin screen should load scripts.
-		 *
-		 * @return bool
-		 */
-		public function is_aui_screen(){
+                add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), $priority );
+            }
+            if ( $this->settings['css_backend'] && $this->load_admin_scripts() ) {
+                add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
+            }
+
+            // maybe load JS
+            if ( $this->settings['js'] ) {
+                $priority = $this->is_bs3_compat() ? 100 : 1;
+                add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), $priority );
+            }
+            if ( $this->settings['js_backend'] && $this->load_admin_scripts() ) {
+                add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 1 );
+            }
+
+            // Maybe set the HTML font size
+            if ( $this->settings['html_font_size'] ) {
+                add_action( 'wp_footer', array( $this, 'html_font_size' ), 10 );
+            }
+
+            // Maybe show backend style error
+            if( $this->settings['css_backend'] != 'compatibility' || $this->settings['js_backend'] != 'core-popper' ){
+                add_action( 'admin_notices', array( $this, 'show_admin_style_notice' ) );
+            }
+
+        }
+
+        /**
+         * Show admin notice if backend scripts not loaded.
+         */
+        public function show_admin_style_notice(){
+            $fix_url = admin_url("options-general.php?page=ayecode-ui-settings&aui-fix-admin=true&nonce=".wp_create_nonce('aui-fix-admin'));
+            $button = '<a href="'.esc_url($fix_url).'" class="button-primary">Fix Now</a>';
+            $message = __( '<b>Style Issue:</b> AyeCode UI is disable or set wrong.')." " .$button;
+            echo '<div class="notice notice-error aui-settings-error-notice"><p>'. wp_kses_post( $message ).'</p></div>';
+        }
+
+        /**
+         * Check if we should load the admin scripts or not.
+         *
+         * @return bool
+         */
+        public function load_admin_scripts(){
+            $result = true;
+
+            // check if specifically disabled
+            if(!empty($this->settings['disable_admin'])){
+                $url_parts = explode("\n",$this->settings['disable_admin']);
+                foreach($url_parts as $part){
+                    if( strpos($_SERVER['REQUEST_URI'], trim($part)) !== false ){
+                        return false; // return early, no point checking further
+                    }
+                }
+            }
+
+            return $result;
+        }
+
+        /**
+         * Add a html font size to the footer.
+         */
+        public function html_font_size(){
+            $this->settings = $this->get_settings();
+            echo "<style>html{font-size:".absint($this->settings['html_font_size'])."px;}</style>";
+        }
+
+        /**
+         * Check if the current admin screen should load scripts.
+         *
+         * @return bool
+         */
+        public function is_aui_screen(){
 //			echo '###';exit;
-			$load = false;
-			// check if we should load or not
-			if ( is_admin() ) {
-				// Only enable on set pages
-				$aui_screens = array(
-					'page',
+            $load = false;
+            // check if we should load or not
+            if ( is_admin() ) {
+                // Only enable on set pages
+                $aui_screens = array(
+                    'page',
                     //'docs',
-					'post',
-					'settings_page_ayecode-ui-settings',
-					'appearance_page_gutenberg-widgets',
-					'widgets',
-					'ayecode-ui-settings',
-					'site-editor'
-				);
-				$screen_ids = apply_filters( 'aui_screen_ids', $aui_screens );
+                    'post',
+                    'settings_page_ayecode-ui-settings',
+                    'appearance_page_gutenberg-widgets',
+                    'widgets',
+                    'ayecode-ui-settings',
+                    'site-editor'
+                );
+                $screen_ids = apply_filters( 'aui_screen_ids', $aui_screens );
 
-				$screen = get_current_screen();
+                $screen = get_current_screen();
 
 //				echo '###'.$screen->id;
 
-				// check if we are on a AUI screen
-				if ( $screen && in_array( $screen->id, $screen_ids ) ) {
-					$load = true;
-				}
+                // check if we are on a AUI screen
+                if ( $screen && in_array( $screen->id, $screen_ids ) ) {
+                    $load = true;
+                }
 
-				//load for widget previews in WP 5.8
-				if( !empty($_REQUEST['legacy-widget-preview'])){
-					$load = true;
-				}
-			}
+                //load for widget previews in WP 5.8
+                if( !empty($_REQUEST['legacy-widget-preview'])){
+                    $load = true;
+                }
+            }
 
 
 
-			return apply_filters( 'aui_load_on_admin' , $load );
-		}
+            return apply_filters( 'aui_load_on_admin' , $load );
+        }
 
-		/**
-		 * Check if the current theme is a block theme.
-		 *
-		 * @return bool
-		 */
-		public static function is_block_theme() {
-			if ( function_exists( 'wp_is_block_theme' && wp_is_block_theme() ) ) {
-				return true;
-			}
+        /**
+         * Check if the current theme is a block theme.
+         *
+         * @return bool
+         */
+        public static function is_block_theme() {
+            if ( function_exists( 'wp_is_block_theme' && wp_is_block_theme() ) ) {
+                return true;
+            }
 
-			return false;
-		}
+            return false;
+        }
 
-		/**
-		 * Adds the styles.
-		 */
-		public function enqueue_style() {
+        /**
+         * Adds the styles.
+         */
+        public function enqueue_style() {
             global $aui_bs5;
 
             $load_fse = false;
 
-			if( is_admin() && !$this->is_aui_screen()){
-				// don't add wp-admin scripts if not requested to
-			}else{
-				$css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
+            if( is_admin() && !$this->is_aui_screen()){
+                // don't add wp-admin scripts if not requested to
+            }else{
+                $css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
 
-				$rtl = is_rtl() && ! $aui_bs5 ? '-rtl' : '';
+                $rtl = is_rtl() && ! $aui_bs5 ? '-rtl' : '';
 
                 $bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
 
-				if($this->settings[$css_setting]){
-					$compatibility = $this->settings[$css_setting]=='core' ? false : true;
-					$url = $this->settings[$css_setting]=='core' ? $this->url.'assets'.$bs_ver.'/css/ayecode-ui'.$rtl.'.css' : $this->url.'assets'.$bs_ver.'/css/ayecode-ui-compatibility'.$rtl.'.css';
+                if($this->settings[$css_setting]){
+                    $compatibility = $this->settings[$css_setting]=='core' ? false : true;
+                    $url = $this->settings[$css_setting]=='core' ? $this->url.'assets'.$bs_ver.'/css/ayecode-ui'.$rtl.'.css' : $this->url.'assets'.$bs_ver.'/css/ayecode-ui-compatibility'.$rtl.'.css';
 
 
 
-					wp_register_style( 'ayecode-ui', $url, array(), $this->version );
-					wp_enqueue_style( 'ayecode-ui' );
+                    wp_register_style( 'ayecode-ui', $url, array(), $this->version );
+                    wp_enqueue_style( 'ayecode-ui' );
 
-					$current_screen = function_exists('get_current_screen' ) ? get_current_screen() : '';
+                    $current_screen = function_exists('get_current_screen' ) ? get_current_screen() : '';
 
 //					if ( is_admin() && !empty($_REQUEST['postType']) ) {
-					if ( is_admin() && ( !empty($_REQUEST['postType']) || $current_screen->is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
-						$url = $this->url.'assets'.$bs_ver.'/css/ayecode-ui-fse.css';
-						wp_register_style( 'ayecode-ui-fse', $url, array(), $this->version );
-						wp_enqueue_style( 'ayecode-ui-fse' );
-						$load_fse = true;
-					}
+                    if ( is_admin() && ( !empty($_REQUEST['postType']) || $current_screen->is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
+                        $url = $this->url.'assets'.$bs_ver.'/css/ayecode-ui-fse.css';
+                        wp_register_style( 'ayecode-ui-fse', $url, array(), $this->version );
+                        wp_enqueue_style( 'ayecode-ui-fse' );
+                        $load_fse = true;
+                    }
 
 
-					// flatpickr
-					wp_register_style( 'flatpickr', $this->url.'assets'.$bs_ver.'/css/flatpickr.min.css', array(), $this->version );
+                    // flatpickr
+                    wp_register_style( 'flatpickr', $this->url.'assets'.$bs_ver.'/css/flatpickr.min.css', array(), $this->version );
 
-					// fix some wp-admin issues
-					if(is_admin()){
-						$custom_css = "
+                    // fix some wp-admin issues
+                    if(is_admin()){
+                        $custom_css = "
                 body{
                     background-color: #f1f1f1;
                     font-family: -apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;
@@ -535,67 +535,67 @@ 
 				}
                 ";
 
-						// @todo, remove once fixed :: fix for this bug https://github.com/WordPress/gutenberg/issues/14377
-						$custom_css .= "
+                        // @todo, remove once fixed :: fix for this bug https://github.com/WordPress/gutenberg/issues/14377
+                        $custom_css .= "
 						.edit-post-sidebar input[type=color].components-text-control__input{
 						    padding: 0;
 						}
 					";
-						wp_add_inline_style( 'ayecode-ui', $custom_css );
-					}
+                        wp_add_inline_style( 'ayecode-ui', $custom_css );
+                    }
 
-					// custom changes
-					if ( $load_fse ) {
-						wp_add_inline_style( 'ayecode-ui-fse', self::custom_css($compatibility) );
-					}else{
-						wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
+                    // custom changes
+                    if ( $load_fse ) {
+                        wp_add_inline_style( 'ayecode-ui-fse', self::custom_css($compatibility) );
+                    }else{
+                        wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
 
-					}
+                    }
 
-				}
-			}
+                }
+            }
 
 
-		}
+        }
 
-		/**
-		 * Get inline script used if bootstrap enqueued
-		 *
-		 * If this remains small then its best to use this than to add another JS file.
-		 */
-		public function inline_script() {
+        /**
+         * Get inline script used if bootstrap enqueued
+         *
+         * If this remains small then its best to use this than to add another JS file.
+         */
+        public function inline_script() {
             global $aui_bs5;
-			// Flatpickr calendar locale
-			$flatpickr_locale = self::flatpickr_locale();
-
-			ob_start();
-			if ( $aui_bs5 ) {
-				include_once( dirname( __FILE__ ) . '/inc/bs5-js.php' );
-			}else{
-				include_once( dirname( __FILE__ ) . '/inc/bs4-js.php' );
+            // Flatpickr calendar locale
+            $flatpickr_locale = self::flatpickr_locale();
+
+            ob_start();
+            if ( $aui_bs5 ) {
+                include_once( dirname( __FILE__ ) . '/inc/bs5-js.php' );
+            }else{
+                include_once( dirname( __FILE__ ) . '/inc/bs4-js.php' );
             }
 
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', self::minify_js($output) );
-		}
-
-
-		/**
-		 * JS to help with conflict issues with other plugins and themes using bootstrap v3.
-		 *
-		 * @TODO we may need this when other conflicts arrise.
-		 * @return mixed
-		 */
-		public static function bs3_compat_js() {
-			ob_start();
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', self::minify_js($output) );
+        }
+
+
+        /**
+         * JS to help with conflict issues with other plugins and themes using bootstrap v3.
+         *
+         * @TODO we may need this when other conflicts arrise.
+         * @return mixed
+         */
+        public static function bs3_compat_js() {
+            ob_start();
+            ?>
             <script>
 				<?php if( defined( 'FUSION_BUILDER_VERSION' ) ){ ?>
                 /* With Avada builder */
@@ -603,20 +603,20 @@ 
 				<?php } ?>
             </script>
 			<?php
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', ob_get_clean());
-		}
-
-		/**
-		 * Get inline script used if bootstrap file browser enqueued.
-		 *
-		 * If this remains small then its best to use this than to add another JS file.
-		 */
-		public function inline_script_file_browser(){
-			ob_start();
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', ob_get_clean());
+        }
+
+        /**
+         * Get inline script used if bootstrap file browser enqueued.
+         *
+         * If this remains small then its best to use this than to add another JS file.
+         */
+        public function inline_script_file_browser(){
+            ob_start();
+            ?>
             <script>
                 // run on doc ready
                 jQuery(document).ready(function () {
@@ -624,282 +624,282 @@ 
                 });
             </script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
 
-		/**
-		 * Adds the Font Awesome JS.
-		 */
-		public function enqueue_scripts() {
+        /**
+         * Adds the Font Awesome JS.
+         */
+        public function enqueue_scripts() {
 
-			if( is_admin() && !$this->is_aui_screen()){
-				// don't add wp-admin scripts if not requested to
-			}else {
+            if( is_admin() && !$this->is_aui_screen()){
+                // don't add wp-admin scripts if not requested to
+            }else {
 
-				$js_setting = current_action() == 'wp_enqueue_scripts' ? 'js' : 'js_backend';
+                $js_setting = current_action() == 'wp_enqueue_scripts' ? 'js' : 'js_backend';
 
-				$bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
+                $bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
 
-				// select2
-				wp_register_script( 'select2', $this->url . 'assets/js/select2.min.js', array( 'jquery' ), $this->select2_version );
+                // select2
+                wp_register_script( 'select2', $this->url . 'assets/js/select2.min.js', array( 'jquery' ), $this->select2_version );
 
-				// flatpickr
-				wp_register_script( 'flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->version );
+                // flatpickr
+                wp_register_script( 'flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->version );
 
-				// iconpicker
-				if ( defined( 'FAS_ICONPICKER_JS_URL' ) ) {
-					wp_register_script( 'iconpicker', FAS_ICONPICKER_JS_URL, array(), $this->version );
-				}else{
-					wp_register_script( 'iconpicker', $this->url . 'assets/js/fa-iconpicker.min.js', array(), $this->version );
-				}
+                // iconpicker
+                if ( defined( 'FAS_ICONPICKER_JS_URL' ) ) {
+                    wp_register_script( 'iconpicker', FAS_ICONPICKER_JS_URL, array(), $this->version );
+                }else{
+                    wp_register_script( 'iconpicker', $this->url . 'assets/js/fa-iconpicker.min.js', array(), $this->version );
+                }
 
-				// Bootstrap file browser
-				wp_register_script( 'aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array( 'jquery' ), $this->select2_version );
-				wp_add_inline_script( 'aui-custom-file-input', $this->inline_script_file_browser() );
-
-				$load_inline = false;
-
-				if ( $this->settings[ $js_setting ] == 'core-popper' ) {
-					// Bootstrap bundle
-					$url = $this->url . 'assets' . $bs_ver . '/js/bootstrap.bundle.min.js';
-					wp_register_script( 'bootstrap-js-bundle', $url, array(
-						'select2',
-						'jquery'
-					), $this->version, $this->is_bs3_compat() );
-					// if in admin then add to footer for compatibility.
-					is_admin() ? wp_enqueue_script( 'bootstrap-js-bundle', '', null, null, true ) : wp_enqueue_script( 'bootstrap-js-bundle' );
-					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-js-bundle', $script );
-				} elseif ( $this->settings[ $js_setting ] == 'popper' ) {
-					$url = $this->url . 'assets/js/popper.min.js'; //@todo we need to update this to bs5
-					wp_register_script( 'bootstrap-js-popper', $url, array( 'select2', 'jquery' ), $this->version );
-					wp_enqueue_script( 'bootstrap-js-popper' );
-					$load_inline = true;
-				} else {
-					$load_inline = true;
-				}
+                // Bootstrap file browser
+                wp_register_script( 'aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array( 'jquery' ), $this->select2_version );
+                wp_add_inline_script( 'aui-custom-file-input', $this->inline_script_file_browser() );
+
+                $load_inline = false;
+
+                if ( $this->settings[ $js_setting ] == 'core-popper' ) {
+                    // Bootstrap bundle
+                    $url = $this->url . 'assets' . $bs_ver . '/js/bootstrap.bundle.min.js';
+                    wp_register_script( 'bootstrap-js-bundle', $url, array(
+                        'select2',
+                        'jquery'
+                    ), $this->version, $this->is_bs3_compat() );
+                    // if in admin then add to footer for compatibility.
+                    is_admin() ? wp_enqueue_script( 'bootstrap-js-bundle', '', null, null, true ) : wp_enqueue_script( 'bootstrap-js-bundle' );
+                    $script = $this->inline_script();
+                    wp_add_inline_script( 'bootstrap-js-bundle', $script );
+                } elseif ( $this->settings[ $js_setting ] == 'popper' ) {
+                    $url = $this->url . 'assets/js/popper.min.js'; //@todo we need to update this to bs5
+                    wp_register_script( 'bootstrap-js-popper', $url, array( 'select2', 'jquery' ), $this->version );
+                    wp_enqueue_script( 'bootstrap-js-popper' );
+                    $load_inline = true;
+                } else {
+                    $load_inline = true;
+                }
 
-				// Load needed inline scripts by faking the loading of a script if the main script is not being loaded
-				if ( $load_inline ) {
-					wp_register_script( 'bootstrap-dummy', '', array( 'select2', 'jquery' ) );
-					wp_enqueue_script( 'bootstrap-dummy' );
-					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-dummy', $script );
-				}
-			}
-
-		}
-
-		/**
-		 * Enqueue flatpickr if called.
-		 */
-		public function enqueue_flatpickr(){
-			wp_enqueue_style( 'flatpickr' );
-			wp_enqueue_script( 'flatpickr' );
-		}
-
-		/**
-		 * Enqueue iconpicker if called.
-		 */
-		public function enqueue_iconpicker(){
-			wp_enqueue_style( 'iconpicker' );
-			wp_enqueue_script( 'iconpicker' );
-		}
-
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url() {
-			$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-			$content_url = untrailingslashit( WP_CONTENT_URL );
-
-			// Replace http:// to https://.
-			if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-				$content_url = str_replace( 'http://', 'https://', $content_url );
-			}
-
-			// Check if we are inside a plugin
-			$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-			$url = str_replace( $content_dir, $content_url, $file_dir );
-
-			return trailingslashit( $url );
-		}
-
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url_old() {
-
-			$url = '';
-			// check if we are inside a plugin
-			$file_dir = str_replace( "/includes","", wp_normalize_path( dirname( __FILE__ ) ) );
-
-			// add check in-case user has changed wp-content dir name.
-			$wp_content_folder_name = basename(WP_CONTENT_DIR);
-			$dir_parts = explode("/$wp_content_folder_name/",$file_dir);
-			$url_parts = explode("/$wp_content_folder_name/",plugins_url());
-
-			if(!empty($url_parts[0]) && !empty($dir_parts[1])){
-				$url = trailingslashit( $url_parts[0]."/$wp_content_folder_name/".$dir_parts[1] );
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Register the database settings with WordPress.
-		 */
-		public function register_settings() {
-			register_setting( 'ayecode-ui-settings', 'ayecode-ui-settings' );
-		}
-
-		/**
-		 * Add the WordPress settings menu item.
-		 * @since 1.0.10 Calling function name direct will fail theme check so we don't.
-		 */
-		public function menu_item() {
-			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
-				$this,
-				'settings_page'
-			) );
-		}
-
-		/**
-		 * Get a list of themes and their default JS settings.
-		 *
-		 * @return array
-		 */
-		public function theme_js_settings(){
-			return array(
-				'ayetheme' => 'popper',
-				'listimia' => 'required',
-				'listimia_backend' => 'core-popper',
-				//'avada'    => 'required', // removed as we now add compatibility
-			);
-		}
-
-		/**
+                // Load needed inline scripts by faking the loading of a script if the main script is not being loaded
+                if ( $load_inline ) {
+                    wp_register_script( 'bootstrap-dummy', '', array( 'select2', 'jquery' ) );
+                    wp_enqueue_script( 'bootstrap-dummy' );
+                    $script = $this->inline_script();
+                    wp_add_inline_script( 'bootstrap-dummy', $script );
+                }
+            }
+
+        }
+
+        /**
+         * Enqueue flatpickr if called.
+         */
+        public function enqueue_flatpickr(){
+            wp_enqueue_style( 'flatpickr' );
+            wp_enqueue_script( 'flatpickr' );
+        }
+
+        /**
+         * Enqueue iconpicker if called.
+         */
+        public function enqueue_iconpicker(){
+            wp_enqueue_style( 'iconpicker' );
+            wp_enqueue_script( 'iconpicker' );
+        }
+
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url() {
+            $content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
+            $content_url = untrailingslashit( WP_CONTENT_URL );
+
+            // Replace http:// to https://.
+            if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
+                $content_url = str_replace( 'http://', 'https://', $content_url );
+            }
+
+            // Check if we are inside a plugin
+            $file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
+            $url = str_replace( $content_dir, $content_url, $file_dir );
+
+            return trailingslashit( $url );
+        }
+
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url_old() {
+
+            $url = '';
+            // check if we are inside a plugin
+            $file_dir = str_replace( "/includes","", wp_normalize_path( dirname( __FILE__ ) ) );
+
+            // add check in-case user has changed wp-content dir name.
+            $wp_content_folder_name = basename(WP_CONTENT_DIR);
+            $dir_parts = explode("/$wp_content_folder_name/",$file_dir);
+            $url_parts = explode("/$wp_content_folder_name/",plugins_url());
+
+            if(!empty($url_parts[0]) && !empty($dir_parts[1])){
+                $url = trailingslashit( $url_parts[0]."/$wp_content_folder_name/".$dir_parts[1] );
+            }
+
+            return $url;
+        }
+
+        /**
+         * Register the database settings with WordPress.
+         */
+        public function register_settings() {
+            register_setting( 'ayecode-ui-settings', 'ayecode-ui-settings' );
+        }
+
+        /**
+         * Add the WordPress settings menu item.
+         * @since 1.0.10 Calling function name direct will fail theme check so we don't.
+         */
+        public function menu_item() {
+            $menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
+            call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
+                $this,
+                'settings_page'
+            ) );
+        }
+
+        /**
+         * Get a list of themes and their default JS settings.
+         *
+         * @return array
+         */
+        public function theme_js_settings(){
+            return array(
+                'ayetheme' => 'popper',
+                'listimia' => 'required',
+                'listimia_backend' => 'core-popper',
+                //'avada'    => 'required', // removed as we now add compatibility
+            );
+        }
+
+        /**
          * Get the date the site was installed.
          *
-		 * @return false|string
-		 */
+         * @return false|string
+         */
         public function get_site_install_date() {
-	        global $wpdb; // This gives you access to the WordPress database object
+            global $wpdb; // This gives you access to the WordPress database object
 
-	        // Prepare the SQL query to get the oldest registration date
-	        $query = "SELECT MIN(user_registered) AS oldest_registration_date FROM {$wpdb->users}";
+            // Prepare the SQL query to get the oldest registration date
+            $query = "SELECT MIN(user_registered) AS oldest_registration_date FROM {$wpdb->users}";
 
-	        // Execute the query
-	        $date = $wpdb->get_var( $query ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
+            // Execute the query
+            $date = $wpdb->get_var( $query ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 
-	        return $date ? $date : false;
+            return $date ? $date : false;
         }
 
-		/**
-		 * Show admin notice if backend scripts not loaded.
-		 */
-		public function show_admin_version_notice(){
-			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings" );
-			$button = '<a href="'.esc_url($fix_url).'" class="button-primary">View Settings</a>';
-			$message = __( '<b>Style Issue:</b> AyeCode UI has changed its default version from v4 to v5, if you notice unwanted style changes, please revert to v4 (saving the settings page will remove this notice)')." " .$button;
-			echo '<div class="notice notice-error aui-settings-error-notice"><p>'. wp_kses_post( $message ).'</p></div>';
-		}
-
-		/**
-		 * Get the current Font Awesome output settings.
-		 *
-		 * @return array The array of settings.
-		 */
-		public function get_settings() {
-
-			$db_settings = get_option( 'ayecode-ui-settings' );
+        /**
+         * Show admin notice if backend scripts not loaded.
+         */
+        public function show_admin_version_notice(){
+            $fix_url = admin_url("options-general.php?page=ayecode-ui-settings" );
+            $button = '<a href="'.esc_url($fix_url).'" class="button-primary">View Settings</a>';
+            $message = __( '<b>Style Issue:</b> AyeCode UI has changed its default version from v4 to v5, if you notice unwanted style changes, please revert to v4 (saving the settings page will remove this notice)')." " .$button;
+            echo '<div class="notice notice-error aui-settings-error-notice"><p>'. wp_kses_post( $message ).'</p></div>';
+        }
+
+        /**
+         * Get the current Font Awesome output settings.
+         *
+         * @return array The array of settings.
+         */
+        public function get_settings() {
+
+            $db_settings = get_option( 'ayecode-ui-settings' );
 
             // Maybe show default version notice
-			$site_install_date = new DateTime( self::get_site_install_date() );
-			$switch_over_date = new DateTime("2024-02-01");
-			if ( empty( $db_settings ) && $site_install_date < $switch_over_date ) {
-				add_action( 'admin_notices', array( $this, 'show_admin_version_notice' ) );
-			}
-
-			$js_default = 'core-popper';
-			$js_default_backend = $js_default;
-
-			// maybe set defaults (if no settings set)
-			if(empty($db_settings)){
-				$active_theme = strtolower( get_template() ); // active parent theme.
-				$theme_js_settings = self::theme_js_settings();
-				if(isset($theme_js_settings[$active_theme])){
-					$js_default = $theme_js_settings[$active_theme];
-					$js_default_backend = isset($theme_js_settings[$active_theme."_backend"]) ? $theme_js_settings[$active_theme."_backend"] : $js_default;
-				}
-			}
+            $site_install_date = new DateTime( self::get_site_install_date() );
+            $switch_over_date = new DateTime("2024-02-01");
+            if ( empty( $db_settings ) && $site_install_date < $switch_over_date ) {
+                add_action( 'admin_notices', array( $this, 'show_admin_version_notice' ) );
+            }
 
-			/**
-			 * Filter the default settings.
-			 */
-			$defaults = apply_filters( 'ayecode-ui-default-settings', array(
-				'css'            => 'compatibility', // core, compatibility
-				'js'             => $js_default, // js to load, core-popper, popper
-				'html_font_size' => '16', // js to load, core-popper, popper
-				'css_backend'    => 'compatibility', // core, compatibility
-				'js_backend'     => $js_default_backend, // js to load, core-popper, popper
-				'disable_admin'  => '', // URL snippets to disable loading on admin
+            $js_default = 'core-popper';
+            $js_default_backend = $js_default;
+
+            // maybe set defaults (if no settings set)
+            if(empty($db_settings)){
+                $active_theme = strtolower( get_template() ); // active parent theme.
+                $theme_js_settings = self::theme_js_settings();
+                if(isset($theme_js_settings[$active_theme])){
+                    $js_default = $theme_js_settings[$active_theme];
+                    $js_default_backend = isset($theme_js_settings[$active_theme."_backend"]) ? $theme_js_settings[$active_theme."_backend"] : $js_default;
+                }
+            }
+
+            /**
+             * Filter the default settings.
+             */
+            $defaults = apply_filters( 'ayecode-ui-default-settings', array(
+                'css'            => 'compatibility', // core, compatibility
+                'js'             => $js_default, // js to load, core-popper, popper
+                'html_font_size' => '16', // js to load, core-popper, popper
+                'css_backend'    => 'compatibility', // core, compatibility
+                'js_backend'     => $js_default_backend, // js to load, core-popper, popper
+                'disable_admin'  => '', // URL snippets to disable loading on admin
                 'bs_ver'         => '5', // The default bootstrap version to sue by default
-			), $db_settings );
+            ), $db_settings );
 
-			$settings = wp_parse_args( $db_settings, $defaults );
+            $settings = wp_parse_args( $db_settings, $defaults );
 
-			/**
-			 * Filter the Bootstrap settings.
-			 *
-			 * @todo if we add this filer people might use it and then it defeats the purpose of this class :/
-			 */
-			return $this->settings = apply_filters( 'ayecode-ui-settings', $settings, $db_settings, $defaults );
-		}
+            /**
+             * Filter the Bootstrap settings.
+             *
+             * @todo if we add this filer people might use it and then it defeats the purpose of this class :/
+             */
+            return $this->settings = apply_filters( 'ayecode-ui-settings', $settings, $db_settings, $defaults );
+        }
 
 
-		/**
-		 * The settings page html output.
-		 */
-		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( esc_attr__( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
-			}
+        /**
+         * The settings page html output.
+         */
+        public function settings_page() {
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die( esc_attr__( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
+            }
             $overrides = apply_filters( 'ayecode-ui-settings', array(), array(), array() );
 
-			?>
+            ?>
             <div class="wrap">
                 <h1><?php echo esc_attr( $this->name ); ?></h1>
                 <p><?php echo esc_html( apply_filters( 'ayecode-ui-settings-message', __("Here you can adjust settings if you are having compatibility issues.", 'ayecode-connect' ) ) );?></p>
                 <form method="post" action="options.php">
 					<?php
-					settings_fields( 'ayecode-ui-settings' );
-					do_settings_sections( 'ayecode-ui-settings' );
-					?>
+                    settings_fields( 'ayecode-ui-settings' );
+                    do_settings_sections( 'ayecode-ui-settings' );
+                    ?>
 
                     <h2><?php esc_html_e( 'BootStrap Version', 'ayecode-connect' ); ?></h2>
                     <p><?php echo esc_html( apply_filters( 'ayecode-ui-version-settings-message', __("V5 is recommended, however if you have another plugin installed using v4, you may need to use v4 also.", 'ayecode-connect' ) ) );?></p>
 	                <div class="bsui"><?php
-	                if ( ! empty( $overrides ) ) {
-		                echo aui()->alert(array( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			                'type'=> 'info',
-			                'content'=> esc_attr__("Some options are disabled as your current theme is overriding them.", 'ayecode-connect' )
-		                ));
-	                }
-	                ?>
+                    if ( ! empty( $overrides ) ) {
+                        echo aui()->alert(array( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                            'type'=> 'info',
+                            'content'=> esc_attr__("Some options are disabled as your current theme is overriding them.", 'ayecode-connect' )
+                        ));
+                    }
+                    ?>
                     </div>
                     <table class="form-table wpbs-table-version-settings">
                         <tr valign="top">
@@ -983,77 +983,77 @@ 
                     </table>
 
 					<?php
-					submit_button();
-					?>
+                    submit_button();
+                    ?>
                 </form>
                 <div id="wpbs-version" data-aui-source="<?php echo esc_attr( $this->get_load_source() ); ?>"><?php echo esc_html( $this->version ); ?></div>
             </div>
 			<?php
-		}
+        }
 
         public function get_load_source(){
-	        $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-	        $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
-
-	        // Find source plugin/theme of SD
-	        $source = array();
-	        if ( strpos( $file, $plugins_dir ) !== false ) {
-		        $source = explode( "/", plugin_basename( $file ) );
-	        } else if ( function_exists( 'get_theme_root' ) ) {
-		        $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
-
-		        if ( strpos( $file, $themes_dir ) !== false ) {
-			        $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
-		        }
-	        }
+            $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
+            $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+
+            // Find source plugin/theme of SD
+            $source = array();
+            if ( strpos( $file, $plugins_dir ) !== false ) {
+                $source = explode( "/", plugin_basename( $file ) );
+            } else if ( function_exists( 'get_theme_root' ) ) {
+                $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+
+                if ( strpos( $file, $themes_dir ) !== false ) {
+                    $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+                }
+            }
 
             return isset($source[0]) ? esc_attr($source[0]) : '';
         }
 
-		public function customizer_settings($wp_customize){
-			$wp_customize->add_section('aui_settings', array(
-				'title'    => __('AyeCode UI', 'ayecode-connect' ),
-				'priority' => 120,
-			));
-
-			//  =============================
-			//  = Color Picker              =
-			//  =============================
-			$wp_customize->add_setting('aui_options[color_primary]', array(
-				'default'           => AUI_PRIMARY_COLOR,
-				'sanitize_callback' => 'sanitize_hex_color',
-				'capability'        => 'edit_theme_options',
-				'type'              => 'option',
-				'transport'         => 'refresh',
-			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
-				'label'    => __('Primary Color', 'ayecode-connect' ),
-				'section'  => 'aui_settings',
-				'settings' => 'aui_options[color_primary]',
-			)));
-
-			$wp_customize->add_setting('aui_options[color_secondary]', array(
-				'default'           => '#6c757d',
-				'sanitize_callback' => 'sanitize_hex_color',
-				'capability'        => 'edit_theme_options',
-				'type'              => 'option',
-				'transport'         => 'refresh',
-			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
-				'label'    => __('Secondary Color', 'ayecode-connect' ),
-				'section'  => 'aui_settings',
-				'settings' => 'aui_options[color_secondary]',
-			)));
-		}
-
-		/**
-		 * CSS to help with conflict issues with other plugins and themes using bootstrap v3.
-		 *
-		 * @return mixed
-		 */
-		public static function bs3_compat_css() {
-			ob_start();
-			?>
+        public function customizer_settings($wp_customize){
+            $wp_customize->add_section('aui_settings', array(
+                'title'    => __('AyeCode UI', 'ayecode-connect' ),
+                'priority' => 120,
+            ));
+
+            //  =============================
+            //  = Color Picker              =
+            //  =============================
+            $wp_customize->add_setting('aui_options[color_primary]', array(
+                'default'           => AUI_PRIMARY_COLOR,
+                'sanitize_callback' => 'sanitize_hex_color',
+                'capability'        => 'edit_theme_options',
+                'type'              => 'option',
+                'transport'         => 'refresh',
+            ));
+            $wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
+                'label'    => __('Primary Color', 'ayecode-connect' ),
+                'section'  => 'aui_settings',
+                'settings' => 'aui_options[color_primary]',
+            )));
+
+            $wp_customize->add_setting('aui_options[color_secondary]', array(
+                'default'           => '#6c757d',
+                'sanitize_callback' => 'sanitize_hex_color',
+                'capability'        => 'edit_theme_options',
+                'type'              => 'option',
+                'transport'         => 'refresh',
+            ));
+            $wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
+                'label'    => __('Secondary Color', 'ayecode-connect' ),
+                'section'  => 'aui_settings',
+                'settings' => 'aui_options[color_secondary]',
+            )));
+        }
+
+        /**
+         * CSS to help with conflict issues with other plugins and themes using bootstrap v3.
+         *
+         * @return mixed
+         */
+        public static function bs3_compat_css() {
+            ob_start();
+            ?>
             <style>
                 /* Bootstrap 3 compatibility */
                 body.modal-open .modal-backdrop.show:not(.in) {opacity:0.5;}
@@ -1082,55 +1082,55 @@ 
                 <?php } ?>
             </style>
 			<?php
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', self::minify_css( ob_get_clean() ) );
-		}
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', self::minify_css( ob_get_clean() ) );
+        }
 
 
-		public static function custom_css($compatibility = true) {
+        public static function custom_css($compatibility = true) {
             global $aui_bs5;
 
-			$colors = array();
-			if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
+            $colors = array();
+            if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
 
 
-				$setting = wp_get_global_settings();
+                $setting = wp_get_global_settings();
 
 //                print_r(wp_get_global_styles());//exit;
 //                print_r(get_default_block_editor_settings());exit;
 
 //                print_r($setting);echo  '###';exit;
-				if(!empty($setting['color']['palette']['theme'])){
-					foreach($setting['color']['palette']['theme'] as $color){
-						$colors[$color['slug']] = esc_attr($color['color']);
-					}
-				}
+                if(!empty($setting['color']['palette']['theme'])){
+                    foreach($setting['color']['palette']['theme'] as $color){
+                        $colors[$color['slug']] = esc_attr($color['color']);
+                    }
+                }
 
-				if(!empty($setting['color']['palette']['custom'])){
-					foreach($setting['color']['palette']['custom'] as $color){
-						$colors[$color['slug']] = esc_attr($color['color']);
-					}
-				}
-			}else{
-				$settings = get_option('aui_options');
-				$colors = array(
-					'primary'   => ! empty( $settings['color_primary'] ) ? $settings['color_primary'] : AUI_PRIMARY_COLOR,
-					'secondary' => ! empty( $settings['color_secondary'] ) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR
-				);
-			}
+                if(!empty($setting['color']['palette']['custom'])){
+                    foreach($setting['color']['palette']['custom'] as $color){
+                        $colors[$color['slug']] = esc_attr($color['color']);
+                    }
+                }
+            }else{
+                $settings = get_option('aui_options');
+                $colors = array(
+                    'primary'   => ! empty( $settings['color_primary'] ) ? $settings['color_primary'] : AUI_PRIMARY_COLOR,
+                    'secondary' => ! empty( $settings['color_secondary'] ) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR
+                );
+            }
 
-			ob_start();
+            ob_start();
 
-			?>
+            ?>
             <style>
                 <?php
 
-					// BS v3 compat
-					if( self::is_bs3_compat() ){
-						echo self::bs3_compat_css(); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-					}
+                    // BS v3 compat
+                    if( self::is_bs3_compat() ){
+                        echo self::bs3_compat_css(); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                    }
 
                     $current_screen = function_exists('get_current_screen' ) ? get_current_screen() : '';
                     $is_fse = false;
@@ -1138,26 +1138,26 @@ 
                         $is_fse = true;
                     }
 
-					if(!empty($colors)){
-						$d_colors = self::get_colors(true);
+                    if(!empty($colors)){
+                        $d_colors = self::get_colors(true);
 
 //						$is_fse = !empty($_REQUEST['postType']) && $_REQUEST['postType']=='wp_template';
-						foreach($colors as $key => $color ){
-							if((empty( $d_colors[$key]) ||  $d_colors[$key] != $color) || $is_fse ) {
-								$var = $is_fse ? "var(--wp--preset--color--$key)" : $color;
-								$compat = $is_fse ? '.editor-styles-wrapper' : $compatibility;
-								echo $aui_bs5 ? self::css_overwrite_bs5($key,$var,$compat,$color) : self::css_overwrite($key,$var,$compat,$color); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-							}
-						}
-					   // exit;
-					}
+                        foreach($colors as $key => $color ){
+                            if((empty( $d_colors[$key]) ||  $d_colors[$key] != $color) || $is_fse ) {
+                                $var = $is_fse ? "var(--wp--preset--color--$key)" : $color;
+                                $compat = $is_fse ? '.editor-styles-wrapper' : $compatibility;
+                                echo $aui_bs5 ? self::css_overwrite_bs5($key,$var,$compat,$color) : self::css_overwrite($key,$var,$compat,$color); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                            }
+                        }
+                        // exit;
+                    }
 
-					// Set admin bar z-index lower when modal is open.
-					echo ' body.modal-open #wpadminbar{z-index:999}.embed-responsive-16by9 .fluid-width-video-wrapper{padding:0 !important;position:initial}';
+                    // Set admin bar z-index lower when modal is open.
+                    echo ' body.modal-open #wpadminbar{z-index:999}.embed-responsive-16by9 .fluid-width-video-wrapper{padding:0 !important;position:initial}';
 
-					if(is_admin()){
-						echo ' body.modal-open #adminmenuwrap{z-index:999} body.modal-open #wpadminbar{z-index:1025}';
-					}
+                    if(is_admin()){
+                        echo ' body.modal-open #adminmenuwrap{z-index:999} body.modal-open #wpadminbar{z-index:1025}';
+                    }
 
                     if( $aui_bs5 && defined( 'BLOCKSTRAP_VERSION' )  ){
                         $css = '';
@@ -1177,28 +1177,28 @@ 
                         }
 
                         // line height
-                         if( !empty( $theme_settings['typography']['lineHeight'] ) ){
+                            if( !empty( $theme_settings['typography']['lineHeight'] ) ){
                             $css .= '--bs-body-line-height: ' . esc_attr( $theme_settings['typography']['lineHeight'] ) . ';';
                         }
 
 
-                           // font weight
-                         if( !empty( $theme_settings['typography']['fontWeight'] ) ){
+                            // font weight
+                            if( !empty( $theme_settings['typography']['fontWeight'] ) ){
                             $css .= '--bs-body-font-weight: ' . esc_attr( $theme_settings['typography']['fontWeight'] ) . ';';
                         }
 
                         // Background
-                         if( !empty( $theme_settings['color']['background'] ) ){
+                            if( !empty( $theme_settings['color']['background'] ) ){
                             $css .= '--bs-body-bg: ' . esc_attr( $theme_settings['color']['background'] ) . ';';
                         }
 
-                         // Background Gradient
-                         if( !empty( $theme_settings['color']['gradient'] ) ){
+                            // Background Gradient
+                            if( !empty( $theme_settings['color']['gradient'] ) ){
                             $css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
                         }
 
-                           // Background Gradient
-                         if( !empty( $theme_settings['color']['gradient'] ) ){
+                            // Background Gradient
+                            if( !empty( $theme_settings['color']['gradient'] ) ){
                             $css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
                         }
 
@@ -1236,7 +1236,7 @@ 
                             $headings_css .= 'background: ' . esc_attr( $theme_settings['elements']['heading']['color']['background'] ) . ';';
                         }
 
-                         // heading font family
+                            // heading font family
                         if( !empty( $theme_settings['elements']['heading']['typography']['fontFamily'] ) ){
                             $headings_css .= 'font-family: ' . esc_attr( $theme_settings['elements']['heading']['typography']['fontFamily']  ) . ';';
                         }
@@ -1249,21 +1249,21 @@ 
 
                         foreach($hs as $hn){
                             $h_css = '';
-                             if( !empty( $theme_settings['elements'][$hn]['color']['text'] ) ){
+                                if( !empty( $theme_settings['elements'][$hn]['color']['text'] ) ){
                                 $h_css .= 'color: ' . esc_attr( $theme_settings['elements'][$hn]['color']['text'] ) . ';';
-                             }
+                                }
 
-                              if( !empty( $theme_settings['elements'][$hn]['typography']['fontSize'] ) ){
+                                if( !empty( $theme_settings['elements'][$hn]['typography']['fontSize'] ) ){
                                 $h_css .= 'font-size: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontSize']  ) . ';';
-                             }
+                                }
 
-                              if( !empty( $theme_settings['elements'][$hn]['typography']['fontFamily'] ) ){
+                                if( !empty( $theme_settings['elements'][$hn]['typography']['fontFamily'] ) ){
                                 $h_css .= 'font-family: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontFamily']  ) . ';';
-                             }
+                                }
 
-                             if($h_css){
+                                if($h_css){
                                 echo esc_attr( $bep  . $hn ) . '{'.esc_attr( $h_css ).'}';
-                             }
+                                }
                         }
                     }
 
@@ -1274,176 +1274,176 @@ 
                 ?>
             </style>
 			<?php
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', self::minify_css( ob_get_clean() ) );
-		}
-
-		/**
-		 * Check if we should add booststrap 3 compatibility changes.
-		 *
-		 * @return bool
-		 */
-		public static function is_bs3_compat(){
-			return defined('AYECODE_UI_BS3_COMPAT') || defined('SVQ_THEME_VERSION') || defined('FUSION_BUILDER_VERSION');
-		}
-
-		public static function hex_to_rgb( $hex ) {
-			// Remove '#' if present
-			$hex = str_replace( '#', '', $hex );
-
-			// Check if input is RGB
-			if ( strpos( $hex, 'rgba(' ) === 0 || strpos( $hex, 'rgb(' ) === 0 ) {
-				$_rgb = explode( ',', str_replace( array( 'rgba(', 'rgb(', ')' ), '', $hex ) );
-
-				$rgb = ( isset( $_rgb[0] ) ? (int) trim( $_rgb[0] ) : '0' ) . ',';
-				$rgb .= ( isset( $_rgb[1] ) ? (int) trim( $_rgb[1] ) : '0' ) . ',';
-				$rgb .= ( isset( $_rgb[2] ) ? (int) trim( $_rgb[2] ) : '0' );
-
-				return $rgb;
-			}
-
-			// Convert 3-digit hex to 6-digit hex
-			if ( strlen( $hex ) == 3 ) {
-				$hex = str_repeat( substr( $hex, 0, 1 ), 2 ) . str_repeat( substr( $hex, 1, 1 ), 2 ) . str_repeat( substr( $hex, 2, 1 ), 2 );
-			}
-
-			// Convert hex to RGB
-			$r = hexdec( substr( $hex, 0, 2 ) );
-			$g = hexdec( substr( $hex, 2, 2 ) );
-			$b = hexdec( substr( $hex, 4, 2 ) );
-
-			// Return RGB values as an array
-			return $r . ',' . $g . ',' . $b;
-		}
-
-		/**
-		 * Build the CSS to overwrite a bootstrap color variable.
-		 *
-		 * @param $type
-		 * @param $color_code
-		 * @param $compatibility
-		 *
-		 * @return string
-		 */
-		public static function css_overwrite_bs5($type,$color_code,$compatibility, $hex = '' ){
-			global $aui_bs5;
-
-			$is_var = false;
-			$is_custom = strpos($type, 'custom-') !== false ? true : false;
-			if(!$color_code){return '';}
-			if(strpos($color_code, 'var') !== false){
-				//if(!sanitize_hex_color($color_code)){
-				$color_code = esc_attr($color_code);
-				$is_var = true;
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', self::minify_css( ob_get_clean() ) );
+        }
+
+        /**
+         * Check if we should add booststrap 3 compatibility changes.
+         *
+         * @return bool
+         */
+        public static function is_bs3_compat(){
+            return defined('AYECODE_UI_BS3_COMPAT') || defined('SVQ_THEME_VERSION') || defined('FUSION_BUILDER_VERSION');
+        }
+
+        public static function hex_to_rgb( $hex ) {
+            // Remove '#' if present
+            $hex = str_replace( '#', '', $hex );
+
+            // Check if input is RGB
+            if ( strpos( $hex, 'rgba(' ) === 0 || strpos( $hex, 'rgb(' ) === 0 ) {
+                $_rgb = explode( ',', str_replace( array( 'rgba(', 'rgb(', ')' ), '', $hex ) );
+
+                $rgb = ( isset( $_rgb[0] ) ? (int) trim( $_rgb[0] ) : '0' ) . ',';
+                $rgb .= ( isset( $_rgb[1] ) ? (int) trim( $_rgb[1] ) : '0' ) . ',';
+                $rgb .= ( isset( $_rgb[2] ) ? (int) trim( $_rgb[2] ) : '0' );
+
+                return $rgb;
+            }
+
+            // Convert 3-digit hex to 6-digit hex
+            if ( strlen( $hex ) == 3 ) {
+                $hex = str_repeat( substr( $hex, 0, 1 ), 2 ) . str_repeat( substr( $hex, 1, 1 ), 2 ) . str_repeat( substr( $hex, 2, 1 ), 2 );
+            }
+
+            // Convert hex to RGB
+            $r = hexdec( substr( $hex, 0, 2 ) );
+            $g = hexdec( substr( $hex, 2, 2 ) );
+            $b = hexdec( substr( $hex, 4, 2 ) );
+
+            // Return RGB values as an array
+            return $r . ',' . $g . ',' . $b;
+        }
+
+        /**
+         * Build the CSS to overwrite a bootstrap color variable.
+         *
+         * @param $type
+         * @param $color_code
+         * @param $compatibility
+         *
+         * @return string
+         */
+        public static function css_overwrite_bs5($type,$color_code,$compatibility, $hex = '' ){
+            global $aui_bs5;
+
+            $is_var = false;
+            $is_custom = strpos($type, 'custom-') !== false ? true : false;
+            if(!$color_code){return '';}
+            if(strpos($color_code, 'var') !== false){
+                //if(!sanitize_hex_color($color_code)){
+                $color_code = esc_attr($color_code);
+                $is_var = true;
 //				$color_code = "rgba($color_code, 0.5)";
 //                echo '###1'.$color_code.'###';//exit;
-			}
+            }
 
 //            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
 
-			if(!$color_code){return '';}
+            if(!$color_code){return '';}
 
-			$rgb = self::hex_to_rgb($hex);
+            $rgb = self::hex_to_rgb($hex);
 
-			if($compatibility===true || $compatibility===1){
-				$compatibility = '.bsui';
-			}elseif(!$compatibility){
-				$compatibility = '';
-			}else{
-				$compatibility = esc_attr($compatibility);
-			}
+            if($compatibility===true || $compatibility===1){
+                $compatibility = '.bsui';
+            }elseif(!$compatibility){
+                $compatibility = '';
+            }else{
+                $compatibility = esc_attr($compatibility);
+            }
 
-			$prefix = $compatibility ? $compatibility . " " : "";
+            $prefix = $compatibility ? $compatibility . " " : "";
 
 
             $output = '';
 
 //            echo '####'.$color_code;exit;
 
-			$type = sanitize_html_class($type);
+            $type = sanitize_html_class($type);
+
+            /**
+             * c = color, b = background color, o = border-color, f = fill
+             */
+            $selectors = array(
+                ".btn-{$type}"                                              => array( 'b', 'o' ),
+                ".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
+                ".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
+                ".btn-outline-{$type}"                                      => array( 'c', 'o' ),
+                ".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
+                ".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
+                ".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
+                ".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
+                ".badge-{$type}"                                            => array( 'b' ),
+                ".alert-{$type}"                                            => array( 'b', 'o' ),
+                ".bg-{$type}"                                               => array( 'b', 'f' ),
+                ".btn-link.btn-{$type}"                                     => array( 'c' ),
+                ".text-{$type}"                                     => array( 'c' ),
+            );
+
+            if ( $aui_bs5 ) {
+                unset($selectors[".alert-{$type}" ]);
+            }
 
-			/**
-			 * c = color, b = background color, o = border-color, f = fill
-			 */
-			$selectors = array(
-				".btn-{$type}"                                              => array( 'b', 'o' ),
-				".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
-				".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
-				".btn-outline-{$type}"                                      => array( 'c', 'o' ),
-				".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
-				".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
-				".badge-{$type}"                                            => array( 'b' ),
-				".alert-{$type}"                                            => array( 'b', 'o' ),
-				".bg-{$type}"                                               => array( 'b', 'f' ),
-				".btn-link.btn-{$type}"                                     => array( 'c' ),
-				".text-{$type}"                                     => array( 'c' ),
-			);
-
-			if ( $aui_bs5 ) {
-				unset($selectors[".alert-{$type}" ]);
-			}
-
-			if ( $type == 'primary' ) {
-				$selectors = $selectors + array(
-						'a'                                                                                                    => array( 'c' ),
-						'.btn-link'                                                                                            => array( 'c' ),
-						'.dropdown-item.active'                                                                                => array( 'b' ),
-						'.custom-control-input:checked~.custom-control-label::before'                                          => array(
-							'b',
-							'o'
-						),
-						'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
-							'b',
-							'o'
-						),
-						'.nav-pills .nav-link.active'                                                                          => array( 'b' ),
-						'.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
-						'.page-link'                                                                                           => array( 'c' ),
-						'.page-item.active .page-link'                                                                         => array(
-							'b',
-							'o'
-						),
-						'.progress-bar'                                                                                        => array( 'b' ),
-						'.list-group-item.active'                                                                              => array(
-							'b',
-							'o'
-						),
-						'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
-					);
-			}
+            if ( $type == 'primary' ) {
+                $selectors = $selectors + array(
+                        'a'                                                                                                    => array( 'c' ),
+                        '.btn-link'                                                                                            => array( 'c' ),
+                        '.dropdown-item.active'                                                                                => array( 'b' ),
+                        '.custom-control-input:checked~.custom-control-label::before'                                          => array(
+                            'b',
+                            'o'
+                        ),
+                        '.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
+                            'b',
+                            'o'
+                        ),
+                        '.nav-pills .nav-link.active'                                                                          => array( 'b' ),
+                        '.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
+                        '.page-link'                                                                                           => array( 'c' ),
+                        '.page-item.active .page-link'                                                                         => array(
+                            'b',
+                            'o'
+                        ),
+                        '.progress-bar'                                                                                        => array( 'b' ),
+                        '.list-group-item.active'                                                                              => array(
+                            'b',
+                            'o'
+                        ),
+                        '.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
+                    );
+            }
 
 
 
             // link
-			if ( $type === 'primary' ) {
-				$output .= 'html body {--bs-link-hover-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .75); --bs-link-color: var(--bs-'.esc_attr($type).'); }';
-				$output .= $prefix . ' .breadcrumb{--bs-breadcrumb-item-active-color: '.esc_attr($color_code).';  }';
-				$output .= $prefix . ' .navbar { --bs-nav-link-hover-color: '.esc_attr($color_code).'; --bs-navbar-hover-color: '.esc_attr($color_code).'; --bs-navbar-active-color: '.esc_attr($color_code).'; }';
+            if ( $type === 'primary' ) {
+                $output .= 'html body {--bs-link-hover-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .75); --bs-link-color: var(--bs-'.esc_attr($type).'); }';
+                $output .= $prefix . ' .breadcrumb{--bs-breadcrumb-item-active-color: '.esc_attr($color_code).';  }';
+                $output .= $prefix . ' .navbar { --bs-nav-link-hover-color: '.esc_attr($color_code).'; --bs-navbar-hover-color: '.esc_attr($color_code).'; --bs-navbar-active-color: '.esc_attr($color_code).'; }';
 
-				$output .= $prefix . ' a{color: var(--bs-'.esc_attr($type).');}';
-				$output .= $prefix . ' .text-primary{color: var(--bs-'.esc_attr($type).') !important;}';
+                $output .= $prefix . ' a{color: var(--bs-'.esc_attr($type).');}';
+                $output .= $prefix . ' .text-primary{color: var(--bs-'.esc_attr($type).') !important;}';
 
                 // dropdown
-				$output .= $prefix . ' .dropdown-menu{--bs-dropdown-link-hover-color: var(--bs-'.esc_attr($type).'); --bs-dropdown-link-active-color: var(--bs-'.esc_attr($type).');}';
+                $output .= $prefix . ' .dropdown-menu{--bs-dropdown-link-hover-color: var(--bs-'.esc_attr($type).'); --bs-dropdown-link-active-color: var(--bs-'.esc_attr($type).');}';
 
                 // pagination
-				$output .= $prefix . ' .pagination{--bs-pagination-hover-color: var(--bs-'.esc_attr($type).'); --bs-pagination-active-bg: var(--bs-'.esc_attr($type).');}';
+                $output .= $prefix . ' .pagination{--bs-pagination-hover-color: var(--bs-'.esc_attr($type).'); --bs-pagination-active-bg: var(--bs-'.esc_attr($type).');}';
 
-			}
+            }
 
-			$output .= $prefix . ' .link-'.esc_attr($type).' {color: var(--bs-'.esc_attr($type).'-rgb) !important;}';
-			$output .= $prefix . ' .link-'.esc_attr($type).':hover {color: rgba(var(--bs-'.esc_attr($type).'-rgb), .8) !important;}';
+            $output .= $prefix . ' .link-'.esc_attr($type).' {color: var(--bs-'.esc_attr($type).'-rgb) !important;}';
+            $output .= $prefix . ' .link-'.esc_attr($type).':hover {color: rgba(var(--bs-'.esc_attr($type).'-rgb), .8) !important;}';
 
-			//  buttons
-			$output .= $prefix . ' .btn-'.esc_attr($type).'{';
-			$output .= ' 
+            //  buttons
+            $output .= $prefix . ' .btn-'.esc_attr($type).'{';
+            $output .= ' 
             --bs-btn-bg: '.esc_attr($color_code).';
             --bs-btn-border-color: '.esc_attr($color_code).';
             --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
@@ -1461,11 +1461,11 @@ 
 //			--bs-btn-active-color: #fff;
 //			--bs-btn-disabled-color: #fff;
 //            ';
-			$output .= '}';
+            $output .= '}';
 
-			//  buttons outline
-			$output .= $prefix . ' .btn-outline-'.esc_attr($type).'{';
-			$output .= ' 
+            //  buttons outline
+            $output .= $prefix . ' .btn-outline-'.esc_attr($type).'{';
+            $output .= ' 
 			--bs-btn-color: '.esc_attr($color_code).';
             --bs-btn-border-color: '.esc_attr($color_code).';
             --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
@@ -1483,37 +1483,37 @@ 
 //			--bs-btn-active-color: #fff;
 //			--bs-btn-disabled-color: #fff;
 //            ';
-			$output .= '}';
+            $output .= '}';
 
 
             // button hover
-			$output .= $prefix . ' .btn-'.esc_attr($type).':hover{';
-			$output .= ' 
+            $output .= $prefix . ' .btn-'.esc_attr($type).':hover{';
+            $output .= ' 
             box-shadow: 0 0.25rem 0.25rem 0.125rem rgb(var(--bs-'.esc_attr($type).'-rgb), .1), 0 0.375rem 0.75rem -0.125rem rgb(var(--bs-'.esc_attr($type).'-rgb) , .4);
             }
             ';
 
 
-			if ( $aui_bs5 ) {
+            if ( $aui_bs5 ) {
 //				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).': '.esc_attr($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
-			}
+                $output .= 'html body {--bs-'.esc_attr($type).': '.esc_attr($color_code).'; }';
+                $output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
+            }
 
 
-			if ( $is_custom ) {
+            if ( $is_custom ) {
 
 //				echo '###'.$type;exit;
 
-				// build rules into each type
-				foreach($selectors as $selector => $types){
-					$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-					$types = array_combine($types,$types);
-					if(isset($types['c'])){$color[] = $selector;}
-					if(isset($types['b'])){$background[] = $selector;}
-					if(isset($types['o'])){$border[] = $selector;}
-					if(isset($types['f'])){$fill[] = $selector;}
-				}
+                // build rules into each type
+                foreach($selectors as $selector => $types){
+                    $selector = $compatibility ? $compatibility . " ".$selector : $selector;
+                    $types = array_combine($types,$types);
+                    if(isset($types['c'])){$color[] = $selector;}
+                    if(isset($types['b'])){$background[] = $selector;}
+                    if(isset($types['o'])){$border[] = $selector;}
+                    if(isset($types['f'])){$fill[] = $selector;}
+                }
 
 //				// build rules into each type
 //				foreach($important_selectors as $selector => $types){
@@ -1525,68 +1525,68 @@ 
 //					if(isset($types['f'])){$fill_i[] = $selector;}
 //				}
 
-				// add any color rules
-				if(!empty($color)){
-					$output .= implode(",",$color) . "{color: $color_code;} ";
-				}
-				if(!empty($color_i)){
-					$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-				}
+                // add any color rules
+                if(!empty($color)){
+                    $output .= implode(",",$color) . "{color: $color_code;} ";
+                }
+                if(!empty($color_i)){
+                    $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+                }
 
-				// add any background color rules
-				if(!empty($background)){
-					$output .= implode(",",$background) . "{background-color: $color_code;} ";
-				}
-				if(!empty($background_i)){
-					$output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
+                // add any background color rules
+                if(!empty($background)){
+                    $output .= implode(",",$background) . "{background-color: $color_code;} ";
+                }
+                if(!empty($background_i)){
+                    $output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
 //				$output .= implode(",",$background_i) . "{background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;} ";
-				}
+                }
 
-				// add any border color rules
-				if(!empty($border)){
-					$output .= implode(",",$border) . "{border-color: $color_code;} ";
-				}
-				if(!empty($border_i)){
-					$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-				}
+                // add any border color rules
+                if(!empty($border)){
+                    $output .= implode(",",$border) . "{border-color: $color_code;} ";
+                }
+                if(!empty($border_i)){
+                    $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+                }
 
-				// add any fill color rules
-				if(!empty($fill)){
-					$output .= implode(",",$fill) . "{fill: $color_code;} ";
-				}
-				if(!empty($fill_i)){
-					$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-				}
+                // add any fill color rules
+                if(!empty($fill)){
+                    $output .= implode(",",$fill) . "{fill: $color_code;} ";
+                }
+                if(!empty($fill_i)){
+                    $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+                }
 
-			}
+            }
 
 
 
 
-			$transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
-			// darken
-			$darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
-			$darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
+            $transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
+            // darken
+            $darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
+            $darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
+            $darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
+            $darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
 
-			// lighten
-			$lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
+            // lighten
+            $lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
 
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
 
 
-			// button states
-			$output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
-			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+            // button states
+            $output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
+            $output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
 //			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: #000;    border-color: #000;} ";
-			$output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+            $output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
             $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
             $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled):focus {box-shadow: 0 0.25rem 0.25rem 0.125rem rgba(var(--bs-{$type}-rgb), 0.1), 0 0.375rem 0.75rem -0.125rem rgba(var(--bs-{$type}-rgb), 0.4);} ";
 
-			// text
+            // text
 //			$output .= $prefix .".xxx, .text-{$type} {color: var(--bs-".esc_attr($type).");} ";
 
 
@@ -1601,777 +1601,777 @@ 
 //				$output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
 //			}
 
-			// alerts
-			if ( $aui_bs5 ) {
+            // alerts
+            if ( $aui_bs5 ) {
 //				$output .= $is_var ? '' : $prefix ." .alert-{$type} {background-color: ".$color_code."20;    border-color: ".$color_code."30;color:$darker_40} ";
-				$output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
-			}
-
-			return $output;
-		}
-
-		/**
-		 * Build the CSS to overwrite a bootstrap color variable.
-		 *
-		 * @param $type
-		 * @param $color_code
-		 * @param $compatibility
-		 *
-		 * @return string
-		 */
-		public static function css_overwrite($type,$color_code,$compatibility, $hex = '' ){
+                $output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
+            }
+
+            return $output;
+        }
+
+        /**
+         * Build the CSS to overwrite a bootstrap color variable.
+         *
+         * @param $type
+         * @param $color_code
+         * @param $compatibility
+         *
+         * @return string
+         */
+        public static function css_overwrite($type,$color_code,$compatibility, $hex = '' ){
             global $aui_bs5;
 
-			$is_var = false;
-			if(!$color_code){return '';}
-			if(strpos($color_code, 'var') !== false){
-				//if(!sanitize_hex_color($color_code)){
-				$color_code = esc_attr($color_code);
-				$is_var = true;
+            $is_var = false;
+            if(!$color_code){return '';}
+            if(strpos($color_code, 'var') !== false){
+                //if(!sanitize_hex_color($color_code)){
+                $color_code = esc_attr($color_code);
+                $is_var = true;
 //				$color_code = "rgba($color_code, 0.5)";
 //                echo '###1'.$color_code.'###';//exit;
-			}
+            }
 
 //            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
 
-			if(!$color_code){return '';}
+            if(!$color_code){return '';}
 
             $rgb = self::hex_to_rgb($hex);
 
-			if($compatibility===true || $compatibility===1){
-				$compatibility = '.bsui';
-			}elseif(!$compatibility){
-				$compatibility = '';
-			}else{
-				$compatibility = esc_attr($compatibility);
-			}
+            if($compatibility===true || $compatibility===1){
+                $compatibility = '.bsui';
+            }elseif(!$compatibility){
+                $compatibility = '';
+            }else{
+                $compatibility = esc_attr($compatibility);
+            }
 
 
 
 //            echo '####'.$color_code;exit;
 
-			$type = sanitize_html_class($type);
-
-			/**
-			 * c = color, b = background color, o = border-color, f = fill
-			 */
-			$selectors = array(
-				".btn-{$type}"                                              => array( 'b', 'o' ),
-				".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
-				".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
-				".btn-outline-{$type}"                                      => array( 'c', 'o' ),
-				".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
-				".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
-				".badge-{$type}"                                            => array( 'b' ),
-				".alert-{$type}"                                            => array( 'b', 'o' ),
-				".bg-{$type}"                                               => array( 'b', 'f' ),
-				".btn-link.btn-{$type}"                                     => array( 'c' ),
-			);
-
-			if ( $aui_bs5 ) {
+            $type = sanitize_html_class($type);
+
+            /**
+             * c = color, b = background color, o = border-color, f = fill
+             */
+            $selectors = array(
+                ".btn-{$type}"                                              => array( 'b', 'o' ),
+                ".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
+                ".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
+                ".btn-outline-{$type}"                                      => array( 'c', 'o' ),
+                ".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
+                ".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
+                ".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
+                ".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
+                ".badge-{$type}"                                            => array( 'b' ),
+                ".alert-{$type}"                                            => array( 'b', 'o' ),
+                ".bg-{$type}"                                               => array( 'b', 'f' ),
+                ".btn-link.btn-{$type}"                                     => array( 'c' ),
+            );
+
+            if ( $aui_bs5 ) {
                 unset($selectors[".alert-{$type}" ]);
-			}
-
-			if ( $type == 'primary' ) {
-				$selectors = $selectors + array(
-						'a'                                                                                                    => array( 'c' ),
-						'.btn-link'                                                                                            => array( 'c' ),
-						'.dropdown-item.active'                                                                                => array( 'b' ),
-						'.custom-control-input:checked~.custom-control-label::before'                                          => array(
-							'b',
-							'o'
-						),
-						'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
-							'b',
-							'o'
-						),
-						'.nav-pills .nav-link.active'                                                                          => array( 'b' ),
-						'.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
-						'.page-link'                                                                                           => array( 'c' ),
-						'.page-item.active .page-link'                                                                         => array(
-							'b',
-							'o'
-						),
-						'.progress-bar'                                                                                        => array( 'b' ),
-						'.list-group-item.active'                                                                              => array(
-							'b',
-							'o'
-						),
-						'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
+            }
+
+            if ( $type == 'primary' ) {
+                $selectors = $selectors + array(
+                        'a'                                                                                                    => array( 'c' ),
+                        '.btn-link'                                                                                            => array( 'c' ),
+                        '.dropdown-item.active'                                                                                => array( 'b' ),
+                        '.custom-control-input:checked~.custom-control-label::before'                                          => array(
+                            'b',
+                            'o'
+                        ),
+                        '.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
+                            'b',
+                            'o'
+                        ),
+                        '.nav-pills .nav-link.active'                                                                          => array( 'b' ),
+                        '.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
+                        '.page-link'                                                                                           => array( 'c' ),
+                        '.page-item.active .page-link'                                                                         => array(
+                            'b',
+                            'o'
+                        ),
+                        '.progress-bar'                                                                                        => array( 'b' ),
+                        '.list-group-item.active'                                                                              => array(
+                            'b',
+                            'o'
+                        ),
+                        '.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
 //				    '.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
 //				    '.custom-range::-moz-range-thumb' => array('b'),
 //				    '.custom-range::-ms-thumb' => array('b'),
-					);
-			}
-
-			$important_selectors = array(
-				".bg-{$type}" => array('b','f'),
-				".border-{$type}" => array('o'),
-				".text-{$type}" => array('c'),
-			);
-
-			$color = array();
-			$color_i = array();
-			$background = array();
-			$background_i = array();
-			$border = array();
-			$border_i = array();
-			$fill = array();
-			$fill_i = array();
-
-			$output = '';
-
-			if ( $aui_bs5 ) {
+                    );
+            }
+
+            $important_selectors = array(
+                ".bg-{$type}" => array('b','f'),
+                ".border-{$type}" => array('o'),
+                ".text-{$type}" => array('c'),
+            );
+
+            $color = array();
+            $color_i = array();
+            $background = array();
+            $background_i = array();
+            $border = array();
+            $border_i = array();
+            $fill = array();
+            $fill_i = array();
+
+            $output = '';
+
+            if ( $aui_bs5 ) {
 //				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
-			}
-
-			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
-			}
-
-			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
-			}
-
-			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
-			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-			}
-
-			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
-			}
-			if(!empty($background_i)){
-				$output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
+                $output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
+            }
+
+            // build rules into each type
+            foreach($selectors as $selector => $types){
+                $selector = $compatibility ? $compatibility . " ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color[] = $selector;}
+                if(isset($types['b'])){$background[] = $selector;}
+                if(isset($types['o'])){$border[] = $selector;}
+                if(isset($types['f'])){$fill[] = $selector;}
+            }
+
+            // build rules into each type
+            foreach($important_selectors as $selector => $types){
+                $selector = $compatibility ? $compatibility . " ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color_i[] = $selector;}
+                if(isset($types['b'])){$background_i[] = $selector;}
+                if(isset($types['o'])){$border_i[] = $selector;}
+                if(isset($types['f'])){$fill_i[] = $selector;}
+            }
+
+            // add any color rules
+            if(!empty($color)){
+                $output .= implode(",",$color) . "{color: $color_code;} ";
+            }
+            if(!empty($color_i)){
+                $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+            }
+
+            // add any background color rules
+            if(!empty($background)){
+                $output .= implode(",",$background) . "{background-color: $color_code;} ";
+            }
+            if(!empty($background_i)){
+                $output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
 //				$output .= implode(",",$background_i) . "{background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;} ";
-			}
+            }
 
-			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
-			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-			}
+            // add any border color rules
+            if(!empty($border)){
+                $output .= implode(",",$border) . "{border-color: $color_code;} ";
+            }
+            if(!empty($border_i)){
+                $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+            }
 
-			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
-			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-			}
+            // add any fill color rules
+            if(!empty($fill)){
+                $output .= implode(",",$fill) . "{fill: $color_code;} ";
+            }
+            if(!empty($fill_i)){
+                $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+            }
 
 
-			$prefix = $compatibility ? $compatibility . " " : "";
+            $prefix = $compatibility ? $compatibility . " " : "";
 
-			$transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
-			// darken
-			$darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
-			$darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
+            $transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
+            // darken
+            $darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
+            $darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
+            $darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
+            $darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
 
-			// lighten
-			$lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
+            // lighten
+            $lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
 
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
 
 
-			// button states
-			$output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
-			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+            // button states
+            $output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
+            $output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
 //			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: #000;    border-color: #000;} ";
-			$output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
 
-			if ( $type == 'primary' ) {
-				// dropdown's
-				$output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
+            if ( $type == 'primary' ) {
+                // dropdown's
+                $output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
 
-				// input states
-				$output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
+                // input states
+                $output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
 
-				// page link
-				$output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			}
+                // page link
+                $output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            }
 
             // alerts
-			if ( $aui_bs5 ) {
+            if ( $aui_bs5 ) {
 //				$output .= $is_var ? '' : $prefix ." .alert-{$type} {background-color: ".$color_code."20;    border-color: ".$color_code."30;color:$darker_40} ";
-				$output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
-			}
-
-			return $output;
-		}
-
-		/**
-		 *
-		 * @deprecated 0.1.76 Use css_overwrite()
-		 *
-		 * @param $color_code
-		 * @param $compatibility
-		 * @param $use_variable
-		 *
-		 * @return string
-		 */
-		public static function css_primary($color_code,$compatibility, $use_variable = false){
-
-			if(!$use_variable){
-				$color_code = sanitize_hex_color($color_code);
-				if(!$color_code){return '';}
-			}
-
-			/**
-			 * c = color, b = background color, o = border-color, f = fill
-			 */
-			$selectors = array(
-				'a' => array('c'),
-				'.btn-primary' => array('b','o'),
-				'.btn-primary.disabled' => array('b','o'),
-				'.btn-primary:disabled' => array('b','o'),
-				'.btn-outline-primary' => array('c','o'),
-				'.btn-outline-primary:hover' => array('b','o'),
-				'.btn-outline-primary:not(:disabled):not(.disabled).active' => array('b','o'),
-				'.btn-outline-primary:not(:disabled):not(.disabled):active' => array('b','o'),
-				'.show>.btn-outline-primary.dropdown-toggle' => array('b','o'),
-				'.btn-link' => array('c'),
-				'.dropdown-item.active' => array('b'),
-				'.custom-control-input:checked~.custom-control-label::before' => array('b','o'),
-				'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before' => array('b','o'),
+                $output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
+            }
+
+            return $output;
+        }
+
+        /**
+         *
+         * @deprecated 0.1.76 Use css_overwrite()
+         *
+         * @param $color_code
+         * @param $compatibility
+         * @param $use_variable
+         *
+         * @return string
+         */
+        public static function css_primary($color_code,$compatibility, $use_variable = false){
+
+            if(!$use_variable){
+                $color_code = sanitize_hex_color($color_code);
+                if(!$color_code){return '';}
+            }
+
+            /**
+             * c = color, b = background color, o = border-color, f = fill
+             */
+            $selectors = array(
+                'a' => array('c'),
+                '.btn-primary' => array('b','o'),
+                '.btn-primary.disabled' => array('b','o'),
+                '.btn-primary:disabled' => array('b','o'),
+                '.btn-outline-primary' => array('c','o'),
+                '.btn-outline-primary:hover' => array('b','o'),
+                '.btn-outline-primary:not(:disabled):not(.disabled).active' => array('b','o'),
+                '.btn-outline-primary:not(:disabled):not(.disabled):active' => array('b','o'),
+                '.show>.btn-outline-primary.dropdown-toggle' => array('b','o'),
+                '.btn-link' => array('c'),
+                '.dropdown-item.active' => array('b'),
+                '.custom-control-input:checked~.custom-control-label::before' => array('b','o'),
+                '.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before' => array('b','o'),
 //				'.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
 //				'.custom-range::-moz-range-thumb' => array('b'),
 //				'.custom-range::-ms-thumb' => array('b'),
-				'.nav-pills .nav-link.active' => array('b'),
-				'.nav-pills .show>.nav-link' => array('b'),
-				'.page-link' => array('c'),
-				'.page-item.active .page-link' => array('b','o'),
-				'.badge-primary' => array('b'),
-				'.alert-primary' => array('b','o'),
-				'.progress-bar' => array('b'),
-				'.list-group-item.active' => array('b','o'),
-				'.bg-primary' => array('b','f'),
-				'.btn-link.btn-primary' => array('c'),
-				'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array('b'),
-			);
-
-			$important_selectors = array(
-				'.bg-primary' => array('b','f'),
-				'.border-primary' => array('o'),
-				'.text-primary' => array('c'),
-			);
-
-			$color = array();
-			$color_i = array();
-			$background = array();
-			$background_i = array();
-			$border = array();
-			$border_i = array();
-			$fill = array();
-			$fill_i = array();
-
-			$output = '';
-
-			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
-			}
-
-			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
-			}
-
-			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
-			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-			}
-
-			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
-			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
-			}
-
-			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
-			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-			}
-
-			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
-			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-			}
-
-
-			$prefix = $compatibility ? ".bsui " : "";
-
-			// darken
-			$darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
-
-			// lighten
-			$lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
-
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
-
-
-			// button states
-			$output .= $prefix ." .btn-primary:hover, $prefix .btn-primary:focus, $prefix .btn-primary.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-			$output .= $prefix ." .btn-outline-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-primary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active, $prefix .btn-primary:not(:disabled):not(.disabled).active, .show>$prefix .btn-primary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-primary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-
-			// dropdown's
-			$output .= $prefix ." .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
-
-
-			// input states
-			$output .= $prefix ." .form-control:focus{border-color: ".$lighten_25.";box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-			// page link
-			$output .= $prefix ." .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-			return $output;
-		}
-
-		/**
-		 *
-		 * @deprecated 0.1.76 Use css_overwrite()
-		 *
-		 * @param $color_code
-		 * @param $compatibility
-		 *
-		 * @return string
-		 */
-		public static function css_secondary($color_code,$compatibility){;
-			$color_code = sanitize_hex_color($color_code);
-			if(!$color_code){return '';}
-			/**
-			 * c = color, b = background color, o = border-color, f = fill
-			 */
-			$selectors = array(
-				'.btn-secondary' => array('b','o'),
-				'.btn-secondary.disabled' => array('b','o'),
-				'.btn-secondary:disabled' => array('b','o'),
-				'.btn-outline-secondary' => array('c','o'),
-				'.btn-outline-secondary:hover' => array('b','o'),
-				'.btn-outline-secondary.disabled' => array('c'),
-				'.btn-outline-secondary:disabled' => array('c'),
-				'.btn-outline-secondary:not(:disabled):not(.disabled):active' => array('b','o'),
-				'.btn-outline-secondary:not(:disabled):not(.disabled).active' => array('b','o'),
-				'.btn-outline-secondary.dropdown-toggle' => array('b','o'),
-				'.badge-secondary' => array('b'),
-				'.alert-secondary' => array('b','o'),
-				'.btn-link.btn-secondary' => array('c'),
-			);
-
-			$important_selectors = array(
-				'.bg-secondary' => array('b','f'),
-				'.border-secondary' => array('o'),
-				'.text-secondary' => array('c'),
-			);
-
-			$color = array();
-			$color_i = array();
-			$background = array();
-			$background_i = array();
-			$border = array();
-			$border_i = array();
-			$fill = array();
-			$fill_i = array();
-
-			$output = '';
-
-			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
-			}
-
-			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
-			}
-
-			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
-			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-			}
-
-			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
-			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
-			}
-
-			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
-			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-			}
-
-			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
-			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-			}
-
-
-			$prefix = $compatibility ? ".bsui " : "";
-
-			// darken
-			$darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
-
-			// lighten
-			$lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
-
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
-
-
-			// button states
-			$output .= $prefix ." .btn-secondary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-			$output .= $prefix ." .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-secondary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active, $prefix .btn-secondary:not(:disabled):not(.disabled).active, .show>$prefix .btn-secondary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-secondary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-
-			return $output;
-		}
-
-		/**
-		 * Increases or decreases the brightness of a color by a percentage of the current brightness.
-		 *
-		 * @param   string  $hexCode        Supported formats: `#FFF`, `#FFFFFF`, `FFF`, `FFFFFF`
-		 * @param   float   $adjustPercent  A number between -1 and 1. E.g. 0.3 = 30% lighter; -0.4 = 40% darker.
-		 *
-		 * @return  string
-		 */
-		public static function css_hex_lighten_darken($hexCode, $adjustPercent) {
-			$hexCode = ltrim($hexCode, '#');
-
-			if ( strpos( $hexCode, 'rgba(' ) !== false || strpos( $hexCode, 'rgb(' ) !== false ) {
-				return $hexCode;
-			}
-
-			if (strlen($hexCode) == 3) {
-				$hexCode = $hexCode[0] . $hexCode[0] . $hexCode[1] . $hexCode[1] . $hexCode[2] . $hexCode[2];
-			}
-
-			$hexCode = array_map('hexdec', str_split($hexCode, 2));
-
-			foreach ($hexCode as & $color) {
-				$adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
-				$adjustAmount = ceil($adjustableLimit * $adjustPercent);
-
-				$color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
-			}
-
-			return '#' . implode($hexCode);
-		}
-
-		/**
-		 * Check if we should display examples.
-		 */
-		public function maybe_show_examples(){
-			if(current_user_can('manage_options') && isset($_REQUEST['preview-aui'])){
-				echo "<head>";
-				wp_head();
-				echo "</head>";
-				echo "<body>";
-				echo $this->get_examples(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-				echo "</body>";
-				exit;
-			}
-		}
-
-		/**
-		 * Get developer examples.
-		 *
-		 * @return string
-		 */
-		public function get_examples(){
-			$output = '';
-
-
-			// open form
-			$output .= "<form class='p-5 m-5 border rounded'>";
-
-			// input example
-			$output .= aui()->input(array(
-				'type'  =>  'text',
-				'id'    =>  'text-example',
-				'name'    =>  'text-example',
-				'placeholder'   => 'text placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label'
-			));
-
-			// input example
-			$output .= aui()->input(array(
-				'type'  =>  'url',
-				'id'    =>  'text-example2',
-				'name'    =>  'text-example',
-				'placeholder'   => 'url placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label'
-			));
-
-			// checkbox example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'checkbox-example',
-				'name'    =>  'checkbox-example',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Checkbox example',
-				'value' =>  '1',
-				'checked'   => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Checkbox checked'
-			));
-
-			// checkbox example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'checkbox-example2',
-				'name'    =>  'checkbox-example2',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Checkbox example',
-				'value' =>  '1',
-				'checked'   => false,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Checkbox un-checked'
-			));
-
-			// switch example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'switch-example',
-				'name'    =>  'switch-example',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Switch example',
-				'value' =>  '1',
-				'checked'   => true,
-				'switch'    => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Switch on'
-			));
-
-			// switch example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'switch-example2',
-				'name'    =>  'switch-example2',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Switch example',
-				'value' =>  '1',
-				'checked'   => false,
-				'switch'    => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Switch off'
-			));
-
-			// close form
-			$output .= "</form>";
-
-			return $output;
-		}
-
-		/**
-		 * Calendar params.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return array Calendar params.
-		 */
-		public static function calendar_params() {
-			$params = array(
-				'month_long_1' => __( 'January', 'ayecode-connect' ),
-				'month_long_2' => __( 'February', 'ayecode-connect' ),
-				'month_long_3' => __( 'March', 'ayecode-connect' ),
-				'month_long_4' => __( 'April', 'ayecode-connect' ),
-				'month_long_5' => __( 'May', 'ayecode-connect' ),
-				'month_long_6' => __( 'June', 'ayecode-connect' ),
-				'month_long_7' => __( 'July', 'ayecode-connect' ),
-				'month_long_8' => __( 'August', 'ayecode-connect' ),
-				'month_long_9' => __( 'September', 'ayecode-connect' ),
-				'month_long_10' => __( 'October', 'ayecode-connect' ),
-				'month_long_11' => __( 'November', 'ayecode-connect' ),
-				'month_long_12' => __( 'December', 'ayecode-connect' ),
-				'month_s_1' => _x( 'Jan', 'January abbreviation', 'ayecode-connect' ),
-				'month_s_2' => _x( 'Feb', 'February abbreviation', 'ayecode-connect' ),
-				'month_s_3' => _x( 'Mar', 'March abbreviation', 'ayecode-connect' ),
-				'month_s_4' => _x( 'Apr', 'April abbreviation', 'ayecode-connect' ),
-				'month_s_5' => _x( 'May', 'May abbreviation', 'ayecode-connect' ),
-				'month_s_6' => _x( 'Jun', 'June abbreviation', 'ayecode-connect' ),
-				'month_s_7' => _x( 'Jul', 'July abbreviation', 'ayecode-connect' ),
-				'month_s_8' => _x( 'Aug', 'August abbreviation', 'ayecode-connect' ),
-				'month_s_9' => _x( 'Sep', 'September abbreviation', 'ayecode-connect' ),
-				'month_s_10' => _x( 'Oct', 'October abbreviation', 'ayecode-connect' ),
-				'month_s_11' => _x( 'Nov', 'November abbreviation', 'ayecode-connect' ),
-				'month_s_12' => _x( 'Dec', 'December abbreviation', 'ayecode-connect' ),
-				'day_s1_1' => _x( 'S', 'Sunday initial', 'ayecode-connect' ),
-				'day_s1_2' => _x( 'M', 'Monday initial', 'ayecode-connect' ),
-				'day_s1_3' => _x( 'T', 'Tuesday initial', 'ayecode-connect' ),
-				'day_s1_4' => _x( 'W', 'Wednesday initial', 'ayecode-connect' ),
-				'day_s1_5' => _x( 'T', 'Friday initial', 'ayecode-connect' ),
-				'day_s1_6' => _x( 'F', 'Thursday initial', 'ayecode-connect' ),
-				'day_s1_7' => _x( 'S', 'Saturday initial', 'ayecode-connect' ),
-				'day_s2_1' => __( 'Su', 'ayecode-connect' ),
-				'day_s2_2' => __( 'Mo', 'ayecode-connect' ),
-				'day_s2_3' => __( 'Tu', 'ayecode-connect' ),
-				'day_s2_4' => __( 'We', 'ayecode-connect' ),
-				'day_s2_5' => __( 'Th', 'ayecode-connect' ),
-				'day_s2_6' => __( 'Fr', 'ayecode-connect' ),
-				'day_s2_7' => __( 'Sa', 'ayecode-connect' ),
-				'day_s3_1' => __( 'Sun', 'ayecode-connect' ),
-				'day_s3_2' => __( 'Mon', 'ayecode-connect' ),
-				'day_s3_3' => __( 'Tue', 'ayecode-connect' ),
-				'day_s3_4' => __( 'Wed', 'ayecode-connect' ),
-				'day_s3_5' => __( 'Thu', 'ayecode-connect' ),
-				'day_s3_6' => __( 'Fri', 'ayecode-connect' ),
-				'day_s3_7' => __( 'Sat', 'ayecode-connect' ),
-				'day_s5_1' => __( 'Sunday', 'ayecode-connect' ),
-				'day_s5_2' => __( 'Monday', 'ayecode-connect' ),
-				'day_s5_3' => __( 'Tuesday', 'ayecode-connect' ),
-				'day_s5_4' => __( 'Wednesday', 'ayecode-connect' ),
-				'day_s5_5' => __( 'Thursday', 'ayecode-connect' ),
-				'day_s5_6' => __( 'Friday', 'ayecode-connect' ),
-				'day_s5_7' => __( 'Saturday', 'ayecode-connect' ),
-				'am_lower' => __( 'am', 'ayecode-connect' ),
-				'pm_lower' => __( 'pm', 'ayecode-connect' ),
-				'am_upper' => __( 'AM', 'ayecode-connect' ),
-				'pm_upper' => __( 'PM', 'ayecode-connect' ),
-				'firstDayOfWeek' => (int) get_option( 'start_of_week' ),
-				'time_24hr' => false,
-				'year' => __( 'Year', 'ayecode-connect' ),
-				'hour' => __( 'Hour', 'ayecode-connect' ),
-				'minute' => __( 'Minute', 'ayecode-connect' ),
-				'weekAbbreviation' => __( 'Wk', 'ayecode-connect' ),
-				'rangeSeparator' => __( ' to ', 'ayecode-connect' ),
-				'scrollTitle' => __( 'Scroll to increment', 'ayecode-connect' ),
-				'toggleTitle' => __( 'Click to toggle', 'ayecode-connect' )
-			);
-
-			return apply_filters( 'ayecode_ui_calendar_params', $params );
-		}
-
-		/**
-		 * Flatpickr calendar localize.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return string Calendar locale.
-		 */
-		public static function flatpickr_locale() {
-			$params = self::calendar_params();
-
-			if ( is_string( $params ) ) {
-				$params = html_entity_decode( $params, ENT_QUOTES, 'UTF-8' );
-			} else {
-				foreach ( (array) $params as $key => $value ) {
-					if ( ! is_scalar( $value ) ) {
-						continue;
-					}
-
-					$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-				}
-			}
+                '.nav-pills .nav-link.active' => array('b'),
+                '.nav-pills .show>.nav-link' => array('b'),
+                '.page-link' => array('c'),
+                '.page-item.active .page-link' => array('b','o'),
+                '.badge-primary' => array('b'),
+                '.alert-primary' => array('b','o'),
+                '.progress-bar' => array('b'),
+                '.list-group-item.active' => array('b','o'),
+                '.bg-primary' => array('b','f'),
+                '.btn-link.btn-primary' => array('c'),
+                '.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array('b'),
+            );
+
+            $important_selectors = array(
+                '.bg-primary' => array('b','f'),
+                '.border-primary' => array('o'),
+                '.text-primary' => array('c'),
+            );
+
+            $color = array();
+            $color_i = array();
+            $background = array();
+            $background_i = array();
+            $border = array();
+            $border_i = array();
+            $fill = array();
+            $fill_i = array();
+
+            $output = '';
+
+            // build rules into each type
+            foreach($selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color[] = $selector;}
+                if(isset($types['b'])){$background[] = $selector;}
+                if(isset($types['o'])){$border[] = $selector;}
+                if(isset($types['f'])){$fill[] = $selector;}
+            }
+
+            // build rules into each type
+            foreach($important_selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color_i[] = $selector;}
+                if(isset($types['b'])){$background_i[] = $selector;}
+                if(isset($types['o'])){$border_i[] = $selector;}
+                if(isset($types['f'])){$fill_i[] = $selector;}
+            }
+
+            // add any color rules
+            if(!empty($color)){
+                $output .= implode(",",$color) . "{color: $color_code;} ";
+            }
+            if(!empty($color_i)){
+                $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+            }
+
+            // add any background color rules
+            if(!empty($background)){
+                $output .= implode(",",$background) . "{background-color: $color_code;} ";
+            }
+            if(!empty($background_i)){
+                $output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+            }
+
+            // add any border color rules
+            if(!empty($border)){
+                $output .= implode(",",$border) . "{border-color: $color_code;} ";
+            }
+            if(!empty($border_i)){
+                $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+            }
+
+            // add any fill color rules
+            if(!empty($fill)){
+                $output .= implode(",",$fill) . "{fill: $color_code;} ";
+            }
+            if(!empty($fill_i)){
+                $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+            }
+
+
+            $prefix = $compatibility ? ".bsui " : "";
+
+            // darken
+            $darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
+            $darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
+            $darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
+
+            // lighten
+            $lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
+
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
+
+
+            // button states
+            $output .= $prefix ." .btn-primary:hover, $prefix .btn-primary:focus, $prefix .btn-primary.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+            $output .= $prefix ." .btn-outline-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-primary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active, $prefix .btn-primary:not(:disabled):not(.disabled).active, .show>$prefix .btn-primary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+            $output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-primary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
 
-			$day_s3 = array();
-			$day_s5 = array();
 
-			for ( $i = 1; $i <= 7; $i ++ ) {
-				$day_s3[] = addslashes( $params[ 'day_s3_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-				$day_s5[] = addslashes( $params[ 'day_s3_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
+            // dropdown's
+            $output .= $prefix ." .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
 
-			$month_s = array();
-			$month_long = array();
 
-			for ( $i = 1; $i <= 12; $i ++ ) {
-				$month_s[] = addslashes( $params[ 'month_s_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-				$month_long[] = addslashes( $params[ 'month_long_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
+            // input states
+            $output .= $prefix ." .form-control:focus{border-color: ".$lighten_25.";box-shadow: 0 0 0 0.2rem $op_25;} ";
 
-			ob_start();
-		if ( 0 ) { ?><script><?php } ?>
+            // page link
+            $output .= $prefix ." .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+            return $output;
+        }
+
+        /**
+         *
+         * @deprecated 0.1.76 Use css_overwrite()
+         *
+         * @param $color_code
+         * @param $compatibility
+         *
+         * @return string
+         */
+        public static function css_secondary($color_code,$compatibility){;
+            $color_code = sanitize_hex_color($color_code);
+            if(!$color_code){return '';}
+            /**
+             * c = color, b = background color, o = border-color, f = fill
+             */
+            $selectors = array(
+                '.btn-secondary' => array('b','o'),
+                '.btn-secondary.disabled' => array('b','o'),
+                '.btn-secondary:disabled' => array('b','o'),
+                '.btn-outline-secondary' => array('c','o'),
+                '.btn-outline-secondary:hover' => array('b','o'),
+                '.btn-outline-secondary.disabled' => array('c'),
+                '.btn-outline-secondary:disabled' => array('c'),
+                '.btn-outline-secondary:not(:disabled):not(.disabled):active' => array('b','o'),
+                '.btn-outline-secondary:not(:disabled):not(.disabled).active' => array('b','o'),
+                '.btn-outline-secondary.dropdown-toggle' => array('b','o'),
+                '.badge-secondary' => array('b'),
+                '.alert-secondary' => array('b','o'),
+                '.btn-link.btn-secondary' => array('c'),
+            );
+
+            $important_selectors = array(
+                '.bg-secondary' => array('b','f'),
+                '.border-secondary' => array('o'),
+                '.text-secondary' => array('c'),
+            );
+
+            $color = array();
+            $color_i = array();
+            $background = array();
+            $background_i = array();
+            $border = array();
+            $border_i = array();
+            $fill = array();
+            $fill_i = array();
+
+            $output = '';
+
+            // build rules into each type
+            foreach($selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color[] = $selector;}
+                if(isset($types['b'])){$background[] = $selector;}
+                if(isset($types['o'])){$border[] = $selector;}
+                if(isset($types['f'])){$fill[] = $selector;}
+            }
+
+            // build rules into each type
+            foreach($important_selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color_i[] = $selector;}
+                if(isset($types['b'])){$background_i[] = $selector;}
+                if(isset($types['o'])){$border_i[] = $selector;}
+                if(isset($types['f'])){$fill_i[] = $selector;}
+            }
+
+            // add any color rules
+            if(!empty($color)){
+                $output .= implode(",",$color) . "{color: $color_code;} ";
+            }
+            if(!empty($color_i)){
+                $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+            }
+
+            // add any background color rules
+            if(!empty($background)){
+                $output .= implode(",",$background) . "{background-color: $color_code;} ";
+            }
+            if(!empty($background_i)){
+                $output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+            }
+
+            // add any border color rules
+            if(!empty($border)){
+                $output .= implode(",",$border) . "{border-color: $color_code;} ";
+            }
+            if(!empty($border_i)){
+                $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+            }
+
+            // add any fill color rules
+            if(!empty($fill)){
+                $output .= implode(",",$fill) . "{fill: $color_code;} ";
+            }
+            if(!empty($fill_i)){
+                $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+            }
+
+
+            $prefix = $compatibility ? ".bsui " : "";
+
+            // darken
+            $darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
+            $darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
+            $darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
+
+            // lighten
+            $lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
+
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
+
+
+            // button states
+            $output .= $prefix ." .btn-secondary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+            $output .= $prefix ." .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-secondary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active, $prefix .btn-secondary:not(:disabled):not(.disabled).active, .show>$prefix .btn-secondary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+            $output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-secondary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+
+            return $output;
+        }
+
+        /**
+         * Increases or decreases the brightness of a color by a percentage of the current brightness.
+         *
+         * @param   string  $hexCode        Supported formats: `#FFF`, `#FFFFFF`, `FFF`, `FFFFFF`
+         * @param   float   $adjustPercent  A number between -1 and 1. E.g. 0.3 = 30% lighter; -0.4 = 40% darker.
+         *
+         * @return  string
+         */
+        public static function css_hex_lighten_darken($hexCode, $adjustPercent) {
+            $hexCode = ltrim($hexCode, '#');
+
+            if ( strpos( $hexCode, 'rgba(' ) !== false || strpos( $hexCode, 'rgb(' ) !== false ) {
+                return $hexCode;
+            }
+
+            if (strlen($hexCode) == 3) {
+                $hexCode = $hexCode[0] . $hexCode[0] . $hexCode[1] . $hexCode[1] . $hexCode[2] . $hexCode[2];
+            }
+
+            $hexCode = array_map('hexdec', str_split($hexCode, 2));
+
+            foreach ($hexCode as & $color) {
+                $adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
+                $adjustAmount = ceil($adjustableLimit * $adjustPercent);
+
+                $color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
+            }
+
+            return '#' . implode($hexCode);
+        }
+
+        /**
+         * Check if we should display examples.
+         */
+        public function maybe_show_examples(){
+            if(current_user_can('manage_options') && isset($_REQUEST['preview-aui'])){
+                echo "<head>";
+                wp_head();
+                echo "</head>";
+                echo "<body>";
+                echo $this->get_examples(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                echo "</body>";
+                exit;
+            }
+        }
+
+        /**
+         * Get developer examples.
+         *
+         * @return string
+         */
+        public function get_examples(){
+            $output = '';
+
+
+            // open form
+            $output .= "<form class='p-5 m-5 border rounded'>";
+
+            // input example
+            $output .= aui()->input(array(
+                'type'  =>  'text',
+                'id'    =>  'text-example',
+                'name'    =>  'text-example',
+                'placeholder'   => 'text placeholder',
+                'title'   => 'Text input example',
+                'value' =>  '',
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Text input example label'
+            ));
+
+            // input example
+            $output .= aui()->input(array(
+                'type'  =>  'url',
+                'id'    =>  'text-example2',
+                'name'    =>  'text-example',
+                'placeholder'   => 'url placeholder',
+                'title'   => 'Text input example',
+                'value' =>  '',
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Text input example label'
+            ));
+
+            // checkbox example
+            $output .= aui()->input(array(
+                'type'  =>  'checkbox',
+                'id'    =>  'checkbox-example',
+                'name'    =>  'checkbox-example',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Checkbox example',
+                'value' =>  '1',
+                'checked'   => true,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Checkbox checked'
+            ));
+
+            // checkbox example
+            $output .= aui()->input(array(
+                'type'  =>  'checkbox',
+                'id'    =>  'checkbox-example2',
+                'name'    =>  'checkbox-example2',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Checkbox example',
+                'value' =>  '1',
+                'checked'   => false,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Checkbox un-checked'
+            ));
+
+            // switch example
+            $output .= aui()->input(array(
+                'type'  =>  'checkbox',
+                'id'    =>  'switch-example',
+                'name'    =>  'switch-example',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Switch example',
+                'value' =>  '1',
+                'checked'   => true,
+                'switch'    => true,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Switch on'
+            ));
+
+            // switch example
+            $output .= aui()->input(array(
+                'type'  =>  'checkbox',
+                'id'    =>  'switch-example2',
+                'name'    =>  'switch-example2',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Switch example',
+                'value' =>  '1',
+                'checked'   => false,
+                'switch'    => true,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Switch off'
+            ));
+
+            // close form
+            $output .= "</form>";
+
+            return $output;
+        }
+
+        /**
+         * Calendar params.
+         *
+         * @since 0.1.44
+         *
+         * @return array Calendar params.
+         */
+        public static function calendar_params() {
+            $params = array(
+                'month_long_1' => __( 'January', 'ayecode-connect' ),
+                'month_long_2' => __( 'February', 'ayecode-connect' ),
+                'month_long_3' => __( 'March', 'ayecode-connect' ),
+                'month_long_4' => __( 'April', 'ayecode-connect' ),
+                'month_long_5' => __( 'May', 'ayecode-connect' ),
+                'month_long_6' => __( 'June', 'ayecode-connect' ),
+                'month_long_7' => __( 'July', 'ayecode-connect' ),
+                'month_long_8' => __( 'August', 'ayecode-connect' ),
+                'month_long_9' => __( 'September', 'ayecode-connect' ),
+                'month_long_10' => __( 'October', 'ayecode-connect' ),
+                'month_long_11' => __( 'November', 'ayecode-connect' ),
+                'month_long_12' => __( 'December', 'ayecode-connect' ),
+                'month_s_1' => _x( 'Jan', 'January abbreviation', 'ayecode-connect' ),
+                'month_s_2' => _x( 'Feb', 'February abbreviation', 'ayecode-connect' ),
+                'month_s_3' => _x( 'Mar', 'March abbreviation', 'ayecode-connect' ),
+                'month_s_4' => _x( 'Apr', 'April abbreviation', 'ayecode-connect' ),
+                'month_s_5' => _x( 'May', 'May abbreviation', 'ayecode-connect' ),
+                'month_s_6' => _x( 'Jun', 'June abbreviation', 'ayecode-connect' ),
+                'month_s_7' => _x( 'Jul', 'July abbreviation', 'ayecode-connect' ),
+                'month_s_8' => _x( 'Aug', 'August abbreviation', 'ayecode-connect' ),
+                'month_s_9' => _x( 'Sep', 'September abbreviation', 'ayecode-connect' ),
+                'month_s_10' => _x( 'Oct', 'October abbreviation', 'ayecode-connect' ),
+                'month_s_11' => _x( 'Nov', 'November abbreviation', 'ayecode-connect' ),
+                'month_s_12' => _x( 'Dec', 'December abbreviation', 'ayecode-connect' ),
+                'day_s1_1' => _x( 'S', 'Sunday initial', 'ayecode-connect' ),
+                'day_s1_2' => _x( 'M', 'Monday initial', 'ayecode-connect' ),
+                'day_s1_3' => _x( 'T', 'Tuesday initial', 'ayecode-connect' ),
+                'day_s1_4' => _x( 'W', 'Wednesday initial', 'ayecode-connect' ),
+                'day_s1_5' => _x( 'T', 'Friday initial', 'ayecode-connect' ),
+                'day_s1_6' => _x( 'F', 'Thursday initial', 'ayecode-connect' ),
+                'day_s1_7' => _x( 'S', 'Saturday initial', 'ayecode-connect' ),
+                'day_s2_1' => __( 'Su', 'ayecode-connect' ),
+                'day_s2_2' => __( 'Mo', 'ayecode-connect' ),
+                'day_s2_3' => __( 'Tu', 'ayecode-connect' ),
+                'day_s2_4' => __( 'We', 'ayecode-connect' ),
+                'day_s2_5' => __( 'Th', 'ayecode-connect' ),
+                'day_s2_6' => __( 'Fr', 'ayecode-connect' ),
+                'day_s2_7' => __( 'Sa', 'ayecode-connect' ),
+                'day_s3_1' => __( 'Sun', 'ayecode-connect' ),
+                'day_s3_2' => __( 'Mon', 'ayecode-connect' ),
+                'day_s3_3' => __( 'Tue', 'ayecode-connect' ),
+                'day_s3_4' => __( 'Wed', 'ayecode-connect' ),
+                'day_s3_5' => __( 'Thu', 'ayecode-connect' ),
+                'day_s3_6' => __( 'Fri', 'ayecode-connect' ),
+                'day_s3_7' => __( 'Sat', 'ayecode-connect' ),
+                'day_s5_1' => __( 'Sunday', 'ayecode-connect' ),
+                'day_s5_2' => __( 'Monday', 'ayecode-connect' ),
+                'day_s5_3' => __( 'Tuesday', 'ayecode-connect' ),
+                'day_s5_4' => __( 'Wednesday', 'ayecode-connect' ),
+                'day_s5_5' => __( 'Thursday', 'ayecode-connect' ),
+                'day_s5_6' => __( 'Friday', 'ayecode-connect' ),
+                'day_s5_7' => __( 'Saturday', 'ayecode-connect' ),
+                'am_lower' => __( 'am', 'ayecode-connect' ),
+                'pm_lower' => __( 'pm', 'ayecode-connect' ),
+                'am_upper' => __( 'AM', 'ayecode-connect' ),
+                'pm_upper' => __( 'PM', 'ayecode-connect' ),
+                'firstDayOfWeek' => (int) get_option( 'start_of_week' ),
+                'time_24hr' => false,
+                'year' => __( 'Year', 'ayecode-connect' ),
+                'hour' => __( 'Hour', 'ayecode-connect' ),
+                'minute' => __( 'Minute', 'ayecode-connect' ),
+                'weekAbbreviation' => __( 'Wk', 'ayecode-connect' ),
+                'rangeSeparator' => __( ' to ', 'ayecode-connect' ),
+                'scrollTitle' => __( 'Scroll to increment', 'ayecode-connect' ),
+                'toggleTitle' => __( 'Click to toggle', 'ayecode-connect' )
+            );
+
+            return apply_filters( 'ayecode_ui_calendar_params', $params );
+        }
+
+        /**
+         * Flatpickr calendar localize.
+         *
+         * @since 0.1.44
+         *
+         * @return string Calendar locale.
+         */
+        public static function flatpickr_locale() {
+            $params = self::calendar_params();
+
+            if ( is_string( $params ) ) {
+                $params = html_entity_decode( $params, ENT_QUOTES, 'UTF-8' );
+            } else {
+                foreach ( (array) $params as $key => $value ) {
+                    if ( ! is_scalar( $value ) ) {
+                        continue;
+                    }
+
+                    $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+                }
+            }
+
+            $day_s3 = array();
+            $day_s5 = array();
+
+            for ( $i = 1; $i <= 7; $i ++ ) {
+                $day_s3[] = addslashes( $params[ 'day_s3_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                $day_s5[] = addslashes( $params[ 'day_s3_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+            }
+
+            $month_s = array();
+            $month_long = array();
+
+            for ( $i = 1; $i <= 12; $i ++ ) {
+                $month_s[] = addslashes( $params[ 'month_s_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                $month_long[] = addslashes( $params[ 'month_long_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+            }
+
+            ob_start();
+        if ( 0 ) { ?><script><?php } ?>
                 {
                     weekdays: {
                         shorthand: ['<?php echo implode( "','", $day_s3 ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>'],
@@ -2410,189 +2410,189 @@ 
                 }
 				<?php if ( 0 ) { ?></script><?php } ?>
 			<?php
-			$locale = ob_get_clean();
-
-			return apply_filters( 'ayecode_ui_flatpickr_locale', trim( $locale ) );
-		}
-
-		/**
-		 * Select2 JS params.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return array Select2 JS params.
-		 */
-		public static function select2_params() {
-			$params = array(
-				'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'ayecode-connect' ),
-				'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'ayecode-connect' ),
-				'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_short_n'    => _x( 'Please enter %item% or more characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_long_1'     => _x( 'Please delete 1 character', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_long_n'     => _x( 'Please delete %item% characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_selection_too_long_1' => _x( 'You can only select 1 item', 'enhanced select', 'ayecode-connect' ),
-				'i18n_selection_too_long_n' => _x( 'You can only select %item% items', 'enhanced select', 'ayecode-connect' ),
-				'i18n_load_more'            => _x( 'Loading more results&hellip;', 'enhanced select', 'ayecode-connect' ),
-				'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'ayecode-connect' )
-			);
-
-			return apply_filters( 'ayecode_ui_select2_params', $params );
-		}
-
-		/**
-		 * Select2 JS localize.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return string Select2 JS locale.
-		 */
-		public static function select2_locale() {
-			$params = self::select2_params();
-
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
-					continue;
-				}
+            $locale = ob_get_clean();
 
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-			}
-
-			$locale = json_encode( $params );
-
-			return apply_filters( 'ayecode_ui_select2_locale', trim( $locale ) );
-		}
-
-		/**
-		 * Time ago JS localize.
-		 *
-		 * @since 0.1.47
-		 *
-		 * @return string Time ago JS locale.
-		 */
-		public static function timeago_locale() {
-			$params = array(
-				'prefix_ago' => '',
-				'suffix_ago' => ' ' . _x( 'ago', 'time ago', 'ayecode-connect' ),
-				'prefix_after' => _x( 'after', 'time ago', 'ayecode-connect' ) . ' ',
-				'suffix_after' => '',
-				'seconds' => _x( 'less than a minute', 'time ago', 'ayecode-connect' ),
-				'minute' => _x( 'about a minute', 'time ago', 'ayecode-connect' ),
-				'minutes' => _x( '%d minutes', 'time ago', 'ayecode-connect' ),
-				'hour' => _x( 'about an hour', 'time ago', 'ayecode-connect' ),
-				'hours' => _x( 'about %d hours', 'time ago', 'ayecode-connect' ),
-				'day' => _x( 'a day', 'time ago', 'ayecode-connect' ),
-				'days' => _x( '%d days', 'time ago', 'ayecode-connect' ),
-				'month' => _x( 'about a month', 'time ago', 'ayecode-connect' ),
-				'months' => _x( '%d months', 'time ago', 'ayecode-connect' ),
-				'year' => _x( 'about a year', 'time ago', 'ayecode-connect' ),
-				'years' => _x( '%d years', 'time ago', 'ayecode-connect' ),
-			);
-
-			$params = apply_filters( 'ayecode_ui_timeago_params', $params );
-
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
-					continue;
-				}
+            return apply_filters( 'ayecode_ui_flatpickr_locale', trim( $locale ) );
+        }
+
+        /**
+         * Select2 JS params.
+         *
+         * @since 0.1.44
+         *
+         * @return array Select2 JS params.
+         */
+        public static function select2_params() {
+            $params = array(
+                'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'ayecode-connect' ),
+                'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'ayecode-connect' ),
+                'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'ayecode-connect' ),
+                'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'ayecode-connect' ),
+                'i18n_input_too_short_n'    => _x( 'Please enter %item% or more characters', 'enhanced select', 'ayecode-connect' ),
+                'i18n_input_too_long_1'     => _x( 'Please delete 1 character', 'enhanced select', 'ayecode-connect' ),
+                'i18n_input_too_long_n'     => _x( 'Please delete %item% characters', 'enhanced select', 'ayecode-connect' ),
+                'i18n_selection_too_long_1' => _x( 'You can only select 1 item', 'enhanced select', 'ayecode-connect' ),
+                'i18n_selection_too_long_n' => _x( 'You can only select %item% items', 'enhanced select', 'ayecode-connect' ),
+                'i18n_load_more'            => _x( 'Loading more results&hellip;', 'enhanced select', 'ayecode-connect' ),
+                'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'ayecode-connect' )
+            );
+
+            return apply_filters( 'ayecode_ui_select2_params', $params );
+        }
+
+        /**
+         * Select2 JS localize.
+         *
+         * @since 0.1.44
+         *
+         * @return string Select2 JS locale.
+         */
+        public static function select2_locale() {
+            $params = self::select2_params();
+
+            foreach ( (array) $params as $key => $value ) {
+                if ( ! is_scalar( $value ) ) {
+                    continue;
+                }
+
+                $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+            }
+
+            $locale = json_encode( $params );
+
+            return apply_filters( 'ayecode_ui_select2_locale', trim( $locale ) );
+        }
+
+        /**
+         * Time ago JS localize.
+         *
+         * @since 0.1.47
+         *
+         * @return string Time ago JS locale.
+         */
+        public static function timeago_locale() {
+            $params = array(
+                'prefix_ago' => '',
+                'suffix_ago' => ' ' . _x( 'ago', 'time ago', 'ayecode-connect' ),
+                'prefix_after' => _x( 'after', 'time ago', 'ayecode-connect' ) . ' ',
+                'suffix_after' => '',
+                'seconds' => _x( 'less than a minute', 'time ago', 'ayecode-connect' ),
+                'minute' => _x( 'about a minute', 'time ago', 'ayecode-connect' ),
+                'minutes' => _x( '%d minutes', 'time ago', 'ayecode-connect' ),
+                'hour' => _x( 'about an hour', 'time ago', 'ayecode-connect' ),
+                'hours' => _x( 'about %d hours', 'time ago', 'ayecode-connect' ),
+                'day' => _x( 'a day', 'time ago', 'ayecode-connect' ),
+                'days' => _x( '%d days', 'time ago', 'ayecode-connect' ),
+                'month' => _x( 'about a month', 'time ago', 'ayecode-connect' ),
+                'months' => _x( '%d months', 'time ago', 'ayecode-connect' ),
+                'year' => _x( 'about a year', 'time ago', 'ayecode-connect' ),
+                'years' => _x( '%d years', 'time ago', 'ayecode-connect' ),
+            );
+
+            $params = apply_filters( 'ayecode_ui_timeago_params', $params );
+
+            foreach ( (array) $params as $key => $value ) {
+                if ( ! is_scalar( $value ) ) {
+                    continue;
+                }
+
+                $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+            }
 
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-			}
-
-			$locale = json_encode( $params );
-
-			return apply_filters( 'ayecode_ui_timeago_locale', trim( $locale ) );
-		}
-
-		/**
-		 * JavaScript Minifier
-		 *
-		 * @param $input
-		 *
-		 * @return mixed
-		 */
-		public static function minify_js($input) {
-			if(trim($input) === "") return $input;
-			return preg_replace(
-				array(
-					// Remove comment(s)
-					'#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',
-					// Remove white-space(s) outside the string and regex
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/)|\/(?!\/)[^\n\r]*?\/(?=[\s.,;]|[gimuy]|$))|\s*([!%&*\(\)\-=+\[\]\{\}|;:,.<>?\/])\s*#s',
-					// Remove the last semicolon
-					'#;+\}#',
-					// Minify object attribute(s) except JSON attribute(s). From `{'foo':'bar'}` to `{foo:'bar'}`
-					'#([\{,])([\'])(\d+|[a-z_][a-z0-9_]*)\2(?=\:)#i',
-					// --ibid. From `foo['bar']` to `foo.bar`
-					'#([a-z0-9_\)\]])\[([\'"])([a-z_][a-z0-9_]*)\2\]#i'
-				),
-				array(
-					'$1',
-					'$1$2',
-					'}',
-					'$1$3',
-					'$1.$3'
-				),
-				$input);
-		}
-
-		/**
-		 * Minify CSS
-		 *
-		 * @param $input
-		 *
-		 * @return mixed
-		 */
-		public static function minify_css($input) {
-			if(trim($input) === "") return $input;
-			return preg_replace(
-				array(
-					// Remove comment(s)
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')|\/\*(?!\!)(?>.*?\*\/)|^\s*|\s*$#s',
-					// Remove unused white-space(s)
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/))|\s*+;\s*+(})\s*+|\s*+([*$~^|]?+=|[{};,>~]|\s(?![0-9\.])|!important\b)\s*+|([[(:])\s++|\s++([])])|\s++(:)\s*+(?!(?>[^{}"\']++|"(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')*+{)|^\s++|\s++\z|(\s)\s+#si',
-					// Replace `0(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)` with `0`
-					'#(?<=[\s:])(0)(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)#si',
-					// Replace `:0 0 0 0` with `:0`
-					'#:(0\s+0|0\s+0\s+0\s+0)(?=[;\}]|\!important)#i',
-					// Replace `background-position:0` with `background-position:0 0`
-					'#(background-position):0(?=[;\}])#si',
-					// Replace `0.6` with `.6`, but only when preceded by `:`, `,`, `-` or a white-space
-					'#(?<=[\s:,\-])0+\.(\d+)#s',
-					// Minify string value
-					'#(\/\*(?>.*?\*\/))|(?<!content\:)([\'"])([a-z_][a-z0-9\-_]*?)\2(?=[\s\{\}\];,])#si',
-					'#(\/\*(?>.*?\*\/))|(\burl\()([\'"])([^\s]+?)\3(\))#si',
-					// Minify HEX color code
-					'#(?<=[\s:,\-]\#)([a-f0-6]+)\1([a-f0-6]+)\2([a-f0-6]+)\3#i',
-					// Replace `(border|outline):none` with `(border|outline):0`
-					'#(?<=[\{;])(border|outline):none(?=[;\}\!])#',
-					// Remove empty selector(s)
-					'#(\/\*(?>.*?\*\/))|(^|[\{\}])(?:[^\s\{\}]+)\{\}#s'
-				),
-				array(
-					'$1',
-					'$1$2$3$4$5$6$7',
-					'$1',
-					':0',
-					'$1:0 0',
-					'.$1',
-					'$1$3',
-					'$1$2$4$5',
-					'$1$2$3',
-					'$1:0',
-					'$1$2'
-				),
-				$input);
-		}
-
-		/**
-		 * Get the conditional fields JavaScript.
-		 *
-		 * @return mixed
-		 */
-		public function conditional_fields_js() {
-			ob_start();
-			?>
+            $locale = json_encode( $params );
+
+            return apply_filters( 'ayecode_ui_timeago_locale', trim( $locale ) );
+        }
+
+        /**
+         * JavaScript Minifier
+         *
+         * @param $input
+         *
+         * @return mixed
+         */
+        public static function minify_js($input) {
+            if(trim($input) === "") return $input;
+            return preg_replace(
+                array(
+                    // Remove comment(s)
+                    '#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',
+                    // Remove white-space(s) outside the string and regex
+                    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/)|\/(?!\/)[^\n\r]*?\/(?=[\s.,;]|[gimuy]|$))|\s*([!%&*\(\)\-=+\[\]\{\}|;:,.<>?\/])\s*#s',
+                    // Remove the last semicolon
+                    '#;+\}#',
+                    // Minify object attribute(s) except JSON attribute(s). From `{'foo':'bar'}` to `{foo:'bar'}`
+                    '#([\{,])([\'])(\d+|[a-z_][a-z0-9_]*)\2(?=\:)#i',
+                    // --ibid. From `foo['bar']` to `foo.bar`
+                    '#([a-z0-9_\)\]])\[([\'"])([a-z_][a-z0-9_]*)\2\]#i'
+                ),
+                array(
+                    '$1',
+                    '$1$2',
+                    '}',
+                    '$1$3',
+                    '$1.$3'
+                ),
+                $input);
+        }
+
+        /**
+         * Minify CSS
+         *
+         * @param $input
+         *
+         * @return mixed
+         */
+        public static function minify_css($input) {
+            if(trim($input) === "") return $input;
+            return preg_replace(
+                array(
+                    // Remove comment(s)
+                    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')|\/\*(?!\!)(?>.*?\*\/)|^\s*|\s*$#s',
+                    // Remove unused white-space(s)
+                    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/))|\s*+;\s*+(})\s*+|\s*+([*$~^|]?+=|[{};,>~]|\s(?![0-9\.])|!important\b)\s*+|([[(:])\s++|\s++([])])|\s++(:)\s*+(?!(?>[^{}"\']++|"(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')*+{)|^\s++|\s++\z|(\s)\s+#si',
+                    // Replace `0(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)` with `0`
+                    '#(?<=[\s:])(0)(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)#si',
+                    // Replace `:0 0 0 0` with `:0`
+                    '#:(0\s+0|0\s+0\s+0\s+0)(?=[;\}]|\!important)#i',
+                    // Replace `background-position:0` with `background-position:0 0`
+                    '#(background-position):0(?=[;\}])#si',
+                    // Replace `0.6` with `.6`, but only when preceded by `:`, `,`, `-` or a white-space
+                    '#(?<=[\s:,\-])0+\.(\d+)#s',
+                    // Minify string value
+                    '#(\/\*(?>.*?\*\/))|(?<!content\:)([\'"])([a-z_][a-z0-9\-_]*?)\2(?=[\s\{\}\];,])#si',
+                    '#(\/\*(?>.*?\*\/))|(\burl\()([\'"])([^\s]+?)\3(\))#si',
+                    // Minify HEX color code
+                    '#(?<=[\s:,\-]\#)([a-f0-6]+)\1([a-f0-6]+)\2([a-f0-6]+)\3#i',
+                    // Replace `(border|outline):none` with `(border|outline):0`
+                    '#(?<=[\{;])(border|outline):none(?=[;\}\!])#',
+                    // Remove empty selector(s)
+                    '#(\/\*(?>.*?\*\/))|(^|[\{\}])(?:[^\s\{\}]+)\{\}#s'
+                ),
+                array(
+                    '$1',
+                    '$1$2$3$4$5$6$7',
+                    '$1',
+                    ':0',
+                    '$1:0 0',
+                    '.$1',
+                    '$1$3',
+                    '$1$2$4$5',
+                    '$1$2$3',
+                    '$1:0',
+                    '$1$2'
+                ),
+                $input);
+        }
+
+        /**
+         * Get the conditional fields JavaScript.
+         *
+         * @return mixed
+         */
+        public function conditional_fields_js() {
+            ob_start();
+            ?>
             <script>
                 /**
                  * Conditional Fields
@@ -3113,14 +3113,14 @@ 
 				<?php do_action( 'aui_conditional_fields_js', $this ); ?>
             </script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			return str_replace( array( '<script>', '</script>' ), '', self::minify_js( $output ) );
-		}
-	}
+            return str_replace( array( '<script>', '</script>' ), '', self::minify_js( $output ) );
+        }
+    }
 
-	/**
-	 * Run the class if found.
-	 */
-	AyeCode_UI_Settings::instance();
+    /**
+     * Run the class if found.
+     */
+    AyeCode_UI_Settings::instance();
 }
\ No newline at end of file

vendor/ayecode/wp-super-duper/sd-plugin.php

Indentation +4 added lines, -4 removed lines

@@ -15,12 +15,12 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'WP_Super_Duper' ) ) {
-	// include the class if needed
-	include_once( dirname( __FILE__ ) . "/wp-super-duper.php" );
+    // include the class if needed
+    include_once( dirname( __FILE__ ) . "/wp-super-duper.php" );
 }
 
 /*
@@ -35,5 +35,5 @@ 
 
 
 if ( ! function_exists( 'sd_get_class_build_keys' ) ) {
-	include_once( dirname( __FILE__ ) . "/sd-functions.php" );
+    include_once( dirname( __FILE__ ) . "/sd-functions.php" );
 }
\ No newline at end of file