AyeCode / invoicing

templates/invoice-history.php

Indentation +59 added lines, -59 removed lines

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

Spacing +31 added lines, -31 removed lines

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

templates/invoice-receipt.php

Spacing +35 added lines, -35 removed lines

@@ -7,54 +7,54 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Fetch the invoice.
-$invoice = new WPInv_Invoice( $invoice );
+$invoice = new WPInv_Invoice($invoice);
 
 // @deprecated
-do_action( 'wpinv_success_content_before', $invoice );
-do_action( 'wpinv_before_receipt', $invoice );
+do_action('wpinv_success_content_before', $invoice);
+do_action('wpinv_before_receipt', $invoice);
 
 
 // Prepare header text.
-if ( $invoice->is_paid() ) {
+if ($invoice->is_paid()) {
 
     $alert = aui()->alert(
         array(
             'type'    => 'success',
-            'content' => __( 'Thank you for your payment!', 'invoicing' ),
+            'content' => __('Thank you for your payment!', 'invoicing'),
         )
     );
 
-} else if ( $invoice->is_refunded() ) {
+} else if ($invoice->is_refunded()) {
 
     $alert = aui()->alert(
         array(
             'type'    => 'info',
-            'content' => __( 'This invoice was refunded.', 'invoicing' ),
+            'content' => __('This invoice was refunded.', 'invoicing'),
         )
     );
 
-} else if ( $invoice->is_held() ) {
+} else if ($invoice->is_held()) {
 
     $alert = aui()->alert(
         array(
             'type'    => 'info',
-            'content' => __( 'This invoice will be processed as soon we verify your payment.', 'invoicing' ),
+            'content' => __('This invoice will be processed as soon we verify your payment.', 'invoicing'),
         )
     );
 
-} else if ( $invoice->needs_payment() ) {
+} else if ($invoice->needs_payment()) {
 
-    if ( $invoice->is_due() ) {
+    if ($invoice->is_due()) {
 
         $alert = aui()->alert(
             array(
                 'type'    => 'danger',
                 'content' => sprintf(
-                    __( 'This invoice was due on %.', 'invoicing' ),
-                    getpaid_format_date_value( $invoice->get_due_date() )
+                    __('This invoice was due on %.', 'invoicing'),
+                    getpaid_format_date_value($invoice->get_due_date())
                 ),
             )
         );
@@ -64,7 +64,7 @@ 
         $alert = aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'This invoice needs payment.', 'invoicing' ),
+                'content' => __('This invoice needs payment.', 'invoicing'),
             )
         );
 
@@ -79,19 +79,19 @@ 
 
         'pay' => array(
             'url'   => $invoice->get_checkout_payment_url(),
-            'name'  => __( 'Pay For Invoice', 'invoicing' ),
+            'name'  => __('Pay For Invoice', 'invoicing'),
             'class' => 'btn-success',
         ),
 
         'view' => array(
             'url'   => $invoice->get_view_url(),
-            'name'  => __( 'View Invoice', 'invoicing' ),
+            'name'  => __('View Invoice', 'invoicing'),
             'class' => 'btn-primary',
         ),
 
         'history' => array(
             'url'   => wpinv_get_history_page_uri(),
-            'name'  => __( 'Invoice History', 'invoicing' ),
+            'name'  => __('Invoice History', 'invoicing'),
             'class' => 'btn-warning',
         ),
 
@@ -100,12 +100,12 @@ 
 
 );
 
-if ( ( ! $invoice->needs_payment() || $invoice->is_held() ) && isset( $actions['pay'] ) ) {
-    unset( $actions['pay'] );
+if ((!$invoice->needs_payment() || $invoice->is_held()) && isset($actions['pay'])) {
+    unset($actions['pay']);
 }
 
-if ( ! is_user_logged_in() && isset( $actions['history'] ) ) {
-    unset( $actions['history'] );
+if (!is_user_logged_in() && isset($actions['history'])) {
+    unset($actions['history']);
 }
 
 ?>
@@ -114,19 +114,19 @@ 
 
         <?php
         
-            do_action( 'wpinv_receipt_start', $invoice );
+            do_action('wpinv_receipt_start', $invoice);
 
-            if ( ! empty( $actions ) ) {
+            if (!empty($actions)) {
 
                 echo '<div class="wpinv-receipt-actions text-right mt-1 mb-4">';
 
-                foreach ( $actions as $key => $action ) {
+                foreach ($actions as $key => $action) {
 
-                    $key    = sanitize_html_class( $key );
-                    $class  = empty( $action['class'] ) ? 'btn-dark' : sanitize_html_class( $action['class'] );
-                    $url    = empty( $action['url'] ) ? '#' : esc_url( $action['url'] );
-                    $attrs  = empty( $action['attrs'] ) ? '' : $action['attrs'];
-                    $anchor = sanitize_text_field( $action['name'] );
+                    $key    = sanitize_html_class($key);
+                    $class  = empty($action['class']) ? 'btn-dark' : sanitize_html_class($action['class']);
+                    $url    = empty($action['url']) ? '#' : esc_url($action['url']);
+                    $attrs  = empty($action['attrs']) ? '' : $action['attrs'];
+                    $anchor = sanitize_text_field($action['name']);
 
                     echo "<a href='$url' class='btn btn-sm ml-1 $class $key' $attrs>$anchor</a>";
                 }
@@ -142,20 +142,20 @@ 
         <div class="wpinv-receipt-details">
 
             <h4 class="wpinv-details-t mb-3 mt-3">
-                <?php echo apply_filters( 'wpinv_receipt_details_title', __( 'Invoice Details', 'invoicing' ), $invoice ); ?>
+                <?php echo apply_filters('wpinv_receipt_details_title', __('Invoice Details', 'invoicing'), $invoice); ?>
             </h4>
 
-            <?php getpaid_invoice_meta( $invoice ); ?>
+            <?php getpaid_invoice_meta($invoice); ?>
 
         </div>
 
 
-        <?php do_action( 'wpinv_receipt_end', $invoice ); ?>
+        <?php do_action('wpinv_receipt_end', $invoice); ?>
 
     </div>
 
 <?php
 
 // @deprecated
-do_action( 'wpinv_success_content_after', $invoice );
-do_action( 'wpinv_after_receipt', $invoice );
+do_action('wpinv_success_content_after', $invoice);
+do_action('wpinv_after_receipt', $invoice);

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

Indentation +986 added lines, -986 removed lines

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

Spacing +201 added lines, -201 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -18,7 +18,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function input($args = array()){
+	public static function input($args = array()) {
 		$defaults = array(
 			'type'       => 'text',
 			'name'       => '',
@@ -51,13 +51,13 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
-		if ( ! empty( $args['type'] ) ) {
+		if (!empty($args['type'])) {
 			// hidden label option needs to be empty
 			$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
 
-			$type = sanitize_html_class( $args['type'] );
+			$type = sanitize_html_class($args['type']);
 
 			$help_text = '';
 			$label = '';
@@ -65,24 +65,24 @@ 
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
 
 			// floating labels need label after
-			if( $args['label_type'] == 'floating' && $type != 'checkbox' ){
+			if ($args['label_type'] == 'floating' && $type != 'checkbox') {
 				$label_after = true;
 				$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 			}
 
 			// Some special sauce for files
-			if($type=='file' ){
+			if ($type == 'file') {
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= ' custom-file-input ';
-			}elseif($type=='checkbox'){
+			}elseif ($type == 'checkbox') {
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= ' custom-control-input ';
-			}elseif($type=='datepicker' || $type=='timepicker'){
+			}elseif ($type == 'datepicker' || $type == 'timepicker') {
 				$type = 'text';
 				//$args['class'] .= ' aui-flatpickr bg-initial ';
 				$args['class'] .= ' bg-initial ';
@@ -98,65 +98,65 @@ 
 			$output .= '<input type="' . $type . '" ';
 
 			// name
-			if(!empty($args['name'])){
-				$output .= ' name="'.esc_attr($args['name']).'" ';
+			if (!empty($args['name'])) {
+				$output .= ' name="' . esc_attr($args['name']) . '" ';
 			}
 
 			// id
-			if(!empty($args['id'])){
-				$output .= ' id="'.sanitize_html_class($args['id']).'" ';
+			if (!empty($args['id'])) {
+				$output .= ' id="' . sanitize_html_class($args['id']) . '" ';
 			}
 
 			// placeholder
-			if(!empty($args['placeholder'])){
-				$output .= ' placeholder="'.esc_attr($args['placeholder']).'" ';
+			if (!empty($args['placeholder'])) {
+				$output .= ' placeholder="' . esc_attr($args['placeholder']) . '" ';
 			}
 
 			// title
-			if(!empty($args['title'])){
-				$output .= ' title="'.esc_attr($args['title']).'" ';
+			if (!empty($args['title'])) {
+				$output .= ' title="' . esc_attr($args['title']) . '" ';
 			}
 
 			// value
-			if(!empty($args['value'])){
-				$output .= ' value="'.sanitize_text_field($args['value']).'" ';
+			if (!empty($args['value'])) {
+				$output .= ' value="' . sanitize_text_field($args['value']) . '" ';
 			}
 
 			// checked, for radio and checkboxes
-			if( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ){
+			if (($type == 'checkbox' || $type == 'radio') && $args['checked']) {
 				$output .= ' checked ';
 			}
 
 			// validation text
-			if(!empty($args['validation_text'])){
-				$output .= ' oninvalid="setCustomValidity(\''.esc_attr($args['validation_text']).'\')" ';
+			if (!empty($args['validation_text'])) {
+				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr($args['validation_text']) . '\')" ';
 				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
 			}
 
 			// validation_pattern
-			if(!empty($args['validation_pattern'])){
-				$output .= ' pattern="'.$args['validation_pattern'].'" ';
+			if (!empty($args['validation_pattern'])) {
+				$output .= ' pattern="' . $args['validation_pattern'] . '" ';
 			}
 
 			// step (for numbers)
-			if(!empty($args['step'])){
-				$output .= ' step="'.$args['step'].'" ';
+			if (!empty($args['step'])) {
+				$output .= ' step="' . $args['step'] . '" ';
 			}
 
 			// required
-			if(!empty($args['required'])){
+			if (!empty($args['required'])) {
 				$output .= ' required ';
 			}
 
 			// class
 			$class = !empty($args['class']) ? $args['class'] : '';
-			$output .= ' class="form-control '.$class.'" ';
+			$output .= ' class="form-control ' . $class . '" ';
 
 			// data-attributes
 			$output .= AUI_Component_Helper::data_attributes($args);
 
 			// extra attributes
-			if(!empty($args['extra_attributes'])){
+			if (!empty($args['extra_attributes'])) {
 				$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 			}
 
@@ -165,40 +165,40 @@ 
 
 
 			// label
-			if(!empty($args['label'])){
-				if($type == 'file'){$label_args['class'] .= 'custom-file-label';}
-				elseif($type == 'checkbox'){$label_args['class'] .= 'custom-control-label';}
-				$label = self::label( $label_args, $type );
+			if (!empty($args['label'])) {
+				if ($type == 'file') {$label_args['class'] .= 'custom-file-label'; }
+				elseif ($type == 'checkbox') {$label_args['class'] .= 'custom-control-label'; }
+				$label = self::label($label_args, $type);
 			}
 
 			// help text
-			if(!empty($args['help_text'])){
+			if (!empty($args['help_text'])) {
 				$help_text = AUI_Component_Helper::help_text($args['help_text']);
 			}
 
 
 			// set help text in the correct possition
-			if($label_after){
+			if ($label_after) {
 				$output .= $label . $help_text;
 			}
 
 			// some input types need a separate wrap
-			if($type == 'file') {
-				$output = self::wrap( array(
+			if ($type == 'file') {
+				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => 'form-group custom-file'
-				) );
-			}elseif($type == 'checkbox'){
+				));
+			}elseif ($type == 'checkbox') {
 				$wrap_class = $args['switch'] ? 'custom-switch' : 'custom-checkbox';
-				$output = self::wrap( array(
+				$output = self::wrap(array(
 					'content' => $output,
-					'class'   => 'custom-control '.$wrap_class
-				) );
+					'class'   => 'custom-control ' . $wrap_class
+				));
 
-				if($args['label_type']=='horizontal'){
+				if ($args['label_type'] == 'horizontal') {
 					$output = '<div class="col-sm-2 col-form-label"></div><div class="col-sm-10">' . $output . '</div>';
 				}
-			}elseif($type == 'password' && $args['password_toggle'] && !$args['input_group_right']){
+			}elseif ($type == 'password' && $args['password_toggle'] && !$args['input_group_right']) {
 
 
 				// allow password field to toggle view
@@ -212,48 +212,48 @@ 
 			}
 
 			// input group wraps
-			if($args['input_group_left'] || $args['input_group_right']){
+			if ($args['input_group_left'] || $args['input_group_right']) {
 				$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
-				if($args['input_group_left']){
-					$output = self::wrap( array(
+				if ($args['input_group_left']) {
+					$output = self::wrap(array(
 						'content' => $output,
-						'class'   => $args['input_group_left_inside'] ? 'input-group-inside position-relative'.$w100  : 'input-group',
+						'class'   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 						'input_group_left' => $args['input_group_left'],
 						'input_group_left_inside'    => $args['input_group_left_inside']
-					) );
+					));
 				}
-				if($args['input_group_right']){
-					$output = self::wrap( array(
+				if ($args['input_group_right']) {
+					$output = self::wrap(array(
 						'content' => $output,
-						'class'   => $args['input_group_right_inside'] ? 'input-group-inside position-relative'.$w100 : 'input-group',
+						'class'   => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 						'input_group_right' => $args['input_group_right'],
 						'input_group_right_inside'    => $args['input_group_right_inside']
-					) );
+					));
 				}
 
 			}
 
-			if(!$label_after){
+			if (!$label_after) {
 				$output .= $help_text;
 			}
 
 
-			if($args['label_type']=='horizontal' && $type != 'checkbox'){
-				$output = self::wrap( array(
+			if ($args['label_type'] == 'horizontal' && $type != 'checkbox') {
+				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => 'col-sm-10',
-				) );
+				));
 			}
 
-			if(!$label_after){
+			if (!$label_after) {
 				$output = $label . $output;
 			}
 
 			// wrap
-			if(!$args['no_wrap']){
+			if (!$args['no_wrap']) {
 
-				$form_group_class = $args['label_type']=='floating' && $type != 'checkbox' ? 'form-label-group' : 'form-group';
-				$wrap_class = $args['label_type']=='horizontal' ? $form_group_class . ' row' : $form_group_class;
+				$form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : 'form-group';
+				$wrap_class = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
 				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => $wrap_class,
@@ -276,7 +276,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function textarea($args = array()){
+	public static function textarea($args = array()) {
 		$defaults = array(
 			'name'       => '',
 			'class'      => '',
@@ -301,43 +301,43 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
 		// hidden label option needs to be empty
 		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
 
 		// floating labels don't work with wysiwyg so set it as top
-		if($args['label_type'] == 'floating' && !empty($args['wysiwyg'])){
+		if ($args['label_type'] == 'floating' && !empty($args['wysiwyg'])) {
 			$args['label_type'] = 'top';
 		}
 
 		$label_after = $args['label_after'];
 
 		// floating labels need label after
-		if( $args['label_type'] == 'floating' && empty($args['wysiwyg']) ){
+		if ($args['label_type'] == 'floating' && empty($args['wysiwyg'])) {
 			$label_after = true;
 			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 		}
 
 		// label
-		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label']) && !$label_after){
+		if (!empty($args['label']) && is_array($args['label'])) {
+		}elseif (!empty($args['label']) && !$label_after) {
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
-			$output .= self::label( $label_args );
+			$output .= self::label($label_args);
 		}
 
 		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '<div class="col-sm-10">';
 		}
 
-		if(!empty($args['wysiwyg'])){
+		if (!empty($args['wysiwyg'])) {
 			ob_start();
 			$content = $args['value'];
 			$editor_id = !empty($args['id']) ? sanitize_html_class($args['id']) : 'wp_editor';
@@ -351,69 +351,69 @@ 
 			);
 
 			// maybe set settings if array
-			if(is_array($args['wysiwyg'])){
-				$settings  = wp_parse_args( $args['wysiwyg'], $settings );
+			if (is_array($args['wysiwyg'])) {
+				$settings = wp_parse_args($args['wysiwyg'], $settings);
 			}
 
-			wp_editor( $content, $editor_id, $settings );
+			wp_editor($content, $editor_id, $settings);
 			$output .= ob_get_clean();
-		}else{
+		} else {
 
 			// open
 			$output .= '<textarea ';
 
 			// name
-			if(!empty($args['name'])){
-				$output .= ' name="'.sanitize_html_class($args['name']).'" ';
+			if (!empty($args['name'])) {
+				$output .= ' name="' . sanitize_html_class($args['name']) . '" ';
 			}
 
 			// id
-			if(!empty($args['id'])){
-				$output .= ' id="'.sanitize_html_class($args['id']).'" ';
+			if (!empty($args['id'])) {
+				$output .= ' id="' . sanitize_html_class($args['id']) . '" ';
 			}
 
 			// placeholder
-			if(!empty($args['placeholder'])){
-				$output .= ' placeholder="'.esc_attr($args['placeholder']).'" ';
+			if (!empty($args['placeholder'])) {
+				$output .= ' placeholder="' . esc_attr($args['placeholder']) . '" ';
 			}
 
 			// title
-			if(!empty($args['title'])){
-				$output .= ' title="'.esc_attr($args['title']).'" ';
+			if (!empty($args['title'])) {
+				$output .= ' title="' . esc_attr($args['title']) . '" ';
 			}
 
 			// validation text
-			if(!empty($args['validation_text'])){
-				$output .= ' oninvalid="setCustomValidity(\''.esc_attr($args['validation_text']).'\')" ';
+			if (!empty($args['validation_text'])) {
+				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr($args['validation_text']) . '\')" ';
 				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
 			}
 
 			// validation_pattern
-			if(!empty($args['validation_pattern'])){
-				$output .= ' pattern="'.$args['validation_pattern'].'" ';
+			if (!empty($args['validation_pattern'])) {
+				$output .= ' pattern="' . $args['validation_pattern'] . '" ';
 			}
 
 			// required
-			if(!empty($args['required'])){
+			if (!empty($args['required'])) {
 				$output .= ' required ';
 			}
 
 			// rows
-			if(!empty($args['rows'])){
-				$output .= ' rows="'.absint($args['rows']).'" ';
+			if (!empty($args['rows'])) {
+				$output .= ' rows="' . absint($args['rows']) . '" ';
 			}
 
 
 			// class
 			$class = !empty($args['class']) ? $args['class'] : '';
-			$output .= ' class="form-control '.$class.'" ';
+			$output .= ' class="form-control ' . $class . '" ';
 
 
 			// close tag
 			$output .= ' >';
 
 			// value
-			if(!empty($args['value'])){
+			if (!empty($args['value'])) {
 				$output .= sanitize_textarea_field($args['value']);
 			}
 
@@ -422,31 +422,31 @@ 
 
 		}
 
-		if(!empty($args['label']) && $label_after){
+		if (!empty($args['label']) && $label_after) {
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
-			$output .= self::label( $label_args );
+			$output .= self::label($label_args);
 		}
 
 		// help text
-		if(!empty($args['help_text'])){
+		if (!empty($args['help_text'])) {
 			$output .= AUI_Component_Helper::help_text($args['help_text']);
 		}
 
 		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '</div>';
 		}
 
 
 		// wrap
-		if(!$args['no_wrap']){
-			$form_group_class = $args['label_type']=='floating' ? 'form-label-group' : 'form-group';
-			$wrap_class = $args['label_type']=='horizontal' ? $form_group_class . ' row' : $form_group_class;
+		if (!$args['no_wrap']) {
+			$form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : 'form-group';
+			$wrap_class = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
 			$output = self::wrap(array(
 				'content' => $output,
 				'class'   => $wrap_class,
@@ -459,7 +459,7 @@ 
 		return $output;
 	}
 
-	public static function label($args = array(), $type = ''){
+	public static function label($args = array(), $type = '') {
 		//<label for="exampleInputEmail1">Email address</label>
 		$defaults = array(
 			'title'       => 'div',
@@ -471,20 +471,20 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
-		if($args['title']){
+		if ($args['title']) {
 
 			// maybe hide labels //@todo set a global option for visibility class
-			if($type == 'file' || $type == 'checkbox' || $type == 'radio' || !empty($args['label_type']) ){
+			if ($type == 'file' || $type == 'checkbox' || $type == 'radio' || !empty($args['label_type'])) {
 				$class = $args['class'];
-			}else{
-				$class = 'sr-only '.$args['class'];
+			} else {
+				$class = 'sr-only ' . $args['class'];
 			}
 
 			// maybe horizontal
-			if($args['label_type']=='horizontal' && $type != 'checkbox'){
+			if ($args['label_type'] == 'horizontal' && $type != 'checkbox') {
 				$class .= ' col-sm-2 col-form-label';
 			}
 
@@ -492,19 +492,19 @@ 
 			$output .= '<label ';
 
 			// for
-			if(!empty($args['for'])){
-				$output .= ' for="'.sanitize_text_field($args['for']).'" ';
+			if (!empty($args['for'])) {
+				$output .= ' for="' . sanitize_text_field($args['for']) . '" ';
 			}
 
 			// class
-			$output .= ' class="'.$class.'" ';
+			$output .= ' class="' . $class . '" ';
 
 			// close
 			$output .= '>';
 
 
 			// title, don't escape fully as can contain html
-			if(!empty($args['title'])){
+			if (!empty($args['title'])) {
 				$output .= wp_kses_post($args['title']);
 			}
 
@@ -518,7 +518,7 @@ 
 		return $output;
 	}
 
-	public static function wrap($args = array()){
+	public static function wrap($args = array()) {
 		$defaults = array(
 			'type'       => 'div',
 			'class'      => 'form-group',
@@ -534,55 +534,55 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
-		if($args['type']){
+		if ($args['type']) {
 
 			// open
-			$output .= '<'.sanitize_html_class($args['type']);
+			$output .= '<' . sanitize_html_class($args['type']);
 
 			// element require
-			if(!empty($args['element_require'])){
+			if (!empty($args['element_require'])) {
 				$output .= AUI_Component_Helper::element_require($args['element_require']);
 				$args['class'] .= " aui-conditional-field";
 			}
 
 			// argument_id
-			if( !empty($args['argument_id']) ){
-				$output .= ' data-argument="'.esc_attr($args['argument_id']).'"';
+			if (!empty($args['argument_id'])) {
+				$output .= ' data-argument="' . esc_attr($args['argument_id']) . '"';
 			}
 
 			// class
 			$class = !empty($args['class']) ? $args['class'] : '';
-			$output .= ' class="'.$class.'" ';
+			$output .= ' class="' . $class . '" ';
 
 			// close wrap
 			$output .= ' >';
 
 
 			// Input group left
-			if(!empty($args['input_group_left'])){
+			if (!empty($args['input_group_left'])) {
 				$position_class = !empty($args['input_group_left_inside']) ? 'position-absolute h-100' : '';
-				$input_group_left = strpos($args['input_group_left'], '<') !== false ? $args['input_group_left'] : '<span class="input-group-text">'.$args['input_group_left'].'</span>';
-				$output .= '<div class="input-group-prepend '.$position_class.'">'.$input_group_left.'</div>';
+				$input_group_left = strpos($args['input_group_left'], '<') !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
+				$output .= '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
 			}
 
 			// content
 			$output .= $args['content'];
 
 			// Input group right
-			if(!empty($args['input_group_right'])){
+			if (!empty($args['input_group_right'])) {
 				$position_class = !empty($args['input_group_left_inside']) ? 'position-absolute h-100' : '';
-				$input_group_right = strpos($args['input_group_right'], '<') !== false ? $args['input_group_right'] : '<span class="input-group-text">'.$args['input_group_right'].'</span>';
-				$output .= '<div class="input-group-append '.$position_class.'">'.$input_group_right.'</div>';
+				$input_group_right = strpos($args['input_group_right'], '<') !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
+				$output .= '<div class="input-group-append ' . $position_class . '">' . $input_group_right . '</div>';
 			}
 
 
 			// close wrap
-			$output .= '</'.sanitize_html_class($args['type']).'>';
+			$output .= '</' . sanitize_html_class($args['type']) . '>';
 
 
-		}else{
+		} else {
 			$output = $args['content'];
 		}
 
@@ -596,7 +596,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function select($args = array()){
+	public static function select($args = array()) {
 		$defaults = array(
 			'class'      => '',
 			'id'         => '',
@@ -621,11 +621,11 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
 		// for now lets hide floating labels
-		if( $args['label_type'] == 'floating' ){$args['label_type'] = 'hidden';}
+		if ($args['label_type'] == 'floating') {$args['label_type'] = 'hidden'; }
 
 		// hidden label option needs to be empty
 		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
@@ -634,47 +634,47 @@ 
 		$label_after = $args['label_after'];
 
 		// floating labels need label after
-		if( $args['label_type'] == 'floating' ){
+		if ($args['label_type'] == 'floating') {
 			$label_after = true;
 			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 		}
 
 		// Maybe setup select2
 		$is_select2 = false;
-		if(!empty($args['select2'])){
+		if (!empty($args['select2'])) {
 			$args['class'] .= ' aui-select2';
 			$is_select2 = true;
-		}elseif( strpos($args['class'], 'aui-select2') !== false){
+		}elseif (strpos($args['class'], 'aui-select2') !== false) {
 			$is_select2 = true;
 		}
 
 		// select2 tags
-		if( !empty($args['select2']) && $args['select2'] === 'tags'){ // triple equals needed here for some reason
+		if (!empty($args['select2']) && $args['select2'] === 'tags') { // triple equals needed here for some reason
 			$args['data-tags'] = 'true';
 			$args['data-token-separators'] = "[',']";
 			$args['multiple'] = true;
 		}
 
 		// select2 placeholder
-		if($is_select2 && !empty($args['placeholder']) && empty($args['data-placeholder'])){
+		if ($is_select2 && !empty($args['placeholder']) && empty($args['data-placeholder'])) {
 			$args['data-placeholder'] = esc_attr($args['placeholder']);
 			$args['data-allow-clear'] = empty($args['data-allow-clear']) ? true : esc_attr($args['data-allow-clear']);
 		}
 
 		// label
-		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label']) && !$label_after){
+		if (!empty($args['label']) && is_array($args['label'])) {
+		}elseif (!empty($args['label']) && !$label_after) {
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
 			$output .= self::label($label_args);
 		}
 
 		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '<div class="col-sm-10">';
 		}
 
@@ -682,32 +682,32 @@ 
 		$output .= '<select ';
 
 		// style
-		if($is_select2){
+		if ($is_select2) {
 			$output .= " style='width:100%;' ";
 		}
 
 		// element require
-		if(!empty($args['element_require'])){
+		if (!empty($args['element_require'])) {
 			$output .= AUI_Component_Helper::element_require($args['element_require']);
 			$args['class'] .= " aui-conditional-field";
 		}
 
 		// class
 		$class = !empty($args['class']) ? $args['class'] : '';
-		$output .= AUI_Component_Helper::class_attr('custom-select '.$class);
+		$output .= AUI_Component_Helper::class_attr('custom-select ' . $class);
 
 		// name
-		if(!empty($args['name'])){
-			$output .= AUI_Component_Helper::name($args['name'],$args['multiple']);
+		if (!empty($args['name'])) {
+			$output .= AUI_Component_Helper::name($args['name'], $args['multiple']);
 		}
 
 		// id
-		if(!empty($args['id'])){
+		if (!empty($args['id'])) {
 			$output .= AUI_Component_Helper::id($args['id']);
 		}
 
 		// title
-		if(!empty($args['title'])){
+		if (!empty($args['title'])) {
 			$output .= AUI_Component_Helper::title($args['title']);
 		}
 
@@ -718,17 +718,17 @@ 
 		$output .= AUI_Component_Helper::aria_attributes($args);
 
 		// extra attributes
-		if(!empty($args['extra_attributes'])){
+		if (!empty($args['extra_attributes'])) {
 			$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 		}
 
 		// required
-		if(!empty($args['required'])){
+		if (!empty($args['required'])) {
 			$output .= ' required ';
 		}
 
 		// multiple
-		if(!empty($args['multiple'])){
+		if (!empty($args['multiple'])) {
 			$output .= ' multiple ';
 		}
 
@@ -736,21 +736,21 @@ 
 		$output .= ' >';
 
 		// placeholder
-		if(!empty($args['placeholder']) && !$is_select2){
-			$output .= '<option value="" disabled selected hidden>'.esc_attr($args['placeholder']).'</option>';
-		}elseif($is_select2 && !empty($args['placeholder'])){
+		if (!empty($args['placeholder']) && !$is_select2) {
+			$output .= '<option value="" disabled selected hidden>' . esc_attr($args['placeholder']) . '</option>';
+		}elseif ($is_select2 && !empty($args['placeholder'])) {
 			$output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
 		}
 
 		// Options
-		if(!empty($args['options'])){
+		if (!empty($args['options'])) {
 
-			if(!is_array($args['options'])){
+			if (!is_array($args['options'])) {
 				$output .= $args['options']; // not the preferred way but an option
-			}else{
-				foreach($args['options'] as $val => $name){
+			} else {
+				foreach ($args['options'] as $val => $name) {
 					$selected = '';
-					if(is_array($name)){
+					if (is_array($name)) {
 						if (isset($name['optgroup']) && ($name['optgroup'] == 'start' || $name['optgroup'] == 'end')) {
 							$option_label = isset($name['label']) ? $name['label'] : '';
 
@@ -758,23 +758,23 @@ 
 						} else {
 							$option_label = isset($name['label']) ? $name['label'] : '';
 							$option_value = isset($name['value']) ? $name['value'] : '';
-							if(!empty($args['multiple']) && !empty($args['value'])){
+							if (!empty($args['multiple']) && !empty($args['value'])) {
 								$selected = in_array($option_value, stripslashes_deep($args['value'])) ? "selected" : "";
-							} elseif(!empty($args['value'])) {
-								$selected = selected($option_value,stripslashes_deep($args['value']), false);
+							} elseif (!empty($args['value'])) {
+								$selected = selected($option_value, stripslashes_deep($args['value']), false);
 							}
 
 							$output .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
 						}
-					}else{
-						if(!empty($args['value'])){
-							if(is_array($args['value'])){
-								$selected = in_array($val,$args['value']) ? 'selected="selected"' : '';
-							} elseif(!empty($args['value'])) {
-								$selected = selected( $args['value'], $val, false);
+					} else {
+						if (!empty($args['value'])) {
+							if (is_array($args['value'])) {
+								$selected = in_array($val, $args['value']) ? 'selected="selected"' : '';
+							} elseif (!empty($args['value'])) {
+								$selected = selected($args['value'], $val, false);
 							}
 						}
-						$output .= '<option value="'.esc_attr($val).'" '.$selected.'>'.esc_attr($name).'</option>';
+						$output .= '<option value="' . esc_attr($val) . '" ' . $selected . '>' . esc_attr($name) . '</option>';
 					}
 				}
 			}
@@ -784,30 +784,30 @@ 
 		// closing tag
 		$output .= '</select>';
 
-		if(!empty($args['label']) && $label_after){
+		if (!empty($args['label']) && $label_after) {
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
 			$output .= self::label($label_args);
 		}
 
 		// help text
-		if(!empty($args['help_text'])){
+		if (!empty($args['help_text'])) {
 			$output .= AUI_Component_Helper::help_text($args['help_text']);
 		}
 
 		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '</div>';
 		}
 
 
 		// wrap
-		if(!$args['no_wrap']){
-			$wrap_class = $args['label_type']=='horizontal' ? 'form-group row' : 'form-group';
+		if (!$args['no_wrap']) {
+			$wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
 			$output = self::wrap(array(
 				'content' => $output,
 				'class'   => $wrap_class,
@@ -827,7 +827,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio($args = array()){
+	public static function radio($args = array()) {
 		$defaults = array(
 			'class'      => '',
 			'id'         => '',
@@ -849,14 +849,14 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		// for now lets use horizontal for floating
-		if( $args['label_type'] != 'hidden' ){$args['label_type'] = 'horizontal';}
+		if ($args['label_type'] != 'hidden') {$args['label_type'] = 'horizontal'; }
 
 		$label_args = array(
 			'title'=> $args['label'],
-			'class' => $args['label_class']." pt-0 ",
+			'class' => $args['label_class'] . " pt-0 ",
 			'label_type' => $args['label_type']
 		);
 
@@ -865,35 +865,35 @@ 
 
 
 		// label before
-		if(!empty($args['label'])){
-			$output .= self::label( $label_args, 'radio' );
+		if (!empty($args['label'])) {
+			$output .= self::label($label_args, 'radio');
 		}
 
 		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '<div class="col-sm-10">';
 		}
 
-		if(!empty($args['options'])){
+		if (!empty($args['options'])) {
 			$count = 0;
-			foreach($args['options'] as $value => $label){
+			foreach ($args['options'] as $value => $label) {
 				$option_args = $args;
 				$option_args['value'] = $value;
 				$option_args['label'] = $label;
 				$option_args['checked'] = $value == $args['value'] ? true : false;
-				$output .= self::radio_option($option_args,$count);
+				$output .= self::radio_option($option_args, $count);
 				$count++;
 			}
 		}
 
 		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '</div>';
 		}
 
 
 		// wrap
-		$wrap_class = $args['label_type']=='horizontal' ? 'form-group row' : 'form-group';
+		$wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
 		$output = self::wrap(array(
 			'content' => $output,
 			'class'   => $wrap_class,
@@ -912,7 +912,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio_option($args = array(),$count = ''){
+	public static function radio_option($args = array(), $count = '') {
 		$defaults = array(
 			'class'      => '',
 			'id'         => '',
@@ -930,7 +930,7 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 
 		$output = '';
 
@@ -941,27 +941,27 @@ 
 		$output .= ' class="form-check-input" ';
 
 		// name
-		if(!empty($args['name'])){
+		if (!empty($args['name'])) {
 			$output .= AUI_Component_Helper::name($args['name']);
 		}
 
 		// id
-		if(!empty($args['id'])){
-			$output .= AUI_Component_Helper::id($args['id'].$count);
+		if (!empty($args['id'])) {
+			$output .= AUI_Component_Helper::id($args['id'] . $count);
 		}
 
 		// title
-		if(!empty($args['title'])){
+		if (!empty($args['title'])) {
 			$output .= AUI_Component_Helper::title($args['title']);
 		}
 
 		// value
-		if(isset($args['value'])){
-			$output .= ' value="'.sanitize_text_field($args['value']).'" ';
+		if (isset($args['value'])) {
+			$output .= ' value="' . sanitize_text_field($args['value']) . '" ';
 		}
 
 		// checked, for radio and checkboxes
-		if( $args['checked'] ){
+		if ($args['checked']) {
 			$output .= ' checked ';
 		}
 
@@ -972,12 +972,12 @@ 
 		$output .= AUI_Component_Helper::aria_attributes($args);
 
 		// extra attributes
-		if(!empty($args['extra_attributes'])){
+		if (!empty($args['extra_attributes'])) {
 			$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 		}
 
 		// required
-		if(!empty($args['required'])){
+		if (!empty($args['required'])) {
 			$output .= ' required ';
 		}
 
@@ -985,13 +985,13 @@ 
 		$output .= ' >';
 
 		// label
-		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label'])){
-			$output .= self::label(array('title'=>$args['label'],'for'=>$args['id'].$count,'class'=>'form-check-label'),'radio');
+		if (!empty($args['label']) && is_array($args['label'])) {
+		}elseif (!empty($args['label'])) {
+			$output .= self::label(array('title'=>$args['label'], 'for'=>$args['id'] . $count, 'class'=>'form-check-label'), 'radio');
 		}
 
 		// wrap
-		if(!$args['no_wrap']){
+		if (!$args['no_wrap']) {
 			$wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
 			$output = self::wrap(array(
 				'content' => $output,

Braces +15 added lines, -16 removed lines

@@ -79,10 +79,10 @@ 
 			if($type=='file' ){
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= ' custom-file-input ';
-			}elseif($type=='checkbox'){
+			} elseif($type=='checkbox'){
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= ' custom-control-input ';
-			}elseif($type=='datepicker' || $type=='timepicker'){
+			} elseif($type=='datepicker' || $type=='timepicker'){
 				$type = 'text';
 				//$args['class'] .= ' aui-flatpickr bg-initial ';
 				$args['class'] .= ' bg-initial ';
@@ -166,8 +166,7 @@ 
 
 			// label
 			if(!empty($args['label'])){
-				if($type == 'file'){$label_args['class'] .= 'custom-file-label';}
-				elseif($type == 'checkbox'){$label_args['class'] .= 'custom-control-label';}
+				if($type == 'file'){$label_args['class'] .= 'custom-file-label';} elseif($type == 'checkbox'){$label_args['class'] .= 'custom-control-label';}
 				$label = self::label( $label_args, $type );
 			}
 
@@ -188,7 +187,7 @@ 
 					'content' => $output,
 					'class'   => 'form-group custom-file'
 				) );
-			}elseif($type == 'checkbox'){
+			} elseif($type == 'checkbox'){
 				$wrap_class = $args['switch'] ? 'custom-switch' : 'custom-checkbox';
 				$output = self::wrap( array(
 					'content' => $output,
@@ -198,7 +197,7 @@ 
 				if($args['label_type']=='horizontal'){
 					$output = '<div class="col-sm-2 col-form-label"></div><div class="col-sm-10">' . $output . '</div>';
 				}
-			}elseif($type == 'password' && $args['password_toggle'] && !$args['input_group_right']){
+			} elseif($type == 'password' && $args['password_toggle'] && !$args['input_group_right']){
 
 
 				// allow password field to toggle view
@@ -322,7 +321,7 @@ 
 
 		// label
 		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label']) && !$label_after){
+		} elseif(!empty($args['label']) && !$label_after){
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
@@ -357,7 +356,7 @@ 
 
 			wp_editor( $content, $editor_id, $settings );
 			$output .= ob_get_clean();
-		}else{
+		} else{
 
 			// open
 			$output .= '<textarea ';
@@ -479,7 +478,7 @@ 
 			// maybe hide labels //@todo set a global option for visibility class
 			if($type == 'file' || $type == 'checkbox' || $type == 'radio' || !empty($args['label_type']) ){
 				$class = $args['class'];
-			}else{
+			} else{
 				$class = 'sr-only '.$args['class'];
 			}
 
@@ -582,7 +581,7 @@ 
 			$output .= '</'.sanitize_html_class($args['type']).'>';
 
 
-		}else{
+		} else{
 			$output = $args['content'];
 		}
 
@@ -644,7 +643,7 @@ 
 		if(!empty($args['select2'])){
 			$args['class'] .= ' aui-select2';
 			$is_select2 = true;
-		}elseif( strpos($args['class'], 'aui-select2') !== false){
+		} elseif( strpos($args['class'], 'aui-select2') !== false){
 			$is_select2 = true;
 		}
 
@@ -663,7 +662,7 @@ 
 
 		// label
 		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label']) && !$label_after){
+		} elseif(!empty($args['label']) && !$label_after){
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
@@ -738,7 +737,7 @@ 
 		// placeholder
 		if(!empty($args['placeholder']) && !$is_select2){
 			$output .= '<option value="" disabled selected hidden>'.esc_attr($args['placeholder']).'</option>';
-		}elseif($is_select2 && !empty($args['placeholder'])){
+		} elseif($is_select2 && !empty($args['placeholder'])){
 			$output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
 		}
 
@@ -747,7 +746,7 @@ 
 
 			if(!is_array($args['options'])){
 				$output .= $args['options']; // not the preferred way but an option
-			}else{
+			} else{
 				foreach($args['options'] as $val => $name){
 					$selected = '';
 					if(is_array($name)){
@@ -766,7 +765,7 @@ 
 
 							$output .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
 						}
-					}else{
+					} else{
 						if(!empty($args['value'])){
 							if(is_array($args['value'])){
 								$selected = in_array($val,$args['value']) ? 'selected="selected"' : '';
@@ -986,7 +985,7 @@ 
 
 		// label
 		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label'])){
+		} elseif(!empty($args['label'])){
 			$output .= self::label(array('title'=>$args['label'],'for'=>$args['id'].$count,'class'=>'form-check-label'),'radio');
 		}
 

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

Indentation +73 added lines, -73 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -11,77 +11,77 @@ 
  */
 class AUI_Component_Pagination {
 
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function get( $args = array() ) {
-		global $wp_query;
-
-		$defaults = array(
-			'class'              => '',
-			'mid_size'           => 2,
-			'prev_text'          => '<i class="fas fa-chevron-left"></i>',
-			'next_text'          => '<i class="fas fa-chevron-right"></i>',
-			'screen_reader_text' => __( 'Posts navigation' ),
-			'before_paging' => '',
-			'after_paging'  => '',
-			'type'               => 'array',
-			'total'              => isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1,
-			'links'              => array() // an array of links if using custom links, this includes the a tag.
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args = wp_parse_args( $args, $defaults );
-
-		$output = '';
-
-		// Don't print empty markup if there's only one page.
-		if ( $args['total'] > 1 ) {
-
-			// Set up paginated links.
-			$links = !empty(  $args['links'] ) ? $args['links'] :  paginate_links( $args );
-
-			$class = !empty($args['class']) ? $args['class'] : '';
-
-			// make the output bootstrap ready
-			$links_html = "<ul class='pagination m-0 p-0 $class'>";
-			if ( ! empty( $links ) ) {
-				foreach ( $links as $link ) {
-					$active = strpos( $link, 'current' ) !== false ? 'active' : '';
-					$links_html .= "<li class='page-item $active'>";
-					$links_html .= str_replace( "page-numbers", "page-link", $link );
-					$links_html .= "</li>";
-				}
-			}
-			$links_html .= "</ul>";
-
-			if ( $links ) {
-				$output .= '<section class="px-0 py-2 w-100">';
-				$output .= _navigation_markup( $links_html, 'aui-pagination', $args['screen_reader_text'] );
-				$output .= '</section>';
-			}
-
-			$output = str_replace( "screen-reader-text", "screen-reader-text sr-only", $output );
-			$output = str_replace( "nav-links", "aui-nav-links", $output );
-		}
-
-		if ( $output ) {
-			if ( ! empty( $args['before_paging'] ) ) {
-				$output = $args['before_paging'] . $output;
-			}
-
-			if ( ! empty( $args['after_paging'] ) ) {
-				$output = $output . $args['after_paging'];
-			}
-		}
-
-		return $output;
-	}
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function get( $args = array() ) {
+        global $wp_query;
+
+        $defaults = array(
+            'class'              => '',
+            'mid_size'           => 2,
+            'prev_text'          => '<i class="fas fa-chevron-left"></i>',
+            'next_text'          => '<i class="fas fa-chevron-right"></i>',
+            'screen_reader_text' => __( 'Posts navigation' ),
+            'before_paging' => '',
+            'after_paging'  => '',
+            'type'               => 'array',
+            'total'              => isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1,
+            'links'              => array() // an array of links if using custom links, this includes the a tag.
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args = wp_parse_args( $args, $defaults );
+
+        $output = '';
+
+        // Don't print empty markup if there's only one page.
+        if ( $args['total'] > 1 ) {
+
+            // Set up paginated links.
+            $links = !empty(  $args['links'] ) ? $args['links'] :  paginate_links( $args );
+
+            $class = !empty($args['class']) ? $args['class'] : '';
+
+            // make the output bootstrap ready
+            $links_html = "<ul class='pagination m-0 p-0 $class'>";
+            if ( ! empty( $links ) ) {
+                foreach ( $links as $link ) {
+                    $active = strpos( $link, 'current' ) !== false ? 'active' : '';
+                    $links_html .= "<li class='page-item $active'>";
+                    $links_html .= str_replace( "page-numbers", "page-link", $link );
+                    $links_html .= "</li>";
+                }
+            }
+            $links_html .= "</ul>";
+
+            if ( $links ) {
+                $output .= '<section class="px-0 py-2 w-100">';
+                $output .= _navigation_markup( $links_html, 'aui-pagination', $args['screen_reader_text'] );
+                $output .= '</section>';
+            }
+
+            $output = str_replace( "screen-reader-text", "screen-reader-text sr-only", $output );
+            $output = str_replace( "nav-links", "aui-nav-links", $output );
+        }
+
+        if ( $output ) {
+            if ( ! empty( $args['before_paging'] ) ) {
+                $output = $args['before_paging'] . $output;
+            }
+
+            if ( ! empty( $args['after_paging'] ) ) {
+                $output = $output . $args['after_paging'];
+            }
+        }
+
+        return $output;
+    }
 
 }
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -18,7 +18,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function get( $args = array() ) {
+	public static function get($args = array()) {
 		global $wp_query;
 
 		$defaults = array(
@@ -26,57 +26,57 @@ 
 			'mid_size'           => 2,
 			'prev_text'          => '<i class="fas fa-chevron-left"></i>',
 			'next_text'          => '<i class="fas fa-chevron-right"></i>',
-			'screen_reader_text' => __( 'Posts navigation' ),
+			'screen_reader_text' => __('Posts navigation'),
 			'before_paging' => '',
 			'after_paging'  => '',
 			'type'               => 'array',
-			'total'              => isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1,
+			'total'              => isset($wp_query->max_num_pages) ? $wp_query->max_num_pages : 1,
 			'links'              => array() // an array of links if using custom links, this includes the a tag.
 		);
 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$output = '';
 
 		// Don't print empty markup if there's only one page.
-		if ( $args['total'] > 1 ) {
+		if ($args['total'] > 1) {
 
 			// Set up paginated links.
-			$links = !empty(  $args['links'] ) ? $args['links'] :  paginate_links( $args );
+			$links = !empty($args['links']) ? $args['links'] : paginate_links($args);
 
 			$class = !empty($args['class']) ? $args['class'] : '';
 
 			// make the output bootstrap ready
 			$links_html = "<ul class='pagination m-0 p-0 $class'>";
-			if ( ! empty( $links ) ) {
-				foreach ( $links as $link ) {
-					$active = strpos( $link, 'current' ) !== false ? 'active' : '';
+			if (!empty($links)) {
+				foreach ($links as $link) {
+					$active = strpos($link, 'current') !== false ? 'active' : '';
 					$links_html .= "<li class='page-item $active'>";
-					$links_html .= str_replace( "page-numbers", "page-link", $link );
+					$links_html .= str_replace("page-numbers", "page-link", $link);
 					$links_html .= "</li>";
 				}
 			}
 			$links_html .= "</ul>";
 
-			if ( $links ) {
+			if ($links) {
 				$output .= '<section class="px-0 py-2 w-100">';
-				$output .= _navigation_markup( $links_html, 'aui-pagination', $args['screen_reader_text'] );
+				$output .= _navigation_markup($links_html, 'aui-pagination', $args['screen_reader_text']);
 				$output .= '</section>';
 			}
 
-			$output = str_replace( "screen-reader-text", "screen-reader-text sr-only", $output );
-			$output = str_replace( "nav-links", "aui-nav-links", $output );
+			$output = str_replace("screen-reader-text", "screen-reader-text sr-only", $output);
+			$output = str_replace("nav-links", "aui-nav-links", $output);
 		}
 
-		if ( $output ) {
-			if ( ! empty( $args['before_paging'] ) ) {
+		if ($output) {
+			if (!empty($args['before_paging'])) {
 				$output = $args['before_paging'] . $output;
 			}
 
-			if ( ! empty( $args['after_paging'] ) ) {
+			if (!empty($args['after_paging'])) {
 				$output = $output . $args['after_paging'];
 			}
 		}

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

Indentation +245 added lines, -245 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -11,249 +11,249 @@ 
  */
 class AUI_Component_Helper {
 
-	/**
-	 * A component helper for generating a input name.
-	 *
-	 * @param $text
-	 *
-	 * @return string
-	 */
-	public static function name($text,$multiple = false){
-		$output = '';
-
-		if($text){
-			$is_multiple = strpos($text, '[]') !== false ? '[]' : '';
-			$output = ' name="'.sanitize_html_class($text).$is_multiple.'" ';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * A component helper for generating a item id.
-	 *
-	 * @param $text string The text to be used as the value.
-	 *
-	 * @return string The sanitized item.
-	 */
-	public static function id($text){
-		$output = '';
-
-		if($text){
-			$output = ' id="'.sanitize_html_class($text).'" ';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * A component helper for generating a item title.
-	 *
-	 * @param $text string The text to be used as the value.
-	 *
-	 * @return string The sanitized item.
-	 */
-	public static function title($text){
-		$output = '';
-
-		if($text){
-			$output = ' title="'.esc_attr($text).'" ';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * A component helper for generating a item value.
-	 *
-	 * @param $text string The text to be used as the value.
-	 *
-	 * @return string The sanitized item.
-	 */
-	public static function value($text){
-		$output = '';
-
-		if($text){
-			$output = ' value="'.sanitize_text_field($text).'" ';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * A component helper for generating a item class attribute.
-	 *
-	 * @param $text string The text to be used as the value.
-	 *
-	 * @return string The sanitized item.
-	 */
-	public static function class_attr($text){
-		$output = '';
-
-		if($text){
-			$classes = self::esc_classes($text);
-			if(!empty($classes)){
-				$output = ' class="'.$classes.'" ';
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Escape a string of classes.
-	 *
-	 * @param $text
-	 *
-	 * @return string
-	 */
-	public static function esc_classes($text){
-		$output = '';
-
-		if($text){
-			$classes = explode(" ",$text);
-			$classes = array_map("trim",$classes);
-			$classes = array_map("sanitize_html_class",$classes);
-			if(!empty($classes)){
-				$output = implode(" ",$classes);
-			}
-		}
-
-		return $output;
-
-	}
-
-	/**
-	 * @param $args
-	 *
-	 * @return string
-	 */
-	public static function data_attributes($args){
-		$output = '';
-
-		if(!empty($args)){
-
-			foreach($args as $key => $val){
-				if(substr( $key, 0, 5 ) === "data-"){
-					$output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
-				}
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * @param $args
-	 *
-	 * @return string
-	 */
-	public static function aria_attributes($args){
-		$output = '';
-
-		if(!empty($args)){
-
-			foreach($args as $key => $val){
-				if(substr( $key, 0, 5 ) === "aria-"){
-					$output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
-				}
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Build a font awesome icon from a class.
-	 *
-	 * @param $class
-	 * @param bool $space_after
-	 * @param array $extra_attributes An array of extra attributes.
-	 *
-	 * @return string
-	 */
-	public static function icon($class,$space_after = false, $extra_attributes = array()){
-		$output = '';
-
-		if($class){
-			$classes = self::esc_classes($class);
-			if(!empty($classes)){
-				$output = '<i class="'.$classes.'" ';
-				// extra attributes
-				if(!empty($extra_attributes)){
-					$output .= AUI_Component_Helper::extra_attributes($extra_attributes);
-				}
-				$output .= '></i>';
-				if($space_after){
-					$output .= " ";
-				}
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * @param $args
-	 *
-	 * @return string
-	 */
-	public static function extra_attributes($args){
-		$output = '';
-
-		if(!empty($args)){
-
-			if( is_array($args) ){
-				foreach($args as $key => $val){
-					$output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
-				}
-			}else{
-				$output .= ' '.$args.' ';
-			}
-
-		}
-
-		return $output;
-	}
-
-	/**
-	 * @param $args
-	 *
-	 * @return string
-	 */
-	public static function help_text($text){
-		$output = '';
-
-		if($text){
-			$output .= '<small class="form-text text-muted">'.wp_kses_post($text).'</small>';
-		}
-
-
-		return $output;
-	}
-
-	/**
-	 * Replace element require context with JS.
-	 *
-	 * @param $input
-	 *
-	 * @return string|void
-	 */
-	public static function element_require( $input ) {
-
-		$input = str_replace( "'", '"', $input );// we only want double quotes
-
-		$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
-			"jQuery(form).find('[data-argument=\"",
-			"\"]').find('input,select,textarea').val()",
-			"\"]').find('input:checked').val()",
-		), $input ) );
-
-		if($output){
-			$output = ' data-element-require="'.$output.'" ';
-		}
-
-		return $output;
-	}
+    /**
+     * A component helper for generating a input name.
+     *
+     * @param $text
+     *
+     * @return string
+     */
+    public static function name($text,$multiple = false){
+        $output = '';
+
+        if($text){
+            $is_multiple = strpos($text, '[]') !== false ? '[]' : '';
+            $output = ' name="'.sanitize_html_class($text).$is_multiple.'" ';
+        }
+
+        return $output;
+    }
+
+    /**
+     * A component helper for generating a item id.
+     *
+     * @param $text string The text to be used as the value.
+     *
+     * @return string The sanitized item.
+     */
+    public static function id($text){
+        $output = '';
+
+        if($text){
+            $output = ' id="'.sanitize_html_class($text).'" ';
+        }
+
+        return $output;
+    }
+
+    /**
+     * A component helper for generating a item title.
+     *
+     * @param $text string The text to be used as the value.
+     *
+     * @return string The sanitized item.
+     */
+    public static function title($text){
+        $output = '';
+
+        if($text){
+            $output = ' title="'.esc_attr($text).'" ';
+        }
+
+        return $output;
+    }
+
+    /**
+     * A component helper for generating a item value.
+     *
+     * @param $text string The text to be used as the value.
+     *
+     * @return string The sanitized item.
+     */
+    public static function value($text){
+        $output = '';
+
+        if($text){
+            $output = ' value="'.sanitize_text_field($text).'" ';
+        }
+
+        return $output;
+    }
+
+    /**
+     * A component helper for generating a item class attribute.
+     *
+     * @param $text string The text to be used as the value.
+     *
+     * @return string The sanitized item.
+     */
+    public static function class_attr($text){
+        $output = '';
+
+        if($text){
+            $classes = self::esc_classes($text);
+            if(!empty($classes)){
+                $output = ' class="'.$classes.'" ';
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Escape a string of classes.
+     *
+     * @param $text
+     *
+     * @return string
+     */
+    public static function esc_classes($text){
+        $output = '';
+
+        if($text){
+            $classes = explode(" ",$text);
+            $classes = array_map("trim",$classes);
+            $classes = array_map("sanitize_html_class",$classes);
+            if(!empty($classes)){
+                $output = implode(" ",$classes);
+            }
+        }
+
+        return $output;
+
+    }
+
+    /**
+     * @param $args
+     *
+     * @return string
+     */
+    public static function data_attributes($args){
+        $output = '';
+
+        if(!empty($args)){
+
+            foreach($args as $key => $val){
+                if(substr( $key, 0, 5 ) === "data-"){
+                    $output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
+                }
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * @param $args
+     *
+     * @return string
+     */
+    public static function aria_attributes($args){
+        $output = '';
+
+        if(!empty($args)){
+
+            foreach($args as $key => $val){
+                if(substr( $key, 0, 5 ) === "aria-"){
+                    $output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
+                }
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Build a font awesome icon from a class.
+     *
+     * @param $class
+     * @param bool $space_after
+     * @param array $extra_attributes An array of extra attributes.
+     *
+     * @return string
+     */
+    public static function icon($class,$space_after = false, $extra_attributes = array()){
+        $output = '';
+
+        if($class){
+            $classes = self::esc_classes($class);
+            if(!empty($classes)){
+                $output = '<i class="'.$classes.'" ';
+                // extra attributes
+                if(!empty($extra_attributes)){
+                    $output .= AUI_Component_Helper::extra_attributes($extra_attributes);
+                }
+                $output .= '></i>';
+                if($space_after){
+                    $output .= " ";
+                }
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * @param $args
+     *
+     * @return string
+     */
+    public static function extra_attributes($args){
+        $output = '';
+
+        if(!empty($args)){
+
+            if( is_array($args) ){
+                foreach($args as $key => $val){
+                    $output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
+                }
+            }else{
+                $output .= ' '.$args.' ';
+            }
+
+        }
+
+        return $output;
+    }
+
+    /**
+     * @param $args
+     *
+     * @return string
+     */
+    public static function help_text($text){
+        $output = '';
+
+        if($text){
+            $output .= '<small class="form-text text-muted">'.wp_kses_post($text).'</small>';
+        }
+
+
+        return $output;
+    }
+
+    /**
+     * Replace element require context with JS.
+     *
+     * @param $input
+     *
+     * @return string|void
+     */
+    public static function element_require( $input ) {
+
+        $input = str_replace( "'", '"', $input );// we only want double quotes
+
+        $output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+            "jQuery(form).find('[data-argument=\"",
+            "\"]').find('input,select,textarea').val()",
+            "\"]').find('input:checked').val()",
+        ), $input ) );
+
+        if($output){
+            $output = ' data-element-require="'.$output.'" ';
+        }
+
+        return $output;
+    }
 
 }
\ No newline at end of file

Spacing +56 added lines, -56 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -18,12 +18,12 @@ 
 	 *
 	 * @return string
 	 */
-	public static function name($text,$multiple = false){
+	public static function name($text, $multiple = false) {
 		$output = '';
 
-		if($text){
+		if ($text) {
 			$is_multiple = strpos($text, '[]') !== false ? '[]' : '';
-			$output = ' name="'.sanitize_html_class($text).$is_multiple.'" ';
+			$output = ' name="' . sanitize_html_class($text) . $is_multiple . '" ';
 		}
 
 		return $output;
@@ -36,11 +36,11 @@ 
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function id($text){
+	public static function id($text) {
 		$output = '';
 
-		if($text){
-			$output = ' id="'.sanitize_html_class($text).'" ';
+		if ($text) {
+			$output = ' id="' . sanitize_html_class($text) . '" ';
 		}
 
 		return $output;
@@ -53,11 +53,11 @@ 
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function title($text){
+	public static function title($text) {
 		$output = '';
 
-		if($text){
-			$output = ' title="'.esc_attr($text).'" ';
+		if ($text) {
+			$output = ' title="' . esc_attr($text) . '" ';
 		}
 
 		return $output;
@@ -70,11 +70,11 @@ 
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function value($text){
+	public static function value($text) {
 		$output = '';
 
-		if($text){
-			$output = ' value="'.sanitize_text_field($text).'" ';
+		if ($text) {
+			$output = ' value="' . sanitize_text_field($text) . '" ';
 		}
 
 		return $output;
@@ -87,13 +87,13 @@ 
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function class_attr($text){
+	public static function class_attr($text) {
 		$output = '';
 
-		if($text){
+		if ($text) {
 			$classes = self::esc_classes($text);
-			if(!empty($classes)){
-				$output = ' class="'.$classes.'" ';
+			if (!empty($classes)) {
+				$output = ' class="' . $classes . '" ';
 			}
 		}
 
@@ -107,15 +107,15 @@ 
 	 *
 	 * @return string
 	 */
-	public static function esc_classes($text){
+	public static function esc_classes($text) {
 		$output = '';
 
-		if($text){
-			$classes = explode(" ",$text);
-			$classes = array_map("trim",$classes);
-			$classes = array_map("sanitize_html_class",$classes);
-			if(!empty($classes)){
-				$output = implode(" ",$classes);
+		if ($text) {
+			$classes = explode(" ", $text);
+			$classes = array_map("trim", $classes);
+			$classes = array_map("sanitize_html_class", $classes);
+			if (!empty($classes)) {
+				$output = implode(" ", $classes);
 			}
 		}
 
@@ -128,14 +128,14 @@ 
 	 *
 	 * @return string
 	 */
-	public static function data_attributes($args){
+	public static function data_attributes($args) {
 		$output = '';
 
-		if(!empty($args)){
+		if (!empty($args)) {
 
-			foreach($args as $key => $val){
-				if(substr( $key, 0, 5 ) === "data-"){
-					$output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
+			foreach ($args as $key => $val) {
+				if (substr($key, 0, 5) === "data-") {
+					$output .= ' ' . sanitize_html_class($key) . '="' . esc_attr($val) . '" ';
 				}
 			}
 		}
@@ -148,14 +148,14 @@ 
 	 *
 	 * @return string
 	 */
-	public static function aria_attributes($args){
+	public static function aria_attributes($args) {
 		$output = '';
 
-		if(!empty($args)){
+		if (!empty($args)) {
 
-			foreach($args as $key => $val){
-				if(substr( $key, 0, 5 ) === "aria-"){
-					$output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
+			foreach ($args as $key => $val) {
+				if (substr($key, 0, 5) === "aria-") {
+					$output .= ' ' . sanitize_html_class($key) . '="' . esc_attr($val) . '" ';
 				}
 			}
 		}
@@ -172,19 +172,19 @@ 
 	 *
 	 * @return string
 	 */
-	public static function icon($class,$space_after = false, $extra_attributes = array()){
+	public static function icon($class, $space_after = false, $extra_attributes = array()) {
 		$output = '';
 
-		if($class){
+		if ($class) {
 			$classes = self::esc_classes($class);
-			if(!empty($classes)){
-				$output = '<i class="'.$classes.'" ';
+			if (!empty($classes)) {
+				$output = '<i class="' . $classes . '" ';
 				// extra attributes
-				if(!empty($extra_attributes)){
+				if (!empty($extra_attributes)) {
 					$output .= AUI_Component_Helper::extra_attributes($extra_attributes);
 				}
 				$output .= '></i>';
-				if($space_after){
+				if ($space_after) {
 					$output .= " ";
 				}
 			}
@@ -198,17 +198,17 @@ 
 	 *
 	 * @return string
 	 */
-	public static function extra_attributes($args){
+	public static function extra_attributes($args) {
 		$output = '';
 
-		if(!empty($args)){
+		if (!empty($args)) {
 
-			if( is_array($args) ){
-				foreach($args as $key => $val){
-					$output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
+			if (is_array($args)) {
+				foreach ($args as $key => $val) {
+					$output .= ' ' . sanitize_html_class($key) . '="' . esc_attr($val) . '" ';
 				}
-			}else{
-				$output .= ' '.$args.' ';
+			} else {
+				$output .= ' ' . $args . ' ';
 			}
 
 		}
@@ -221,11 +221,11 @@ 
 	 *
 	 * @return string
 	 */
-	public static function help_text($text){
+	public static function help_text($text) {
 		$output = '';
 
-		if($text){
-			$output .= '<small class="form-text text-muted">'.wp_kses_post($text).'</small>';
+		if ($text) {
+			$output .= '<small class="form-text text-muted">' . wp_kses_post($text) . '</small>';
 		}
 
 
@@ -239,18 +239,18 @@ 
 	 *
 	 * @return string|void
 	 */
-	public static function element_require( $input ) {
+	public static function element_require($input) {
 
-		$input = str_replace( "'", '"', $input );// we only want double quotes
+		$input = str_replace("'", '"', $input); // we only want double quotes
 
-		$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+		$output = esc_attr(str_replace(array("[%", "%]", "%:checked]"), array(
 			"jQuery(form).find('[data-argument=\"",
 			"\"]').find('input,select,textarea').val()",
 			"\"]').find('input:checked').val()",
-		), $input ) );
+		), $input));
 
-		if($output){
-			$output = ' data-element-require="'.$output.'" ';
+		if ($output) {
+			$output = ' data-element-require="' . $output . '" ';
 		}
 
 		return $output;

Braces +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
 				foreach($args as $key => $val){
 					$output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
 				}
-			}else{
+			} else{
 				$output .= ' '.$args.' ';
 			}
 

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

Indentation +18 added lines, -18 removed lines

@@ -7,40 +7,40 @@
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
  * Set the version only if its the current newest while loading.
  */
 add_action('after_setup_theme', function () {
-	global $ayecode_ui_version,$ayecode_ui_file_key;
-	$this_version = "0.1.24";
-	if(version_compare($this_version , $ayecode_ui_version, '>')){
-		$ayecode_ui_version = $this_version ;
-		$ayecode_ui_file_key = wp_hash( __FILE__ );
-	}
+    global $ayecode_ui_version,$ayecode_ui_file_key;
+    $this_version = "0.1.24";
+    if(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();
+    }
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

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

includes/admin/class-getpaid-metaboxes.php

Indentation +157 added lines, -157 removed lines

@@ -12,186 +12,186 @@
  */
 class GetPaid_Metaboxes {
 
-	/**
-	 * Only save metaboxes once.
-	 *
-	 * @var boolean
-	 */
-	private static $saved_meta_boxes = false;
+    /**
+     * Only save metaboxes once.
+     *
+     * @var boolean
+     */
+    private static $saved_meta_boxes = false;
 
     /**
-	 * Hook in methods.
-	 */
-	public static function init() {
-
-		// Register metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
-
-		// Remove metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
-
-		// Rename metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
-
-		// Save metaboxes.
-		add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
-	}
-
-	/**
-	 * Register core metaboxes.
-	 */
-	public static function add_meta_boxes( $post_type, $post ) {
-		global $wpinv_euvat;
-
-		// For invoices...
-		if ( $post_type == 'wpi_invoice' ) {
-			$invoice = new WPInv_Invoice( $post );
-
-			// Resend invoice.
-			if ( ! $invoice->is_draft() && ! $invoice->is_paid() ) {
-				add_meta_box( 'wpinv-mb-resend-invoice', __( 'Resend Invoice', 'invoicing' ), 'GetPaid_Meta_Box_Resend_Invoice::output', 'wpi_invoice', 'side', 'low' );
-			}
-
-			// Subscriptions.
-			$subscription = getpaid_get_invoice_subscription( $invoice );
-			if ( ! empty( $subscription ) ) {
-				add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', 'wpi_invoice', 'advanced' );
-				add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', 'wpi_invoice', 'advanced' );
-			}
-
-			// Invoice details.
-			add_meta_box( 'wpinv-details', __( 'Invoice Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Details::output', 'wpi_invoice', 'side', 'default' );
+     * Hook in methods.
+     */
+    public static function init() {
+
+        // Register metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
+
+        // Remove metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
+
+        // Rename metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
+
+        // Save metaboxes.
+        add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
+    }
+
+    /**
+     * Register core metaboxes.
+     */
+    public static function add_meta_boxes( $post_type, $post ) {
+        global $wpinv_euvat;
+
+        // For invoices...
+        if ( $post_type == 'wpi_invoice' ) {
+            $invoice = new WPInv_Invoice( $post );
+
+            // Resend invoice.
+            if ( ! $invoice->is_draft() && ! $invoice->is_paid() ) {
+                add_meta_box( 'wpinv-mb-resend-invoice', __( 'Resend Invoice', 'invoicing' ), 'GetPaid_Meta_Box_Resend_Invoice::output', 'wpi_invoice', 'side', 'low' );
+            }
+
+            // Subscriptions.
+            $subscription = getpaid_get_invoice_subscription( $invoice );
+            if ( ! empty( $subscription ) ) {
+                add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', 'wpi_invoice', 'advanced' );
+                add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', 'wpi_invoice', 'advanced' );
+            }
+
+            // Invoice details.
+            add_meta_box( 'wpinv-details', __( 'Invoice Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Details::output', 'wpi_invoice', 'side', 'default' );
 			
-			// Payment details.
-			if ( ! $invoice->is_draft() ) {
-				add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', 'wpi_invoice', 'side', 'default' );
-			}
+            // Payment details.
+            if ( ! $invoice->is_draft() ) {
+                add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', 'wpi_invoice', 'side', 'default' );
+            }
 
-			// Billing details.
-			add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', 'wpi_invoice', 'normal', 'high' );
+            // Billing details.
+            add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', 'wpi_invoice', 'normal', 'high' );
 			
-			// Invoice items.
-			add_meta_box( 'wpinv-items', __( 'Invoice Items', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Items::output', 'wpi_invoice', 'normal', 'high' );
+            // Invoice items.
+            add_meta_box( 'wpinv-items', __( 'Invoice Items', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Items::output', 'wpi_invoice', 'normal', 'high' );
 			
-			// Invoice notes.
-			add_meta_box( 'wpinv-notes', __( 'Invoice Notes', 'invoicing' ), 'WPInv_Meta_Box_Notes::output', 'wpi_invoice', 'side', 'low' );
+            // Invoice notes.
+            add_meta_box( 'wpinv-notes', __( 'Invoice Notes', 'invoicing' ), 'WPInv_Meta_Box_Notes::output', 'wpi_invoice', 'side', 'low' );
 
-			// Payment form information.
-			if ( ! empty( $post->ID ) && get_post_meta( $post->ID, 'payment_form_data', true ) ) {
-				add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', 'wpi_invoice', 'side', 'high' );
-			}
-		}
+            // Payment form information.
+            if ( ! empty( $post->ID ) && get_post_meta( $post->ID, 'payment_form_data', true ) ) {
+                add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', 'wpi_invoice', 'side', 'high' );
+            }
+        }
 
-		// For payment forms.
-		if ( $post_type == 'wpi_payment_form' ) {
+        // For payment forms.
+        if ( $post_type == 'wpi_payment_form' ) {
 
-			// Design payment form.
-			add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
+            // Design payment form.
+            add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
 
-			// Payment form information.
-			add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
+            // Payment form information.
+            add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
 
-		}
+        }
 
-		// For invoice items.
-		if ( $post_type == 'wpi_item' ) {
+        // For invoice items.
+        if ( $post_type == 'wpi_item' ) {
 
-			// Item details.
-			add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
+            // Item details.
+            add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
 
-			// If taxes are enabled, register the tax metabox.
-			if ( $wpinv_euvat->allow_vat_rules() || $wpinv_euvat->allow_vat_classes() ) {
-				add_meta_box( 'wpinv_item_vat', __( 'VAT / Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
-			}
+            // If taxes are enabled, register the tax metabox.
+            if ( $wpinv_euvat->allow_vat_rules() || $wpinv_euvat->allow_vat_classes() ) {
+                add_meta_box( 'wpinv_item_vat', __( 'VAT / Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
+            }
 
-			// Item info.
-			add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
+            // Item info.
+            add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
 
-		}
+        }
 
-		// For invoice discounts.
-		if ( $post_type == 'wpi_discount' ) {
-			add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
-		}
+        // For invoice discounts.
+        if ( $post_type == 'wpi_discount' ) {
+            add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
+        }
 		
 
-	}
+    }
 
-	/**
-	 * Remove some metaboxes.
-	 */
-	public static function remove_meta_boxes() {
-		remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
-	}
+    /**
+     * Remove some metaboxes.
+     */
+    public static function remove_meta_boxes() {
+        remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
+    }
 
-	/**
-	 * Rename other metaboxes.
-	 */
-	public static function rename_meta_boxes() {
+    /**
+     * Rename other metaboxes.
+     */
+    public static function rename_meta_boxes() {
 		
-	}
-
-	/**
-	 * Check if we're saving, then trigger an action based on the post type.
-	 *
-	 * @param  int    $post_id Post ID.
-	 * @param  object $post Post object.
-	 */
-	public static function save_meta_boxes( $post_id, $post ) {
-		$post_id = absint( $post_id );
-		$data    = wp_unslash( $_POST );
-
-		// Do not save for ajax requests.
-		if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
-			return;
-		}
-
-		// $post_id and $post are required
-		if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
-			return;
-		}
-
-		// Dont' save meta boxes for revisions or autosaves.
-		if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
-			return;
-		}
-
-		// Check the nonce.
-		if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
-			return;
-		}
-
-		// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
-		if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
-			return;
-		}
-
-		// Check user has permission to edit.
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
-			return;
-		}
-
-		// Ensure this is our post type.
-		$post_types_map = array(
-			'wpi_invoice'      => 'GetPaid_Meta_Box_Invoice_Address',
-			'wpi_quote'        => 'GetPaid_Meta_Box_Invoice_Address',
-			'wpi_item'         => 'GetPaid_Meta_Box_Item_Details',
-			'wpi_payment_form' => 'GetPaid_Meta_Box_Payment_Form',
-			'wpi_discount'     => 'GetPaid_Meta_Box_Discount_Details',
-		);
-
-		// Is this our post type?
-		if ( empty( $post->post_type ) || ! isset( $post_types_map[ $post->post_type ] ) ) {
-			return;
-		}
-
-		// We need this save event to run once to avoid potential endless loops.
-		self::$saved_meta_boxes = true;
+    }
+
+    /**
+     * Check if we're saving, then trigger an action based on the post type.
+     *
+     * @param  int    $post_id Post ID.
+     * @param  object $post Post object.
+     */
+    public static function save_meta_boxes( $post_id, $post ) {
+        $post_id = absint( $post_id );
+        $data    = wp_unslash( $_POST );
+
+        // Do not save for ajax requests.
+        if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+            return;
+        }
+
+        // $post_id and $post are required
+        if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
+            return;
+        }
+
+        // Dont' save meta boxes for revisions or autosaves.
+        if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+            return;
+        }
+
+        // Check the nonce.
+        if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
+            return;
+        }
+
+        // Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
+        if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
+            return;
+        }
+
+        // Check user has permission to edit.
+        if ( ! current_user_can( 'edit_post', $post_id ) ) {
+            return;
+        }
+
+        // Ensure this is our post type.
+        $post_types_map = array(
+            'wpi_invoice'      => 'GetPaid_Meta_Box_Invoice_Address',
+            'wpi_quote'        => 'GetPaid_Meta_Box_Invoice_Address',
+            'wpi_item'         => 'GetPaid_Meta_Box_Item_Details',
+            'wpi_payment_form' => 'GetPaid_Meta_Box_Payment_Form',
+            'wpi_discount'     => 'GetPaid_Meta_Box_Discount_Details',
+        );
+
+        // Is this our post type?
+        if ( empty( $post->post_type ) || ! isset( $post_types_map[ $post->post_type ] ) ) {
+            return;
+        }
+
+        // We need this save event to run once to avoid potential endless loops.
+        self::$saved_meta_boxes = true;
 		
-		// Save the post.
-		$class = $post_types_map[ $post->post_type ];
-		$class::save( $post_id, $_POST, $post );
+        // Save the post.
+        $class = $post_types_map[ $post->post_type ];
+        $class::save( $post_id, $_POST, $post );
 
-	}
+    }
 
 }

Spacing +45 added lines, -45 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Metaboxes Admin Class
@@ -25,93 +25,93 @@ 
 	public static function init() {
 
 		// Register metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2);
 
 		// Remove metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30);
 
 		// Rename metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45);
 
 		// Save metaboxes.
-		add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
+		add_action('save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2);
 	}
 
 	/**
 	 * Register core metaboxes.
 	 */
-	public static function add_meta_boxes( $post_type, $post ) {
+	public static function add_meta_boxes($post_type, $post) {
 		global $wpinv_euvat;
 
 		// For invoices...
-		if ( $post_type == 'wpi_invoice' ) {
-			$invoice = new WPInv_Invoice( $post );
+		if ($post_type == 'wpi_invoice') {
+			$invoice = new WPInv_Invoice($post);
 
 			// Resend invoice.
-			if ( ! $invoice->is_draft() && ! $invoice->is_paid() ) {
-				add_meta_box( 'wpinv-mb-resend-invoice', __( 'Resend Invoice', 'invoicing' ), 'GetPaid_Meta_Box_Resend_Invoice::output', 'wpi_invoice', 'side', 'low' );
+			if (!$invoice->is_draft() && !$invoice->is_paid()) {
+				add_meta_box('wpinv-mb-resend-invoice', __('Resend Invoice', 'invoicing'), 'GetPaid_Meta_Box_Resend_Invoice::output', 'wpi_invoice', 'side', 'low');
 			}
 
 			// Subscriptions.
-			$subscription = getpaid_get_invoice_subscription( $invoice );
-			if ( ! empty( $subscription ) ) {
-				add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', 'wpi_invoice', 'advanced' );
-				add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', 'wpi_invoice', 'advanced' );
+			$subscription = getpaid_get_invoice_subscription($invoice);
+			if (!empty($subscription)) {
+				add_meta_box('wpinv-mb-subscriptions', __('Subscription Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output', 'wpi_invoice', 'advanced');
+				add_meta_box('wpinv-mb-subscription-invoices', __('Related Payments', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', 'wpi_invoice', 'advanced');
 			}
 
 			// Invoice details.
-			add_meta_box( 'wpinv-details', __( 'Invoice Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Details::output', 'wpi_invoice', 'side', 'default' );
+			add_meta_box('wpinv-details', __('Invoice Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Details::output', 'wpi_invoice', 'side', 'default');
 			
 			// Payment details.
-			if ( ! $invoice->is_draft() ) {
-				add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', 'wpi_invoice', 'side', 'default' );
+			if (!$invoice->is_draft()) {
+				add_meta_box('wpinv-payment-meta', __('Payment Meta', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', 'wpi_invoice', 'side', 'default');
 			}
 
 			// Billing details.
-			add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', 'wpi_invoice', 'normal', 'high' );
+			add_meta_box('wpinv-address', __('Billing Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Address::output', 'wpi_invoice', 'normal', 'high');
 			
 			// Invoice items.
-			add_meta_box( 'wpinv-items', __( 'Invoice Items', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Items::output', 'wpi_invoice', 'normal', 'high' );
+			add_meta_box('wpinv-items', __('Invoice Items', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Items::output', 'wpi_invoice', 'normal', 'high');
 			
 			// Invoice notes.
-			add_meta_box( 'wpinv-notes', __( 'Invoice Notes', 'invoicing' ), 'WPInv_Meta_Box_Notes::output', 'wpi_invoice', 'side', 'low' );
+			add_meta_box('wpinv-notes', __('Invoice Notes', 'invoicing'), 'WPInv_Meta_Box_Notes::output', 'wpi_invoice', 'side', 'low');
 
 			// Payment form information.
-			if ( ! empty( $post->ID ) && get_post_meta( $post->ID, 'payment_form_data', true ) ) {
-				add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', 'wpi_invoice', 'side', 'high' );
+			if (!empty($post->ID) && get_post_meta($post->ID, 'payment_form_data', true)) {
+				add_meta_box('wpinv-invoice-payment-form-details', __('Payment Form Details', 'invoicing'), 'WPInv_Meta_Box_Payment_Form::output_details', 'wpi_invoice', 'side', 'high');
 			}
 		}
 
 		// For payment forms.
-		if ( $post_type == 'wpi_payment_form' ) {
+		if ($post_type == 'wpi_payment_form') {
 
 			// Design payment form.
-			add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
+			add_meta_box('wpinv-payment-form-design', __('Payment Form', 'invoicing'), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal');
 
 			// Payment form information.
-			add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
+			add_meta_box('wpinv-payment-form-info', __('Details', 'invoicing'), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side');
 
 		}
 
 		// For invoice items.
-		if ( $post_type == 'wpi_item' ) {
+		if ($post_type == 'wpi_item') {
 
 			// Item details.
-			add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
+			add_meta_box('wpinv_item_details', __('Item Details', 'invoicing'), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high');
 
 			// If taxes are enabled, register the tax metabox.
-			if ( $wpinv_euvat->allow_vat_rules() || $wpinv_euvat->allow_vat_classes() ) {
-				add_meta_box( 'wpinv_item_vat', __( 'VAT / Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
+			if ($wpinv_euvat->allow_vat_rules() || $wpinv_euvat->allow_vat_classes()) {
+				add_meta_box('wpinv_item_vat', __('VAT / Tax', 'invoicing'), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high');
 			}
 
 			// Item info.
-			add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
+			add_meta_box('wpinv_field_item_info', __('Item info', 'invoicing'), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core');
 
 		}
 
 		// For invoice discounts.
-		if ( $post_type == 'wpi_discount' ) {
-			add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
+		if ($post_type == 'wpi_discount') {
+			add_meta_box('wpinv_discount_details', __('Discount Details', 'invoicing'), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high');
 		}
 		
 
@@ -121,7 +121,7 @@ 
 	 * Remove some metaboxes.
 	 */
 	public static function remove_meta_boxes() {
-		remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
+		remove_meta_box('wpseo_meta', 'wpi_invoice', 'normal');
 	}
 
 	/**
@@ -137,37 +137,37 @@ 
 	 * @param  int    $post_id Post ID.
 	 * @param  object $post Post object.
 	 */
-	public static function save_meta_boxes( $post_id, $post ) {
-		$post_id = absint( $post_id );
-		$data    = wp_unslash( $_POST );
+	public static function save_meta_boxes($post_id, $post) {
+		$post_id = absint($post_id);
+		$data    = wp_unslash($_POST);
 
 		// Do not save for ajax requests.
-		if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+		if ((defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
 			return;
 		}
 
 		// $post_id and $post are required
-		if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
+		if (empty($post_id) || empty($post) || self::$saved_meta_boxes) {
 			return;
 		}
 
 		// Dont' save meta boxes for revisions or autosaves.
-		if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+		if ((defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) || is_int(wp_is_post_revision($post)) || is_int(wp_is_post_autosave($post))) {
 			return;
 		}
 
 		// Check the nonce.
-		if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
+		if (empty($data['getpaid_meta_nonce']) || !wp_verify_nonce($data['getpaid_meta_nonce'], 'getpaid_meta_nonce')) {
 			return;
 		}
 
 		// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
-		if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
+		if (empty($data['post_ID']) || absint($data['post_ID']) !== $post_id) {
 			return;
 		}
 
 		// Check user has permission to edit.
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+		if (!current_user_can('edit_post', $post_id)) {
 			return;
 		}
 
@@ -181,7 +181,7 @@ 
 		);
 
 		// Is this our post type?
-		if ( empty( $post->post_type ) || ! isset( $post_types_map[ $post->post_type ] ) ) {
+		if (empty($post->post_type) || !isset($post_types_map[$post->post_type])) {
 			return;
 		}
 
@@ -189,8 +189,8 @@ 
 		self::$saved_meta_boxes = true;
 		
 		// Save the post.
-		$class = $post_types_map[ $post->post_type ];
-		$class::save( $post_id, $_POST, $post );
+		$class = $post_types_map[$post->post_type];
+		$class::save($post_id, $_POST, $post);
 
 	}
 

includes/admin/subscriptions.php

Indentation +203 added lines, -203 removed lines

@@ -14,7 +14,7 @@ 
  */
 function wpinv_subscriptions_page() {
 
-	?>
+    ?>
 
 	<div class="wrap">
 		<h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
@@ -22,27 +22,27 @@ 
 
 			<?php
 
-				// Verify user permissions.
-				if ( ! wpinv_current_user_can_manage_invoicing() ) {
+                // Verify user permissions.
+                if ( ! wpinv_current_user_can_manage_invoicing() ) {
 
-					echo aui()->alert(
-						array(
-							'type'    => 'danger',
-							'content' => __( 'You are not permitted to view this page.', 'invoicing' ),
-						)
-					);
+                    echo aui()->alert(
+                        array(
+                            'type'    => 'danger',
+                            'content' => __( 'You are not permitted to view this page.', 'invoicing' ),
+                        )
+                    );
 
-				} else if ( ! empty( $_GET['id'] ) && is_numeric( $_GET['id'] ) ) {
+                } else if ( ! 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>
@@ -59,10 +59,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();
 
-	?>
+    ?>
 	<form id="subscribers-filter" class="bsui" method="get">
 		<input type="hidden" name="page" value="wpinv-subscriptions" />
 		<?php $subscribers_table->views(); ?>
@@ -80,27 +80,27 @@ 
  */
 function wpinv_recurring_subscription_details() {
 
-	// Fetch the subscription.
-	$sub = new WPInv_Subscription( (int) $_GET['id'] );
-	if ( ! $sub->get_id() ) {
+    // Fetch the subscription.
+    $sub = new WPInv_Subscription( (int) $_GET['id'] );
+    if ( ! $sub->get_id() ) {
 
-		echo aui()->alert(
-			array(
-				'type'    => 'danger',
-				'content' => __( 'Subscription not found.', 'invoicing' ),
-			)
-		);
+        echo aui()->alert(
+            array(
+                'type'    => 'danger',
+                'content' => __( 'Subscription not found.', 'invoicing' ),
+            )
+        );
 
-		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' );
-	add_meta_box( 'getpaid_admin_subscription_update_metabox', __( 'Change Status', 'invoicing' ), 'getpaid_admin_subscription_update_metabox', get_current_screen(), 'side' );
-	add_meta_box( 'getpaid_admin_subscription_invoice_details_metabox', __( 'Invoices', 'invoicing' ), 'getpaid_admin_subscription_invoice_details_metabox', get_current_screen(), 'advanced' );
-	do_action( 'getpaid_admin_single_subscription_register_metabox', $sub );
+    // 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' );
+    add_meta_box( 'getpaid_admin_subscription_update_metabox', __( 'Change Status', 'invoicing' ), 'getpaid_admin_subscription_update_metabox', get_current_screen(), 'side' );
+    add_meta_box( 'getpaid_admin_subscription_invoice_details_metabox', __( 'Invoices', 'invoicing' ), 'getpaid_admin_subscription_invoice_details_metabox', get_current_screen(), 'advanced' );
+    do_action( 'getpaid_admin_single_subscription_register_metabox', $sub );
 
-	?>
+    ?>
 
 		<form method="post" action="<?php echo admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $sub->get_id() ) ); ?>">
 
@@ -140,41 +140,41 @@ 
  */
 function getpaid_admin_subscription_details_metabox( $sub ) {
 
-	// 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'       => __( 'Renewals', 'invoicing' ),
-			'item'           => __( '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'] );
-		}
+    // 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'       => __( 'Renewals', 'invoicing' ),
+            'item'           => __( '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'] );
+        }
 		
-	}
+    }
 
-	$profile_id = $sub->get_profile_id();
-	if ( empty( $profile_id ) && isset( $fields['profile_id'] ) ) {
-		unset( $fields['profile_id'] );
-	}
+    $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>
@@ -208,20 +208,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 ) ? sanitize_text_field( $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 ) ? sanitize_text_field( $user->display_name ) : sanitize_email( $user->user_email )
+        );
 
-	}
+    }
 
-	echo  $username;
+    echo  $username;
 }
 add_action( 'getpaid_subscription_admin_display_customer', 'getpaid_admin_subscription_metabox_display_customer' );
 
@@ -231,8 +231,8 @@ 
  * @param WPInv_Subscription $subscription
  */
 function getpaid_admin_subscription_metabox_display_amount( $subscription ) {
-	$amount    = sanitize_text_field( getpaid_get_formatted_subscription_amount( $subscription ) );
-	echo "<span>$amount</span>";
+    $amount    = sanitize_text_field( getpaid_get_formatted_subscription_amount( $subscription ) );
+    echo "<span>$amount</span>";
 }
 add_action( 'getpaid_subscription_admin_display_amount', 'getpaid_admin_subscription_metabox_display_amount' );
 
@@ -242,7 +242,7 @@ 
  * @param WPInv_Subscription $subscription
  */
 function getpaid_admin_subscription_metabox_display_id( $subscription ) {
-	echo  '#' . absint( $subscription->get_id() );
+    echo  '#' . absint( $subscription->get_id() );
 }
 add_action( 'getpaid_subscription_admin_display_subscription', 'getpaid_admin_subscription_metabox_display_id' );
 
@@ -252,7 +252,7 @@ 
  * @param WPInv_Subscription $subscription
  */
 function getpaid_admin_subscription_metabox_display_start_date( $subscription ) {
-	echo getpaid_format_date_value( $subscription->get_date_created() );
+    echo getpaid_format_date_value( $subscription->get_date_created() );
 }
 add_action( 'getpaid_subscription_admin_display_start_date', 'getpaid_admin_subscription_metabox_display_start_date' );
 
@@ -262,7 +262,7 @@ 
  * @param WPInv_Subscription $subscription
  */
 function getpaid_admin_subscription_metabox_display_renews_on( $subscription ) {
-	echo getpaid_format_date_value( $subscription->get_expiration() );
+    echo getpaid_format_date_value( $subscription->get_expiration() );
 }
 add_action( 'getpaid_subscription_admin_display_renews_on', 'getpaid_admin_subscription_metabox_display_renews_on' );
 
@@ -272,8 +272,8 @@ 
  * @param WPInv_Subscription $subscription
  */
 function getpaid_admin_subscription_metabox_display_renewals( $subscription ) {
-	$max_bills = $subscription->get_bill_times();
-	echo $subscription->get_times_billed() . ' / ' . ( empty( $max_bills ) ? "&infin;" : $max_bills );
+    $max_bills = $subscription->get_bill_times();
+    echo $subscription->get_times_billed() . ' / ' . ( empty( $max_bills ) ? "&infin;" : $max_bills );
 }
 add_action( 'getpaid_subscription_admin_display_renewals', 'getpaid_admin_subscription_metabox_display_renewals' );
 /**
@@ -283,16 +283,16 @@ 
  */
 function getpaid_admin_subscription_metabox_display_item( $subscription ) {
 
-	$item = get_post( $subscription->get_product_id() );
+    $item = get_post( $subscription->get_product_id() );
 
-	if ( ! empty( $item ) ) {
-		$link = get_edit_post_link( $item );
-		$link = esc_url( $link );
-		$name = esc_html( get_the_title( $item ) );
-		echo "<a href='$link'>$name</a>";
-	} else {
-		echo sprintf( __( 'Item #%s', 'invoicing' ), $subscription->get_product_id() );
-	}
+    if ( ! empty( $item ) ) {
+        $link = get_edit_post_link( $item );
+        $link = esc_url( $link );
+        $name = esc_html( get_the_title( $item ) );
+        echo "<a href='$link'>$name</a>";
+    } else {
+        echo sprintf( __( 'Item #%s', 'invoicing' ), $subscription->get_product_id() );
+    }
 
 }
 add_action( 'getpaid_subscription_admin_display_item', 'getpaid_admin_subscription_metabox_display_item' );
@@ -304,13 +304,13 @@ 
  */
 function getpaid_admin_subscription_metabox_display_gateway( $subscription ) {
 
-	$gateway = $subscription->get_gateway();
+    $gateway = $subscription->get_gateway();
 
-	if ( ! empty( $gateway ) ) {
-		echo sanitize_text_field( wpinv_get_gateway_admin_label( $gateway ) );
-	} else {
-		echo "&mdash;";
-	}
+    if ( ! empty( $gateway ) ) {
+        echo sanitize_text_field( wpinv_get_gateway_admin_label( $gateway ) );
+    } else {
+        echo "&mdash;";
+    }
 
 }
 add_action( 'getpaid_subscription_admin_display_gateway', 'getpaid_admin_subscription_metabox_display_gateway' );
@@ -321,7 +321,7 @@ 
  * @param WPInv_Subscription $subscription
  */
 function getpaid_admin_subscription_metabox_display_status( $subscription ) {
-	echo $subscription->get_status_label_html();
+    echo $subscription->get_status_label_html();
 }
 add_action( 'getpaid_subscription_admin_display_status', 'getpaid_admin_subscription_metabox_display_status' );
 
@@ -332,14 +332,14 @@ 
  */
 function getpaid_admin_subscription_metabox_display_profile_id( $subscription ) {
 
-	$profile_id = $subscription->get_profile_id();
+    $profile_id = $subscription->get_profile_id();
 
-	if ( ! empty( $profile_id ) ) {
-		$profile_id = sanitize_text_field( $profile_id );
-		echo apply_filters( 'getpaid_subscription_profile_id_display', $profile_id, $subscription );
-	} else {
-		echo "&mdash;";
-	}
+    if ( ! empty( $profile_id ) ) {
+        $profile_id = sanitize_text_field( $profile_id );
+        echo apply_filters( 'getpaid_subscription_profile_id_display', $profile_id, $subscription );
+    } else {
+        echo "&mdash;";
+    }
 
 }
 add_action( 'getpaid_subscription_admin_display_profile_id', 'getpaid_admin_subscription_metabox_display_profile_id' );
@@ -351,39 +351,39 @@ 
  */
 function getpaid_admin_subscription_update_metabox( $subscription ) {
 
-	?>
+    ?>
 	<div class="mt-3">
 
 		<?php
-			echo 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' ),
-				)
-			);
-		?>
+            echo 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' ),
+                )
+            );
+        ?>
 
 		<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    = esc_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    = esc_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='$url' class='float-right text-muted' onclick='return confirm(\"$title\")'>$anchor</a>";
-			}
+            if ( $subscription->is_active() ) {
+                echo "<a href='$url' class='float-right text-muted' onclick='return confirm(\"$title\")'>$anchor</a>";
+            }
 
-	echo '</div></div>';
+    echo '</div></div>';
 }
 
 /**
@@ -393,33 +393,33 @@ 
  */
 function getpaid_admin_subscription_invoice_details_metabox( $subscription ) {
 
-	$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();
-	$parent   = $subscription->get_parent_invoice();
-
-	if ( $parent->get_id() ) {
-		$payments = array_merge( array( $parent ), $payments );
-	}
+    $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();
+    $parent   = $subscription->get_parent_invoice();
+
+    if ( $parent->get_id() ) {
+        $payments = array_merge( array( $parent ), $payments );
+    }
 	
-	$table_class = 'w-100 bg-white';
+    $table_class = 'w-100 bg-white';
 
-	if ( ! is_admin() ) {
-		$table_class = 'table table-bordered table-striped';
-	}
+    if ( ! is_admin() ) {
+        $table_class = 'table table-bordered table-striped';
+    }
 
-	?>
+    ?>
 		<div class="m-0" style="overflow: auto;">
 
 			<table class="<?php echo $table_class; ?>">
@@ -427,13 +427,13 @@ 
 				<thead>
 					<tr>
 						<?php
-							foreach ( $columns as $key => $label ) {
-								$key   = esc_attr( $key );
-								$label = sanitize_text_field( $label );
+                            foreach ( $columns as $key => $label ) {
+                                $key   = esc_attr( $key );
+                                $label = sanitize_text_field( $label );
 
-								echo "<th class='subscription-invoice-field-$key bg-light p-2 text-left color-dark'>$label</th>";
-							}
-						?>
+                                echo "<th class='subscription-invoice-field-$key bg-light p-2 text-left color-dark'>$label</th>";
+                            }
+                        ?>
 					</tr>
 				</thead>
 
@@ -449,66 +449,66 @@ 
 
 					<?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->get_id() ) {
-								continue;
-							}
+                            // Abort if the invoice is invalid.
+                            if ( ! $payment->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_price( wpinv_format_amount( wpinv_sanitize_amount( $payment->get_total ) ), $payment->get_currency() ) . '</strong>';
-												break;
+                                            case 'total':
+                                                echo '<strong>' . wpinv_price( wpinv_format_amount( wpinv_sanitize_amount( $payment->get_total ) ), $payment->get_currency() ) . '</strong>';
+                                                break;
 
-											case 'relationship':
-												echo $payment->is_renewal() ? __( 'Renewal Invoice', 'invoicing' ) : __( 'Initial Invoice', 'invoicing' );
-												break;
+                                            case 'relationship':
+                                                echo $payment->is_renewal() ? __( 'Renewal Invoice', 'invoicing' ) : __( 'Initial Invoice', 'invoicing' );
+                                                break;
 
-											case 'date':
-												echo getpaid_format_date_value( $payment->get_date_created() );
-												break;
+                                            case 'date':
+                                                echo getpaid_format_date_value( $payment->get_date_created() );
+                                                break;
 
-											case 'status':
+                                            case 'status':
 
-												$status = $payment->get_status_nicename();
-												if ( is_admin() ) {
-													$status = $payment->get_status_label_html();
-												}
+                                                $status = $payment->get_status_nicename();
+                                                if ( is_admin() ) {
+                                                    $status = $payment->get_status_label_html();
+                                                }
 
-												echo $status;
-												break;
+                                                echo $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 = sanitize_text_field( $payment->get_number() );
-												echo "<a href='$link'>$invoice</a>";
-												break;
-										}
+                                                $invoice = sanitize_text_field( $payment->get_number() );
+                                                echo "<a href='$link'>$invoice</a>";
+                                                break;
+                                        }
 
-									echo '</td>';
+                                    echo '</td>';
 
-								}
+                                }
 
-							echo '</tr>';
+                            echo '</tr>';
 
-						endforeach;
-					?>
+                        endforeach;
+                    ?>
 
 				</tbody>
 

Spacing +119 added lines, -119 removed lines

@@ -3,7 +3,7 @@ 
  * Contains functions that display the subscriptions admin page.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Render the Subscriptions page
@@ -17,22 +17,22 @@ 
 	?>
 
 	<div class="wrap">
-		<h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
+		<h1><?php echo esc_html(get_admin_page_title()); ?></h1>
 		<div class="bsui">
 
 			<?php
 
 				// Verify user permissions.
-				if ( ! wpinv_current_user_can_manage_invoicing() ) {
+				if (!wpinv_current_user_can_manage_invoicing()) {
 
 					echo aui()->alert(
 						array(
 							'type'    => 'danger',
-							'content' => __( 'You are not permitted to view this page.', 'invoicing' ),
+							'content' => __('You are not permitted to view this page.', 'invoicing'),
 						)
 					);
 
-				} else if ( ! empty( $_GET['id'] ) && is_numeric( $_GET['id'] ) ) {
+				} else if (!empty($_GET['id']) && is_numeric($_GET['id'])) {
 
 					// Display a single subscription.
 					wpinv_recurring_subscription_details();
@@ -81,13 +81,13 @@ 
 function wpinv_recurring_subscription_details() {
 
 	// Fetch the subscription.
-	$sub = new WPInv_Subscription( (int) $_GET['id'] );
-	if ( ! $sub->get_id() ) {
+	$sub = new WPInv_Subscription((int) $_GET['id']);
+	if (!$sub->get_id()) {
 
 		echo aui()->alert(
 			array(
 				'type'    => 'danger',
-				'content' => __( 'Subscription not found.', 'invoicing' ),
+				'content' => __('Subscription not found.', 'invoicing'),
 			)
 		);
 
@@ -95,31 +95,31 @@ 
 	}
 
 	// 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' );
-	add_meta_box( 'getpaid_admin_subscription_update_metabox', __( 'Change Status', 'invoicing' ), 'getpaid_admin_subscription_update_metabox', get_current_screen(), 'side' );
-	add_meta_box( 'getpaid_admin_subscription_invoice_details_metabox', __( 'Invoices', 'invoicing' ), 'getpaid_admin_subscription_invoice_details_metabox', get_current_screen(), 'advanced' );
-	do_action( 'getpaid_admin_single_subscription_register_metabox', $sub );
+	add_meta_box('getpaid_admin_subscription_details_metabox', __('Subscription Details', 'invoicing'), 'getpaid_admin_subscription_details_metabox', get_current_screen(), 'normal');
+	add_meta_box('getpaid_admin_subscription_update_metabox', __('Change Status', 'invoicing'), 'getpaid_admin_subscription_update_metabox', get_current_screen(), 'side');
+	add_meta_box('getpaid_admin_subscription_invoice_details_metabox', __('Invoices', 'invoicing'), 'getpaid_admin_subscription_invoice_details_metabox', get_current_screen(), 'advanced');
+	do_action('getpaid_admin_single_subscription_register_metabox', $sub);
 
 	?>
 
-		<form method="post" action="<?php echo admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $sub->get_id() ) ); ?>">
+		<form method="post" action="<?php echo admin_url('admin.php?page=wpinv-subscriptions&id=' . absint($sub->get_id())); ?>">
 
-			<?php wp_nonce_field( 'getpaid-nonce', 'getpaid-nonce' ); ?>
-			<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
-			<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+			<?php wp_nonce_field('getpaid-nonce', 'getpaid-nonce'); ?>
+			<?php wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false); ?>
+			<?php wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false); ?>
 			<input type="hidden" name="getpaid-admin-action" value="update_single_subscription" />
-			<input type="hidden" name="subscription_id" value="<?php echo (int) $sub->get_id() ;?>" />
+			<input type="hidden" name="subscription_id" value="<?php echo (int) $sub->get_id(); ?>" />
 
 			<div id="poststuff">
 				<div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
 
 					<div id="postbox-container-1" class="postbox-container">
-						<?php do_meta_boxes( get_current_screen(), 'side', $sub ); ?>
+						<?php do_meta_boxes(get_current_screen(), 'side', $sub); ?>
 					</div>
 
 					<div id="postbox-container-2" class="postbox-container">
-						<?php do_meta_boxes( get_current_screen(), 'normal', $sub ); ?>
-						<?php do_meta_boxes( get_current_screen(), 'advanced', $sub ); ?>
+						<?php do_meta_boxes(get_current_screen(), 'normal', $sub); ?>
+						<?php do_meta_boxes(get_current_screen(), 'advanced', $sub); ?>
 					</div>
 
 				</div>
@@ -138,40 +138,40 @@ 
  *
  * @param WPInv_Subscription $sub
  */
-function getpaid_admin_subscription_details_metabox( $sub ) {
+function getpaid_admin_subscription_details_metabox($sub) {
 
 	// 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'       => __( 'Renewals', 'invoicing' ),
-			'item'           => __( 'Item', 'invoicing' ),
-			'gateway'        => __( 'Payment Method', 'invoicing' ),
-			'profile_id'     => __( 'Profile ID', 'invoicing' ),
-			'status'         => __( 'Status', 'invoicing' ),
+			'subscription'   => __('Subscription', 'invoicing'),
+			'customer'       => __('Customer', 'invoicing'),
+			'amount'         => __('Amount', 'invoicing'),
+			'start_date'     => __('Start Date', 'invoicing'),
+			'renews_on'      => __('Next Payment', 'invoicing'),
+			'renewals'       => __('Renewals', 'invoicing'),
+			'item'           => __('Item', 'invoicing'),
+			'gateway'        => __('Payment Method', 'invoicing'),
+			'profile_id'     => __('Profile ID', 'invoicing'),
+			'status'         => __('Status', 'invoicing'),
 		)
 	);
 
-	if ( ! $sub->is_active() ) {
+	if (!$sub->is_active()) {
 
-		if ( isset( $fields['renews_on'] ) ) {
-			unset( $fields['renews_on'] );
+		if (isset($fields['renews_on'])) {
+			unset($fields['renews_on']);
 		}
 
-		if ( isset( $fields['gateway'] ) ) {
-			unset( $fields['gateway'] );
+		if (isset($fields['gateway'])) {
+			unset($fields['gateway']);
 		}
 		
 	}
 
 	$profile_id = $sub->get_profile_id();
-	if ( empty( $profile_id ) && isset( $fields['profile_id'] ) ) {
-		unset( $fields['profile_id'] );
+	if (empty($profile_id) && isset($fields['profile_id'])) {
+		unset($fields['profile_id']);
 	}
 
 	?>
@@ -179,16 +179,16 @@ 
 		<table class="table table-borderless" style="font-size: 14px;">
 			<tbody>
 
-				<?php foreach ( $fields as $key => $label ) : ?>
+				<?php foreach ($fields as $key => $label) : ?>
 
-					<tr class="getpaid-subscription-meta-<?php echo sanitize_html_class( $key ); ?>">
+					<tr class="getpaid-subscription-meta-<?php echo sanitize_html_class($key); ?>">
 
 						<th class="w-25" style="font-weight: 500;">
-							<?php echo sanitize_text_field( $label ); ?>
+							<?php echo sanitize_text_field($label); ?>
 						</th>
 
 						<td class="w-75 text-muted">
-							<?php do_action( 'getpaid_subscription_admin_display_' . sanitize_text_field( $key ), $sub ); ?>
+							<?php do_action('getpaid_subscription_admin_display_' . sanitize_text_field($key), $sub); ?>
 						</td>
 
 					</tr>
@@ -206,150 +206,150 @@ 
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_customer( $subscription ) {
+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 ) ? sanitize_text_field( $user->display_name ) : sanitize_email( $user->user_email )
+			absint($user->ID),
+			!empty($user->display_name) ? sanitize_text_field($user->display_name) : sanitize_email($user->user_email)
 		);
 
 	}
 
 	echo  $username;
 }
-add_action( 'getpaid_subscription_admin_display_customer', 'getpaid_admin_subscription_metabox_display_customer' );
+add_action('getpaid_subscription_admin_display_customer', 'getpaid_admin_subscription_metabox_display_customer');
 
 /**
  * Displays the subscription amount.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_amount( $subscription ) {
-	$amount    = sanitize_text_field( getpaid_get_formatted_subscription_amount( $subscription ) );
+function getpaid_admin_subscription_metabox_display_amount($subscription) {
+	$amount = sanitize_text_field(getpaid_get_formatted_subscription_amount($subscription));
 	echo "<span>$amount</span>";
 }
-add_action( 'getpaid_subscription_admin_display_amount', 'getpaid_admin_subscription_metabox_display_amount' );
+add_action('getpaid_subscription_admin_display_amount', 'getpaid_admin_subscription_metabox_display_amount');
 
 /**
  * Displays the subscription id.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_id( $subscription ) {
-	echo  '#' . absint( $subscription->get_id() );
+function getpaid_admin_subscription_metabox_display_id($subscription) {
+	echo  '#' . absint($subscription->get_id());
 }
-add_action( 'getpaid_subscription_admin_display_subscription', 'getpaid_admin_subscription_metabox_display_id' );
+add_action('getpaid_subscription_admin_display_subscription', 'getpaid_admin_subscription_metabox_display_id');
 
 /**
  * Displays the subscription renewal date.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_start_date( $subscription ) {
-	echo getpaid_format_date_value( $subscription->get_date_created() );
+function getpaid_admin_subscription_metabox_display_start_date($subscription) {
+	echo getpaid_format_date_value($subscription->get_date_created());
 }
-add_action( 'getpaid_subscription_admin_display_start_date', 'getpaid_admin_subscription_metabox_display_start_date' );
+add_action('getpaid_subscription_admin_display_start_date', 'getpaid_admin_subscription_metabox_display_start_date');
 
 /**
  * Displays the subscription renewal date.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_renews_on( $subscription ) {
-	echo getpaid_format_date_value( $subscription->get_expiration() );
+function getpaid_admin_subscription_metabox_display_renews_on($subscription) {
+	echo getpaid_format_date_value($subscription->get_expiration());
 }
-add_action( 'getpaid_subscription_admin_display_renews_on', 'getpaid_admin_subscription_metabox_display_renews_on' );
+add_action('getpaid_subscription_admin_display_renews_on', 'getpaid_admin_subscription_metabox_display_renews_on');
 
 /**
  * Displays the subscription renewal count.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_renewals( $subscription ) {
+function getpaid_admin_subscription_metabox_display_renewals($subscription) {
 	$max_bills = $subscription->get_bill_times();
-	echo $subscription->get_times_billed() . ' / ' . ( empty( $max_bills ) ? "&infin;" : $max_bills );
+	echo $subscription->get_times_billed() . ' / ' . (empty($max_bills) ? "&infin;" : $max_bills);
 }
-add_action( 'getpaid_subscription_admin_display_renewals', 'getpaid_admin_subscription_metabox_display_renewals' );
+add_action('getpaid_subscription_admin_display_renewals', 'getpaid_admin_subscription_metabox_display_renewals');
 /**
  * Displays the subscription item.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_item( $subscription ) {
+function getpaid_admin_subscription_metabox_display_item($subscription) {
 
-	$item = get_post( $subscription->get_product_id() );
+	$item = get_post($subscription->get_product_id());
 
-	if ( ! empty( $item ) ) {
-		$link = get_edit_post_link( $item );
-		$link = esc_url( $link );
-		$name = esc_html( get_the_title( $item ) );
+	if (!empty($item)) {
+		$link = get_edit_post_link($item);
+		$link = esc_url($link);
+		$name = esc_html(get_the_title($item));
 		echo "<a href='$link'>$name</a>";
 	} else {
-		echo sprintf( __( 'Item #%s', 'invoicing' ), $subscription->get_product_id() );
+		echo sprintf(__('Item #%s', 'invoicing'), $subscription->get_product_id());
 	}
 
 }
-add_action( 'getpaid_subscription_admin_display_item', 'getpaid_admin_subscription_metabox_display_item' );
+add_action('getpaid_subscription_admin_display_item', 'getpaid_admin_subscription_metabox_display_item');
 
 /**
  * Displays the subscription gateway.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_gateway( $subscription ) {
+function getpaid_admin_subscription_metabox_display_gateway($subscription) {
 
 	$gateway = $subscription->get_gateway();
 
-	if ( ! empty( $gateway ) ) {
-		echo sanitize_text_field( wpinv_get_gateway_admin_label( $gateway ) );
+	if (!empty($gateway)) {
+		echo sanitize_text_field(wpinv_get_gateway_admin_label($gateway));
 	} else {
 		echo "&mdash;";
 	}
 
 }
-add_action( 'getpaid_subscription_admin_display_gateway', 'getpaid_admin_subscription_metabox_display_gateway' );
+add_action('getpaid_subscription_admin_display_gateway', 'getpaid_admin_subscription_metabox_display_gateway');
 
 /**
  * Displays the subscription status.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_status( $subscription ) {
+function getpaid_admin_subscription_metabox_display_status($subscription) {
 	echo $subscription->get_status_label_html();
 }
-add_action( 'getpaid_subscription_admin_display_status', 'getpaid_admin_subscription_metabox_display_status' );
+add_action('getpaid_subscription_admin_display_status', 'getpaid_admin_subscription_metabox_display_status');
 
 /**
  * Displays the subscription profile id.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_profile_id( $subscription ) {
+function getpaid_admin_subscription_metabox_display_profile_id($subscription) {
 
 	$profile_id = $subscription->get_profile_id();
 
-	if ( ! empty( $profile_id ) ) {
-		$profile_id = sanitize_text_field( $profile_id );
-		echo apply_filters( 'getpaid_subscription_profile_id_display', $profile_id, $subscription );
+	if (!empty($profile_id)) {
+		$profile_id = sanitize_text_field($profile_id);
+		echo apply_filters('getpaid_subscription_profile_id_display', $profile_id, $subscription);
 	} else {
 		echo "&mdash;";
 	}
 
 }
-add_action( 'getpaid_subscription_admin_display_profile_id', 'getpaid_admin_subscription_metabox_display_profile_id' );
+add_action('getpaid_subscription_admin_display_profile_id', 'getpaid_admin_subscription_metabox_display_profile_id');
 
 /**
  * Displays the subscriptions update metabox.
  * 
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_update_metabox( $subscription ) {
+function getpaid_admin_subscription_update_metabox($subscription) {
 
 	?>
 	<div class="mt-3">
@@ -362,10 +362,10 @@ 
 					'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' ),
+					'label'            => __('Subscription Status', 'invoicing'),
+					'help_text'        => __('Updating the status will trigger related actions and hooks', 'invoicing'),
 					'select2'          => true,
-					'value'            => $subscription->get_status( 'edit' ),
+					'value'            => $subscription->get_status('edit'),
 				)
 			);
 		?>
@@ -373,13 +373,13 @@ 
 		<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    = esc_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    = esc_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() ) {
+			if ($subscription->is_active()) {
 				echo "<a href='$url' class='float-right text-muted' onclick='return confirm(\"$title\")'>$anchor</a>";
 			}
 
@@ -391,16 +391,16 @@ 
  * 
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_invoice_details_metabox( $subscription ) {
+function getpaid_admin_subscription_invoice_details_metabox($subscription) {
 
 	$columns = apply_filters(
 		'getpaid_subscription_related_invoices_columns',
 		array(
-			'invoice'      => __( 'Invoice', 'invoicing' ),
-			'relationship' => __( 'Relationship', 'invoicing' ),
-			'date'         => __( 'Date', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
-			'total'        => __( 'Total', 'invoicing' ),
+			'invoice'      => __('Invoice', 'invoicing'),
+			'relationship' => __('Relationship', 'invoicing'),
+			'date'         => __('Date', 'invoicing'),
+			'status'       => __('Status', 'invoicing'),
+			'total'        => __('Total', 'invoicing'),
 		),
 		$subscription
 	);
@@ -409,13 +409,13 @@ 
 	$payments = $subscription->get_child_payments();
 	$parent   = $subscription->get_parent_invoice();
 
-	if ( $parent->get_id() ) {
-		$payments = array_merge( array( $parent ), $payments );
+	if ($parent->get_id()) {
+		$payments = array_merge(array($parent), $payments);
 	}
 	
 	$table_class = 'w-100 bg-white';
 
-	if ( ! is_admin() ) {
+	if (!is_admin()) {
 		$table_class = 'table table-bordered table-striped';
 	}
 
@@ -427,9 +427,9 @@ 
 				<thead>
 					<tr>
 						<?php
-							foreach ( $columns as $key => $label ) {
-								$key   = esc_attr( $key );
-								$label = sanitize_text_field( $label );
+							foreach ($columns as $key => $label) {
+								$key   = esc_attr($key);
+								$label = sanitize_text_field($label);
 
 								echo "<th class='subscription-invoice-field-$key bg-light p-2 text-left color-dark'>$label</th>";
 							}
@@ -439,50 +439,50 @@ 
 
 				<tbody>
 
-					<?php if ( empty( $payments ) ) : ?>
+					<?php if (empty($payments)) : ?>
 						<tr>
 							<td colspan="<?php echo count($columns); ?>" class="p-2 text-left text-muted">
-								<?php _e( 'This subscription has no invoices.', 'invoicing' ); ?>
+								<?php _e('This subscription has no invoices.', 'invoicing'); ?>
 							</td>
 						</tr>
 					<?php endif; ?>
 
 					<?php
 
-						foreach( $payments as $payment ) :
+						foreach ($payments as $payment) :
 
 							// Ensure that we have an invoice.
-							$payment = new WPInv_Invoice( $payment );
+							$payment = new WPInv_Invoice($payment);
 
 							// Abort if the invoice is invalid.
-							if ( ! $payment->get_id() ) {
+							if (!$payment->get_id()) {
 								continue;
 							}
 
 							echo '<tr>';
 
-								foreach ( array_keys( $columns ) as $key ) {
+								foreach (array_keys($columns) as $key) {
 									
 									echo '<td class="p-2 text-left">';
 
-										switch( $key ) {
+										switch ($key) {
 
 											case 'total':
-												echo '<strong>' . wpinv_price( wpinv_format_amount( wpinv_sanitize_amount( $payment->get_total ) ), $payment->get_currency() ) . '</strong>';
+												echo '<strong>' . wpinv_price(wpinv_format_amount(wpinv_sanitize_amount($payment->get_total)), $payment->get_currency()) . '</strong>';
 												break;
 
 											case 'relationship':
-												echo $payment->is_renewal() ? __( 'Renewal Invoice', 'invoicing' ) : __( 'Initial Invoice', 'invoicing' );
+												echo $payment->is_renewal() ? __('Renewal Invoice', 'invoicing') : __('Initial Invoice', 'invoicing');
 												break;
 
 											case 'date':
-												echo getpaid_format_date_value( $payment->get_date_created() );
+												echo getpaid_format_date_value($payment->get_date_created());
 												break;
 
 											case 'status':
 
 												$status = $payment->get_status_nicename();
-												if ( is_admin() ) {
+												if (is_admin()) {
 													$status = $payment->get_status_label_html();
 												}
 
@@ -490,13 +490,13 @@ 
 												break;
 
 											case 'invoice':
-												$link    = esc_url( get_edit_post_link( $payment->get_id() ) );
+												$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 = sanitize_text_field( $payment->get_number() );
+												$invoice = sanitize_text_field($payment->get_number());
 												echo "<a href='$link'>$invoice</a>";
 												break;
 										}

includes/admin/wpinv-upgrade-functions.php

Spacing +50 added lines, -50 removed lines

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