AyeCode / invoicing

includes/api/class-getpaid-rest-date-based-controller.php

Spacing +84 added lines, -84 removed lines

@@ -7,7 +7,7 @@ 
  * @since   2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid REST date based controller class.
@@ -43,26 +43,26 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array The appropriate date range.
 	 */
-	public function get_date_range( $request ) {
+	public function get_date_range($request) {
 
 		// Check if the period is x_days.
-		if ( preg_match( '/^(\d+)_days$/', $request['period'], $matches ) ) {
-			$date_range = $this->get_x_days_date_range( absint( $matches[1] ) );
-		} elseif ( is_callable( array( $this, 'get_' . $request['period'] . '_date_range' ) ) ) {
-			$date_range = call_user_func( array( $this, 'get_' . $request['period'] . '_date_range' ), $request );
+		if (preg_match('/^(\d+)_days$/', $request['period'], $matches)) {
+			$date_range = $this->get_x_days_date_range(absint($matches[1]));
+		} elseif (is_callable(array($this, 'get_' . $request['period'] . '_date_range'))) {
+			$date_range = call_user_func(array($this, 'get_' . $request['period'] . '_date_range'), $request);
 		} else {
 			$request['period'] = '7_days';
 			$date_range        = $this->get_x_days_date_range();
 		}
 
 		// 3 months max for day view.
-		$before = strtotime( $date_range['before'] );
-		$after  = strtotime( $date_range['after'] );
-		if ( floor( ( $before - $after ) / MONTH_IN_SECONDS ) > 2 ) {
+		$before = strtotime($date_range['before']);
+		$after  = strtotime($date_range['after']);
+		if (floor(($before - $after) / MONTH_IN_SECONDS) > 2) {
 			$this->groupby = 'month';
 		}
 
-		$this->prepare_interval( $date_range );
+		$this->prepare_interval($date_range);
 
 		return $date_range;
 
@@ -74,25 +74,25 @@ 
 	 * @param array $range Date range.
 	 * @return array The appropriate date range.
 	 */
-	public function prepare_interval( $range ) {
+	public function prepare_interval($range) {
 
-		$before = strtotime( $range['before'] );
-		$after  = strtotime( $range['after'] );
-		if ( 'day' === $this->groupby ) {
-			$difference     = max( DAY_IN_SECONDS, ( DAY_IN_SECONDS + $before - $after ) ); // Prevent division by 0;
-			$this->interval = absint( ceil( max( 1, $difference / DAY_IN_SECONDS ) ) );
+		$before = strtotime($range['before']);
+		$after  = strtotime($range['after']);
+		if ('day' === $this->groupby) {
+			$difference     = max(DAY_IN_SECONDS, (DAY_IN_SECONDS + $before - $after)); // Prevent division by 0;
+			$this->interval = absint(ceil(max(1, $difference / DAY_IN_SECONDS)));
 			return;
 		}
 
 		$this->interval = 0;
-		$min_date       = strtotime( gmdate( 'Y-m-01', $after ) );
+		$min_date       = strtotime(gmdate('Y-m-01', $after));
 
-		while ( $min_date <= $before ) {
-			$this->interval ++;
-			$min_date = strtotime( '+1 MONTH', $min_date );
+		while ($min_date <= $before) {
+			$this->interval++;
+			$min_date = strtotime('+1 MONTH', $min_date);
 		}
 
-		$this->interval = max( 1, $this->interval );
+		$this->interval = max(1, $this->interval);
 
 	}
 
@@ -102,27 +102,27 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array The appropriate date range.
 	 */
-	public function get_custom_date_range( $request ) {
+	public function get_custom_date_range($request) {
 
-		$after  = max( strtotime( '-20 years' ), strtotime( sanitize_text_field( $request['after'] ) ) );
-		$before = gmdate( 'Y-m-d' );
+		$after  = max(strtotime('-20 years'), strtotime(sanitize_text_field($request['after'])));
+		$before = gmdate('Y-m-d');
 
-		if ( ! empty( $request['before'] ) ) {
-			$before  = min( strtotime( $before ), strtotime( sanitize_text_field( $request['before'] ) ) );
+		if (!empty($request['before'])) {
+			$before = min(strtotime($before), strtotime(sanitize_text_field($request['before'])));
 		}
 
 		// Set the previous date range.
 		$difference           = $before - $after;
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', $before - $difference - DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', $after - $difference - DAY_IN_SECONDS ),
+			'before' => gmdate('Y-m-d', $before - $difference - DAY_IN_SECONDS),
+			'after'  => gmdate('Y-m-d', $after - $difference - DAY_IN_SECONDS),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => gmdate( 'Y-m-d', $before ),
-			'after'  => gmdate( 'Y-m-d', $after ),
+			'before' => gmdate('Y-m-d', $before),
+			'after'  => gmdate('Y-m-d', $after),
 		);
 
 	}
@@ -141,8 +141,8 @@ 
 
 		// Generate the report.
 		return array(
-			'before' => gmdate( 'Y-m-d' ),
-			'after'  => gmdate( 'Y-m-d' ),
+			'before' => gmdate('Y-m-d'),
+			'after'  => gmdate('Y-m-d'),
 		);
 
 	}
@@ -157,14 +157,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', strtotime( '-2 days' ) ),
-			'after'  => gmdate( 'Y-m-d', strtotime( '-2 days' ) ),
+			'before' => gmdate('Y-m-d', strtotime('-2 days')),
+			'after'  => gmdate('Y-m-d', strtotime('-2 days')),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => gmdate( 'Y-m-d', strtotime( '-1 day' ) ),
-			'after'  => gmdate( 'Y-m-d', strtotime( '-1 day' ) ),
+			'before' => gmdate('Y-m-d', strtotime('-1 day')),
+			'after'  => gmdate('Y-m-d', strtotime('-1 day')),
 		);
 
 	}
@@ -182,10 +182,10 @@ 
 		);
 
 		// Generate the report.
-		$week_starts = absint( get_option( 'start_of_week' ) );
+		$week_starts = absint(get_option('start_of_week'));
 		return array(
-			'before' => gmdate( 'Y-m-d' ),
-			'after'  => gmdate( 'Y-m-d', strtotime( 'next Sunday -' . ( 7 - $week_starts ) . ' days' ) ),
+			'before' => gmdate('Y-m-d'),
+			'after'  => gmdate('Y-m-d', strtotime('next Sunday -' . (7 - $week_starts) . ' days')),
 		);
 	}
 
@@ -196,19 +196,19 @@ 
 	 */
 	public function get_last_week_date_range() {
 
-		$week_starts = absint( get_option( 'start_of_week' ) );
-		$week_starts = strtotime( 'last Sunday -' . ( 7 - $week_starts ) . ' days' );
+		$week_starts = absint(get_option('start_of_week'));
+		$week_starts = strtotime('last Sunday -' . (7 - $week_starts) . ' days');
 		$date_range  = array(
-			'before' => gmdate( 'Y-m-d', $week_starts + 6 * DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', $week_starts ),
+			'before' => gmdate('Y-m-d', $week_starts + 6 * DAY_IN_SECONDS),
+			'after'  => gmdate('Y-m-d', $week_starts),
 		);
 
 		// Set the previous date range.
 		$week_starts          = $week_starts - 7 * DAY_IN_SECONDS;
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', $week_starts + 6 * DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', $week_starts ),
+			'before' => gmdate('Y-m-d', $week_starts + 6 * DAY_IN_SECONDS),
+			'after'  => gmdate('Y-m-d', $week_starts),
 		);
 
 		// Generate the report.
@@ -220,13 +220,13 @@ 
 	 *
 	 * @return array The appropriate date range.
 	 */
-	public function get_x_days_date_range( $days = 7 ) {
+	public function get_x_days_date_range($days = 7) {
 
 		$days--;
 
-		$date_range  = array(
-			'before' => gmdate( 'Y-m-d' ),
-			'after'  => gmdate( 'Y-m-d', strtotime( "-$days days" ) ),
+		$date_range = array(
+			'before' => gmdate('Y-m-d'),
+			'after'  => gmdate('Y-m-d', strtotime("-$days days")),
 		);
 
 		$days++;
@@ -234,8 +234,8 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', strtotime( $date_range['before'] ) - $days * DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', strtotime( $date_range['after'] ) - $days * DAY_IN_SECONDS ),
+			'before' => gmdate('Y-m-d', strtotime($date_range['before']) - $days * DAY_IN_SECONDS),
+			'after'  => gmdate('Y-m-d', strtotime($date_range['after']) - $days * DAY_IN_SECONDS),
 		);
 
 		// Generate the report.
@@ -256,8 +256,8 @@ 
 
 		// Generate the report.
 		return array(
-			'after'  => gmdate( 'Y-m-01' ),
-			'before' => gmdate( 'Y-m-t' ),
+			'after'  => gmdate('Y-m-01'),
+			'before' => gmdate('Y-m-t'),
 		);
 
 	}
@@ -272,14 +272,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'after'  => gmdate( 'Y-m-01', strtotime( '-2 months' ) ),
-			'before' => gmdate( 'Y-m-t', strtotime( '-2 months' ) ),
+			'after'  => gmdate('Y-m-01', strtotime('-2 months')),
+			'before' => gmdate('Y-m-t', strtotime('-2 months')),
 		);
 
 		// Generate the report.
 		return array(
-			'after'  => gmdate( 'Y-m-01', strtotime( 'last month' ) ),
-			'before' => gmdate( 'Y-m-t', strtotime( 'last month' ) ),
+			'after'  => gmdate('Y-m-01', strtotime('last month')),
+			'before' => gmdate('Y-m-t', strtotime('last month')),
 		);
 
 	}
@@ -291,7 +291,7 @@ 
 	 */
 	public function get_quarters() {
 
-		$year      = (int) gmdate( 'Y' );
+		$year      = (int) gmdate('Y');
 		$last_year = (int) $year - 1;
 		return array(
 
@@ -340,9 +340,9 @@ 
 	 */
 	public function get_quarter() {
 
-		$month    = (int) gmdate( 'n' );
-		$quarters = array( 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4 );
-		return $quarters[ $month - 1 ];
+		$month    = (int) gmdate('n');
+		$quarters = array(1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4);
+		return $quarters[$month - 1];
 
 	}
 
@@ -361,7 +361,7 @@ 
 		// Generate the report.
 		$quarter  = $this->get_quarter();
 		$quarters = $this->get_quarters();
-		return $quarters[ $quarter + 1 ];
+		return $quarters[$quarter + 1];
 
 	}
 
@@ -377,12 +377,12 @@ 
 
 		// Set the previous date range.
 		$this->previous_range = array_merge(
-			$quarters[ $quarter - 1 ],
-			array( 'period' => 'custom' )
+			$quarters[$quarter - 1],
+			array('period' => 'custom')
 		);
 
 		// Generate the report.
-		return $quarters[ $quarter ];
+		return $quarters[$quarter];
 
 	}
 
@@ -400,8 +400,8 @@ 
 
 		// Generate the report.
 		return array(
-			'after'  => gmdate( 'Y-01-01' ),
-			'before' => gmdate( 'Y-12-31' ),
+			'after'  => gmdate('Y-01-01'),
+			'before' => gmdate('Y-12-31'),
 		);
 
 	}
@@ -416,14 +416,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'after'  => gmdate( 'Y-01-01', strtotime( '-2 years' ) ),
-			'before' => gmdate( 'Y-12-31', strtotime( '-2 years' ) ),
+			'after'  => gmdate('Y-01-01', strtotime('-2 years')),
+			'before' => gmdate('Y-12-31', strtotime('-2 years')),
 		);
 
 		// Generate the report.
 		return array(
-			'after'  => gmdate( 'Y-01-01', strtotime( 'last year' ) ),
-			'before' => gmdate( 'Y-12-31', strtotime( 'last year' ) ),
+			'after'  => gmdate('Y-01-01', strtotime('last year')),
+			'before' => gmdate('Y-12-31', strtotime('last year')),
 		);
 
 	}
@@ -435,20 +435,20 @@ 
 	 * @param string $date_field The date field.
 	 * @return string The appropriate SQL.
 	 */
-	public function get_date_range_sql( $request, $date_field ) {
+	public function get_date_range_sql($request, $date_field) {
 		global $wpdb;
 
 		$sql = '1=1';
-		$range = $this->get_date_range( $request );
+		$range = $this->get_date_range($request);
 
-		if ( ! empty( $range['after'] ) ) {
+		if (!empty($range['after'])) {
 			$sql .= ' AND ' . $wpdb->prepare(
 				"$date_field >= %s",
 				$range['after']
 			);
 		}
 
-		if ( ! empty( $range['before'] ) ) {
+		if (!empty($range['before'])) {
 			$sql .= ' AND ' . $wpdb->prepare(
 				"$date_field <= %s",
 				$range['before']
@@ -465,9 +465,9 @@ 
 	 * @param string $date_field The date field.
 	 * @return string The appropriate SQL.
 	 */
-	public function get_group_by_sql( $date_field ) {
+	public function get_group_by_sql($date_field) {
 
-		if ( 'day' === $this->groupby ) {
+		if ('day' === $this->groupby) {
 			return "YEAR($date_field), MONTH($date_field), DAY($date_field)";
 		}
 
@@ -481,30 +481,30 @@ 
 	 */
 	public function get_collection_params() {
 		return array(
-			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+			'context' => $this->get_context_param(array('default' => 'view')),
 			'period'  => array(
-				'description'       => __( 'Limit to results of a specific period.', 'invoicing' ),
+				'description'       => __('Limit to results of a specific period.', 'invoicing'),
 				'type'              => 'string',
-				'enum'              => array( 'custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year', 'quarter', 'last_quarter' ),
+				'enum'              => array('custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year', 'quarter', 'last_quarter'),
 				'validate_callback' => 'rest_validate_request_arg',
 				'sanitize_callback' => 'sanitize_text_field',
 				'default'           => '7_days',
 			),
 			'after'   => array(
 				/* translators: %s: date format */
-				'description'       => sprintf( __( 'Limit to results after a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
+				'description'       => sprintf(__('Limit to results after a specific date, the date needs to be in the %s format.', 'invoicing'), 'YYYY-MM-DD'),
 				'type'              => 'string',
 				'validate_callback' => 'rest_validate_request_arg',
 				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => gmdate( 'Y-m-d', strtotime( '-7 days' ) ),
+				'default'           => gmdate('Y-m-d', strtotime('-7 days')),
 			),
 			'before'  => array(
 				/* translators: %s: date format */
-				'description'       => sprintf( __( 'Limit to results before a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
+				'description'       => sprintf(__('Limit to results before a specific date, the date needs to be in the %s format.', 'invoicing'), 'YYYY-MM-DD'),
 				'type'              => 'string',
 				'validate_callback' => 'rest_validate_request_arg',
 				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => gmdate( 'Y-m-d' ),
+				'default'           => gmdate('Y-m-d'),
 			),
 		);
 	}

Indentation +491 added lines, -491 removed lines

@@ -16,496 +16,496 @@
  */
 class GetPaid_REST_Date_Based_Controller extends GetPaid_REST_Controller {
 
-	/**
-	 * Group response items by day or month.
-	 *
-	 * @var string
-	 */
-	public $groupby = 'day';
-
-	/**
-	 * Returns an array with arguments to request the previous report.
-	 *
-	 * @var array
-	 */
-	public $previous_range = array();
-
-	/**
-	 * The period interval.
-	 *
-	 * @var int
-	 */
-	public $interval;
-
-	/**
-	 * Retrieves the before and after dates.
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @return array The appropriate date range.
-	 */
-	public function get_date_range( $request ) {
-
-		// Check if the period is x_days.
-		if ( preg_match( '/^(\d+)_days$/', $request['period'], $matches ) ) {
-			$date_range = $this->get_x_days_date_range( absint( $matches[1] ) );
-		} elseif ( is_callable( array( $this, 'get_' . $request['period'] . '_date_range' ) ) ) {
-			$date_range = call_user_func( array( $this, 'get_' . $request['period'] . '_date_range' ), $request );
-		} else {
-			$request['period'] = '7_days';
-			$date_range        = $this->get_x_days_date_range();
-		}
-
-		// 3 months max for day view.
-		$before = strtotime( $date_range['before'] );
-		$after  = strtotime( $date_range['after'] );
-		if ( floor( ( $before - $after ) / MONTH_IN_SECONDS ) > 2 ) {
-			$this->groupby = 'month';
-		}
-
-		$this->prepare_interval( $date_range );
-
-		return $date_range;
-
-	}
-
-	/**
-	 * Groups by month or days.
-	 *
-	 * @param array $range Date range.
-	 * @return array The appropriate date range.
-	 */
-	public function prepare_interval( $range ) {
-
-		$before = strtotime( $range['before'] );
-		$after  = strtotime( $range['after'] );
-		if ( 'day' === $this->groupby ) {
-			$difference     = max( DAY_IN_SECONDS, ( DAY_IN_SECONDS + $before - $after ) ); // Prevent division by 0;
-			$this->interval = absint( ceil( max( 1, $difference / DAY_IN_SECONDS ) ) );
-			return;
-		}
-
-		$this->interval = 0;
-		$min_date       = strtotime( gmdate( 'Y-m-01', $after ) );
-
-		while ( $min_date <= $before ) {
-			$this->interval ++;
-			$min_date = strtotime( '+1 MONTH', $min_date );
-		}
-
-		$this->interval = max( 1, $this->interval );
-
-	}
-
-	/**
-	 * Retrieves a custom date range.
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @return array The appropriate date range.
-	 */
-	public function get_custom_date_range( $request ) {
-
-		$after  = max( strtotime( '-20 years' ), strtotime( sanitize_text_field( $request['after'] ) ) );
-		$before = gmdate( 'Y-m-d' );
+    /**
+     * Group response items by day or month.
+     *
+     * @var string
+     */
+    public $groupby = 'day';
+
+    /**
+     * Returns an array with arguments to request the previous report.
+     *
+     * @var array
+     */
+    public $previous_range = array();
+
+    /**
+     * The period interval.
+     *
+     * @var int
+     */
+    public $interval;
+
+    /**
+     * Retrieves the before and after dates.
+     *
+     * @param WP_REST_Request $request Request object.
+     * @return array The appropriate date range.
+     */
+    public function get_date_range( $request ) {
+
+        // Check if the period is x_days.
+        if ( preg_match( '/^(\d+)_days$/', $request['period'], $matches ) ) {
+            $date_range = $this->get_x_days_date_range( absint( $matches[1] ) );
+        } elseif ( is_callable( array( $this, 'get_' . $request['period'] . '_date_range' ) ) ) {
+            $date_range = call_user_func( array( $this, 'get_' . $request['period'] . '_date_range' ), $request );
+        } else {
+            $request['period'] = '7_days';
+            $date_range        = $this->get_x_days_date_range();
+        }
+
+        // 3 months max for day view.
+        $before = strtotime( $date_range['before'] );
+        $after  = strtotime( $date_range['after'] );
+        if ( floor( ( $before - $after ) / MONTH_IN_SECONDS ) > 2 ) {
+            $this->groupby = 'month';
+        }
+
+        $this->prepare_interval( $date_range );
+
+        return $date_range;
+
+    }
+
+    /**
+     * Groups by month or days.
+     *
+     * @param array $range Date range.
+     * @return array The appropriate date range.
+     */
+    public function prepare_interval( $range ) {
+
+        $before = strtotime( $range['before'] );
+        $after  = strtotime( $range['after'] );
+        if ( 'day' === $this->groupby ) {
+            $difference     = max( DAY_IN_SECONDS, ( DAY_IN_SECONDS + $before - $after ) ); // Prevent division by 0;
+            $this->interval = absint( ceil( max( 1, $difference / DAY_IN_SECONDS ) ) );
+            return;
+        }
+
+        $this->interval = 0;
+        $min_date       = strtotime( gmdate( 'Y-m-01', $after ) );
+
+        while ( $min_date <= $before ) {
+            $this->interval ++;
+            $min_date = strtotime( '+1 MONTH', $min_date );
+        }
+
+        $this->interval = max( 1, $this->interval );
+
+    }
+
+    /**
+     * Retrieves a custom date range.
+     *
+     * @param WP_REST_Request $request Request object.
+     * @return array The appropriate date range.
+     */
+    public function get_custom_date_range( $request ) {
+
+        $after  = max( strtotime( '-20 years' ), strtotime( sanitize_text_field( $request['after'] ) ) );
+        $before = gmdate( 'Y-m-d' );
 		
-		if ( ! empty( $request['before'] ) ) {
-			$before  = min( strtotime( $before ), strtotime( sanitize_text_field( $request['before'] ) ) );
-		}
-
-		// Set the previous date range.
-		$difference           = $before - $after;
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', $before - $difference - DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', $after - $difference - DAY_IN_SECONDS ),
-		);
-
-		// Generate the report.
-		return array(
-			'before' => gmdate( 'Y-m-d', $before ),
-			'after'  => gmdate( 'Y-m-d', $after ),
-		);
-
-	}
-
-	/**
-	 * Retrieves todays date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_today_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'yesterday',
-		);
-
-		// Generate the report.
-		return array(
-			'before' => gmdate( 'Y-m-d' ),
-			'after'  => gmdate( 'Y-m-d' ),
-		);
-
-	}
-
-	/**
-	 * Retrieves yesterdays date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_yesterday_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', strtotime( '-2 days' ) ),
-			'after'  => gmdate( 'Y-m-d', strtotime( '-2 days' ) ),
-		);
-
-		// Generate the report.
-		return array(
-			'before' => gmdate( 'Y-m-d', strtotime( '-1 day' ) ),
-			'after'  => gmdate( 'Y-m-d', strtotime( '-1 day' ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves this week's date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_week_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'last_week',
-		);
-
-		// Generate the report.
-		$week_starts = absint( get_option( 'start_of_week' ) );
-		return array(
-			'before' => gmdate( 'Y-m-d' ),
-			'after'  => gmdate( 'Y-m-d', strtotime( 'next Sunday -' . ( 7 - $week_starts ) . ' days' ) ),
-		);
-	}
-
-	/**
-	 * Retrieves last week's date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_last_week_date_range() {
-
-		$week_starts = absint( get_option( 'start_of_week' ) );
-		$week_starts = strtotime( 'last Sunday -' . ( 7 - $week_starts ) . ' days' );
-		$date_range  = array(
-			'before' => gmdate( 'Y-m-d', $week_starts + 6 * DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', $week_starts ),
-		);
-
-		// Set the previous date range.
-		$week_starts          = $week_starts - 7 * DAY_IN_SECONDS;
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', $week_starts + 6 * DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', $week_starts ),
-		);
-
-		// Generate the report.
-		return $date_range;
-	}
-
-	/**
-	 * Retrieves last x days date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_x_days_date_range( $days = 7 ) {
-
-		$days--;
-
-		$date_range  = array(
-			'before' => gmdate( 'Y-m-d' ),
-			'after'  => gmdate( 'Y-m-d', strtotime( "-$days days" ) ),
-		);
-
-		$days++;
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', strtotime( $date_range['before'] ) - $days * DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', strtotime( $date_range['after'] ) - $days * DAY_IN_SECONDS ),
-		);
-
-		// Generate the report.
-		return $date_range;
-	}
-
-	/**
-	 * Retrieves this month date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_month_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'last_month',
-		);
-
-		// Generate the report.
-		return array(
-			'after'  => gmdate( 'Y-m-01' ),
-			'before' => gmdate( 'Y-m-t' ),
-		);
-
-	}
-
-	/**
-	 * Retrieves last month's date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_last_month_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'after'  => gmdate( 'Y-m-01', strtotime( '-2 months' ) ),
-			'before' => gmdate( 'Y-m-t', strtotime( '-2 months' ) ),
-		);
-
-		// Generate the report.
-		return array(
-			'after'  => gmdate( 'Y-m-01', strtotime( 'last month' ) ),
-			'before' => gmdate( 'Y-m-t', strtotime( 'last month' ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves this quarter date range.
-	 *
-	 * @return array The available quarters.
-	 */
-	public function get_quarters() {
-
-		$year      = (int) gmdate( 'Y' );
-		$last_year = (int) $year - 1;
-		return array(
-
-			// Third quarter of previous year: July 1st to September 30th
-			array(
-				'before' => "{$last_year}-09-30",
-				'after'  => "{$last_year}-07-01",
-			),
-
-			// Last quarter of previous year: October 1st to December 31st
-			array(
-				'before' => "{$last_year}-12-31",
-        		'after'  => "{$last_year}-10-01",
-			),
-
-			// First quarter: January 1st to March 31st
-			array(
-				'before' => "{$year}-03-31",
-				'after'  => "{$year}-01-01",
-			),
-
-			// Second quarter: April 1st to June 30th
-			array(
-				'before' => "{$year}-06-30",
-				'after'  => "{$year}-04-01",
-			),
-
-			// Third quarter: July 1st to September 30th
-			array(
-				'before' => "{$year}-09-30",
-				'after'  => "{$year}-07-01",
-			),
-
-			// Fourth quarter: October 1st to December 31st
-			array(
-				'before' => "{$year}-12-31",
-				'after'  => "{$year}-10-01",
-			),
-		);
-	}
-
-	/**
-	 * Retrieves the current quater.
-	 *
-	 * @return int The current quarter.
-	 */
-	public function get_quarter() {
-
-		$month    = (int) gmdate( 'n' );
-		$quarters = array( 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4 );
-		return $quarters[ $month - 1 ];
-
-	}
-
-	/**
-	 * Retrieves this quarter date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_quarter_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'last_quarter',
-		);
-
-		// Generate the report.
-		$quarter  = $this->get_quarter();
-		$quarters = $this->get_quarters();
-		return $quarters[ $quarter + 1 ];
-
-	}
-
-	/**
-	 * Retrieves last quarter's date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_last_quarter_date_range() {
-
-		$quarters = $this->get_quarters();
-		$quarter  = $this->get_quarter();
-
-		// Set the previous date range.
-		$this->previous_range = array_merge(
-			$quarters[ $quarter - 1 ],
-			array( 'period' => 'custom' )
-		);
-
-		// Generate the report.
-		return $quarters[ $quarter ];
-
-	}
-
-	/**
-	 * Retrieves this year date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_year_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'last_year',
-		);
-
-		// Generate the report.
-		return array(
-			'after'  => gmdate( 'Y-01-01' ),
-			'before' => gmdate( 'Y-12-31' ),
-		);
-
-	}
-
-	/**
-	 * Retrieves last year date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_last_year_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'after'  => gmdate( 'Y-01-01', strtotime( '-2 years' ) ),
-			'before' => gmdate( 'Y-12-31', strtotime( '-2 years' ) ),
-		);
-
-		// Generate the report.
-		return array(
-			'after'  => gmdate( 'Y-01-01', strtotime( 'last year' ) ),
-			'before' => gmdate( 'Y-12-31', strtotime( 'last year' ) ),
-		);
-
-	}
-
-	/**
-	 * Prepare a the request date for SQL usage.
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @param string $date_field The date field.
-	 * @return string The appropriate SQL.
-	 */
-	public function get_date_range_sql( $request, $date_field ) {
-		global $wpdb;
-
-		$sql = '1=1';
-		$range = $this->get_date_range( $request );
-
-		if ( ! empty( $range['after'] ) ) {
-			$sql .= ' AND ' . $wpdb->prepare(
-				"$date_field >= %s",
-				$range['after']
-			);
-		}
-
-		if ( ! empty( $range['before'] ) ) {
-			$sql .= ' AND ' . $wpdb->prepare(
-				"$date_field <= %s",
-				$range['before']
-			);
-		}
-
-		return $sql;
-
-	}
-
-	/**
-	 * Prepares a group by query.
-	 *
-	 * @param string $date_field The date field.
-	 * @return string The appropriate SQL.
-	 */
-	public function get_group_by_sql( $date_field ) {
-
-		if ( 'day' === $this->groupby ) {
-			return "YEAR($date_field), MONTH($date_field), DAY($date_field)";
-		}
-
-		return "YEAR($date_field), MONTH($date_field)";
-	}
-
-	/**
-	 * Get the query params for collections.
-	 *
-	 * @return array
-	 */
-	public function get_collection_params() {
-		return array(
-			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
-			'period'  => array(
-				'description'       => __( 'Limit to results of a specific period.', 'invoicing' ),
-				'type'              => 'string',
-				'enum'              => array( 'custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year', 'quarter', 'last_quarter' ),
-				'validate_callback' => 'rest_validate_request_arg',
-				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => '7_days',
-			),
-			'after'   => array(
-				/* translators: %s: date format */
-				'description'       => sprintf( __( 'Limit to results after a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
-				'type'              => 'string',
-				'validate_callback' => 'rest_validate_request_arg',
-				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => gmdate( 'Y-m-d', strtotime( '-7 days' ) ),
-			),
-			'before'  => array(
-				/* translators: %s: date format */
-				'description'       => sprintf( __( 'Limit to results before a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
-				'type'              => 'string',
-				'validate_callback' => 'rest_validate_request_arg',
-				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => gmdate( 'Y-m-d' ),
-			),
-		);
-	}
+        if ( ! empty( $request['before'] ) ) {
+            $before  = min( strtotime( $before ), strtotime( sanitize_text_field( $request['before'] ) ) );
+        }
+
+        // Set the previous date range.
+        $difference           = $before - $after;
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => gmdate( 'Y-m-d', $before - $difference - DAY_IN_SECONDS ),
+            'after'  => gmdate( 'Y-m-d', $after - $difference - DAY_IN_SECONDS ),
+        );
+
+        // Generate the report.
+        return array(
+            'before' => gmdate( 'Y-m-d', $before ),
+            'after'  => gmdate( 'Y-m-d', $after ),
+        );
+
+    }
+
+    /**
+     * Retrieves todays date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_today_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'yesterday',
+        );
+
+        // Generate the report.
+        return array(
+            'before' => gmdate( 'Y-m-d' ),
+            'after'  => gmdate( 'Y-m-d' ),
+        );
+
+    }
+
+    /**
+     * Retrieves yesterdays date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_yesterday_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => gmdate( 'Y-m-d', strtotime( '-2 days' ) ),
+            'after'  => gmdate( 'Y-m-d', strtotime( '-2 days' ) ),
+        );
+
+        // Generate the report.
+        return array(
+            'before' => gmdate( 'Y-m-d', strtotime( '-1 day' ) ),
+            'after'  => gmdate( 'Y-m-d', strtotime( '-1 day' ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves this week's date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_week_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'last_week',
+        );
+
+        // Generate the report.
+        $week_starts = absint( get_option( 'start_of_week' ) );
+        return array(
+            'before' => gmdate( 'Y-m-d' ),
+            'after'  => gmdate( 'Y-m-d', strtotime( 'next Sunday -' . ( 7 - $week_starts ) . ' days' ) ),
+        );
+    }
+
+    /**
+     * Retrieves last week's date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_last_week_date_range() {
+
+        $week_starts = absint( get_option( 'start_of_week' ) );
+        $week_starts = strtotime( 'last Sunday -' . ( 7 - $week_starts ) . ' days' );
+        $date_range  = array(
+            'before' => gmdate( 'Y-m-d', $week_starts + 6 * DAY_IN_SECONDS ),
+            'after'  => gmdate( 'Y-m-d', $week_starts ),
+        );
+
+        // Set the previous date range.
+        $week_starts          = $week_starts - 7 * DAY_IN_SECONDS;
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => gmdate( 'Y-m-d', $week_starts + 6 * DAY_IN_SECONDS ),
+            'after'  => gmdate( 'Y-m-d', $week_starts ),
+        );
+
+        // Generate the report.
+        return $date_range;
+    }
+
+    /**
+     * Retrieves last x days date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_x_days_date_range( $days = 7 ) {
+
+        $days--;
+
+        $date_range  = array(
+            'before' => gmdate( 'Y-m-d' ),
+            'after'  => gmdate( 'Y-m-d', strtotime( "-$days days" ) ),
+        );
+
+        $days++;
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => gmdate( 'Y-m-d', strtotime( $date_range['before'] ) - $days * DAY_IN_SECONDS ),
+            'after'  => gmdate( 'Y-m-d', strtotime( $date_range['after'] ) - $days * DAY_IN_SECONDS ),
+        );
+
+        // Generate the report.
+        return $date_range;
+    }
+
+    /**
+     * Retrieves this month date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_month_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'last_month',
+        );
+
+        // Generate the report.
+        return array(
+            'after'  => gmdate( 'Y-m-01' ),
+            'before' => gmdate( 'Y-m-t' ),
+        );
+
+    }
+
+    /**
+     * Retrieves last month's date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_last_month_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'after'  => gmdate( 'Y-m-01', strtotime( '-2 months' ) ),
+            'before' => gmdate( 'Y-m-t', strtotime( '-2 months' ) ),
+        );
+
+        // Generate the report.
+        return array(
+            'after'  => gmdate( 'Y-m-01', strtotime( 'last month' ) ),
+            'before' => gmdate( 'Y-m-t', strtotime( 'last month' ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves this quarter date range.
+     *
+     * @return array The available quarters.
+     */
+    public function get_quarters() {
+
+        $year      = (int) gmdate( 'Y' );
+        $last_year = (int) $year - 1;
+        return array(
+
+            // Third quarter of previous year: July 1st to September 30th
+            array(
+                'before' => "{$last_year}-09-30",
+                'after'  => "{$last_year}-07-01",
+            ),
+
+            // Last quarter of previous year: October 1st to December 31st
+            array(
+                'before' => "{$last_year}-12-31",
+                'after'  => "{$last_year}-10-01",
+            ),
+
+            // First quarter: January 1st to March 31st
+            array(
+                'before' => "{$year}-03-31",
+                'after'  => "{$year}-01-01",
+            ),
+
+            // Second quarter: April 1st to June 30th
+            array(
+                'before' => "{$year}-06-30",
+                'after'  => "{$year}-04-01",
+            ),
+
+            // Third quarter: July 1st to September 30th
+            array(
+                'before' => "{$year}-09-30",
+                'after'  => "{$year}-07-01",
+            ),
+
+            // Fourth quarter: October 1st to December 31st
+            array(
+                'before' => "{$year}-12-31",
+                'after'  => "{$year}-10-01",
+            ),
+        );
+    }
+
+    /**
+     * Retrieves the current quater.
+     *
+     * @return int The current quarter.
+     */
+    public function get_quarter() {
+
+        $month    = (int) gmdate( 'n' );
+        $quarters = array( 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4 );
+        return $quarters[ $month - 1 ];
+
+    }
+
+    /**
+     * Retrieves this quarter date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_quarter_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'last_quarter',
+        );
+
+        // Generate the report.
+        $quarter  = $this->get_quarter();
+        $quarters = $this->get_quarters();
+        return $quarters[ $quarter + 1 ];
+
+    }
+
+    /**
+     * Retrieves last quarter's date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_last_quarter_date_range() {
+
+        $quarters = $this->get_quarters();
+        $quarter  = $this->get_quarter();
+
+        // Set the previous date range.
+        $this->previous_range = array_merge(
+            $quarters[ $quarter - 1 ],
+            array( 'period' => 'custom' )
+        );
+
+        // Generate the report.
+        return $quarters[ $quarter ];
+
+    }
+
+    /**
+     * Retrieves this year date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_year_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'last_year',
+        );
+
+        // Generate the report.
+        return array(
+            'after'  => gmdate( 'Y-01-01' ),
+            'before' => gmdate( 'Y-12-31' ),
+        );
+
+    }
+
+    /**
+     * Retrieves last year date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_last_year_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'after'  => gmdate( 'Y-01-01', strtotime( '-2 years' ) ),
+            'before' => gmdate( 'Y-12-31', strtotime( '-2 years' ) ),
+        );
+
+        // Generate the report.
+        return array(
+            'after'  => gmdate( 'Y-01-01', strtotime( 'last year' ) ),
+            'before' => gmdate( 'Y-12-31', strtotime( 'last year' ) ),
+        );
+
+    }
+
+    /**
+     * Prepare a the request date for SQL usage.
+     *
+     * @param WP_REST_Request $request Request object.
+     * @param string $date_field The date field.
+     * @return string The appropriate SQL.
+     */
+    public function get_date_range_sql( $request, $date_field ) {
+        global $wpdb;
+
+        $sql = '1=1';
+        $range = $this->get_date_range( $request );
+
+        if ( ! empty( $range['after'] ) ) {
+            $sql .= ' AND ' . $wpdb->prepare(
+                "$date_field >= %s",
+                $range['after']
+            );
+        }
+
+        if ( ! empty( $range['before'] ) ) {
+            $sql .= ' AND ' . $wpdb->prepare(
+                "$date_field <= %s",
+                $range['before']
+            );
+        }
+
+        return $sql;
+
+    }
+
+    /**
+     * Prepares a group by query.
+     *
+     * @param string $date_field The date field.
+     * @return string The appropriate SQL.
+     */
+    public function get_group_by_sql( $date_field ) {
+
+        if ( 'day' === $this->groupby ) {
+            return "YEAR($date_field), MONTH($date_field), DAY($date_field)";
+        }
+
+        return "YEAR($date_field), MONTH($date_field)";
+    }
+
+    /**
+     * Get the query params for collections.
+     *
+     * @return array
+     */
+    public function get_collection_params() {
+        return array(
+            'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+            'period'  => array(
+                'description'       => __( 'Limit to results of a specific period.', 'invoicing' ),
+                'type'              => 'string',
+                'enum'              => array( 'custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year', 'quarter', 'last_quarter' ),
+                'validate_callback' => 'rest_validate_request_arg',
+                'sanitize_callback' => 'sanitize_text_field',
+                'default'           => '7_days',
+            ),
+            'after'   => array(
+                /* translators: %s: date format */
+                'description'       => sprintf( __( 'Limit to results after a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
+                'type'              => 'string',
+                'validate_callback' => 'rest_validate_request_arg',
+                'sanitize_callback' => 'sanitize_text_field',
+                'default'           => gmdate( 'Y-m-d', strtotime( '-7 days' ) ),
+            ),
+            'before'  => array(
+                /* translators: %s: date format */
+                'description'       => sprintf( __( 'Limit to results before a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
+                'type'              => 'string',
+                'validate_callback' => 'rest_validate_request_arg',
+                'sanitize_callback' => 'sanitize_text_field',
+                'default'           => gmdate( 'Y-m-d' ),
+            ),
+        );
+    }
 }

includes/payments/class-getpaid-checkout.php

Indentation +310 added lines, -310 removed lines

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

Spacing +139 added lines, -139 removed lines

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

includes/admin/register-settings.php

Indentation +369 added lines, -369 removed lines

@@ -25,8 +25,8 @@ 
                     $defaults[ $key ] = $setting['std'];
                 }
             }
-		}
-	}
+        }
+    }
 
     return $defaults;
 
@@ -144,7 +144,7 @@ 
  *
  */
 function wpinv_register_settings() {
-	do_action( 'getpaid_before_register_settings' );
+    do_action( 'getpaid_before_register_settings' );
 
     // Loop through all tabs.
     foreach ( wpinv_get_registered_settings() as $tab => $sections ) {
@@ -159,7 +159,7 @@ 
                 $settings = $sections;
             }
 
-			do_action( "getpaid_register_{$tab}_{$section}" );
+            do_action( "getpaid_register_{$tab}_{$section}" );
 
             // Register the setting section.
             add_settings_section(
@@ -180,7 +180,7 @@ 
     // Creates our settings in the options table.
     register_setting( 'wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize' );
 
-	do_action( 'getpaid_after_register_settings' );
+    do_action( 'getpaid_after_register_settings' );
 }
 add_action( 'admin_init', 'wpinv_register_settings' );
 
@@ -197,13 +197,13 @@ 
     $name       = isset( $option['name'] ) ? $option['name'] : '';
     $cb         = "wpinv_{$option['type']}_callback";
     $section    = "wpinv_settings_{$tab}_$section";
-	$is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
+    $is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
 
-	if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
-		$tip   = wpinv_clean( $option['desc'] );
-		$name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
-		unset( $option['desc'] );
-	}
+    if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
+        $tip   = wpinv_clean( $option['desc'] );
+        $name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
+        unset( $option['desc'] );
+    }
 
     // Loop through all tabs.
     add_settings_field(
@@ -230,9 +230,9 @@ 
             'faux'            => isset( $option['faux'] ) ? $option['faux'] : false,
             'onchange'        => isset( $option['onchange'] ) ? $option['onchange'] : '',
             'custom'          => isset( $option['custom'] ) ? $option['custom'] : '',
-			'default_content' => isset( $option['default_content'] ) ? $option['default_content'] : '',
-			'class'           => isset( $option['class'] ) ? $option['class'] : '',
-			'style'           => isset( $option['style'] ) ? $option['style'] : '',
+            'default_content' => isset( $option['default_content'] ) ? $option['default_content'] : '',
+            'class'           => isset( $option['class'] ) ? $option['class'] : '',
+            'style'           => isset( $option['style'] ) ? $option['style'] : '',
             'cols'            => isset( $option['cols'] ) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
             'rows'            => isset( $option['rows'] ) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
         )
@@ -246,7 +246,7 @@ 
  * @return array
  */
 function wpinv_get_registered_settings() {
-	return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
+    return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
 }
 
 /**
@@ -265,18 +265,18 @@ 
  */
 function wpinv_settings_sanitize( $input = array() ) {
 
-	$wpinv_options = wpinv_get_options();
-	$raw_referrer  = wp_get_raw_referer();
+    $wpinv_options = wpinv_get_options();
+    $raw_referrer  = wp_get_raw_referer();
 
     if ( empty( $raw_referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+        return array_merge( $wpinv_options, $input );
     }
 
     wp_parse_str( $raw_referrer, $referrer );
 
-	if ( in_array( 'gp-setup', $referrer ) ) {
-		return array_merge( $wpinv_options, $input );
-	}
+    if ( in_array( 'gp-setup', $referrer ) ) {
+        return array_merge( $wpinv_options, $input );
+    }
 
     $settings = wpinv_get_registered_settings();
     $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
@@ -298,10 +298,10 @@ 
         }
 
         // General filter
-		$input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+        $input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
 
-		// Key specific filter.
-		$input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
+        // Key specific filter.
+        $input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
@@ -344,14 +344,14 @@ 
 
     foreach ( $new_rates as $rate ) {
 
-		$rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
-		$rate['name']    = sanitize_text_field( $rate['name'] );
-		$rate['state']   = sanitize_text_field( $rate['state'] );
-		$rate['country'] = sanitize_text_field( $rate['country'] );
-		$rate['global']  = empty( $rate['state'] );
-		$tax_rates[]     = $rate;
+        $rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
+        $rate['name']    = sanitize_text_field( $rate['name'] );
+        $rate['state']   = sanitize_text_field( $rate['state'] );
+        $rate['country'] = sanitize_text_field( $rate['country'] );
+        $rate['global']  = empty( $rate['state'] );
+        $tax_rates[]     = $rate;
 
-	}
+    }
 
     update_option( 'wpinv_tax_rates', $tax_rates );
 
@@ -364,21 +364,21 @@ 
         return $input;
     }
 
-	if ( empty( $_POST['wpinv_tax_rules_nonce'] ) || ! wp_verify_nonce( $_POST['wpinv_tax_rules_nonce'], 'wpinv_tax_rules' ) ) {
-		return $input;
-	}
+    if ( empty( $_POST['wpinv_tax_rules_nonce'] ) || ! wp_verify_nonce( $_POST['wpinv_tax_rules_nonce'], 'wpinv_tax_rules' ) ) {
+        return $input;
+    }
 
     $new_rules = ! empty( $_POST['tax_rules'] ) ? wp_kses_post_deep( array_values( $_POST['tax_rules'] ) ) : array();
     $tax_rules = array();
 
     foreach ( $new_rules as $rule ) {
 
-		$rule['key']      = sanitize_title_with_dashes( $rule['key'] );
-		$rule['label']    = sanitize_text_field( $rule['label'] );
-		$rule['tax_base'] = sanitize_text_field( $rule['tax_base'] );
-		$tax_rules[]      = $rule;
+        $rule['key']      = sanitize_title_with_dashes( $rule['key'] );
+        $rule['label']    = sanitize_text_field( $rule['label'] );
+        $rule['tax_base'] = sanitize_text_field( $rule['tax_base'] );
+        $tax_rules[]      = $rule;
 
-	}
+    }
 
     update_option( 'wpinv_tax_rules', $tax_rules );
 
@@ -391,11 +391,11 @@ 
     $tabs['general']  = __( 'General', 'invoicing' );
     $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
     $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-	$tabs['emails']   = __( 'Emails', 'invoicing' );
+    $tabs['emails']   = __( 'Emails', 'invoicing' );
 
-	if ( count( getpaid_get_integration_settings() ) > 0 ) {
-		$tabs['integrations'] = __( 'Integrations', 'invoicing' );
-	}
+    if ( count( getpaid_get_integration_settings() ) > 0 ) {
+        $tabs['integrations'] = __( 'Integrations', 'invoicing' );
+    }
 
     $tabs['privacy']  = __( 'Privacy', 'invoicing' );
     $tabs['misc']     = __( 'Misc', 'invoicing' );
@@ -426,53 +426,53 @@ 
         'general'      => apply_filters(
             'wpinv_settings_sections_general',
             array(
-				'main'             => __( 'General Settings', 'invoicing' ),
-				'page_section'     => __( 'Page Settings', 'invoicing' ),
-				'currency_section' => __( 'Currency Settings', 'invoicing' ),
-				'labels'           => __( 'Label Texts', 'invoicing' ),
+                'main'             => __( 'General Settings', 'invoicing' ),
+                'page_section'     => __( 'Page Settings', 'invoicing' ),
+                'currency_section' => __( 'Currency Settings', 'invoicing' ),
+                'labels'           => __( 'Label Texts', 'invoicing' ),
             )
         ),
         'gateways'     => apply_filters(
             'wpinv_settings_sections_gateways',
             array(
-				'main' => __( 'Gateway Settings', 'invoicing' ),
+                'main' => __( 'Gateway Settings', 'invoicing' ),
             )
         ),
         'taxes'        => apply_filters(
             'wpinv_settings_sections_taxes',
             array(
-				'main'  => __( 'Tax Settings', 'invoicing' ),
-				'rules' => __( 'Tax Rules', 'invoicing' ),
-				'rates' => __( 'Tax Rates', 'invoicing' ),
-				'vat'   => __( 'EU VAT Settings', 'invoicing' ),
+                'main'  => __( 'Tax Settings', 'invoicing' ),
+                'rules' => __( 'Tax Rules', 'invoicing' ),
+                'rates' => __( 'Tax Rates', 'invoicing' ),
+                'vat'   => __( 'EU VAT Settings', 'invoicing' ),
             )
         ),
         'emails'       => apply_filters(
             'wpinv_settings_sections_emails',
             array(
-				'main' => __( 'Email Settings', 'invoicing' ),
+                'main' => __( 'Email Settings', 'invoicing' ),
             )
         ),
 
-		'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
+        'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
 
         'privacy'      => apply_filters(
             'wpinv_settings_sections_privacy',
             array(
-				'main' => __( 'Privacy policy', 'invoicing' ),
+                'main' => __( 'Privacy policy', 'invoicing' ),
             )
         ),
         'misc'         => apply_filters(
             'wpinv_settings_sections_misc',
             array(
-				'main'       => __( 'Miscellaneous', 'invoicing' ),
-				'custom-css' => __( 'Custom CSS', 'invoicing' ),
+                'main'       => __( 'Miscellaneous', 'invoicing' ),
+                'custom-css' => __( 'Custom CSS', 'invoicing' ),
             )
         ),
         'tools'        => apply_filters(
             'wpinv_settings_sections_tools',
             array(
-				'main' => __( 'Diagnostic Tools', 'invoicing' ),
+                'main' => __( 'Diagnostic Tools', 'invoicing' ),
             )
         ),
     );
@@ -483,46 +483,46 @@ 
 }
 
 function wpinv_get_pages( $with_slug = false, $default_label = null ) {
-	$pages_options = array();
+    $pages_options = array();
 
-	if ( $default_label !== null && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
-	}
+    if ( $default_label !== null && $default_label !== false ) {
+        $pages_options = array( '' => $default_label ); // Blank option
+    }
 
-	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
-			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
+    $pages = get_pages();
+    if ( $pages ) {
+        foreach ( $pages as $page ) {
+            $title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
             $pages_options[ $page->ID ] = $title;
-		}
-	}
+        }
+    }
 
-	return $pages_options;
+    return $pages_options;
 }
 
 function wpinv_header_callback( $args ) {
-	if ( ! empty( $args['desc'] ) ) {
+    if ( ! empty( $args['desc'] ) ) {
         echo wp_kses_post( $args['desc'] );
     }
 }
 
 function wpinv_hidden_callback( $args ) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	if ( isset( $args['set_value'] ) ) {
-		$value = $args['set_value'];
-	}
+    if ( isset( $args['set_value'] ) ) {
+        $value = $args['set_value'];
+    }
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$name  = '';
-	} else {
-		$name = 'wpinv_settings[' . esc_attr( $args['id'] ) . ']';
-	}
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $name  = '';
+    } else {
+        $name = 'wpinv_settings[' . esc_attr( $args['id'] ) . ']';
+    }
 
-	echo '<input type="hidden" id="wpinv_settings[' . esc_attr( $args['id'] ) . ']" name="' . esc_attr( $name ) . '" value="' . esc_attr( stripslashes( $value ) ) . '" />';
+    echo '<input type="hidden" id="wpinv_settings[' . esc_attr( $args['id'] ) . ']" name="' . esc_attr( $name ) . '" value="' . esc_attr( stripslashes( $value ) ) . '" />';
 
 }
 
@@ -531,12 +531,12 @@ 
  */
 function wpinv_checkbox_callback( $args ) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	$id  = esc_attr( $args['id'] );
+    $std = isset( $args['std'] ) ? $args['std'] : '';
+    $std = wpinv_get_option( $args['id'], $std );
+    $id  = esc_attr( $args['id'] );
 
-	getpaid_hidden_field( "wpinv_settings[$id]", '0' );
-	?>
+    getpaid_hidden_field( "wpinv_settings[$id]", '0' );
+    ?>
 		<label>
 			<input id="wpinv-settings-<?php echo esc_attr( $id ); ?>" name="wpinv_settings[<?php echo esc_attr( $id ); ?>]" <?php checked( empty( $std ), false ); ?> value="1" type="checkbox" />
 			<?php echo wp_kses_post( $args['desc'] ); ?>
@@ -546,75 +546,75 @@ 
 
 function wpinv_multicheck_callback( $args ) {
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	if ( ! empty( $args['options'] ) ) {
+    if ( ! empty( $args['options'] ) ) {
 
-		$std     = isset( $args['std'] ) ? $args['std'] : array();
-		$value   = wpinv_get_option( $args['id'], $std );
+        $std     = isset( $args['std'] ) ? $args['std'] : array();
+        $value   = wpinv_get_option( $args['id'], $std );
 
-		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . esc_attr( $sanitize_id . $class ) . '">';
+        echo '<div class="wpi-mcheck-rows wpi-mcheck-' . esc_attr( $sanitize_id . $class ) . '">';
         foreach ( $args['options'] as $key => $option ) :
-			$sanitize_key = esc_attr( wpinv_sanitize_key( $key ) );
-			if ( in_array( $sanitize_key, $value ) ) {
-				$enabled = $sanitize_key;
-			} else {
-				$enabled = null;
-			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']">' . wp_kses_post( $option ) . '</label></div>';
-		endforeach;
-		echo '</div>';
-		echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
-	}
+            $sanitize_key = esc_attr( wpinv_sanitize_key( $key ) );
+            if ( in_array( $sanitize_key, $value ) ) {
+                $enabled = $sanitize_key;
+            } else {
+                $enabled = null;
+            }
+            echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
+            echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']">' . wp_kses_post( $option ) . '</label></div>';
+        endforeach;
+        echo '</div>';
+        echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
+    }
 }
 
 function wpinv_payment_icons_callback( $args ) {
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$value   = wpinv_get_option( $args['id'], false );
+    $value   = wpinv_get_option( $args['id'], false );
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach ( $args['options'] as $key => $option ) {
+    if ( ! empty( $args['options'] ) ) {
+        foreach ( $args['options'] as $key => $option ) {
             $sanitize_key = wpinv_sanitize_key( $key );
 
-			if ( empty( $value ) ) {
-				$enabled = $option;
-			} else {
-				$enabled = null;
-			}
-
-			echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
-
-				echo '<input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
-
-				if ( wpinv_string_is_image_url( $key ) ) {
-				echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				} else {
-				$card = strtolower( str_replace( ' ', '', $option ) );
-
-				if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-					$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
-					} else {
-					$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
-					$content_dir = WP_CONTENT_DIR;
-
-					if ( function_exists( 'wp_normalize_path' ) ) {
-						// Replaces backslashes with forward slashes for Windows systems
-						$image = wp_normalize_path( $image );
-						$content_dir = wp_normalize_path( $content_dir );
-						}
-
-					$image = str_replace( $content_dir, content_url(), $image );
-					}
-
-				echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				}
-			echo wp_kses_post( $option ) . '</label>';
-		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
-	}
+            if ( empty( $value ) ) {
+                $enabled = $option;
+            } else {
+                $enabled = null;
+            }
+
+            echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
+
+                echo '<input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+
+                if ( wpinv_string_is_image_url( $key ) ) {
+                echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                } else {
+                $card = strtolower( str_replace( ' ', '', $option ) );
+
+                if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
+                    $image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+                    } else {
+                    $image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+                    $content_dir = WP_CONTENT_DIR;
+
+                    if ( function_exists( 'wp_normalize_path' ) ) {
+                        // Replaces backslashes with forward slashes for Windows systems
+                        $image = wp_normalize_path( $image );
+                        $content_dir = wp_normalize_path( $content_dir );
+                        }
+
+                    $image = str_replace( $content_dir, content_url(), $image );
+                    }
+
+                echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                }
+            echo wp_kses_post( $option ) . '</label>';
+        }
+        echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+    }
 }
 
 /**
@@ -622,9 +622,9 @@ 
  */
 function wpinv_radio_callback( $args ) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	?>
+    $std = isset( $args['std'] ) ? $args['std'] : '';
+    $std = wpinv_get_option( $args['id'], $std );
+    ?>
 		<fieldset>
 			<ul id="wpinv-settings-<?php echo esc_attr( $args['id'] ); ?>" style="margin-top: 0;">
 				<?php foreach ( $args['options'] as $key => $option ) : ?>
@@ -638,7 +638,7 @@ 
 			</ul>
 		</fieldset>
 	<?php
-	getpaid_settings_description_callback( $args );
+    getpaid_settings_description_callback( $args );
 }
 
 /**
@@ -646,10 +646,10 @@ 
  */
 function getpaid_settings_description_callback( $args ) {
 
-	if ( ! empty( $args['desc'] ) ) {
-		$description = $args['desc'];
-		echo wp_kses_post( "<p class='description'>$description</p>" );
-	}
+    if ( ! empty( $args['desc'] ) ) {
+        $description = $args['desc'];
+        echo wp_kses_post( "<p class='description'>$description</p>" );
+    }
 
 }
 
@@ -658,7 +658,7 @@ 
  */
 function wpinv_gateways_callback() {
 
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -672,26 +672,26 @@ 
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     $class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	echo '<select name="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" class="' . esc_attr( $class ) . '" >';
+    echo '<select name="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" class="' . esc_attr( $class ) . '" >';
 
-	foreach ( $args['options'] as $key => $option ) :
+    foreach ( $args['options'] as $key => $option ) :
 
-		echo '<option value="' . esc_attr( $key ) . '" ';
+        echo '<option value="' . esc_attr( $key ) . '" ';
 
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
+        if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
             selected( $key, $args['selected'] );
         } else {
             selected( $key, $value );
         }
 
-		echo '>' . esc_html( $option['admin_label'] ) . '</option>';
-	endforeach;
+        echo '>' . esc_html( $option['admin_label'] ) . '</option>';
+    endforeach;
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 }
 
 /**
@@ -702,38 +702,38 @@ 
  */
 function wpinv_settings_attrs_helper( $args ) {
 
-	$value = isset( $args['std'] ) ? $args['std'] : '';
-	$id    = esc_attr( $args['id'] );
-	$value = is_scalar( $value ) ? $value : '';
-
-	$attrs = array(
-		'name'     => ! empty( $args['faux'] ) ? false : "wpinv_settings[$id]",
-		'readonly' => ! empty( $args['faux'] ),
-		'value'    => ! empty( $args['faux'] ) ? $value : wpinv_get_option( $args['id'], $value ),
-		'id'       => 'wpinv-settings-' . $args['id'],
-		'style'    => $args['style'],
-		'class'    => $args['class'],
-		'placeholder' => $args['placeholder'],
-		'data-placeholder' => $args['placeholder'],
-	);
+    $value = isset( $args['std'] ) ? $args['std'] : '';
+    $id    = esc_attr( $args['id'] );
+    $value = is_scalar( $value ) ? $value : '';
+
+    $attrs = array(
+        'name'     => ! empty( $args['faux'] ) ? false : "wpinv_settings[$id]",
+        'readonly' => ! empty( $args['faux'] ),
+        'value'    => ! empty( $args['faux'] ) ? $value : wpinv_get_option( $args['id'], $value ),
+        'id'       => 'wpinv-settings-' . $args['id'],
+        'style'    => $args['style'],
+        'class'    => $args['class'],
+        'placeholder' => $args['placeholder'],
+        'data-placeholder' => $args['placeholder'],
+    );
 
-	if ( ! empty( $args['onchange'] ) ) {
-		$attrs['onchange'] = $args['onchange'];
-	}
+    if ( ! empty( $args['onchange'] ) ) {
+        $attrs['onchange'] = $args['onchange'];
+    }
 
-	foreach ( $attrs as $key => $value ) {
+    foreach ( $attrs as $key => $value ) {
 
-		if ( false === $value ) {
-			continue;
-		}
+        if ( false === $value ) {
+            continue;
+        }
 
-		if ( true === $value ) {
-			echo ' ' . esc_attr( $key );
-		} else {
-			echo ' ' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
-		}
+        if ( true === $value ) {
+            echo ' ' . esc_attr( $key );
+        } else {
+            echo ' ' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
+        }
 
-	}
+    }
 
 }
 
@@ -742,7 +742,7 @@ 
  */
 function wpinv_text_callback( $args ) {
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<input type="text" <?php wpinv_settings_attrs_helper( $args ); ?>>
 			<?php getpaid_settings_description_callback( $args ); ?>
@@ -756,7 +756,7 @@ 
  */
 function wpinv_number_callback( $args ) {
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<input type="number" step="<?php echo esc_attr( $args['step'] ); ?>" max="<?php echo intval( $args['max'] ); ?>" min="<?php echo intval( $args['min'] ); ?>" <?php wpinv_settings_attrs_helper( $args ); ?>>
 			<?php getpaid_settings_description_callback( $args ); ?>
@@ -768,34 +768,34 @@ 
 function wpinv_textarea_callback( $args ) {
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
     $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
     $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
 
-	echo '<textarea class="' . esc_attr( $class ) . ' txtarea-' . esc_attr( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . esc_attr( $args['cols'] ) . '" rows="' . esc_attr( $args['rows'] ) . '" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	echo '<br /><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '<textarea class="' . esc_attr( $class ) . ' txtarea-' . esc_attr( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . esc_attr( $args['cols'] ) . '" rows="' . esc_attr( $args['rows'] ) . '" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    echo '<br /><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_password_callback( $args ) {
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	echo '<input type="password" class="' . esc_attr( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    echo '<input type="password" class="' . esc_attr( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_missing_callback( $args ) {
-	printf(
-		esc_html__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
-		'<strong>' . esc_html( $args['id'] ) . '</strong>'
-	);
+    printf(
+        esc_html__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+        '<strong>' . esc_html( $args['id'] ) . '</strong>'
+    );
 }
 
 /**
@@ -803,13 +803,13 @@ 
  */
 function wpinv_select_callback( $args ) {
 
-	$desc   = wp_kses_post( $args['desc'] );
-	$desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$value  = isset( $args['std'] ) ? $args['std'] : '';
-	$value  = wpinv_get_option( $args['id'], $value );
-	$rand   = uniqid( 'random_id' );
+    $desc   = wp_kses_post( $args['desc'] );
+    $desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $value  = isset( $args['std'] ) ? $args['std'] : '';
+    $value  = wpinv_get_option( $args['id'], $value );
+    $rand   = uniqid( 'random_id' );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<select <?php wpinv_settings_attrs_helper( $args ); ?> data-allow-clear="true">
 				<?php foreach ( $args['options'] as $option => $name ) : ?>
@@ -842,50 +842,50 @@ 
 function wpinv_color_select_callback( $args ) {
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+    echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $color['label'] ) . '</option>';
-	}
+    foreach ( $args['options'] as $option => $color ) {
+        echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $color['label'] ) . '</option>';
+    }
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_rich_editor_callback( $args ) {
-	global $wp_version;
+    global $wp_version;
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
-		$value = $std;
-	}
+    if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
+        $value = $std;
+    }
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+    $rows = isset( $args['size'] ) ? $args['size'] : 20;
 
-	echo '<div class="getpaid-settings-editor-input">';
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
-		wp_editor(
+    echo '<div class="getpaid-settings-editor-input">';
+    if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+        wp_editor(
             stripslashes( $value ),
             'wpinv_settings_' . esc_attr( $args['id'] ),
             array(
-				'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']',
-				'textarea_rows' => absint( $rows ),
-				'media_buttons' => false,
+                'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']',
+                'textarea_rows' => absint( $rows ),
+                'media_buttons' => false,
             )
         );
-	} else {
-		echo '<textarea class="large-text" rows="10" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	}
+    } else {
+        echo '<textarea class="large-text" rows="10" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    }
 
-	echo '</div><br/><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</div><br/><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
@@ -893,51 +893,51 @@ 
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	echo '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	echo '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . esc_attr__( 'Upload File', 'invoicing' ) . '"/></span>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    echo '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    echo '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . esc_attr__( 'Upload File', 'invoicing' ) . '"/></span>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_color_callback( $args ) {
 
-	$std         = isset( $args['std'] ) ? $args['std'] : '';
-	$value       = wpinv_get_option( $args['id'], $std );
+    $std         = isset( $args['std'] ) ? $args['std'] : '';
+    $value       = wpinv_get_option( $args['id'], $std );
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	echo '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_country_states_callback( $args ) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
 
-	$states = wpinv_get_country_states();
+    $states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? 'wpinv-no-states' : 'wpi_select2';
-	echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="' . esc_attr( $class ) . '" data-placeholder="' . esc_html( $placeholder ) . '"/>';
+    $class = empty( $states ) ? 'wpinv-no-states' : 'wpi_select2';
+    echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="' . esc_attr( $class ) . '" data-placeholder="' . esc_html( $placeholder ) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $states as $option => $name ) {
+        echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $name ) . '</option>';
+    }
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
@@ -946,7 +946,7 @@ 
  */
 function wpinv_tax_rates_callback() {
 
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -962,9 +962,9 @@ 
  */
 function wpinv_tax_rate_callback( $tax_rate, $key ) {
 
-	$key                      = sanitize_key( $key );
-	$tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
-	include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
+    $key                      = sanitize_key( $key );
+    $tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
+    include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
 
 }
 
@@ -973,7 +973,7 @@ 
  */
 function wpinv_tax_rules_callback() {
 
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -1011,14 +1011,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1030,14 +1030,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'refresh_permalinks' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'refresh_permalinks' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1049,14 +1049,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1068,14 +1068,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1088,14 +1088,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1108,8 +1108,8 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
-					?>
+                        echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Launch', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1123,19 +1123,19 @@ 
 
 
 function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+    echo wp_kses_post( $args['desc'] );
 }
 
 function wpinv_raw_html_callback( $args ) {
-	echo wp_kses( $args['desc'], getpaid_allowed_html() );
+    echo wp_kses( $args['desc'], getpaid_allowed_html() );
 }
 
 function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+    do_action( 'wpinv_' . $args['id'], $args );
 }
 
 function wpinv_set_settings_cap() {
-	return wpinv_get_capability();
+    return wpinv_get_capability();
 }
 add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
 
@@ -1161,47 +1161,47 @@ 
  * @return array
  */
 function wpinv_get_email_merge_tags( $subscription = false ) {
-	$merge_tags = array(
-		'{site_title}'           => __( 'Site Title', 'invoicing' ),
-		'{name}'                 => __( "Customer's full name", 'invoicing' ),
-		'{first_name}'           => __( "Customer's first name", 'invoicing' ),
-		'{last_name}'            => __( "Customer's last name", 'invoicing' ),
-		'{email}'                => __( "Customer's email address", 'invoicing' ),
-		'{invoice_number}'       => __( 'The invoice number', 'invoicing' ),
-		'{invoice_currency}'     => __( 'The invoice currency', 'invoicing' ),
-		'{invoice_total}'        => __( 'The invoice total', 'invoicing' ),
-		'{invoice_link}'         => __( 'The invoice link', 'invoicing' ),
-		'{invoice_pay_link}'     => __( 'The payment link', 'invoicing' ),
-		'{invoice_receipt_link}' => __( 'The receipt link', 'invoicing' ),
-		'{invoice_date}'         => __( 'The date the invoice was created', 'invoicing' ),
-		'{invoice_due_date}'     => __( 'The date the invoice is due', 'invoicing' ),
-		'{date}'                 => __( "Today's date", 'invoicing' ),
-		'{is_was}'               => __( 'If due date of invoice is past, displays "was" otherwise displays "is"', 'invoicing' ),
-		'{invoice_label}'        => __( 'Invoices/quotes singular name. Ex: Invoice/Quote', 'invoicing' ),
-		'{invoice_quote}'        => __( 'Invoices/quotes singular name in small letters. Ex: invoice/quote', 'invoicing' ),
-		'{invoice_description}'  => __( 'The description of the invoice', 'invoicing' ),
-	);
-
-	if ( $subscription ) {
-		$merge_tags = array_merge(
-			$merge_tags,
-			array(
-				'{subscription_renewal_date}'     => __( 'The next renewal date of the subscription', 'invoicing' ),
-				'{subscription_created}'          => __( "The subscription's creation date", 'invoicing' ),
-				'{subscription_status}'           => __( "The subscription's status", 'invoicing' ),
-				'{subscription_profile_id}'       => __( "The subscription's remote profile id", 'invoicing' ),
-				'{subscription_id}'               => __( "The subscription's id", 'invoicing' ),
-				'{subscription_recurring_amount}' => __( 'The renewal amount of the subscription', 'invoicing' ),
-				'{subscription_initial_amount}'   => __( 'The initial amount of the subscription', 'invoicing' ),
-				'{subscription_recurring_period}' => __( 'The recurring period of the subscription (e.g 1 year)', 'invoicing' ),
-				'{subscription_bill_times}'       => __( 'The maximum number of times the subscription can be renewed', 'invoicing' ),
-				'{subscription_url}'              => __( 'The URL to manage a subscription', 'invoicing' ),
-				'{subscription_name}'             => __( 'The name of the recurring item', 'invoicing' ),
-			)
-		);
-	}
-
-	return $merge_tags;
+    $merge_tags = array(
+        '{site_title}'           => __( 'Site Title', 'invoicing' ),
+        '{name}'                 => __( "Customer's full name", 'invoicing' ),
+        '{first_name}'           => __( "Customer's first name", 'invoicing' ),
+        '{last_name}'            => __( "Customer's last name", 'invoicing' ),
+        '{email}'                => __( "Customer's email address", 'invoicing' ),
+        '{invoice_number}'       => __( 'The invoice number', 'invoicing' ),
+        '{invoice_currency}'     => __( 'The invoice currency', 'invoicing' ),
+        '{invoice_total}'        => __( 'The invoice total', 'invoicing' ),
+        '{invoice_link}'         => __( 'The invoice link', 'invoicing' ),
+        '{invoice_pay_link}'     => __( 'The payment link', 'invoicing' ),
+        '{invoice_receipt_link}' => __( 'The receipt link', 'invoicing' ),
+        '{invoice_date}'         => __( 'The date the invoice was created', 'invoicing' ),
+        '{invoice_due_date}'     => __( 'The date the invoice is due', 'invoicing' ),
+        '{date}'                 => __( "Today's date", 'invoicing' ),
+        '{is_was}'               => __( 'If due date of invoice is past, displays "was" otherwise displays "is"', 'invoicing' ),
+        '{invoice_label}'        => __( 'Invoices/quotes singular name. Ex: Invoice/Quote', 'invoicing' ),
+        '{invoice_quote}'        => __( 'Invoices/quotes singular name in small letters. Ex: invoice/quote', 'invoicing' ),
+        '{invoice_description}'  => __( 'The description of the invoice', 'invoicing' ),
+    );
+
+    if ( $subscription ) {
+        $merge_tags = array_merge(
+            $merge_tags,
+            array(
+                '{subscription_renewal_date}'     => __( 'The next renewal date of the subscription', 'invoicing' ),
+                '{subscription_created}'          => __( "The subscription's creation date", 'invoicing' ),
+                '{subscription_status}'           => __( "The subscription's status", 'invoicing' ),
+                '{subscription_profile_id}'       => __( "The subscription's remote profile id", 'invoicing' ),
+                '{subscription_id}'               => __( "The subscription's id", 'invoicing' ),
+                '{subscription_recurring_amount}' => __( 'The renewal amount of the subscription', 'invoicing' ),
+                '{subscription_initial_amount}'   => __( 'The initial amount of the subscription', 'invoicing' ),
+                '{subscription_recurring_period}' => __( 'The recurring period of the subscription (e.g 1 year)', 'invoicing' ),
+                '{subscription_bill_times}'       => __( 'The maximum number of times the subscription can be renewed', 'invoicing' ),
+                '{subscription_url}'              => __( 'The URL to manage a subscription', 'invoicing' ),
+                '{subscription_name}'             => __( 'The name of the recurring item', 'invoicing' ),
+            )
+        );
+    }
+
+    return $merge_tags;
 }
 
 
@@ -1213,28 +1213,28 @@ 
  * @return string
  */
 function wpinv_get_merge_tags_help_text( $subscription = false ) {
-	$merge_tags = wpinv_get_email_merge_tags( $subscription );
+    $merge_tags = wpinv_get_email_merge_tags( $subscription );
 
-	$output = '<div class="bsui">';
+    $output = '<div class="bsui">';
 
-	$link = sprintf(
-		'<strong class="getpaid-merge-tags text-primary" role="button">%s</strong>',
-		esc_html__( 'View available merge tags.', 'invoicing' )
-	);
+    $link = sprintf(
+        '<strong class="getpaid-merge-tags text-primary" role="button">%s</strong>',
+        esc_html__( 'View available merge tags.', 'invoicing' )
+    );
 
-	$description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
+    $description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
 	
-	$output .= "$description $link";
+    $output .= "$description $link";
 
-	$output .= '<div class="getpaid-merge-tags-content mt-2 p-1 d-none">';
-	$output .= '<p class="mb-2">' . esc_html__( 'The following wildcards can be used in email subjects, heading and content:', 'invoicing' ) . '</p>';
+    $output .= '<div class="getpaid-merge-tags-content mt-2 p-1 d-none">';
+    $output .= '<p class="mb-2">' . esc_html__( 'The following wildcards can be used in email subjects, heading and content:', 'invoicing' ) . '</p>';
 
-	$output .= '<ul class="p-0 m-0">';
-	foreach($merge_tags as $tag => $tag_description) {
-		$output .= "<li class='mb-2'><strong class='text-dark'>$tag</strong> &mdash; $tag_description</li>";
-	}
+    $output .= '<ul class="p-0 m-0">';
+    foreach($merge_tags as $tag => $tag_description) {
+        $output .= "<li class='mb-2'><strong class='text-dark'>$tag</strong> &mdash; $tag_description</li>";
+    }
 
-	$output .= '</ul></div></div>';
+    $output .= '</ul></div></div>';
 
-	return $output;
+    return $output;
 }

Spacing +420 added lines, -420 removed lines

@@ -6,7 +6,7 @@ 
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Retrieves all default settings.
@@ -16,13 +16,13 @@ 
 function wpinv_get_settings() {
     $defaults = array();
 
-    foreach ( array_values( wpinv_get_registered_settings() ) as $tab_settings ) {
+    foreach (array_values(wpinv_get_registered_settings()) as $tab_settings) {
 
-        foreach ( array_values( $tab_settings ) as $section_settings ) {
+        foreach (array_values($tab_settings) as $section_settings) {
 
-            foreach ( $section_settings as $key => $setting ) {
-                if ( isset( $setting['std'] ) ) {
-                    $defaults[ $key ] = $setting['std'];
+            foreach ($section_settings as $key => $setting) {
+                if (isset($setting['std'])) {
+                    $defaults[$key] = $setting['std'];
                 }
             }
 		}
@@ -41,12 +41,12 @@ 
     global $wpinv_options;
 
     // Try fetching the saved options.
-    if ( empty( $wpinv_options ) ) {
-        $wpinv_options = get_option( 'wpinv_settings' );
+    if (empty($wpinv_options)) {
+        $wpinv_options = get_option('wpinv_settings');
     }
 
     // If that fails, don't fetch the default settings to prevent a loop.
-    if ( ! is_array( $wpinv_options ) ) {
+    if (!is_array($wpinv_options)) {
         $wpinv_options = array();
     }
 
@@ -60,13 +60,13 @@ 
  * @param mixed $default The default value to use if the setting has not been set.
  * @return mixed
  */
-function wpinv_get_option( $key = '', $default = false ) {
+function wpinv_get_option($key = '', $default = false) {
 
     $options = wpinv_get_options();
-    $value   = isset( $options[ $key ] ) ? $options[ $key ] : $default;
-    $value   = apply_filters( 'wpinv_get_option', $value, $key, $default );
+    $value   = isset($options[$key]) ? $options[$key] : $default;
+    $value   = apply_filters('wpinv_get_option', $value, $key, $default);
 
-    return apply_filters( 'wpinv_get_option_' . $key, $value, $key, $default );
+    return apply_filters('wpinv_get_option_' . $key, $value, $key, $default);
 }
 
 /**
@@ -75,11 +75,11 @@ 
  * @param array $options the new options.
  * @return bool
  */
-function wpinv_update_options( $options ) {
+function wpinv_update_options($options) {
     global $wpinv_options;
 
     // update the option.
-    if ( is_array( $options ) && update_option( 'wpinv_settings', $options ) ) {
+    if (is_array($options) && update_option('wpinv_settings', $options)) {
         $wpinv_options = $options;
         return true;
     }
@@ -94,24 +94,24 @@ 
  * @param mixed $value The setting value.
  * @return bool
  */
-function wpinv_update_option( $key = '', $value = false ) {
+function wpinv_update_option($key = '', $value = false) {
 
     // If no key, exit.
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     // Maybe delete the option instead.
-    if ( is_null( $value ) ) {
-        return wpinv_delete_option( $key );
+    if (is_null($value)) {
+        return wpinv_delete_option($key);
     }
 
     // Prepare the new options.
     $options         = wpinv_get_options();
-    $options[ $key ] = apply_filters( 'wpinv_update_option', $value, $key );
+    $options[$key] = apply_filters('wpinv_update_option', $value, $key);
 
     // Save the new options.
-    return wpinv_update_options( $options );
+    return wpinv_update_options($options);
 
 }
 
@@ -121,18 +121,18 @@ 
  * @param string $key the setting key.
  * @return bool
  */
-function wpinv_delete_option( $key = '' ) {
+function wpinv_delete_option($key = '') {
 
     // If no key, exit
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     $options = wpinv_get_options();
 
-    if ( isset( $options[ $key ] ) ) {
-        unset( $options[ $key ] );
-        return wpinv_update_options( $options );
+    if (isset($options[$key])) {
+        unset($options[$key]);
+        return wpinv_update_options($options);
     }
 
     return true;
@@ -144,22 +144,22 @@ 
  *
  */
 function wpinv_register_settings() {
-	do_action( 'getpaid_before_register_settings' );
+	do_action('getpaid_before_register_settings');
 
     // Loop through all tabs.
-    foreach ( wpinv_get_registered_settings() as $tab => $sections ) {
+    foreach (wpinv_get_registered_settings() as $tab => $sections) {
 
         // In each tab, loop through sections.
-        foreach ( $sections as $section => $settings ) {
+        foreach ($sections as $section => $settings) {
 
             // Check for backwards compatibility
-            $section_tabs = wpinv_get_settings_tab_sections( $tab );
-            if ( ! is_array( $section_tabs ) || ! array_key_exists( $section, $section_tabs ) ) {
+            $section_tabs = wpinv_get_settings_tab_sections($tab);
+            if (!is_array($section_tabs) || !array_key_exists($section, $section_tabs)) {
                 $section = 'main';
                 $settings = $sections;
             }
 
-			do_action( "getpaid_register_{$tab}_{$section}" );
+			do_action("getpaid_register_{$tab}_{$section}");
 
             // Register the setting section.
             add_settings_section(
@@ -169,20 +169,20 @@ 
                 'wpinv_settings_' . $tab . '_' . $section
             );
 
-            foreach ( $settings as $option ) {
-                if ( ! empty( $option['id'] ) ) {
-                    wpinv_register_settings_option( $tab, $section, $option );
+            foreach ($settings as $option) {
+                if (!empty($option['id'])) {
+                    wpinv_register_settings_option($tab, $section, $option);
                 }
             }
 }
     }
 
     // Creates our settings in the options table.
-    register_setting( 'wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize' );
+    register_setting('wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize');
 
-	do_action( 'getpaid_after_register_settings' );
+	do_action('getpaid_after_register_settings');
 }
-add_action( 'admin_init', 'wpinv_register_settings' );
+add_action('admin_init', 'wpinv_register_settings');
 
 /**
  * Register a single settings option.
@@ -192,49 +192,49 @@ 
  * @param string $option
  *
  */
-function wpinv_register_settings_option( $tab, $section, $option ) {
+function wpinv_register_settings_option($tab, $section, $option) {
 
-    $name       = isset( $option['name'] ) ? $option['name'] : '';
+    $name       = isset($option['name']) ? $option['name'] : '';
     $cb         = "wpinv_{$option['type']}_callback";
     $section    = "wpinv_settings_{$tab}_$section";
-	$is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
+	$is_wizzard = is_admin() && isset($_GET['page']) && 'gp-setup' == $_GET['page'];
 
-	if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
-		$tip   = wpinv_clean( $option['desc'] );
+	if (isset($option['desc']) && (!$is_wizzard && !empty($option['help-tip']))) {
+		$tip   = wpinv_clean($option['desc']);
 		$name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
-		unset( $option['desc'] );
+		unset($option['desc']);
 	}
 
     // Loop through all tabs.
     add_settings_field(
         'wpinv_settings[' . $option['id'] . ']',
         $name,
-        function_exists( $cb ) ? $cb : 'wpinv_missing_callback',
+        function_exists($cb) ? $cb : 'wpinv_missing_callback',
         $section,
         $section,
         array(
             'section'         => $section,
-            'id'              => isset( $option['id'] ) ? $option['id'] : uniqid( 'wpinv-' ),
-            'desc'            => isset( $option['desc'] ) ? $option['desc'] : '',
+            'id'              => isset($option['id']) ? $option['id'] : uniqid('wpinv-'),
+            'desc'            => isset($option['desc']) ? $option['desc'] : '',
             'name'            => $name,
-            'size'            => isset( $option['size'] ) ? $option['size'] : null,
-            'options'         => isset( $option['options'] ) ? $option['options'] : '',
-            'selected'        => isset( $option['selected'] ) ? $option['selected'] : null,
-            'std'             => isset( $option['std'] ) ? $option['std'] : '',
-            'min'             => isset( $option['min'] ) ? $option['min'] : 0,
-            'max'             => isset( $option['max'] ) ? $option['max'] : 999999,
-            'step'            => isset( $option['step'] ) ? $option['step'] : 1,
-            'placeholder'     => isset( $option['placeholder'] ) ? $option['placeholder'] : null,
-            'allow_blank'     => isset( $option['allow_blank'] ) ? $option['allow_blank'] : true,
-            'readonly'        => isset( $option['readonly'] ) ? $option['readonly'] : false,
-            'faux'            => isset( $option['faux'] ) ? $option['faux'] : false,
-            'onchange'        => isset( $option['onchange'] ) ? $option['onchange'] : '',
-            'custom'          => isset( $option['custom'] ) ? $option['custom'] : '',
-			'default_content' => isset( $option['default_content'] ) ? $option['default_content'] : '',
-			'class'           => isset( $option['class'] ) ? $option['class'] : '',
-			'style'           => isset( $option['style'] ) ? $option['style'] : '',
-            'cols'            => isset( $option['cols'] ) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
-            'rows'            => isset( $option['rows'] ) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
+            'size'            => isset($option['size']) ? $option['size'] : null,
+            'options'         => isset($option['options']) ? $option['options'] : '',
+            'selected'        => isset($option['selected']) ? $option['selected'] : null,
+            'std'             => isset($option['std']) ? $option['std'] : '',
+            'min'             => isset($option['min']) ? $option['min'] : 0,
+            'max'             => isset($option['max']) ? $option['max'] : 999999,
+            'step'            => isset($option['step']) ? $option['step'] : 1,
+            'placeholder'     => isset($option['placeholder']) ? $option['placeholder'] : null,
+            'allow_blank'     => isset($option['allow_blank']) ? $option['allow_blank'] : true,
+            'readonly'        => isset($option['readonly']) ? $option['readonly'] : false,
+            'faux'            => isset($option['faux']) ? $option['faux'] : false,
+            'onchange'        => isset($option['onchange']) ? $option['onchange'] : '',
+            'custom'          => isset($option['custom']) ? $option['custom'] : '',
+			'default_content' => isset($option['default_content']) ? $option['default_content'] : '',
+			'class'           => isset($option['class']) ? $option['class'] : '',
+			'style'           => isset($option['style']) ? $option['style'] : '',
+            'cols'            => isset($option['cols']) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
+            'rows'            => isset($option['rows']) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
         )
     );
 
@@ -246,7 +246,7 @@ 
  * @return array
  */
 function wpinv_get_registered_settings() {
-	return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
+	return array_filter(apply_filters('wpinv_registered_settings', wpinv_get_data('admin-settings')));
 }
 
 /**
@@ -255,7 +255,7 @@ 
  * @return array
  */
 function getpaid_get_integration_settings() {
-    return apply_filters( 'getpaid_integration_settings', array() );
+    return apply_filters('getpaid_integration_settings', array());
 }
 
 /**
@@ -263,153 +263,153 @@ 
  *
  * @return array
  */
-function wpinv_settings_sanitize( $input = array() ) {
+function wpinv_settings_sanitize($input = array()) {
 
 	$wpinv_options = wpinv_get_options();
 	$raw_referrer  = wp_get_raw_referer();
 
-    if ( empty( $raw_referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+    if (empty($raw_referrer)) {
+		return array_merge($wpinv_options, $input);
     }
 
-    wp_parse_str( $raw_referrer, $referrer );
+    wp_parse_str($raw_referrer, $referrer);
 
-	if ( in_array( 'gp-setup', $referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+	if (in_array('gp-setup', $referrer)) {
+		return array_merge($wpinv_options, $input);
 	}
 
     $settings = wpinv_get_registered_settings();
-    $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
-    $section  = isset( $referrer['section'] ) ? $referrer['section'] : 'main';
+    $tab      = isset($referrer['tab']) ? $referrer['tab'] : 'general';
+    $section  = isset($referrer['section']) ? $referrer['section'] : 'main';
 
     $input = $input ? $input : array();
-    $input = apply_filters( 'wpinv_settings_tab_' . $tab . '_sanitize', $input );
-    $input = apply_filters( 'wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input );
+    $input = apply_filters('wpinv_settings_tab_' . $tab . '_sanitize', $input);
+    $input = apply_filters('wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input);
 
     // Loop through each setting being saved and pass it through a sanitization filter
-    foreach ( $input as $key => $value ) {
+    foreach ($input as $key => $value) {
 
         // Get the setting type (checkbox, select, etc)
-        $type = isset( $settings[ $tab ][ $section ][ $key ]['type'] ) ? $settings[ $tab ][ $section ][ $key ]['type'] : false;
+        $type = isset($settings[$tab][$section][$key]['type']) ? $settings[$tab][$section][$key]['type'] : false;
 
-        if ( $type ) {
+        if ($type) {
             // Field type specific filter
-            $input[ $key ] = apply_filters( "wpinv_settings_sanitize_$type", $value, $key );
+            $input[$key] = apply_filters("wpinv_settings_sanitize_$type", $value, $key);
         }
 
         // General filter
-		$input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+		$input[$key] = apply_filters('wpinv_settings_sanitize', $input[$key], $key);
 
 		// Key specific filter.
-		$input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
+		$input[$key] = apply_filters("wpinv_settings_sanitize_$key", $input[$key]);
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
-    $main_settings    = isset( $settings[ $tab ] ) ? $settings[ $tab ] : array(); // Check for extensions that aren't using new sections
-    $section_settings = ! empty( $settings[ $tab ][ $section ] ) ? $settings[ $tab ][ $section ] : array();
+    $main_settings    = isset($settings[$tab]) ? $settings[$tab] : array(); // Check for extensions that aren't using new sections
+    $section_settings = !empty($settings[$tab][$section]) ? $settings[$tab][$section] : array();
 
-    $found_settings   = array_merge( $main_settings, $section_settings );
+    $found_settings   = array_merge($main_settings, $section_settings);
 
-    if ( ! empty( $found_settings ) ) {
-        foreach ( $found_settings as $key => $value ) {
+    if (!empty($found_settings)) {
+        foreach ($found_settings as $key => $value) {
 
             // settings used to have numeric keys, now they have keys that match the option ID. This ensures both methods work
-            if ( is_numeric( $key ) ) {
+            if (is_numeric($key)) {
                 $key = $value['id'];
             }
 
-            if ( ! isset( $input[ $key ] ) && isset( $wpinv_options[ $key ] ) ) {
-                unset( $wpinv_options[ $key ] );
+            if (!isset($input[$key]) && isset($wpinv_options[$key])) {
+                unset($wpinv_options[$key]);
             }
         }
     }
 
     // Merge our new settings with the existing
-    $output = array_merge( $wpinv_options, $input );
+    $output = array_merge($wpinv_options, $input);
 
-    add_settings_error( 'wpinv-notices', '', __( 'Settings updated.', 'invoicing' ), 'updated' );
+    add_settings_error('wpinv-notices', '', __('Settings updated.', 'invoicing'), 'updated');
 
     return $output;
 }
-add_filter( 'wpinv_settings_sanitize_text', 'trim', 10, 1 );
-add_filter( 'wpinv_settings_sanitize_tax_rate', 'wpinv_sanitize_amount' );
+add_filter('wpinv_settings_sanitize_text', 'trim', 10, 1);
+add_filter('wpinv_settings_sanitize_tax_rate', 'wpinv_sanitize_amount');
 
-function wpinv_settings_sanitize_tax_rates( $input ) {
-    if ( ! wpinv_current_user_can_manage_invoicing() ) {
+function wpinv_settings_sanitize_tax_rates($input) {
+    if (!wpinv_current_user_can_manage_invoicing()) {
         return $input;
     }
 
-    $new_rates = ! empty( $_POST['tax_rates'] ) ? wp_kses_post_deep( array_values( $_POST['tax_rates'] ) ) : array();
+    $new_rates = !empty($_POST['tax_rates']) ? wp_kses_post_deep(array_values($_POST['tax_rates'])) : array();
     $tax_rates = array();
 
-    foreach ( $new_rates as $rate ) {
+    foreach ($new_rates as $rate) {
 
-		$rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
-		$rate['name']    = sanitize_text_field( $rate['name'] );
-		$rate['state']   = sanitize_text_field( $rate['state'] );
-		$rate['country'] = sanitize_text_field( $rate['country'] );
-		$rate['global']  = empty( $rate['state'] );
+		$rate['rate']    = wpinv_sanitize_amount($rate['rate']);
+		$rate['name']    = sanitize_text_field($rate['name']);
+		$rate['state']   = sanitize_text_field($rate['state']);
+		$rate['country'] = sanitize_text_field($rate['country']);
+		$rate['global']  = empty($rate['state']);
 		$tax_rates[]     = $rate;
 
 	}
 
-    update_option( 'wpinv_tax_rates', $tax_rates );
+    update_option('wpinv_tax_rates', $tax_rates);
 
     return $input;
 }
-add_filter( 'wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates' );
+add_filter('wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates');
 
-function wpinv_settings_sanitize_tax_rules( $input ) {
-    if ( ! wpinv_current_user_can_manage_invoicing() ) {
+function wpinv_settings_sanitize_tax_rules($input) {
+    if (!wpinv_current_user_can_manage_invoicing()) {
         return $input;
     }
 
-	if ( empty( $_POST['wpinv_tax_rules_nonce'] ) || ! wp_verify_nonce( $_POST['wpinv_tax_rules_nonce'], 'wpinv_tax_rules' ) ) {
+	if (empty($_POST['wpinv_tax_rules_nonce']) || !wp_verify_nonce($_POST['wpinv_tax_rules_nonce'], 'wpinv_tax_rules')) {
 		return $input;
 	}
 
-    $new_rules = ! empty( $_POST['tax_rules'] ) ? wp_kses_post_deep( array_values( $_POST['tax_rules'] ) ) : array();
+    $new_rules = !empty($_POST['tax_rules']) ? wp_kses_post_deep(array_values($_POST['tax_rules'])) : array();
     $tax_rules = array();
 
-    foreach ( $new_rules as $rule ) {
+    foreach ($new_rules as $rule) {
 
-		$rule['key']      = sanitize_title_with_dashes( $rule['key'] );
-		$rule['label']    = sanitize_text_field( $rule['label'] );
-		$rule['tax_base'] = sanitize_text_field( $rule['tax_base'] );
+		$rule['key']      = sanitize_title_with_dashes($rule['key']);
+		$rule['label']    = sanitize_text_field($rule['label']);
+		$rule['tax_base'] = sanitize_text_field($rule['tax_base']);
 		$tax_rules[]      = $rule;
 
 	}
 
-    update_option( 'wpinv_tax_rules', $tax_rules );
+    update_option('wpinv_tax_rules', $tax_rules);
 
     return $input;
 }
-add_filter( 'wpinv_settings_taxes-rules_sanitize', 'wpinv_settings_sanitize_tax_rules' );
+add_filter('wpinv_settings_taxes-rules_sanitize', 'wpinv_settings_sanitize_tax_rules');
 
 function wpinv_get_settings_tabs() {
     $tabs             = array();
-    $tabs['general']  = __( 'General', 'invoicing' );
-    $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
-    $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-	$tabs['emails']   = __( 'Emails', 'invoicing' );
+    $tabs['general']  = __('General', 'invoicing');
+    $tabs['gateways'] = __('Payment Gateways', 'invoicing');
+    $tabs['taxes']    = __('Taxes', 'invoicing');
+	$tabs['emails'] = __('Emails', 'invoicing');
 
-	if ( count( getpaid_get_integration_settings() ) > 0 ) {
-		$tabs['integrations'] = __( 'Integrations', 'invoicing' );
+	if (count(getpaid_get_integration_settings()) > 0) {
+		$tabs['integrations'] = __('Integrations', 'invoicing');
 	}
 
-    $tabs['privacy']  = __( 'Privacy', 'invoicing' );
-    $tabs['misc']     = __( 'Misc', 'invoicing' );
-    $tabs['tools']    = __( 'Tools', 'invoicing' );
+    $tabs['privacy']  = __('Privacy', 'invoicing');
+    $tabs['misc']     = __('Misc', 'invoicing');
+    $tabs['tools']    = __('Tools', 'invoicing');
 
-    return apply_filters( 'wpinv_settings_tabs', $tabs );
+    return apply_filters('wpinv_settings_tabs', $tabs);
 }
 
-function wpinv_get_settings_tab_sections( $tab = false ) {
+function wpinv_get_settings_tab_sections($tab = false) {
     $tabs     = false;
     $sections = wpinv_get_registered_settings_sections();
 
-    if ( $tab && ! empty( $sections[ $tab ] ) ) {
-        $tabs = $sections[ $tab ];
+    if ($tab && !empty($sections[$tab])) {
+        $tabs = $sections[$tab];
     }
 
     return $tabs;
@@ -418,7 +418,7 @@ 
 function wpinv_get_registered_settings_sections() {
     static $sections = false;
 
-    if ( false !== $sections ) {
+    if (false !== $sections) {
         return $sections;
     }
 
@@ -426,229 +426,229 @@ 
         'general'      => apply_filters(
             'wpinv_settings_sections_general',
             array(
-				'main'             => __( 'General Settings', 'invoicing' ),
-				'page_section'     => __( 'Page Settings', 'invoicing' ),
-				'currency_section' => __( 'Currency Settings', 'invoicing' ),
-				'labels'           => __( 'Label Texts', 'invoicing' ),
+				'main'             => __('General Settings', 'invoicing'),
+				'page_section'     => __('Page Settings', 'invoicing'),
+				'currency_section' => __('Currency Settings', 'invoicing'),
+				'labels'           => __('Label Texts', 'invoicing'),
             )
         ),
         'gateways'     => apply_filters(
             'wpinv_settings_sections_gateways',
             array(
-				'main' => __( 'Gateway Settings', 'invoicing' ),
+				'main' => __('Gateway Settings', 'invoicing'),
             )
         ),
         'taxes'        => apply_filters(
             'wpinv_settings_sections_taxes',
             array(
-				'main'  => __( 'Tax Settings', 'invoicing' ),
-				'rules' => __( 'Tax Rules', 'invoicing' ),
-				'rates' => __( 'Tax Rates', 'invoicing' ),
-				'vat'   => __( 'EU VAT Settings', 'invoicing' ),
+				'main'  => __('Tax Settings', 'invoicing'),
+				'rules' => __('Tax Rules', 'invoicing'),
+				'rates' => __('Tax Rates', 'invoicing'),
+				'vat'   => __('EU VAT Settings', 'invoicing'),
             )
         ),
         'emails'       => apply_filters(
             'wpinv_settings_sections_emails',
             array(
-				'main' => __( 'Email Settings', 'invoicing' ),
+				'main' => __('Email Settings', 'invoicing'),
             )
         ),
 
-		'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
+		'integrations' => wp_list_pluck(getpaid_get_integration_settings(), 'label', 'id'),
 
         'privacy'      => apply_filters(
             'wpinv_settings_sections_privacy',
             array(
-				'main' => __( 'Privacy policy', 'invoicing' ),
+				'main' => __('Privacy policy', 'invoicing'),
             )
         ),
         'misc'         => apply_filters(
             'wpinv_settings_sections_misc',
             array(
-				'main'       => __( 'Miscellaneous', 'invoicing' ),
-				'custom-css' => __( 'Custom CSS', 'invoicing' ),
+				'main'       => __('Miscellaneous', 'invoicing'),
+				'custom-css' => __('Custom CSS', 'invoicing'),
             )
         ),
         'tools'        => apply_filters(
             'wpinv_settings_sections_tools',
             array(
-				'main' => __( 'Diagnostic Tools', 'invoicing' ),
+				'main' => __('Diagnostic Tools', 'invoicing'),
             )
         ),
     );
 
-    $sections = apply_filters( 'wpinv_settings_sections', $sections );
+    $sections = apply_filters('wpinv_settings_sections', $sections);
 
     return $sections;
 }
 
-function wpinv_get_pages( $with_slug = false, $default_label = null ) {
+function wpinv_get_pages($with_slug = false, $default_label = null) {
 	$pages_options = array();
 
-	if ( $default_label !== null && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
+	if ($default_label !== null && $default_label !== false) {
+		$pages_options = array('' => $default_label); // Blank option
 	}
 
 	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
+	if ($pages) {
+		foreach ($pages as $page) {
 			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
-            $pages_options[ $page->ID ] = $title;
+            $pages_options[$page->ID] = $title;
 		}
 	}
 
 	return $pages_options;
 }
 
-function wpinv_header_callback( $args ) {
-	if ( ! empty( $args['desc'] ) ) {
-        echo wp_kses_post( $args['desc'] );
+function wpinv_header_callback($args) {
+	if (!empty($args['desc'])) {
+        echo wp_kses_post($args['desc']);
     }
 }
 
-function wpinv_hidden_callback( $args ) {
+function wpinv_hidden_callback($args) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	if ( isset( $args['set_value'] ) ) {
+	if (isset($args['set_value'])) {
 		$value = $args['set_value'];
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$name  = '';
+		$name = '';
 	} else {
-		$name = 'wpinv_settings[' . esc_attr( $args['id'] ) . ']';
+		$name = 'wpinv_settings[' . esc_attr($args['id']) . ']';
 	}
 
-	echo '<input type="hidden" id="wpinv_settings[' . esc_attr( $args['id'] ) . ']" name="' . esc_attr( $name ) . '" value="' . esc_attr( stripslashes( $value ) ) . '" />';
+	echo '<input type="hidden" id="wpinv_settings[' . esc_attr($args['id']) . ']" name="' . esc_attr($name) . '" value="' . esc_attr(stripslashes($value)) . '" />';
 
 }
 
 /**
  * Displays a checkbox settings callback.
  */
-function wpinv_checkbox_callback( $args ) {
+function wpinv_checkbox_callback($args) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	$id  = esc_attr( $args['id'] );
+	$std = isset($args['std']) ? $args['std'] : '';
+	$std = wpinv_get_option($args['id'], $std);
+	$id  = esc_attr($args['id']);
 
-	getpaid_hidden_field( "wpinv_settings[$id]", '0' );
+	getpaid_hidden_field("wpinv_settings[$id]", '0');
 	?>
 		<label>
-			<input id="wpinv-settings-<?php echo esc_attr( $id ); ?>" name="wpinv_settings[<?php echo esc_attr( $id ); ?>]" <?php checked( empty( $std ), false ); ?> value="1" type="checkbox" />
-			<?php echo wp_kses_post( $args['desc'] ); ?>
+			<input id="wpinv-settings-<?php echo esc_attr($id); ?>" name="wpinv_settings[<?php echo esc_attr($id); ?>]" <?php checked(empty($std), false); ?> value="1" type="checkbox" />
+			<?php echo wp_kses_post($args['desc']); ?>
 		</label>
 	<?php
 }
 
-function wpinv_multicheck_callback( $args ) {
+function wpinv_multicheck_callback($args) {
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+	$sanitize_id = wpinv_sanitize_key($args['id']);
+	$class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
 
-	if ( ! empty( $args['options'] ) ) {
+	if (!empty($args['options'])) {
 
-		$std     = isset( $args['std'] ) ? $args['std'] : array();
-		$value   = wpinv_get_option( $args['id'], $std );
+		$std     = isset($args['std']) ? $args['std'] : array();
+		$value   = wpinv_get_option($args['id'], $std);
 
-		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . esc_attr( $sanitize_id . $class ) . '">';
-        foreach ( $args['options'] as $key => $option ) :
-			$sanitize_key = esc_attr( wpinv_sanitize_key( $key ) );
-			if ( in_array( $sanitize_key, $value ) ) {
+		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . esc_attr($sanitize_id . $class) . '">';
+        foreach ($args['options'] as $key => $option) :
+			$sanitize_key = esc_attr(wpinv_sanitize_key($key));
+			if (in_array($sanitize_key, $value)) {
 				$enabled = $sanitize_key;
 			} else {
 				$enabled = null;
 			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']">' . wp_kses_post( $option ) . '</label></div>';
+			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" id="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" type="checkbox" value="' . esc_attr($sanitize_key) . '" ' . checked($sanitize_key, $enabled, false) . '/>&nbsp;';
+			echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']">' . wp_kses_post($option) . '</label></div>';
 		endforeach;
 		echo '</div>';
-		echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
+		echo '<p class="description">' . wp_kses_post($args['desc']) . '</p>';
 	}
 }
 
-function wpinv_payment_icons_callback( $args ) {
+function wpinv_payment_icons_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$value   = wpinv_get_option( $args['id'], false );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$value = wpinv_get_option($args['id'], false);
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach ( $args['options'] as $key => $option ) {
-            $sanitize_key = wpinv_sanitize_key( $key );
+	if (!empty($args['options'])) {
+		foreach ($args['options'] as $key => $option) {
+            $sanitize_key = wpinv_sanitize_key($key);
 
-			if ( empty( $value ) ) {
+			if (empty($value)) {
 				$enabled = $option;
 			} else {
 				$enabled = null;
 			}
 
-			echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
+			echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
 
-				echo '<input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+				echo '<input name="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" id="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" type="checkbox" value="' . esc_attr($option) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
 
-				if ( wpinv_string_is_image_url( $key ) ) {
-				echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+				if (wpinv_string_is_image_url($key)) {
+				echo '<img class="payment-icon" src="' . esc_url($key) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				} else {
-				$card = strtolower( str_replace( ' ', '', $option ) );
+				$card = strtolower(str_replace(' ', '', $option));
 
-				if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-					$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+				if (has_filter('wpinv_accepted_payment_' . $card . '_image')) {
+					$image = apply_filters('wpinv_accepted_payment_' . $card . '_image', '');
 					} else {
-					$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+					$image       = wpinv_locate_template('images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false);
 					$content_dir = WP_CONTENT_DIR;
 
-					if ( function_exists( 'wp_normalize_path' ) ) {
+					if (function_exists('wp_normalize_path')) {
 						// Replaces backslashes with forward slashes for Windows systems
-						$image = wp_normalize_path( $image );
-						$content_dir = wp_normalize_path( $content_dir );
+						$image = wp_normalize_path($image);
+						$content_dir = wp_normalize_path($content_dir);
 						}
 
-					$image = str_replace( $content_dir, content_url(), $image );
+					$image = str_replace($content_dir, content_url(), $image);
 					}
 
-				echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+				echo '<img class="payment-icon" src="' . esc_url($image) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				}
-			echo wp_kses_post( $option ) . '</label>';
+			echo wp_kses_post($option) . '</label>';
 		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post($args['desc']) . '</p>';
 	}
 }
 
 /**
  * Displays a radio settings field.
  */
-function wpinv_radio_callback( $args ) {
+function wpinv_radio_callback($args) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
+	$std = isset($args['std']) ? $args['std'] : '';
+	$std = wpinv_get_option($args['id'], $std);
 	?>
 		<fieldset>
-			<ul id="wpinv-settings-<?php echo esc_attr( $args['id'] ); ?>" style="margin-top: 0;">
-				<?php foreach ( $args['options'] as $key => $option ) : ?>
+			<ul id="wpinv-settings-<?php echo esc_attr($args['id']); ?>" style="margin-top: 0;">
+				<?php foreach ($args['options'] as $key => $option) : ?>
 					<li>
 						<label>
-							<input name="wpinv_settings[<?php echo esc_attr( $args['id'] ); ?>]" <?php checked( $std, $key ); ?> value="<?php echo esc_attr( $key ); ?>" type="radio">
-							<?php echo wp_kses_post( $option ); ?>
+							<input name="wpinv_settings[<?php echo esc_attr($args['id']); ?>]" <?php checked($std, $key); ?> value="<?php echo esc_attr($key); ?>" type="radio">
+							<?php echo wp_kses_post($option); ?>
 						</label>
 					</li>
 				<?php endforeach; ?>
 			</ul>
 		</fieldset>
 	<?php
-	getpaid_settings_description_callback( $args );
+	getpaid_settings_description_callback($args);
 }
 
 /**
  * Displays a description if available.
  */
-function getpaid_settings_description_callback( $args ) {
+function getpaid_settings_description_callback($args) {
 
-	if ( ! empty( $args['desc'] ) ) {
+	if (!empty($args['desc'])) {
 		$description = $args['desc'];
-		echo wp_kses_post( "<p class='description'>$description</p>" );
+		echo wp_kses_post("<p class='description'>$description</p>");
 	}
 
 }
@@ -663,35 +663,35 @@ 
 	</tr>
 	<tr class="bsui">
     	<td colspan="2" class="p-0">
-			<?php include plugin_dir_path( __FILE__ ) . 'views/html-gateways-edit.php'; ?>
+			<?php include plugin_dir_path(__FILE__) . 'views/html-gateways-edit.php'; ?>
 
 	<?php
 }
 
-function wpinv_gateway_select_callback( $args ) {
+function wpinv_gateway_select_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-    $class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+    $class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	echo '<select name="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" class="' . esc_attr( $class ) . '" >';
+	echo '<select name="wpinv_settings[' . esc_attr($sanitize_id) . ']"" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" class="' . esc_attr($class) . '" >';
 
-	foreach ( $args['options'] as $key => $option ) :
+	foreach ($args['options'] as $key => $option) :
 
-		echo '<option value="' . esc_attr( $key ) . '" ';
+		echo '<option value="' . esc_attr($key) . '" ';
 
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
-            selected( $key, $args['selected'] );
+		if (isset($args['selected']) && $args['selected'] !== null && $args['selected'] !== false) {
+            selected($key, $args['selected']);
         } else {
-            selected( $key, $value );
+            selected($key, $value);
         }
 
-		echo '>' . esc_html( $option['admin_label'] ) . '</option>';
+		echo '>' . esc_html($option['admin_label']) . '</option>';
 	endforeach;
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 }
 
 /**
@@ -700,16 +700,16 @@ 
  * @param array $args
  * @return string
  */
-function wpinv_settings_attrs_helper( $args ) {
+function wpinv_settings_attrs_helper($args) {
 
-	$value = isset( $args['std'] ) ? $args['std'] : '';
-	$id    = esc_attr( $args['id'] );
-	$value = is_scalar( $value ) ? $value : '';
+	$value = isset($args['std']) ? $args['std'] : '';
+	$id    = esc_attr($args['id']);
+	$value = is_scalar($value) ? $value : '';
 
 	$attrs = array(
-		'name'     => ! empty( $args['faux'] ) ? false : "wpinv_settings[$id]",
-		'readonly' => ! empty( $args['faux'] ),
-		'value'    => ! empty( $args['faux'] ) ? $value : wpinv_get_option( $args['id'], $value ),
+		'name'     => !empty($args['faux']) ? false : "wpinv_settings[$id]",
+		'readonly' => !empty($args['faux']),
+		'value'    => !empty($args['faux']) ? $value : wpinv_get_option($args['id'], $value),
 		'id'       => 'wpinv-settings-' . $args['id'],
 		'style'    => $args['style'],
 		'class'    => $args['class'],
@@ -717,20 +717,20 @@ 
 		'data-placeholder' => $args['placeholder'],
 	);
 
-	if ( ! empty( $args['onchange'] ) ) {
+	if (!empty($args['onchange'])) {
 		$attrs['onchange'] = $args['onchange'];
 	}
 
-	foreach ( $attrs as $key => $value ) {
+	foreach ($attrs as $key => $value) {
 
-		if ( false === $value ) {
+		if (false === $value) {
 			continue;
 		}
 
-		if ( true === $value ) {
-			echo ' ' . esc_attr( $key );
+		if (true === $value) {
+			echo ' ' . esc_attr($key);
 		} else {
-			echo ' ' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
+			echo ' ' . esc_attr($key) . '="' . esc_attr($value) . '"';
 		}
 
 	}
@@ -740,12 +740,12 @@ 
 /**
  * Displays a text input settings callback.
  */
-function wpinv_text_callback( $args ) {
+function wpinv_text_callback($args) {
 
 	?>
 		<label style="width: 100%;">
-			<input type="text" <?php wpinv_settings_attrs_helper( $args ); ?>>
-			<?php getpaid_settings_description_callback( $args ); ?>
+			<input type="text" <?php wpinv_settings_attrs_helper($args); ?>>
+			<?php getpaid_settings_description_callback($args); ?>
 		</label>
 	<?php
 
@@ -754,174 +754,174 @@ 
 /**
  * Displays a number input settings callback.
  */
-function wpinv_number_callback( $args ) {
+function wpinv_number_callback($args) {
 
 	?>
 		<label style="width: 100%;">
-			<input type="number" step="<?php echo esc_attr( $args['step'] ); ?>" max="<?php echo intval( $args['max'] ); ?>" min="<?php echo intval( $args['min'] ); ?>" <?php wpinv_settings_attrs_helper( $args ); ?>>
-			<?php getpaid_settings_description_callback( $args ); ?>
+			<input type="number" step="<?php echo esc_attr($args['step']); ?>" max="<?php echo intval($args['max']); ?>" min="<?php echo intval($args['min']); ?>" <?php wpinv_settings_attrs_helper($args); ?>>
+			<?php getpaid_settings_description_callback($args); ?>
 		</label>
 	<?php
 
 }
 
-function wpinv_textarea_callback( $args ) {
+function wpinv_textarea_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-    $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
+    $size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+    $class = (isset($args['class']) && !is_null($args['class'])) ? $args['class'] : 'large-text';
 
-	echo '<textarea class="' . esc_attr( $class ) . ' txtarea-' . esc_attr( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . esc_attr( $args['cols'] ) . '" rows="' . esc_attr( $args['rows'] ) . '" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	echo '<br /><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<textarea class="' . esc_attr($class) . ' txtarea-' . esc_attr($size) . ' wpi-' . esc_attr(sanitize_html_class($sanitize_id)) . ' " cols="' . esc_attr($args['cols']) . '" rows="' . esc_attr($args['rows']) . '" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']">' . esc_textarea(stripslashes($value)) . '</textarea>';
+	echo '<br /><label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_password_callback( $args ) {
+function wpinv_password_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	echo '<input type="password" class="' . esc_attr( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	echo '<input type="password" class="' . esc_attr($size) . '-text" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '"/>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_missing_callback( $args ) {
+function wpinv_missing_callback($args) {
 	printf(
-		esc_html__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
-		'<strong>' . esc_html( $args['id'] ) . '</strong>'
+		esc_html__('The callback function used for the %s setting is missing.', 'invoicing'),
+		'<strong>' . esc_html($args['id']) . '</strong>'
 	);
 }
 
 /**
  * Displays a number input settings callback.
  */
-function wpinv_select_callback( $args ) {
+function wpinv_select_callback($args) {
 
-	$desc   = wp_kses_post( $args['desc'] );
-	$desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$value  = isset( $args['std'] ) ? $args['std'] : '';
-	$value  = wpinv_get_option( $args['id'], $value );
-	$rand   = uniqid( 'random_id' );
+	$desc   = wp_kses_post($args['desc']);
+	$desc   = empty($desc) ? '' : "<p class='description'>$desc</p>";
+	$value  = isset($args['std']) ? $args['std'] : '';
+	$value  = wpinv_get_option($args['id'], $value);
+	$rand   = uniqid('random_id');
 
 	?>
 		<label style="width: 100%;">
-			<select <?php wpinv_settings_attrs_helper( $args ); ?> data-allow-clear="true">
-				<?php foreach ( $args['options'] as $option => $name ) : ?>
-					<option value="<?php echo esc_attr( $option ); ?>" <?php echo selected( $option, $value ); ?>><?php echo esc_html( $name ); ?></option>
+			<select <?php wpinv_settings_attrs_helper($args); ?> data-allow-clear="true">
+				<?php foreach ($args['options'] as $option => $name) : ?>
+					<option value="<?php echo esc_attr($option); ?>" <?php echo selected($option, $value); ?>><?php echo esc_html($name); ?></option>
 				<?php endforeach; ?>
 			</select>
 
-			<?php if ( substr( $args['id'], -5 ) === '_page' && is_numeric( $value ) ) : ?>
-				<a href="<?php echo esc_url( get_edit_post_link( $value ) ); ?>" target="_blank" class="button getpaid-page-setting-edit"><?php esc_html_e( 'Edit Page', 'invoicing' ); ?></a>
+			<?php if (substr($args['id'], -5) === '_page' && is_numeric($value)) : ?>
+				<a href="<?php echo esc_url(get_edit_post_link($value)); ?>" target="_blank" class="button getpaid-page-setting-edit"><?php esc_html_e('Edit Page', 'invoicing'); ?></a>
 			<?php endif; ?>
 
-			<?php if ( substr( $args['id'], -5 ) === '_page' && ! empty( $args['default_content'] ) ) : ?>
-				&nbsp;<a href="#TB_inline?&width=400&height=550&inlineId=<?php echo esc_attr( $rand ); ?>" class="button thickbox getpaid-page-setting-view-default"><?php esc_html_e( 'View Default Content', 'invoicing' ); ?></a>
-				<div id='<?php echo esc_attr( $rand ); ?>' style='display:none;'>
+			<?php if (substr($args['id'], -5) === '_page' && !empty($args['default_content'])) : ?>
+				&nbsp;<a href="#TB_inline?&width=400&height=550&inlineId=<?php echo esc_attr($rand); ?>" class="button thickbox getpaid-page-setting-view-default"><?php esc_html_e('View Default Content', 'invoicing'); ?></a>
+				<div id='<?php echo esc_attr($rand); ?>' style='display:none;'>
 					<div>
-						<h3><?php esc_html_e( 'Original Content', 'invoicing' ); ?></h3>
-						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php echo wp_kses_post( gepaid_trim_lines( $args['default_content'] ) ); ?></textarea>
-						<h3><?php esc_html_e( 'Current Content', 'invoicing' ); ?></h3>
-						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php $_post = get_post( $value ); echo empty( $_post ) ? '' : wp_kses_post( gepaid_trim_lines( $_post->post_content ) ); ?></textarea>
+						<h3><?php esc_html_e('Original Content', 'invoicing'); ?></h3>
+						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php echo wp_kses_post(gepaid_trim_lines($args['default_content'])); ?></textarea>
+						<h3><?php esc_html_e('Current Content', 'invoicing'); ?></h3>
+						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php $_post = get_post($value); echo empty($_post) ? '' : wp_kses_post(gepaid_trim_lines($_post->post_content)); ?></textarea>
 					</div>
 				</div>
 			<?php endif; ?>
 
-			<?php echo wp_kses_post( $desc ); ?>
+			<?php echo wp_kses_post($desc); ?>
 		</label>
 	<?php
 
 }
 
-function wpinv_color_select_callback( $args ) {
+function wpinv_color_select_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+	echo '<select id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $color['label'] ) . '</option>';
+	foreach ($args['options'] as $option => $color) {
+		echo '<option value="' . esc_attr($option) . '" ' . selected($option, $value) . '>' . esc_html($color['label']) . '</option>';
 	}
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_rich_editor_callback( $args ) {
+function wpinv_rich_editor_callback($args) {
 	global $wp_version;
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
+	if (!empty($args['allow_blank']) && empty($value)) {
 		$value = $std;
 	}
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+	$rows = isset($args['size']) ? $args['size'] : 20;
 
 	echo '<div class="getpaid-settings-editor-input">';
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+	if ($wp_version >= 3.3 && function_exists('wp_editor')) {
 		wp_editor(
-            stripslashes( $value ),
-            'wpinv_settings_' . esc_attr( $args['id'] ),
+            stripslashes($value),
+            'wpinv_settings_' . esc_attr($args['id']),
             array(
-				'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']',
-				'textarea_rows' => absint( $rows ),
+				'textarea_name' => 'wpinv_settings[' . esc_attr($args['id']) . ']',
+				'textarea_rows' => absint($rows),
 				'media_buttons' => false,
             )
         );
 	} else {
-		echo '<textarea class="large-text" rows="10" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+		echo '<textarea class="large-text" rows="10" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" class="wpi-' . esc_attr(sanitize_html_class($args['id'])) . '">' . esc_textarea(stripslashes($value)) . '</textarea>';
 	}
 
-	echo '</div><br/><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '</div><br/><label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_upload_callback( $args ) {
+function wpinv_upload_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	echo '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	echo '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . esc_attr__( 'Upload File', 'invoicing' ) . '"/></span>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	echo '<input type="text" class="' . sanitize_html_class($size) . '-text" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr(stripslashes($value)) . '"/>';
+	echo '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . esc_attr__('Upload File', 'invoicing') . '"/></span>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_color_callback( $args ) {
+function wpinv_color_callback($args) {
 
-	$std         = isset( $args['std'] ) ? $args['std'] : '';
-	$value       = wpinv_get_option( $args['id'], $std );
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+	$std         = isset($args['std']) ? $args['std'] : '';
+	$value       = wpinv_get_option($args['id'], $std);
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	echo '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '" data-default-color="' . esc_attr($std) . '" />';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_country_states_callback( $args ) {
+function wpinv_country_states_callback($args) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $args['placeholder'] ) ) {
+	if (isset($args['placeholder'])) {
 		$placeholder = $args['placeholder'];
 	} else {
 		$placeholder = '';
@@ -929,15 +929,15 @@ 
 
 	$states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? 'wpinv-no-states' : 'wpi_select2';
-	echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="' . esc_attr( $class ) . '" data-placeholder="' . esc_html( $placeholder ) . '"/>';
+	$class = empty($states) ? 'wpinv-no-states' : 'wpi_select2';
+	echo '<select id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" class="' . esc_attr($class) . '" data-placeholder="' . esc_html($placeholder) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $name ) . '</option>';
+	foreach ($states as $option => $name) {
+		echo '<option value="' . esc_attr($option) . '" ' . selected($option, $value) . '>' . esc_html($name) . '</option>';
 	}
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
@@ -951,7 +951,7 @@ 
 	</tr>
 	<tr class="bsui">
     	<td colspan="2" class="p-0">
-			<?php include plugin_dir_path( __FILE__ ) . 'views/html-tax-rates-edit.php'; ?>
+			<?php include plugin_dir_path(__FILE__) . 'views/html-tax-rates-edit.php'; ?>
 
 	<?php
 
@@ -960,11 +960,11 @@ 
 /**
  * Displays a tax rate' edit row.
  */
-function wpinv_tax_rate_callback( $tax_rate, $key ) {
+function wpinv_tax_rate_callback($tax_rate, $key) {
 
-	$key                      = sanitize_key( $key );
-	$tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
-	include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
+	$key                      = sanitize_key($key);
+	$tax_rate['reduced_rate'] = empty($tax_rate['reduced_rate']) ? 0 : $tax_rate['reduced_rate'];
+	include plugin_dir_path(__FILE__) . 'views/html-tax-rate-edit.php';
 
 }
 
@@ -978,177 +978,177 @@ 
 	</tr>
 	<tr class="bsui">
     	<td colspan="2" class="p-0">
-			<?php include plugin_dir_path( __FILE__ ) . 'views/html-tax-rules-edit.php'; ?>
+			<?php include plugin_dir_path(__FILE__) . 'views/html-tax-rules-edit.php'; ?>
 
 	<?php
 
 }
 
-function wpinv_tools_callback( $args ) {
+function wpinv_tools_callback($args) {
     ?>
     </td><tr>
     <td colspan="2" class="wpinv_tools_tdbox">
     <?php
-    if ( $args['desc'] ) {
+    if ($args['desc']) {
 ?>
-<p><?php echo wp_kses_post( $args['desc'] ); ?></p><?php } ?>
-    <?php do_action( 'wpinv_tools_before' ); ?>
+<p><?php echo wp_kses_post($args['desc']); ?></p><?php } ?>
+    <?php do_action('wpinv_tools_before'); ?>
     <table id="wpinv_tools_table" class="wp-list-table widefat fixed posts">
         <thead>
             <tr>
-                <th scope="col" class="wpinv-th-tool"><?php esc_html_e( 'Tool', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-desc"><?php esc_html_e( 'Description', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-action"><?php esc_html_e( 'Action', 'invoicing' ); ?></th>
+                <th scope="col" class="wpinv-th-tool"><?php esc_html_e('Tool', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-desc"><?php esc_html_e('Description', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-action"><?php esc_html_e('Action', 'invoicing'); ?></th>
             </tr>
         </thead>
 
         <tbody>
 			<tr>
-                <td><?php esc_html_e( 'Check Pages', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Check Pages', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Creates any missing GetPaid pages.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Creates any missing GetPaid pages.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+								add_query_arg('getpaid-admin-action', 'create_missing_pages'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php esc_html_e( 'Refresh Permalinks', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Refresh Permalinks', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Might fix the page not found error when viewing an invoice.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Might fix the page not found error when viewing an invoice.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'refresh_permalinks' ),
+								add_query_arg('getpaid-admin-action', 'refresh_permalinks'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php esc_html_e( 'Repair Database Tables', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Repair Database Tables', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Run this tool to create any missing database tables.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Run this tool to create any missing database tables.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+								add_query_arg('getpaid-admin-action', 'create_missing_tables'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php esc_html_e( 'Migrate old invoices', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Migrate old invoices', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'If your old invoices were not migrated after updating from Invoicing to GetPaid, you can use this tool to migrate them.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('If your old invoices were not migrated after updating from Invoicing to GetPaid, you can use this tool to migrate them.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
+								add_query_arg('getpaid-admin-action', 'migrate_old_invoices'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 
 			<tr>
-                <td><?php esc_html_e( 'Recalculate Discounts', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Recalculate Discounts', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Recalculate discounts for existing invoices that have discount codes but are not discounted.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Recalculate discounts for existing invoices that have discount codes but are not discounted.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
+								add_query_arg('getpaid-admin-action', 'recalculate_discounts'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 
 			<tr>
-                <td><?php esc_html_e( 'Set-up Wizard', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Set-up Wizard', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Launch the quick set-up wizard.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Launch the quick set-up wizard.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
-						echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
+						echo esc_url(admin_url('index.php?page=gp-setup'));
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Launch', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Launch', 'invoicing'); ?></a>
                 </td>
             </tr>
 
-			<?php do_action( 'wpinv_tools_row' ); ?>
+			<?php do_action('wpinv_tools_row'); ?>
         </tbody>
     </table>
-    <?php do_action( 'wpinv_tools_after' ); ?>
+    <?php do_action('wpinv_tools_after'); ?>
     <?php
 }
 
 
-function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+function wpinv_descriptive_text_callback($args) {
+	echo wp_kses_post($args['desc']);
 }
 
-function wpinv_raw_html_callback( $args ) {
-	echo wp_kses( $args['desc'], getpaid_allowed_html() );
+function wpinv_raw_html_callback($args) {
+	echo wp_kses($args['desc'], getpaid_allowed_html());
 }
 
-function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+function wpinv_hook_callback($args) {
+	do_action('wpinv_' . $args['id'], $args);
 }
 
 function wpinv_set_settings_cap() {
 	return wpinv_get_capability();
 }
-add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
+add_filter('option_page_capability_wpinv_settings', 'wpinv_set_settings_cap');
 
 
-function wpinv_on_update_settings( $old_value, $value, $option ) {
-    $old = ! empty( $old_value['remove_data_on_unistall'] ) ? 1 : '';
-    $new = ! empty( $value['remove_data_on_unistall'] ) ? 1 : '';
+function wpinv_on_update_settings($old_value, $value, $option) {
+    $old = !empty($old_value['remove_data_on_unistall']) ? 1 : '';
+    $new = !empty($value['remove_data_on_unistall']) ? 1 : '';
 
-    if ( $old != $new ) {
-        update_option( 'wpinv_remove_data_on_invoice_unistall', $new );
+    if ($old != $new) {
+        update_option('wpinv_remove_data_on_invoice_unistall', $new);
     }
 }
-add_action( 'update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3 );
+add_action('update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3);
 
 
 /**
@@ -1160,43 +1160,43 @@ 
  *
  * @return array
  */
-function wpinv_get_email_merge_tags( $subscription = false ) {
+function wpinv_get_email_merge_tags($subscription = false) {
 	$merge_tags = array(
-		'{site_title}'           => __( 'Site Title', 'invoicing' ),
-		'{name}'                 => __( "Customer's full name", 'invoicing' ),
-		'{first_name}'           => __( "Customer's first name", 'invoicing' ),
-		'{last_name}'            => __( "Customer's last name", 'invoicing' ),
-		'{email}'                => __( "Customer's email address", 'invoicing' ),
-		'{invoice_number}'       => __( 'The invoice number', 'invoicing' ),
-		'{invoice_currency}'     => __( 'The invoice currency', 'invoicing' ),
-		'{invoice_total}'        => __( 'The invoice total', 'invoicing' ),
-		'{invoice_link}'         => __( 'The invoice link', 'invoicing' ),
-		'{invoice_pay_link}'     => __( 'The payment link', 'invoicing' ),
-		'{invoice_receipt_link}' => __( 'The receipt link', 'invoicing' ),
-		'{invoice_date}'         => __( 'The date the invoice was created', 'invoicing' ),
-		'{invoice_due_date}'     => __( 'The date the invoice is due', 'invoicing' ),
-		'{date}'                 => __( "Today's date", 'invoicing' ),
-		'{is_was}'               => __( 'If due date of invoice is past, displays "was" otherwise displays "is"', 'invoicing' ),
-		'{invoice_label}'        => __( 'Invoices/quotes singular name. Ex: Invoice/Quote', 'invoicing' ),
-		'{invoice_quote}'        => __( 'Invoices/quotes singular name in small letters. Ex: invoice/quote', 'invoicing' ),
-		'{invoice_description}'  => __( 'The description of the invoice', 'invoicing' ),
+		'{site_title}'           => __('Site Title', 'invoicing'),
+		'{name}'                 => __("Customer's full name", 'invoicing'),
+		'{first_name}'           => __("Customer's first name", 'invoicing'),
+		'{last_name}'            => __("Customer's last name", 'invoicing'),
+		'{email}'                => __("Customer's email address", 'invoicing'),
+		'{invoice_number}'       => __('The invoice number', 'invoicing'),
+		'{invoice_currency}'     => __('The invoice currency', 'invoicing'),
+		'{invoice_total}'        => __('The invoice total', 'invoicing'),
+		'{invoice_link}'         => __('The invoice link', 'invoicing'),
+		'{invoice_pay_link}'     => __('The payment link', 'invoicing'),
+		'{invoice_receipt_link}' => __('The receipt link', 'invoicing'),
+		'{invoice_date}'         => __('The date the invoice was created', 'invoicing'),
+		'{invoice_due_date}'     => __('The date the invoice is due', 'invoicing'),
+		'{date}'                 => __("Today's date", 'invoicing'),
+		'{is_was}'               => __('If due date of invoice is past, displays "was" otherwise displays "is"', 'invoicing'),
+		'{invoice_label}'        => __('Invoices/quotes singular name. Ex: Invoice/Quote', 'invoicing'),
+		'{invoice_quote}'        => __('Invoices/quotes singular name in small letters. Ex: invoice/quote', 'invoicing'),
+		'{invoice_description}'  => __('The description of the invoice', 'invoicing'),
 	);
 
-	if ( $subscription ) {
+	if ($subscription) {
 		$merge_tags = array_merge(
 			$merge_tags,
 			array(
-				'{subscription_renewal_date}'     => __( 'The next renewal date of the subscription', 'invoicing' ),
-				'{subscription_created}'          => __( "The subscription's creation date", 'invoicing' ),
-				'{subscription_status}'           => __( "The subscription's status", 'invoicing' ),
-				'{subscription_profile_id}'       => __( "The subscription's remote profile id", 'invoicing' ),
-				'{subscription_id}'               => __( "The subscription's id", 'invoicing' ),
-				'{subscription_recurring_amount}' => __( 'The renewal amount of the subscription', 'invoicing' ),
-				'{subscription_initial_amount}'   => __( 'The initial amount of the subscription', 'invoicing' ),
-				'{subscription_recurring_period}' => __( 'The recurring period of the subscription (e.g 1 year)', 'invoicing' ),
-				'{subscription_bill_times}'       => __( 'The maximum number of times the subscription can be renewed', 'invoicing' ),
-				'{subscription_url}'              => __( 'The URL to manage a subscription', 'invoicing' ),
-				'{subscription_name}'             => __( 'The name of the recurring item', 'invoicing' ),
+				'{subscription_renewal_date}'     => __('The next renewal date of the subscription', 'invoicing'),
+				'{subscription_created}'          => __("The subscription's creation date", 'invoicing'),
+				'{subscription_status}'           => __("The subscription's status", 'invoicing'),
+				'{subscription_profile_id}'       => __("The subscription's remote profile id", 'invoicing'),
+				'{subscription_id}'               => __("The subscription's id", 'invoicing'),
+				'{subscription_recurring_amount}' => __('The renewal amount of the subscription', 'invoicing'),
+				'{subscription_initial_amount}'   => __('The initial amount of the subscription', 'invoicing'),
+				'{subscription_recurring_period}' => __('The recurring period of the subscription (e.g 1 year)', 'invoicing'),
+				'{subscription_bill_times}'       => __('The maximum number of times the subscription can be renewed', 'invoicing'),
+				'{subscription_url}'              => __('The URL to manage a subscription', 'invoicing'),
+				'{subscription_name}'             => __('The name of the recurring item', 'invoicing'),
 			)
 		);
 	}
@@ -1212,25 +1212,25 @@ 
  *
  * @return string
  */
-function wpinv_get_merge_tags_help_text( $subscription = false ) {
-	$merge_tags = wpinv_get_email_merge_tags( $subscription );
+function wpinv_get_merge_tags_help_text($subscription = false) {
+	$merge_tags = wpinv_get_email_merge_tags($subscription);
 
 	$output = '<div class="bsui">';
 
 	$link = sprintf(
 		'<strong class="getpaid-merge-tags text-primary" role="button">%s</strong>',
-		esc_html__( 'View available merge tags.', 'invoicing' )
+		esc_html__('View available merge tags.', 'invoicing')
 	);
 
-	$description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
+	$description = esc_html__('The content of the email (Merge Tags and HTML are allowed).', 'invoicing');
 	
 	$output .= "$description $link";
 
 	$output .= '<div class="getpaid-merge-tags-content mt-2 p-1 d-none">';
-	$output .= '<p class="mb-2">' . esc_html__( 'The following wildcards can be used in email subjects, heading and content:', 'invoicing' ) . '</p>';
+	$output .= '<p class="mb-2">' . esc_html__('The following wildcards can be used in email subjects, heading and content:', 'invoicing') . '</p>';
 
 	$output .= '<ul class="p-0 m-0">';
-	foreach($merge_tags as $tag => $tag_description) {
+	foreach ($merge_tags as $tag => $tag_description) {
 		$output .= "<li class='mb-2'><strong class='text-dark'>$tag</strong> &mdash; $tag_description</li>";
 	}
 

includes/api/class-getpaid-rest-report-sales-controller.php

Indentation +679 added lines, -679 removed lines

@@ -18,688 +18,688 @@
  */
 class GetPaid_REST_Report_Sales_Controller extends GetPaid_REST_Date_Based_Controller {
 
-	/**
-	 * Route base.
-	 *
-	 * @var string
-	 */
-	protected $rest_base = 'reports/sales';
-
-	/**
-	 * The report data.
-	 *
-	 * @var stdClass
-	 */
-	public $report_data;
-
-	/**
-	 * The report range.
-	 *
-	 * @var array
-	 */
-	public $report_range;
-
-	/**
-	 * Registers the routes for the objects of the controller.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @see register_rest_route()
-	 */
-	public function register_namespace_routes( $namespace ) {
-
-		// Get sales report.
-		register_rest_route(
-			$namespace,
-			$this->rest_base,
-			array(
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_items' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
-					'args'                => $this->get_collection_params(),
-				),
-				'schema' => array( $this, 'get_public_item_schema' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Makes sure the current user has access to READ the report APIs.
-	 *
-	 * @since  2.0.0
-	 * @param WP_REST_Request $request Full data about the request.
-	 * @return WP_Error|boolean
-	 */
-	public function get_items_permissions_check( $request ) {
-
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error( 'rest_cannot_view', __( 'Sorry, you cannot list resources.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Get sales reports.
-	 *
-	 * @param WP_REST_Request $request
-	 * @return array|WP_Error
-	 */
-	public function get_items( $request ) {
-		$data   = array();
-		$item   = $this->prepare_item_for_response( null, $request );
-		$data[] = $this->prepare_response_for_collection( $item );
-
-		return rest_ensure_response( $data );
-	}
-
-	/**
-	 * Prepare a report sales object for serialization.
-	 *
-	 * @param null $_
-	 * @param WP_REST_Request $request Request object.
-	 * @return WP_REST_Response $response Response data.
-	 */
-	public function prepare_item_for_response( $_, $request ) {
-
-		// Set report range.
-		$this->report_range = $this->get_date_range( $request );
-
-		$report_data     = $this->get_report_data();
-		$period_totals   = array();
-
-		// Setup period totals by ensuring each period in the interval has data.
-		$start_date      = strtotime( $this->report_range['after'] );
-
-		if ( 'month' === $this->groupby ) {
-			$start_date      = strtotime( gmdate( 'Y-m-01', $start_date ) );
-		}
-
-		for ( $i = 0; $i < $this->interval; $i++ ) {
-
-			switch ( $this->groupby ) {
-				case 'day':
-					$time = gmdate( 'Y-m-d', strtotime( "+{$i} DAY", $start_date ) );
-					break;
-				default:
-					$time = gmdate( 'Y-m', strtotime( "+{$i} MONTH", $start_date ) );
-					break;
-			}
-
-			// Set the defaults for each period.
-			$period_totals[ $time ] = array(
-				'invoices'          => 0,
-				'items'             => 0,
-				'refunded_items'    => 0,
-				'refunded_tax'      => wpinv_round_amount( 0.00 ),
-				'subtotal'          => wpinv_round_amount( 0.00 ),
-				'refunded_subtotal' => wpinv_round_amount( 0.00 ),
-				'refunded_fees'     => wpinv_round_amount( 0.00 ),
-				'discount'          => wpinv_round_amount( 0.00 ),
-			);
-
-			foreach ( array_keys( wpinv_get_report_graphs() ) as $key ) {
-				if ( ! isset( $period_totals[ $time ][ $key ] ) ) {
-					$period_totals[ $time ][ $key ] = wpinv_round_amount( 0.00 );
-				}
-			}
-		}
-
-		// add total sales, total invoice count, total tax for each period
-		$date_format = ( 'day' === $this->groupby ) ? 'Y-m-d' : 'Y-m';
-		foreach ( $report_data->invoices as $invoice ) {
-			$time = gmdate( $date_format, strtotime( $invoice->post_date ) );
-
-			if ( ! isset( $period_totals[ $time ] ) ) {
-				continue;
-			}
-
-			$period_totals[ $time ]['sales']    = wpinv_round_amount( $invoice->total_sales );
-			$period_totals[ $time ]['tax']      = wpinv_round_amount( $invoice->total_tax );
-			$period_totals[ $time ]['subtotal'] = wpinv_round_amount( $invoice->subtotal );
-			$period_totals[ $time ]['fees']     = wpinv_round_amount( $invoice->total_fees );
-
-		}
-
-		foreach ( $report_data->refunds as $invoice ) {
-			$time = gmdate( $date_format, strtotime( $invoice->post_date ) );
-
-			if ( ! isset( $period_totals[ $time ] ) ) {
-				continue;
-			}
-
-			$period_totals[ $time ]['refunds']           = wpinv_round_amount( $invoice->total_sales );
-			$period_totals[ $time ]['refunded_tax']      = wpinv_round_amount( $invoice->total_tax );
-			$period_totals[ $time ]['refunded_subtotal'] = wpinv_round_amount( $invoice->subtotal );
-			$period_totals[ $time ]['refunded_fees']     = wpinv_round_amount( $invoice->total_fees );
-
-		}
-
-		foreach ( $report_data->invoice_counts as $invoice ) {
-			$time = gmdate( $date_format, strtotime( $invoice->post_date ) );
-
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['invoices']   = (int) $invoice->count;
-			}
-		}
-
-		// Add total invoice items for each period.
-		foreach ( $report_data->invoice_items as $invoice_item ) {
-			$time = ( 'day' === $this->groupby ) ? gmdate( 'Y-m-d', strtotime( $invoice_item->post_date ) ) : gmdate( 'Y-m', strtotime( $invoice_item->post_date ) );
-
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['items'] = (int) $invoice_item->invoice_item_count;
-			}
-		}
-
-		// Add total discount for each period.
-		foreach ( $report_data->coupons as $discount ) {
-			$time = ( 'day' === $this->groupby ) ? gmdate( 'Y-m-d', strtotime( $discount->post_date ) ) : gmdate( 'Y-m', strtotime( $discount->post_date ) );
-
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['discount'] = wpinv_round_amount( $discount->discount_amount );
-			}
-		}
-
-		// Extra fields.
-		foreach ( array_keys( wpinv_get_report_graphs() ) as $key ) {
-
-			// Abort unprepared.
-			if ( ! isset( $report_data->$key ) ) {
-				continue;
-			} 
-
-			// Abort defaults.
-			if ( in_array( $key, array( 'sales', 'refunds', 'tax', 'fees', 'discount', 'invoices', 'items' ) ) ) {
-				continue;
-			}
-
-			// Set values.
-			foreach ( $report_data->$key as $item ) {
-				$time = ( 'day' === $this->groupby ) ? gmdate( 'Y-m-d', strtotime( $item->date ) ) : gmdate( 'Y-m', strtotime( $item->date ) );
-
-				if ( isset( $period_totals[ $time ] ) ) {
-					$period_totals[ $time ][ $key ] = wpinv_round_amount( $item->val );
-				}
-			}
-
-			unset( $report_data->$key );
-		}
-
-		$report_data->totals            = $period_totals;
-		$report_data->grouped_by        = $this->groupby;
-		$report_data->interval          = max( $this->interval, 1 );
-		$report_data->currency          = wpinv_get_currency();
-		$report_data->currency_symbol   = wpinv_currency_symbol();
-		$report_data->currency_position = wpinv_currency_position();
-		$report_data->decimal_places    = wpinv_decimals();
-		$report_data->thousands_sep     = wpinv_thousands_separator();
-		$report_data->decimals_sep      = wpinv_decimal_separator();
-		$report_data->start_date        = gmdate( 'Y-m-d', strtotime( $this->report_range['after'] ) );
-		$report_data->end_date          = gmdate( 'Y-m-d', strtotime( $this->report_range['before'] ) );
-		$report_data->start_date_locale = getpaid_format_date( gmdate( 'Y-m-d', strtotime( $this->report_range['after'] ) ) );
-		$report_data->end_date_locale   = getpaid_format_date( gmdate( 'Y-m-d', strtotime( $this->report_range['before'] ) ) );
-		$report_data->decimals_sep      = wpinv_decimal_separator();
-
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $report_data;
-		unset( $data->invoice_counts, $data->invoices, $data->coupons, $data->refunds, $data->invoice_items );
-		$data    = $this->add_additional_fields_to_object( (array) $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
-
-		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
-		$response->add_links(
+    /**
+     * Route base.
+     *
+     * @var string
+     */
+    protected $rest_base = 'reports/sales';
+
+    /**
+     * The report data.
+     *
+     * @var stdClass
+     */
+    public $report_data;
+
+    /**
+     * The report range.
+     *
+     * @var array
+     */
+    public $report_range;
+
+    /**
+     * Registers the routes for the objects of the controller.
+     *
+     * @since 2.0.0
+     *
+     * @see register_rest_route()
+     */
+    public function register_namespace_routes( $namespace ) {
+
+        // Get sales report.
+        register_rest_route(
+            $namespace,
+            $this->rest_base,
             array(
-				'about' => array(
-					'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
-				),
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_items' ),
+                    'permission_callback' => array( $this, 'get_items_permissions_check' ),
+                    'args'                => $this->get_collection_params(),
+                ),
+                'schema' => array( $this, 'get_public_item_schema' ),
             )
         );
 
-		return apply_filters( 'getpaid_rest_prepare_report_sales', $response, $report_data, $request );
-	}
-
-	/**
-	 * Get report data.
-	 *
-	 * @return stdClass
-	 */
-	public function get_report_data() {
-		if ( empty( $this->report_data ) ) {
-			$this->query_report_data();
-		}
-		return $this->report_data;
-	}
-
-	/**
-	 * Get all data needed for this report and store in the class.
-	 */
-	protected function query_report_data() {
-
-		// Prepare reports.
-		$this->report_data = (object) array(
-			'invoice_counts' => $this->query_invoice_counts(), //count, post_date
-			'coupons'        => $this->query_coupon_counts(), // discount_amount, post_date
-			'invoice_items'  => $this->query_item_counts(), // invoice_item_count, post_date
-			'refunded_items' => $this->count_refunded_items(), // invoice_item_count, post_date
-			'invoices'       => $this->query_invoice_totals(), // total_sales, total_tax, total_discount, total_fees, subtotal, post_date
-			'refunds'        => $this->query_refunded_totals(), // total_sales, total_tax, total_discount, total_fees, subtotal, post_date
-			'previous_range' => $this->previous_range,
-		);
-
-		// Calculated totals.
-		$this->report_data->total_tax          = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_tax' ) ) );
-		$this->report_data->total_sales        = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_sales' ) ) );
-		$this->report_data->total_discount     = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_discount' ) ) );
-		$this->report_data->total_fees         = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_fees' ) ) );
-		$this->report_data->subtotal           = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'subtotal' ) ) );
-		$this->report_data->net_sales          = wpinv_round_amount( $this->report_data->total_sales - max( 0, $this->report_data->total_tax ) );
-		$this->report_data->total_refunded_tax = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_tax' ) ) );
-		$this->report_data->total_refunds      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_sales' ) ) );
-		$this->report_data->refunded_discount  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_discount' ) ) );
-		$this->report_data->refunded_fees      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_fees' ) ) );
-		$this->report_data->refunded_subtotal  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'subtotal' ) ) );
-		$this->report_data->net_refunds        = wpinv_round_amount( $this->report_data->total_refunds + max( 0, $this->report_data->total_refunded_tax ) );
-
-		// Calculate average based on net.
-		$this->report_data->average_sales       = wpinv_round_amount( $this->report_data->net_sales / max( $this->interval, 1 ), 2 );
-		$this->report_data->average_total_sales = wpinv_round_amount( $this->report_data->total_sales / max( $this->interval, 1 ), 2 );
-
-		// Total invoices in this period, even if refunded.
-		$this->report_data->total_invoices = absint( array_sum( wp_list_pluck( $this->report_data->invoice_counts, 'count' ) ) );
-
-		// Items invoiced in this period, even if refunded.
-		$this->report_data->total_items = absint( array_sum( wp_list_pluck( $this->report_data->invoice_items, 'invoice_item_count' ) ) );
-
-		// 3rd party filtering of report data
-		$this->report_data = apply_filters( 'getpaid_rest_api_filter_report_data', $this->report_data, $this );
-	}
-
-	/**
-	 * Prepares invoice counts.
-	 *
-	 * @return array.
-	 */
-	protected function query_invoice_counts() {
-
-		return (array) GetPaid_Reports_Helper::get_invoice_report_data(
-			array(
-				'data'           => array(
-					'ID'        => array(
-						'type'     => 'post_data',
-						'function' => 'COUNT',
-						'name'     => 'count',
-						'distinct' => true,
-					),
-					'post_date' => array(
-						'type'     => 'post_data',
-						'function' => 'MIN',
-						'name'     => 'post_date',
-					),
-				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
-				'order_by'       => 'post_date ASC',
-				'query_type'     => 'get_results',
-				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Prepares coupon counts.
-	 *
-	 * @return array.
-	 */
-	protected function query_coupon_counts() {
-
-		return (array) GetPaid_Reports_Helper::get_invoice_report_data(
-			array(
-				'data'           => array(
-					'discount'  => array(
-						'type'     => 'invoice_data',
-						'function' => 'SUM',
-						'name'     => 'discount_amount',
-					),
-					'post_date' => array(
-						'type'     => 'post_data',
-						'function' => 'MIN',
-						'name'     => 'post_date',
-					),
-				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
-				'order_by'       => 'post_date ASC',
-				'query_type'     => 'get_results',
-				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Prepares item counts.
-	 *
-	 * @return array.
-	 */
-	protected function query_item_counts() {
-
-		return (array) GetPaid_Reports_Helper::get_invoice_report_data(
-			array(
-				'data'           => array(
-					'quantity'  => array(
-						'type'     => 'invoice_item',
-						'function' => 'SUM',
-						'name'     => 'invoice_item_count',
-					),
-					'post_date' => array(
-						'type'     => 'post_data',
-						'function' => 'MIN',
-						'name'     => 'post_date',
-					),
-				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
-				'order_by'       => 'post_date ASC',
-				'query_type'     => 'get_results',
-				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Prepares refunded item counts.
-	 *
-	 * @return array.
-	 */
-	protected function count_refunded_items() {
-
-		return (int) GetPaid_Reports_Helper::get_invoice_report_data(
-			array(
-				'data'           => array(
-					'quantity' => array(
-						'type'     => 'invoice_item',
-						'function' => 'SUM',
-						'name'     => 'invoice_item_count',
-					),
-				),
-				'query_type'     => 'get_var',
-				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'wpi-refunded' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Prepares daily invoice totals.
-	 *
-	 * @return array.
-	 */
-	protected function query_invoice_totals() {
-
-		return (array) GetPaid_Reports_Helper::get_invoice_report_data(
-			array(
-				'data'           => array(
-					'total'      => array(
-						'type'     => 'invoice_data',
-						'function' => 'SUM',
-						'name'     => 'total_sales',
-					),
-					'tax'        => array(
-						'type'     => 'invoice_data',
-						'function' => 'SUM',
-						'name'     => 'total_tax',
-					),
-					'discount'   => array(
-						'type'     => 'invoice_data',
-						'function' => 'SUM',
-						'name'     => 'total_discount',
-					),
-					'fees_total' => array(
-						'type'     => 'invoice_data',
-						'function' => 'SUM',
-						'name'     => 'total_fees',
-					),
-					'subtotal'   => array(
-						'type'     => 'invoice_data',
-						'function' => 'SUM',
-						'name'     => 'subtotal',
-					),
-					'post_date'  => array(
-						'type'     => 'post_data',
-						'function' => '',
-						'name'     => 'post_date',
-					),
-				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
-				'order_by'       => 'post_date ASC',
-				'query_type'     => 'get_results',
-				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-renewal' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Prepares daily invoice totals.
-	 *
-	 * @return array.
-	 */
-	protected function query_refunded_totals() {
-
-		return (array) GetPaid_Reports_Helper::get_invoice_report_data(
-			array(
-				'data'           => array(
-					'total'      => array(
-						'type'     => 'invoice_data',
-						'function' => 'SUM',
-						'name'     => 'total_sales',
-					),
-					'tax'        => array(
-						'type'     => 'invoice_data',
-						'function' => 'SUM',
-						'name'     => 'total_tax',
-					),
-					'discount'   => array(
-						'type'     => 'invoice_data',
-						'function' => 'SUM',
-						'name'     => 'total_discount',
-					),
-					'fees_total' => array(
-						'type'     => 'invoice_data',
-						'function' => 'SUM',
-						'name'     => 'total_fees',
-					),
-					'subtotal'   => array(
-						'type'     => 'invoice_data',
-						'function' => 'SUM',
-						'name'     => 'subtotal',
-					),
-					'post_date'  => array(
-						'type'     => 'post_data',
-						'function' => '',
-						'name'     => 'post_date',
-					),
-				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
-				'order_by'       => 'post_date ASC',
-				'query_type'     => 'get_results',
-				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'wpi-refunded' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Get the Report's schema, conforming to JSON Schema.
-	 *
-	 * @return array
-	 */
-	public function get_item_schema() {
-
-		$schema = array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => 'sales_report',
-			'type'       => 'object',
-			'properties' => array(
-				'total_sales'         => array(
-					'description' => __( 'Gross sales in the period.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'net_sales'           => array(
-					'description' => __( 'Net sales in the period.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'average_sales'       => array(
-					'description' => __( 'Average net daily sales.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'average_total_sales' => array(
-					'description' => __( 'Average gross daily sales.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'total_invoices'      => array(
-					'description' => __( 'Number of paid invoices.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'total_items'         => array(
-					'description' => __( 'Number of items purchased.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'refunded_items'      => array(
-					'description' => __( 'Number of items refunded.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'total_tax'           => array(
-					'description' => __( 'Total charged for taxes.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'total_refunded_tax'  => array(
-					'description' => __( 'Total refunded for taxes.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'total_fees'          => array(
-					'description' => __( 'Total fees charged.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'total_refunds'       => array(
-					'description' => __( 'Total of refunded invoices.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'net_refunds'         => array(
-					'description' => __( 'Net of refunded invoices.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'total_discount'      => array(
-					'description' => __( 'Total of discounts used.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'totals'              => array(
-					'description' => __( 'Totals.', 'invoicing' ),
-					'type'        => 'array',
-					'items'       => array(
-						'type' => 'array',
-					),
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'interval'            => array(
-					'description' => __( 'Number of months/days in the report period.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'previous_range'      => array(
-					'description' => __( 'The previous report period.', 'invoicing' ),
-					'type'        => 'array',
-					'items'       => array(
-						'type' => 'string',
-					),
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'grouped_by'          => array(
-					'description' => __( 'The period used to group the totals.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'enum'        => array( 'day', 'month' ),
-					'readonly'    => true,
-				),
-				'currency'            => array(
-					'description' => __( 'The default store currency.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'currency_symbol'     => array(
-					'description' => __( 'The default store currency symbol.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'currency_position'   => array(
-					'description' => __( 'The default store currency position.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'decimal_places'      => array(
-					'description' => __( 'The default store decimal places.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'thousands_sep'       => array(
-					'description' => __( 'The default store thousands separator.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'decimals_sep'        => array(
-					'description' => __( 'The default store decimals separator.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-			),
-		);
-
-		return $this->add_additional_fields_schema( $schema );
-
-	}
+    }
+
+    /**
+     * Makes sure the current user has access to READ the report APIs.
+     *
+     * @since  2.0.0
+     * @param WP_REST_Request $request Full data about the request.
+     * @return WP_Error|boolean
+     */
+    public function get_items_permissions_check( $request ) {
+
+        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+            return new WP_Error( 'rest_cannot_view', __( 'Sorry, you cannot list resources.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+        }
+
+        return true;
+    }
+
+    /**
+     * Get sales reports.
+     *
+     * @param WP_REST_Request $request
+     * @return array|WP_Error
+     */
+    public function get_items( $request ) {
+        $data   = array();
+        $item   = $this->prepare_item_for_response( null, $request );
+        $data[] = $this->prepare_response_for_collection( $item );
+
+        return rest_ensure_response( $data );
+    }
+
+    /**
+     * Prepare a report sales object for serialization.
+     *
+     * @param null $_
+     * @param WP_REST_Request $request Request object.
+     * @return WP_REST_Response $response Response data.
+     */
+    public function prepare_item_for_response( $_, $request ) {
+
+        // Set report range.
+        $this->report_range = $this->get_date_range( $request );
+
+        $report_data     = $this->get_report_data();
+        $period_totals   = array();
+
+        // Setup period totals by ensuring each period in the interval has data.
+        $start_date      = strtotime( $this->report_range['after'] );
+
+        if ( 'month' === $this->groupby ) {
+            $start_date      = strtotime( gmdate( 'Y-m-01', $start_date ) );
+        }
+
+        for ( $i = 0; $i < $this->interval; $i++ ) {
+
+            switch ( $this->groupby ) {
+                case 'day':
+                    $time = gmdate( 'Y-m-d', strtotime( "+{$i} DAY", $start_date ) );
+                    break;
+                default:
+                    $time = gmdate( 'Y-m', strtotime( "+{$i} MONTH", $start_date ) );
+                    break;
+            }
+
+            // Set the defaults for each period.
+            $period_totals[ $time ] = array(
+                'invoices'          => 0,
+                'items'             => 0,
+                'refunded_items'    => 0,
+                'refunded_tax'      => wpinv_round_amount( 0.00 ),
+                'subtotal'          => wpinv_round_amount( 0.00 ),
+                'refunded_subtotal' => wpinv_round_amount( 0.00 ),
+                'refunded_fees'     => wpinv_round_amount( 0.00 ),
+                'discount'          => wpinv_round_amount( 0.00 ),
+            );
+
+            foreach ( array_keys( wpinv_get_report_graphs() ) as $key ) {
+                if ( ! isset( $period_totals[ $time ][ $key ] ) ) {
+                    $period_totals[ $time ][ $key ] = wpinv_round_amount( 0.00 );
+                }
+            }
+        }
+
+        // add total sales, total invoice count, total tax for each period
+        $date_format = ( 'day' === $this->groupby ) ? 'Y-m-d' : 'Y-m';
+        foreach ( $report_data->invoices as $invoice ) {
+            $time = gmdate( $date_format, strtotime( $invoice->post_date ) );
+
+            if ( ! isset( $period_totals[ $time ] ) ) {
+                continue;
+            }
+
+            $period_totals[ $time ]['sales']    = wpinv_round_amount( $invoice->total_sales );
+            $period_totals[ $time ]['tax']      = wpinv_round_amount( $invoice->total_tax );
+            $period_totals[ $time ]['subtotal'] = wpinv_round_amount( $invoice->subtotal );
+            $period_totals[ $time ]['fees']     = wpinv_round_amount( $invoice->total_fees );
+
+        }
+
+        foreach ( $report_data->refunds as $invoice ) {
+            $time = gmdate( $date_format, strtotime( $invoice->post_date ) );
+
+            if ( ! isset( $period_totals[ $time ] ) ) {
+                continue;
+            }
+
+            $period_totals[ $time ]['refunds']           = wpinv_round_amount( $invoice->total_sales );
+            $period_totals[ $time ]['refunded_tax']      = wpinv_round_amount( $invoice->total_tax );
+            $period_totals[ $time ]['refunded_subtotal'] = wpinv_round_amount( $invoice->subtotal );
+            $period_totals[ $time ]['refunded_fees']     = wpinv_round_amount( $invoice->total_fees );
+
+        }
+
+        foreach ( $report_data->invoice_counts as $invoice ) {
+            $time = gmdate( $date_format, strtotime( $invoice->post_date ) );
+
+            if ( isset( $period_totals[ $time ] ) ) {
+                $period_totals[ $time ]['invoices']   = (int) $invoice->count;
+            }
+        }
+
+        // Add total invoice items for each period.
+        foreach ( $report_data->invoice_items as $invoice_item ) {
+            $time = ( 'day' === $this->groupby ) ? gmdate( 'Y-m-d', strtotime( $invoice_item->post_date ) ) : gmdate( 'Y-m', strtotime( $invoice_item->post_date ) );
+
+            if ( isset( $period_totals[ $time ] ) ) {
+                $period_totals[ $time ]['items'] = (int) $invoice_item->invoice_item_count;
+            }
+        }
+
+        // Add total discount for each period.
+        foreach ( $report_data->coupons as $discount ) {
+            $time = ( 'day' === $this->groupby ) ? gmdate( 'Y-m-d', strtotime( $discount->post_date ) ) : gmdate( 'Y-m', strtotime( $discount->post_date ) );
+
+            if ( isset( $period_totals[ $time ] ) ) {
+                $period_totals[ $time ]['discount'] = wpinv_round_amount( $discount->discount_amount );
+            }
+        }
+
+        // Extra fields.
+        foreach ( array_keys( wpinv_get_report_graphs() ) as $key ) {
+
+            // Abort unprepared.
+            if ( ! isset( $report_data->$key ) ) {
+                continue;
+            } 
+
+            // Abort defaults.
+            if ( in_array( $key, array( 'sales', 'refunds', 'tax', 'fees', 'discount', 'invoices', 'items' ) ) ) {
+                continue;
+            }
+
+            // Set values.
+            foreach ( $report_data->$key as $item ) {
+                $time = ( 'day' === $this->groupby ) ? gmdate( 'Y-m-d', strtotime( $item->date ) ) : gmdate( 'Y-m', strtotime( $item->date ) );
+
+                if ( isset( $period_totals[ $time ] ) ) {
+                    $period_totals[ $time ][ $key ] = wpinv_round_amount( $item->val );
+                }
+            }
+
+            unset( $report_data->$key );
+        }
+
+        $report_data->totals            = $period_totals;
+        $report_data->grouped_by        = $this->groupby;
+        $report_data->interval          = max( $this->interval, 1 );
+        $report_data->currency          = wpinv_get_currency();
+        $report_data->currency_symbol   = wpinv_currency_symbol();
+        $report_data->currency_position = wpinv_currency_position();
+        $report_data->decimal_places    = wpinv_decimals();
+        $report_data->thousands_sep     = wpinv_thousands_separator();
+        $report_data->decimals_sep      = wpinv_decimal_separator();
+        $report_data->start_date        = gmdate( 'Y-m-d', strtotime( $this->report_range['after'] ) );
+        $report_data->end_date          = gmdate( 'Y-m-d', strtotime( $this->report_range['before'] ) );
+        $report_data->start_date_locale = getpaid_format_date( gmdate( 'Y-m-d', strtotime( $this->report_range['after'] ) ) );
+        $report_data->end_date_locale   = getpaid_format_date( gmdate( 'Y-m-d', strtotime( $this->report_range['before'] ) ) );
+        $report_data->decimals_sep      = wpinv_decimal_separator();
+
+        $context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+        $data    = $report_data;
+        unset( $data->invoice_counts, $data->invoices, $data->coupons, $data->refunds, $data->invoice_items );
+        $data    = $this->add_additional_fields_to_object( (array) $data, $request );
+        $data    = $this->filter_response_by_context( $data, $context );
+
+        // Wrap the data in a response object.
+        $response = rest_ensure_response( $data );
+        $response->add_links(
+            array(
+                'about' => array(
+                    'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
+                ),
+            )
+        );
+
+        return apply_filters( 'getpaid_rest_prepare_report_sales', $response, $report_data, $request );
+    }
+
+    /**
+     * Get report data.
+     *
+     * @return stdClass
+     */
+    public function get_report_data() {
+        if ( empty( $this->report_data ) ) {
+            $this->query_report_data();
+        }
+        return $this->report_data;
+    }
+
+    /**
+     * Get all data needed for this report and store in the class.
+     */
+    protected function query_report_data() {
+
+        // Prepare reports.
+        $this->report_data = (object) array(
+            'invoice_counts' => $this->query_invoice_counts(), //count, post_date
+            'coupons'        => $this->query_coupon_counts(), // discount_amount, post_date
+            'invoice_items'  => $this->query_item_counts(), // invoice_item_count, post_date
+            'refunded_items' => $this->count_refunded_items(), // invoice_item_count, post_date
+            'invoices'       => $this->query_invoice_totals(), // total_sales, total_tax, total_discount, total_fees, subtotal, post_date
+            'refunds'        => $this->query_refunded_totals(), // total_sales, total_tax, total_discount, total_fees, subtotal, post_date
+            'previous_range' => $this->previous_range,
+        );
+
+        // Calculated totals.
+        $this->report_data->total_tax          = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_tax' ) ) );
+        $this->report_data->total_sales        = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_sales' ) ) );
+        $this->report_data->total_discount     = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_discount' ) ) );
+        $this->report_data->total_fees         = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_fees' ) ) );
+        $this->report_data->subtotal           = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'subtotal' ) ) );
+        $this->report_data->net_sales          = wpinv_round_amount( $this->report_data->total_sales - max( 0, $this->report_data->total_tax ) );
+        $this->report_data->total_refunded_tax = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_tax' ) ) );
+        $this->report_data->total_refunds      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_sales' ) ) );
+        $this->report_data->refunded_discount  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_discount' ) ) );
+        $this->report_data->refunded_fees      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_fees' ) ) );
+        $this->report_data->refunded_subtotal  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'subtotal' ) ) );
+        $this->report_data->net_refunds        = wpinv_round_amount( $this->report_data->total_refunds + max( 0, $this->report_data->total_refunded_tax ) );
+
+        // Calculate average based on net.
+        $this->report_data->average_sales       = wpinv_round_amount( $this->report_data->net_sales / max( $this->interval, 1 ), 2 );
+        $this->report_data->average_total_sales = wpinv_round_amount( $this->report_data->total_sales / max( $this->interval, 1 ), 2 );
+
+        // Total invoices in this period, even if refunded.
+        $this->report_data->total_invoices = absint( array_sum( wp_list_pluck( $this->report_data->invoice_counts, 'count' ) ) );
+
+        // Items invoiced in this period, even if refunded.
+        $this->report_data->total_items = absint( array_sum( wp_list_pluck( $this->report_data->invoice_items, 'invoice_item_count' ) ) );
+
+        // 3rd party filtering of report data
+        $this->report_data = apply_filters( 'getpaid_rest_api_filter_report_data', $this->report_data, $this );
+    }
+
+    /**
+     * Prepares invoice counts.
+     *
+     * @return array.
+     */
+    protected function query_invoice_counts() {
+
+        return (array) GetPaid_Reports_Helper::get_invoice_report_data(
+            array(
+                'data'           => array(
+                    'ID'        => array(
+                        'type'     => 'post_data',
+                        'function' => 'COUNT',
+                        'name'     => 'count',
+                        'distinct' => true,
+                    ),
+                    'post_date' => array(
+                        'type'     => 'post_data',
+                        'function' => 'MIN',
+                        'name'     => 'post_date',
+                    ),
+                ),
+                'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+                'order_by'       => 'post_date ASC',
+                'query_type'     => 'get_results',
+                'filter_range'   => $this->report_range,
+                'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+            )
+        );
+
+    }
+
+    /**
+     * Prepares coupon counts.
+     *
+     * @return array.
+     */
+    protected function query_coupon_counts() {
+
+        return (array) GetPaid_Reports_Helper::get_invoice_report_data(
+            array(
+                'data'           => array(
+                    'discount'  => array(
+                        'type'     => 'invoice_data',
+                        'function' => 'SUM',
+                        'name'     => 'discount_amount',
+                    ),
+                    'post_date' => array(
+                        'type'     => 'post_data',
+                        'function' => 'MIN',
+                        'name'     => 'post_date',
+                    ),
+                ),
+                'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+                'order_by'       => 'post_date ASC',
+                'query_type'     => 'get_results',
+                'filter_range'   => $this->report_range,
+                'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+            )
+        );
+
+    }
+
+    /**
+     * Prepares item counts.
+     *
+     * @return array.
+     */
+    protected function query_item_counts() {
+
+        return (array) GetPaid_Reports_Helper::get_invoice_report_data(
+            array(
+                'data'           => array(
+                    'quantity'  => array(
+                        'type'     => 'invoice_item',
+                        'function' => 'SUM',
+                        'name'     => 'invoice_item_count',
+                    ),
+                    'post_date' => array(
+                        'type'     => 'post_data',
+                        'function' => 'MIN',
+                        'name'     => 'post_date',
+                    ),
+                ),
+                'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+                'order_by'       => 'post_date ASC',
+                'query_type'     => 'get_results',
+                'filter_range'   => $this->report_range,
+                'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+            )
+        );
+
+    }
+
+    /**
+     * Prepares refunded item counts.
+     *
+     * @return array.
+     */
+    protected function count_refunded_items() {
+
+        return (int) GetPaid_Reports_Helper::get_invoice_report_data(
+            array(
+                'data'           => array(
+                    'quantity' => array(
+                        'type'     => 'invoice_item',
+                        'function' => 'SUM',
+                        'name'     => 'invoice_item_count',
+                    ),
+                ),
+                'query_type'     => 'get_var',
+                'filter_range'   => $this->report_range,
+                'invoice_status' => array( 'wpi-refunded' ),
+            )
+        );
+
+    }
+
+    /**
+     * Prepares daily invoice totals.
+     *
+     * @return array.
+     */
+    protected function query_invoice_totals() {
+
+        return (array) GetPaid_Reports_Helper::get_invoice_report_data(
+            array(
+                'data'           => array(
+                    'total'      => array(
+                        'type'     => 'invoice_data',
+                        'function' => 'SUM',
+                        'name'     => 'total_sales',
+                    ),
+                    'tax'        => array(
+                        'type'     => 'invoice_data',
+                        'function' => 'SUM',
+                        'name'     => 'total_tax',
+                    ),
+                    'discount'   => array(
+                        'type'     => 'invoice_data',
+                        'function' => 'SUM',
+                        'name'     => 'total_discount',
+                    ),
+                    'fees_total' => array(
+                        'type'     => 'invoice_data',
+                        'function' => 'SUM',
+                        'name'     => 'total_fees',
+                    ),
+                    'subtotal'   => array(
+                        'type'     => 'invoice_data',
+                        'function' => 'SUM',
+                        'name'     => 'subtotal',
+                    ),
+                    'post_date'  => array(
+                        'type'     => 'post_data',
+                        'function' => '',
+                        'name'     => 'post_date',
+                    ),
+                ),
+                'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+                'order_by'       => 'post_date ASC',
+                'query_type'     => 'get_results',
+                'filter_range'   => $this->report_range,
+                'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-renewal' ),
+            )
+        );
+
+    }
+
+    /**
+     * Prepares daily invoice totals.
+     *
+     * @return array.
+     */
+    protected function query_refunded_totals() {
+
+        return (array) GetPaid_Reports_Helper::get_invoice_report_data(
+            array(
+                'data'           => array(
+                    'total'      => array(
+                        'type'     => 'invoice_data',
+                        'function' => 'SUM',
+                        'name'     => 'total_sales',
+                    ),
+                    'tax'        => array(
+                        'type'     => 'invoice_data',
+                        'function' => 'SUM',
+                        'name'     => 'total_tax',
+                    ),
+                    'discount'   => array(
+                        'type'     => 'invoice_data',
+                        'function' => 'SUM',
+                        'name'     => 'total_discount',
+                    ),
+                    'fees_total' => array(
+                        'type'     => 'invoice_data',
+                        'function' => 'SUM',
+                        'name'     => 'total_fees',
+                    ),
+                    'subtotal'   => array(
+                        'type'     => 'invoice_data',
+                        'function' => 'SUM',
+                        'name'     => 'subtotal',
+                    ),
+                    'post_date'  => array(
+                        'type'     => 'post_data',
+                        'function' => '',
+                        'name'     => 'post_date',
+                    ),
+                ),
+                'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+                'order_by'       => 'post_date ASC',
+                'query_type'     => 'get_results',
+                'filter_range'   => $this->report_range,
+                'invoice_status' => array( 'wpi-refunded' ),
+            )
+        );
+
+    }
+
+    /**
+     * Get the Report's schema, conforming to JSON Schema.
+     *
+     * @return array
+     */
+    public function get_item_schema() {
+
+        $schema = array(
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => 'sales_report',
+            'type'       => 'object',
+            'properties' => array(
+                'total_sales'         => array(
+                    'description' => __( 'Gross sales in the period.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'net_sales'           => array(
+                    'description' => __( 'Net sales in the period.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'average_sales'       => array(
+                    'description' => __( 'Average net daily sales.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'average_total_sales' => array(
+                    'description' => __( 'Average gross daily sales.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'total_invoices'      => array(
+                    'description' => __( 'Number of paid invoices.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'total_items'         => array(
+                    'description' => __( 'Number of items purchased.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'refunded_items'      => array(
+                    'description' => __( 'Number of items refunded.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'total_tax'           => array(
+                    'description' => __( 'Total charged for taxes.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'total_refunded_tax'  => array(
+                    'description' => __( 'Total refunded for taxes.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'total_fees'          => array(
+                    'description' => __( 'Total fees charged.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'total_refunds'       => array(
+                    'description' => __( 'Total of refunded invoices.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'net_refunds'         => array(
+                    'description' => __( 'Net of refunded invoices.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'total_discount'      => array(
+                    'description' => __( 'Total of discounts used.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'totals'              => array(
+                    'description' => __( 'Totals.', 'invoicing' ),
+                    'type'        => 'array',
+                    'items'       => array(
+                        'type' => 'array',
+                    ),
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'interval'            => array(
+                    'description' => __( 'Number of months/days in the report period.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'previous_range'      => array(
+                    'description' => __( 'The previous report period.', 'invoicing' ),
+                    'type'        => 'array',
+                    'items'       => array(
+                        'type' => 'string',
+                    ),
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'grouped_by'          => array(
+                    'description' => __( 'The period used to group the totals.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'enum'        => array( 'day', 'month' ),
+                    'readonly'    => true,
+                ),
+                'currency'            => array(
+                    'description' => __( 'The default store currency.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'currency_symbol'     => array(
+                    'description' => __( 'The default store currency symbol.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'currency_position'   => array(
+                    'description' => __( 'The default store currency position.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'decimal_places'      => array(
+                    'description' => __( 'The default store decimal places.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'thousands_sep'       => array(
+                    'description' => __( 'The default store thousands separator.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'decimals_sep'        => array(
+                    'description' => __( 'The default store decimals separator.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+            ),
+        );
+
+        return $this->add_additional_fields_schema( $schema );
+
+    }
 
 }

Spacing +154 added lines, -154 removed lines

@@ -9,7 +9,7 @@ 
  * @since   2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid REST reports controller class.
@@ -46,7 +46,7 @@ 
 	 *
 	 * @see register_rest_route()
 	 */
-	public function register_namespace_routes( $namespace ) {
+	public function register_namespace_routes($namespace) {
 
 		// Get sales report.
 		register_rest_route(
@@ -55,11 +55,11 @@ 
 			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_items' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'callback'            => array($this, 'get_items'),
+					'permission_callback' => array($this, 'get_items_permissions_check'),
 					'args'                => $this->get_collection_params(),
 				),
-				'schema' => array( $this, 'get_public_item_schema' ),
+				'schema' => array($this, 'get_public_item_schema'),
 			)
 		);
 
@@ -72,10 +72,10 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|boolean
 	 */
-	public function get_items_permissions_check( $request ) {
+	public function get_items_permissions_check($request) {
 
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error( 'rest_cannot_view', __( 'Sorry, you cannot list resources.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+		if (!wpinv_current_user_can_manage_invoicing()) {
+			return new WP_Error('rest_cannot_view', __('Sorry, you cannot list resources.', 'invoicing'), array('status' => rest_authorization_required_code()));
 		}
 
 		return true;
@@ -87,12 +87,12 @@ 
 	 * @param WP_REST_Request $request
 	 * @return array|WP_Error
 	 */
-	public function get_items( $request ) {
+	public function get_items($request) {
 		$data   = array();
-		$item   = $this->prepare_item_for_response( null, $request );
-		$data[] = $this->prepare_response_for_collection( $item );
+		$item   = $this->prepare_item_for_response(null, $request);
+		$data[] = $this->prepare_response_for_collection($item);
 
-		return rest_ensure_response( $data );
+		return rest_ensure_response($data);
 	}
 
 	/**
@@ -102,164 +102,164 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response $response Response data.
 	 */
-	public function prepare_item_for_response( $_, $request ) {
+	public function prepare_item_for_response($_, $request) {
 
 		// Set report range.
-		$this->report_range = $this->get_date_range( $request );
+		$this->report_range = $this->get_date_range($request);
 
 		$report_data     = $this->get_report_data();
 		$period_totals   = array();
 
 		// Setup period totals by ensuring each period in the interval has data.
-		$start_date      = strtotime( $this->report_range['after'] );
+		$start_date      = strtotime($this->report_range['after']);
 
-		if ( 'month' === $this->groupby ) {
-			$start_date      = strtotime( gmdate( 'Y-m-01', $start_date ) );
+		if ('month' === $this->groupby) {
+			$start_date = strtotime(gmdate('Y-m-01', $start_date));
 		}
 
-		for ( $i = 0; $i < $this->interval; $i++ ) {
+		for ($i = 0; $i < $this->interval; $i++) {
 
-			switch ( $this->groupby ) {
+			switch ($this->groupby) {
 				case 'day':
-					$time = gmdate( 'Y-m-d', strtotime( "+{$i} DAY", $start_date ) );
+					$time = gmdate('Y-m-d', strtotime("+{$i} DAY", $start_date));
 					break;
 				default:
-					$time = gmdate( 'Y-m', strtotime( "+{$i} MONTH", $start_date ) );
+					$time = gmdate('Y-m', strtotime("+{$i} MONTH", $start_date));
 					break;
 			}
 
 			// Set the defaults for each period.
-			$period_totals[ $time ] = array(
+			$period_totals[$time] = array(
 				'invoices'          => 0,
 				'items'             => 0,
 				'refunded_items'    => 0,
-				'refunded_tax'      => wpinv_round_amount( 0.00 ),
-				'subtotal'          => wpinv_round_amount( 0.00 ),
-				'refunded_subtotal' => wpinv_round_amount( 0.00 ),
-				'refunded_fees'     => wpinv_round_amount( 0.00 ),
-				'discount'          => wpinv_round_amount( 0.00 ),
+				'refunded_tax'      => wpinv_round_amount(0.00),
+				'subtotal'          => wpinv_round_amount(0.00),
+				'refunded_subtotal' => wpinv_round_amount(0.00),
+				'refunded_fees'     => wpinv_round_amount(0.00),
+				'discount'          => wpinv_round_amount(0.00),
 			);
 
-			foreach ( array_keys( wpinv_get_report_graphs() ) as $key ) {
-				if ( ! isset( $period_totals[ $time ][ $key ] ) ) {
-					$period_totals[ $time ][ $key ] = wpinv_round_amount( 0.00 );
+			foreach (array_keys(wpinv_get_report_graphs()) as $key) {
+				if (!isset($period_totals[$time][$key])) {
+					$period_totals[$time][$key] = wpinv_round_amount(0.00);
 				}
 			}
 		}
 
 		// add total sales, total invoice count, total tax for each period
-		$date_format = ( 'day' === $this->groupby ) ? 'Y-m-d' : 'Y-m';
-		foreach ( $report_data->invoices as $invoice ) {
-			$time = gmdate( $date_format, strtotime( $invoice->post_date ) );
+		$date_format = ('day' === $this->groupby) ? 'Y-m-d' : 'Y-m';
+		foreach ($report_data->invoices as $invoice) {
+			$time = gmdate($date_format, strtotime($invoice->post_date));
 
-			if ( ! isset( $period_totals[ $time ] ) ) {
+			if (!isset($period_totals[$time])) {
 				continue;
 			}
 
-			$period_totals[ $time ]['sales']    = wpinv_round_amount( $invoice->total_sales );
-			$period_totals[ $time ]['tax']      = wpinv_round_amount( $invoice->total_tax );
-			$period_totals[ $time ]['subtotal'] = wpinv_round_amount( $invoice->subtotal );
-			$period_totals[ $time ]['fees']     = wpinv_round_amount( $invoice->total_fees );
+			$period_totals[$time]['sales']    = wpinv_round_amount($invoice->total_sales);
+			$period_totals[$time]['tax']      = wpinv_round_amount($invoice->total_tax);
+			$period_totals[$time]['subtotal'] = wpinv_round_amount($invoice->subtotal);
+			$period_totals[$time]['fees']     = wpinv_round_amount($invoice->total_fees);
 
 		}
 
-		foreach ( $report_data->refunds as $invoice ) {
-			$time = gmdate( $date_format, strtotime( $invoice->post_date ) );
+		foreach ($report_data->refunds as $invoice) {
+			$time = gmdate($date_format, strtotime($invoice->post_date));
 
-			if ( ! isset( $period_totals[ $time ] ) ) {
+			if (!isset($period_totals[$time])) {
 				continue;
 			}
 
-			$period_totals[ $time ]['refunds']           = wpinv_round_amount( $invoice->total_sales );
-			$period_totals[ $time ]['refunded_tax']      = wpinv_round_amount( $invoice->total_tax );
-			$period_totals[ $time ]['refunded_subtotal'] = wpinv_round_amount( $invoice->subtotal );
-			$period_totals[ $time ]['refunded_fees']     = wpinv_round_amount( $invoice->total_fees );
+			$period_totals[$time]['refunds']           = wpinv_round_amount($invoice->total_sales);
+			$period_totals[$time]['refunded_tax']      = wpinv_round_amount($invoice->total_tax);
+			$period_totals[$time]['refunded_subtotal'] = wpinv_round_amount($invoice->subtotal);
+			$period_totals[$time]['refunded_fees']     = wpinv_round_amount($invoice->total_fees);
 
 		}
 
-		foreach ( $report_data->invoice_counts as $invoice ) {
-			$time = gmdate( $date_format, strtotime( $invoice->post_date ) );
+		foreach ($report_data->invoice_counts as $invoice) {
+			$time = gmdate($date_format, strtotime($invoice->post_date));
 
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['invoices']   = (int) $invoice->count;
+			if (isset($period_totals[$time])) {
+				$period_totals[$time]['invoices'] = (int) $invoice->count;
 			}
 		}
 
 		// Add total invoice items for each period.
-		foreach ( $report_data->invoice_items as $invoice_item ) {
-			$time = ( 'day' === $this->groupby ) ? gmdate( 'Y-m-d', strtotime( $invoice_item->post_date ) ) : gmdate( 'Y-m', strtotime( $invoice_item->post_date ) );
+		foreach ($report_data->invoice_items as $invoice_item) {
+			$time = ('day' === $this->groupby) ? gmdate('Y-m-d', strtotime($invoice_item->post_date)) : gmdate('Y-m', strtotime($invoice_item->post_date));
 
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['items'] = (int) $invoice_item->invoice_item_count;
+			if (isset($period_totals[$time])) {
+				$period_totals[$time]['items'] = (int) $invoice_item->invoice_item_count;
 			}
 		}
 
 		// Add total discount for each period.
-		foreach ( $report_data->coupons as $discount ) {
-			$time = ( 'day' === $this->groupby ) ? gmdate( 'Y-m-d', strtotime( $discount->post_date ) ) : gmdate( 'Y-m', strtotime( $discount->post_date ) );
+		foreach ($report_data->coupons as $discount) {
+			$time = ('day' === $this->groupby) ? gmdate('Y-m-d', strtotime($discount->post_date)) : gmdate('Y-m', strtotime($discount->post_date));
 
-			if ( isset( $period_totals[ $time ] ) ) {
-				$period_totals[ $time ]['discount'] = wpinv_round_amount( $discount->discount_amount );
+			if (isset($period_totals[$time])) {
+				$period_totals[$time]['discount'] = wpinv_round_amount($discount->discount_amount);
 			}
 		}
 
 		// Extra fields.
-		foreach ( array_keys( wpinv_get_report_graphs() ) as $key ) {
+		foreach (array_keys(wpinv_get_report_graphs()) as $key) {
 
 			// Abort unprepared.
-			if ( ! isset( $report_data->$key ) ) {
+			if (!isset($report_data->$key)) {
 				continue;
 			} 
 
 			// Abort defaults.
-			if ( in_array( $key, array( 'sales', 'refunds', 'tax', 'fees', 'discount', 'invoices', 'items' ) ) ) {
+			if (in_array($key, array('sales', 'refunds', 'tax', 'fees', 'discount', 'invoices', 'items'))) {
 				continue;
 			}
 
 			// Set values.
-			foreach ( $report_data->$key as $item ) {
-				$time = ( 'day' === $this->groupby ) ? gmdate( 'Y-m-d', strtotime( $item->date ) ) : gmdate( 'Y-m', strtotime( $item->date ) );
+			foreach ($report_data->$key as $item) {
+				$time = ('day' === $this->groupby) ? gmdate('Y-m-d', strtotime($item->date)) : gmdate('Y-m', strtotime($item->date));
 
-				if ( isset( $period_totals[ $time ] ) ) {
-					$period_totals[ $time ][ $key ] = wpinv_round_amount( $item->val );
+				if (isset($period_totals[$time])) {
+					$period_totals[$time][$key] = wpinv_round_amount($item->val);
 				}
 			}
 
-			unset( $report_data->$key );
+			unset($report_data->$key);
 		}
 
 		$report_data->totals            = $period_totals;
 		$report_data->grouped_by        = $this->groupby;
-		$report_data->interval          = max( $this->interval, 1 );
+		$report_data->interval          = max($this->interval, 1);
 		$report_data->currency          = wpinv_get_currency();
 		$report_data->currency_symbol   = wpinv_currency_symbol();
 		$report_data->currency_position = wpinv_currency_position();
 		$report_data->decimal_places    = wpinv_decimals();
 		$report_data->thousands_sep     = wpinv_thousands_separator();
 		$report_data->decimals_sep      = wpinv_decimal_separator();
-		$report_data->start_date        = gmdate( 'Y-m-d', strtotime( $this->report_range['after'] ) );
-		$report_data->end_date          = gmdate( 'Y-m-d', strtotime( $this->report_range['before'] ) );
-		$report_data->start_date_locale = getpaid_format_date( gmdate( 'Y-m-d', strtotime( $this->report_range['after'] ) ) );
-		$report_data->end_date_locale   = getpaid_format_date( gmdate( 'Y-m-d', strtotime( $this->report_range['before'] ) ) );
+		$report_data->start_date        = gmdate('Y-m-d', strtotime($this->report_range['after']));
+		$report_data->end_date          = gmdate('Y-m-d', strtotime($this->report_range['before']));
+		$report_data->start_date_locale = getpaid_format_date(gmdate('Y-m-d', strtotime($this->report_range['after'])));
+		$report_data->end_date_locale   = getpaid_format_date(gmdate('Y-m-d', strtotime($this->report_range['before'])));
 		$report_data->decimals_sep      = wpinv_decimal_separator();
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$context = !empty($request['context']) ? $request['context'] : 'view';
 		$data    = $report_data;
-		unset( $data->invoice_counts, $data->invoices, $data->coupons, $data->refunds, $data->invoice_items );
-		$data    = $this->add_additional_fields_to_object( (array) $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
+		unset($data->invoice_counts, $data->invoices, $data->coupons, $data->refunds, $data->invoice_items);
+		$data    = $this->add_additional_fields_to_object((array) $data, $request);
+		$data    = $this->filter_response_by_context($data, $context);
 
 		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
+		$response = rest_ensure_response($data);
 		$response->add_links(
             array(
 				'about' => array(
-					'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
+					'href' => rest_url(sprintf('%s/reports', $this->namespace)),
 				),
             )
         );
 
-		return apply_filters( 'getpaid_rest_prepare_report_sales', $response, $report_data, $request );
+		return apply_filters('getpaid_rest_prepare_report_sales', $response, $report_data, $request);
 	}
 
 	/**
@@ -268,7 +268,7 @@ 
 	 * @return stdClass
 	 */
 	public function get_report_data() {
-		if ( empty( $this->report_data ) ) {
+		if (empty($this->report_data)) {
 			$this->query_report_data();
 		}
 		return $this->report_data;
@@ -291,31 +291,31 @@ 
 		);
 
 		// Calculated totals.
-		$this->report_data->total_tax          = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_tax' ) ) );
-		$this->report_data->total_sales        = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_sales' ) ) );
-		$this->report_data->total_discount     = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_discount' ) ) );
-		$this->report_data->total_fees         = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'total_fees' ) ) );
-		$this->report_data->subtotal           = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->invoices, 'subtotal' ) ) );
-		$this->report_data->net_sales          = wpinv_round_amount( $this->report_data->total_sales - max( 0, $this->report_data->total_tax ) );
-		$this->report_data->total_refunded_tax = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_tax' ) ) );
-		$this->report_data->total_refunds      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_sales' ) ) );
-		$this->report_data->refunded_discount  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_discount' ) ) );
-		$this->report_data->refunded_fees      = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'total_fees' ) ) );
-		$this->report_data->refunded_subtotal  = wpinv_round_amount( array_sum( wp_list_pluck( $this->report_data->refunds, 'subtotal' ) ) );
-		$this->report_data->net_refunds        = wpinv_round_amount( $this->report_data->total_refunds + max( 0, $this->report_data->total_refunded_tax ) );
+		$this->report_data->total_tax          = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_tax')));
+		$this->report_data->total_sales        = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_sales')));
+		$this->report_data->total_discount     = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_discount')));
+		$this->report_data->total_fees         = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'total_fees')));
+		$this->report_data->subtotal           = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->invoices, 'subtotal')));
+		$this->report_data->net_sales          = wpinv_round_amount($this->report_data->total_sales - max(0, $this->report_data->total_tax));
+		$this->report_data->total_refunded_tax = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_tax')));
+		$this->report_data->total_refunds      = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_sales')));
+		$this->report_data->refunded_discount  = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_discount')));
+		$this->report_data->refunded_fees      = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'total_fees')));
+		$this->report_data->refunded_subtotal  = wpinv_round_amount(array_sum(wp_list_pluck($this->report_data->refunds, 'subtotal')));
+		$this->report_data->net_refunds        = wpinv_round_amount($this->report_data->total_refunds + max(0, $this->report_data->total_refunded_tax));
 
 		// Calculate average based on net.
-		$this->report_data->average_sales       = wpinv_round_amount( $this->report_data->net_sales / max( $this->interval, 1 ), 2 );
-		$this->report_data->average_total_sales = wpinv_round_amount( $this->report_data->total_sales / max( $this->interval, 1 ), 2 );
+		$this->report_data->average_sales       = wpinv_round_amount($this->report_data->net_sales / max($this->interval, 1), 2);
+		$this->report_data->average_total_sales = wpinv_round_amount($this->report_data->total_sales / max($this->interval, 1), 2);
 
 		// Total invoices in this period, even if refunded.
-		$this->report_data->total_invoices = absint( array_sum( wp_list_pluck( $this->report_data->invoice_counts, 'count' ) ) );
+		$this->report_data->total_invoices = absint(array_sum(wp_list_pluck($this->report_data->invoice_counts, 'count')));
 
 		// Items invoiced in this period, even if refunded.
-		$this->report_data->total_items = absint( array_sum( wp_list_pluck( $this->report_data->invoice_items, 'invoice_item_count' ) ) );
+		$this->report_data->total_items = absint(array_sum(wp_list_pluck($this->report_data->invoice_items, 'invoice_item_count')));
 
 		// 3rd party filtering of report data
-		$this->report_data = apply_filters( 'getpaid_rest_api_filter_report_data', $this->report_data, $this );
+		$this->report_data = apply_filters('getpaid_rest_api_filter_report_data', $this->report_data, $this);
 	}
 
 	/**
@@ -340,11 +340,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal'),
 			)
 		);
 
@@ -371,11 +371,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal'),
 			)
 		);
 
@@ -402,11 +402,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-refunded', 'wpi-renewal'),
 			)
 		);
 
@@ -430,7 +430,7 @@ 
 				),
 				'query_type'     => 'get_var',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'wpi-refunded' ),
+				'invoice_status' => array('wpi-refunded'),
 			)
 		);
 
@@ -477,11 +477,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'publish', 'wpi-processing', 'wpi-onhold', 'wpi-renewal' ),
+				'invoice_status' => array('publish', 'wpi-processing', 'wpi-onhold', 'wpi-renewal'),
 			)
 		);
 
@@ -528,11 +528,11 @@ 
 						'name'     => 'post_date',
 					),
 				),
-				'group_by'       => $this->get_group_by_sql( 'posts.post_date' ),
+				'group_by'       => $this->get_group_by_sql('posts.post_date'),
 				'order_by'       => 'post_date ASC',
 				'query_type'     => 'get_results',
 				'filter_range'   => $this->report_range,
-				'invoice_status' => array( 'wpi-refunded' ),
+				'invoice_status' => array('wpi-refunded'),
 			)
 		);
 
@@ -551,154 +551,154 @@ 
 			'type'       => 'object',
 			'properties' => array(
 				'total_sales'         => array(
-					'description' => __( 'Gross sales in the period.', 'invoicing' ),
+					'description' => __('Gross sales in the period.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'net_sales'           => array(
-					'description' => __( 'Net sales in the period.', 'invoicing' ),
+					'description' => __('Net sales in the period.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'average_sales'       => array(
-					'description' => __( 'Average net daily sales.', 'invoicing' ),
+					'description' => __('Average net daily sales.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'average_total_sales' => array(
-					'description' => __( 'Average gross daily sales.', 'invoicing' ),
+					'description' => __('Average gross daily sales.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_invoices'      => array(
-					'description' => __( 'Number of paid invoices.', 'invoicing' ),
+					'description' => __('Number of paid invoices.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_items'         => array(
-					'description' => __( 'Number of items purchased.', 'invoicing' ),
+					'description' => __('Number of items purchased.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'refunded_items'      => array(
-					'description' => __( 'Number of items refunded.', 'invoicing' ),
+					'description' => __('Number of items refunded.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_tax'           => array(
-					'description' => __( 'Total charged for taxes.', 'invoicing' ),
+					'description' => __('Total charged for taxes.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_refunded_tax'  => array(
-					'description' => __( 'Total refunded for taxes.', 'invoicing' ),
+					'description' => __('Total refunded for taxes.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_fees'          => array(
-					'description' => __( 'Total fees charged.', 'invoicing' ),
+					'description' => __('Total fees charged.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_refunds'       => array(
-					'description' => __( 'Total of refunded invoices.', 'invoicing' ),
+					'description' => __('Total of refunded invoices.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'net_refunds'         => array(
-					'description' => __( 'Net of refunded invoices.', 'invoicing' ),
+					'description' => __('Net of refunded invoices.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'total_discount'      => array(
-					'description' => __( 'Total of discounts used.', 'invoicing' ),
+					'description' => __('Total of discounts used.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'totals'              => array(
-					'description' => __( 'Totals.', 'invoicing' ),
+					'description' => __('Totals.', 'invoicing'),
 					'type'        => 'array',
 					'items'       => array(
 						'type' => 'array',
 					),
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'interval'            => array(
-					'description' => __( 'Number of months/days in the report period.', 'invoicing' ),
+					'description' => __('Number of months/days in the report period.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'previous_range'      => array(
-					'description' => __( 'The previous report period.', 'invoicing' ),
+					'description' => __('The previous report period.', 'invoicing'),
 					'type'        => 'array',
 					'items'       => array(
 						'type' => 'string',
 					),
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'grouped_by'          => array(
-					'description' => __( 'The period used to group the totals.', 'invoicing' ),
+					'description' => __('The period used to group the totals.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'enum'        => array( 'day', 'month' ),
+					'context'     => array('view'),
+					'enum'        => array('day', 'month'),
 					'readonly'    => true,
 				),
 				'currency'            => array(
-					'description' => __( 'The default store currency.', 'invoicing' ),
+					'description' => __('The default store currency.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'currency_symbol'     => array(
-					'description' => __( 'The default store currency symbol.', 'invoicing' ),
+					'description' => __('The default store currency symbol.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'currency_position'   => array(
-					'description' => __( 'The default store currency position.', 'invoicing' ),
+					'description' => __('The default store currency position.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'decimal_places'      => array(
-					'description' => __( 'The default store decimal places.', 'invoicing' ),
+					'description' => __('The default store decimal places.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'thousands_sep'       => array(
-					'description' => __( 'The default store thousands separator.', 'invoicing' ),
+					'description' => __('The default store thousands separator.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'decimals_sep'        => array(
-					'description' => __( 'The default store decimals separator.', 'invoicing' ),
+					'description' => __('The default store decimals separator.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 			),
 		);
 
-		return $this->add_additional_fields_schema( $schema );
+		return $this->add_additional_fields_schema($schema);
 
 	}
 

includes/api/class-getpaid-rest-settings-controller.php

Indentation +743 added lines, -743 removed lines

@@ -18,756 +18,756 @@
  */
 class GetPaid_REST_Settings_Controller extends GetPaid_REST_Controller {
 
-	/**
-	 * An array of available settings.
-	 *
-	 * @var string
-	 */
-	protected $settings;
-
-	/**
-	 * Route base.
-	 *
-	 * @var string
-	 */
-	protected $rest_base = 'settings';
-
-	/**
-	 * Registers the routes for the objects of the controller.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @see register_rest_route()
-	 */
-	public function register_namespace_routes( $namespace ) {
-
-		// List all registered tabs.
-		register_rest_route(
-			$namespace,
-			$this->rest_base,
-			array(
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_tabs' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				),
-				'schema' => '__return_empty_array',
-			)
-		);
-
-		// View/Update a single setting.
-		register_rest_route(
-			$namespace,
-			$this->rest_base . '/setting/(?P<id>[\w-]+)',
-			array(
-				'args'   => array(
-					'id' => array(
-						'description' => __( 'Unique identifier for the setting.', 'invoicing' ),
-						'type'        => 'string',
-						'required'    => true,
-					),
-				),
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_item' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				),
-				array(
-					'methods'             => WP_REST_Server::EDITABLE,
-					'callback'            => array( $this, 'update_item' ),
-					'permission_callback' => array( $this, 'update_items_permissions_check' ),
-					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
-				),
-				'schema' => array( $this, 'get_public_item_schema' ),
-			)
-		);
-
-		// List registered sections for a given tab.
-		register_rest_route(
-			$namespace,
-			$this->rest_base . '/(?P<tab>[\w-]+)',
-			array(
-				'args'   => array(
-					'tab' => array(
-						'description' => __( 'Unique identifier for the tab whose sections should be retrieved.', 'invoicing' ),
-						'type'        => 'string',
-						'required'    => true,
-						'enum'        => array_keys( wpinv_get_settings_tabs() ),
-					),
-				),
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_sections' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				),
-				'schema' => '__return_empty_array',
-			)
-		);
-
-		// List all registered settings for a given tab.
-		register_rest_route(
-			$namespace,
-			$this->rest_base . '/(?P<tab>[\w-]+)/(?P<section>[\w-]+)',
-			array(
-				'args'   => array(
-					'tab'     => array(
-						'description' => __( 'Unique identifier for the tab whose settings should be retrieved.', 'invoicing' ),
-						'type'        => 'string',
-						'required'    => true,
-						'enum'        => array_keys( wpinv_get_settings_tabs() ),
-					),
-					'section' => array(
-						'description' => __( 'The section in the tab whose settings should be retrieved.', 'invoicing' ),
-						'type'        => 'string',
-						'required'    => true,
-					),
-				),
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_items' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				),
-				'schema' => array( $this, 'get_public_item_schema' ),
-			)
-		); 
-
-		register_rest_route(
-			$namespace,
-			'/' . $this->rest_base . '/batch',
-			array(
-				'args'   => array(
-					'id' => array(
-						'description' => __( 'Setting ID.', 'invoicing' ),
-						'type'        => 'string',
-					),
-				),
-				array(
-					'methods'             => WP_REST_Server::EDITABLE,
-					'callback'            => array( $this, 'batch_items' ),
-					'permission_callback' => array( $this, 'batch_items_permissions_check' ),
-					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
-				),
-				'schema' => array( $this, 'get_public_batch_schema' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Return all settings.
-	 *
-	 * @since  2.0.0
-	 * @param  WP_REST_Request $request Request data.
-	 * @return WP_Error|WP_REST_Response
-	 */
-	public function get_items( $request ) {
-
-		$settings = $this->get_settings();
-
-		if ( ! isset( $settings[ $request['tab'] ] ) ) {
-			return new WP_Error( 'rest_invalid_tab', __( 'Invalid tab.', 'invoicing' ), array( 'status' => 400 ) );
-		}
-
-		if ( ! isset( $settings[ $request['tab'] ][ $request['section'] ] ) ) {
-			return new WP_Error( 'rest_invalid_section', __( 'Invalid section.', 'invoicing' ), array( 'status' => 400 ) );
-		}
-
-		$settings = $settings[ $request['tab'] ][ $request['section'] ];
-		$prepared = array();
-
-		foreach ( $settings as $setting ) {
-
-			$setting      = $this->sanitize_setting( $setting );
-			$setting_data = $this->prepare_item_for_response( $setting, $request );
-			$setting_data = $this->prepare_response_for_collection( $setting_data );
-
-			if ( $this->is_setting_type_valid( $setting['type'] ) ) {
-				$prepared[]   = $setting_data;
-			}
+    /**
+     * An array of available settings.
+     *
+     * @var string
+     */
+    protected $settings;
+
+    /**
+     * Route base.
+     *
+     * @var string
+     */
+    protected $rest_base = 'settings';
+
+    /**
+     * Registers the routes for the objects of the controller.
+     *
+     * @since 2.0.0
+     *
+     * @see register_rest_route()
+     */
+    public function register_namespace_routes( $namespace ) {
+
+        // List all registered tabs.
+        register_rest_route(
+            $namespace,
+            $this->rest_base,
+            array(
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_tabs' ),
+                    'permission_callback' => array( $this, 'get_items_permissions_check' ),
+                ),
+                'schema' => '__return_empty_array',
+            )
+        );
+
+        // View/Update a single setting.
+        register_rest_route(
+            $namespace,
+            $this->rest_base . '/setting/(?P<id>[\w-]+)',
+            array(
+                'args'   => array(
+                    'id' => array(
+                        'description' => __( 'Unique identifier for the setting.', 'invoicing' ),
+                        'type'        => 'string',
+                        'required'    => true,
+                    ),
+                ),
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_item' ),
+                    'permission_callback' => array( $this, 'get_items_permissions_check' ),
+                ),
+                array(
+                    'methods'             => WP_REST_Server::EDITABLE,
+                    'callback'            => array( $this, 'update_item' ),
+                    'permission_callback' => array( $this, 'update_items_permissions_check' ),
+                    'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+                ),
+                'schema' => array( $this, 'get_public_item_schema' ),
+            )
+        );
+
+        // List registered sections for a given tab.
+        register_rest_route(
+            $namespace,
+            $this->rest_base . '/(?P<tab>[\w-]+)',
+            array(
+                'args'   => array(
+                    'tab' => array(
+                        'description' => __( 'Unique identifier for the tab whose sections should be retrieved.', 'invoicing' ),
+                        'type'        => 'string',
+                        'required'    => true,
+                        'enum'        => array_keys( wpinv_get_settings_tabs() ),
+                    ),
+                ),
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_sections' ),
+                    'permission_callback' => array( $this, 'get_items_permissions_check' ),
+                ),
+                'schema' => '__return_empty_array',
+            )
+        );
+
+        // List all registered settings for a given tab.
+        register_rest_route(
+            $namespace,
+            $this->rest_base . '/(?P<tab>[\w-]+)/(?P<section>[\w-]+)',
+            array(
+                'args'   => array(
+                    'tab'     => array(
+                        'description' => __( 'Unique identifier for the tab whose settings should be retrieved.', 'invoicing' ),
+                        'type'        => 'string',
+                        'required'    => true,
+                        'enum'        => array_keys( wpinv_get_settings_tabs() ),
+                    ),
+                    'section' => array(
+                        'description' => __( 'The section in the tab whose settings should be retrieved.', 'invoicing' ),
+                        'type'        => 'string',
+                        'required'    => true,
+                    ),
+                ),
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_items' ),
+                    'permission_callback' => array( $this, 'get_items_permissions_check' ),
+                ),
+                'schema' => array( $this, 'get_public_item_schema' ),
+            )
+        ); 
+
+        register_rest_route(
+            $namespace,
+            '/' . $this->rest_base . '/batch',
+            array(
+                'args'   => array(
+                    'id' => array(
+                        'description' => __( 'Setting ID.', 'invoicing' ),
+                        'type'        => 'string',
+                    ),
+                ),
+                array(
+                    'methods'             => WP_REST_Server::EDITABLE,
+                    'callback'            => array( $this, 'batch_items' ),
+                    'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+                    'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+                ),
+                'schema' => array( $this, 'get_public_batch_schema' ),
+            )
+        );
+
+    }
+
+    /**
+     * Return all settings.
+     *
+     * @since  2.0.0
+     * @param  WP_REST_Request $request Request data.
+     * @return WP_Error|WP_REST_Response
+     */
+    public function get_items( $request ) {
+
+        $settings = $this->get_settings();
+
+        if ( ! isset( $settings[ $request['tab'] ] ) ) {
+            return new WP_Error( 'rest_invalid_tab', __( 'Invalid tab.', 'invoicing' ), array( 'status' => 400 ) );
+        }
+
+        if ( ! isset( $settings[ $request['tab'] ][ $request['section'] ] ) ) {
+            return new WP_Error( 'rest_invalid_section', __( 'Invalid section.', 'invoicing' ), array( 'status' => 400 ) );
+        }
+
+        $settings = $settings[ $request['tab'] ][ $request['section'] ];
+        $prepared = array();
+
+        foreach ( $settings as $setting ) {
+
+            $setting      = $this->sanitize_setting( $setting );
+            $setting_data = $this->prepare_item_for_response( $setting, $request );
+            $setting_data = $this->prepare_response_for_collection( $setting_data );
+
+            if ( $this->is_setting_type_valid( $setting['type'] ) ) {
+                $prepared[]   = $setting_data;
+            }
 }
 
-		return rest_ensure_response( $prepared );
-	}
-
-	/**
-	 * Return a single setting.
-	 *
-	 * @since  2.0.0
-	 * @param  WP_REST_Request $request Request data.
-	 * @return WP_Error|WP_REST_Response
-	 */
-	public function get_item( $request ) {
-		$setting  = $this->get_setting( $request['id'] );
-
-		if ( is_wp_error( $setting ) ) {
-			return $setting;
-		}
-
-		$setting  = $this->sanitize_setting( $setting );
-		$response = $this->prepare_item_for_response( $setting, $request );
-		return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Update a single setting.
-	 *
-	 * @since  2.0.0
-	 * @param  WP_REST_Request $request Request data.
-	 * @return WP_Error|WP_REST_Response
-	 */
-	public function update_item( $request ) {
-		$setting = $this->get_setting( $request['id'] );
-
-		if ( is_wp_error( $setting ) ) {
-			return $setting;
-		}
-
-		if ( is_callable( array( $this, 'validate_setting_' . $setting['type'] . '_field' ) ) ) {
-			$value = $this->{'validate_setting_' . $setting['type'] . '_field'}( $request['value'], $setting );
-		} else {
-			$value = $this->validate_setting_text_field( $request['value'], $setting );
-		}
-
-		if ( is_wp_error( $value ) ) {
-			return $value;
-		}
-
-		wpinv_update_option( $request['id'], $value );
-		$setting['value'] = $value;
-		$setting          = $this->sanitize_setting( $setting );
-		$response         = $this->prepare_item_for_response( $setting, $request );
-
-		return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Makes sure the current user has access to READ the settings APIs.
-	 *
-	 * @since  2.0.0
-	 * @param WP_REST_Request $request Full data about the request.
-	 * @return WP_Error|boolean
-	 */
-	public function get_items_permissions_check( $request ) {
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error( 'rest_cannot_view', __( 'Sorry, you cannot list resources.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Makes sure the current user has access to WRITE the settings APIs.
-	 *
-	 * @since  2.0.0
-	 * @param WP_REST_Request $request Full data about the request.
-	 * @return WP_Error|boolean
-	 */
-	public function update_items_permissions_check( $request ) {
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error( 'rest_cannot_edit', __( 'Sorry, you cannot edit this resource.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if a given request has access batch create, update and delete items.
-	 *
-	 * @param  WP_REST_Request $request Full details about the request.
-	 *
-	 * @return boolean|WP_Error
-	 */
-	public function batch_items_permissions_check( $request ) {
-		return wpinv_current_user_can_manage_invoicing() ? true : new WP_Error( 'rest_cannot_batch', __( 'Sorry, you are not allowed to batch manipulate this resource.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
-	}
-
-	/**
-	 * Prepare links for the request.
-	 *
-	 * @param string $setting_id Setting ID.
-	 * @return array Links for the given setting.
-	 */
-	protected function prepare_links( $setting_id ) {
-
-		$links = array(
-			'self'       => array(
-				'href' => rest_url( sprintf( '/%s/%s/setting/%s', $this->namespace, $this->rest_base, $setting_id ) ),
-			),
-			'collection' => array(
-				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
-			),
-		);
-
-		return $links;
-	}
-
-	/**
-	 * Prepare a settings object for serialization.
-	 *
-	 * @since  2.0.0
-	 * @param array           $item Setting object.
-	 * @param WP_REST_Request $request Request object.
-	 * @return WP_REST_Response $response Response data.
-	 */
-	public function prepare_item_for_response( $item, $request ) {
-		$context = empty( $request['context'] ) ? 'view' : $request['context'];
-		$data    = $this->add_additional_fields_to_object( $item, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
-
-		$response = rest_ensure_response( $data );
-
-		$response->add_links( $this->prepare_links( $item['id'] ) );
-
-		return $response;
-	}
-
-	/**
-	 * Filters out bad values from the settings array/filter so we
-	 * only return known values via the API.
-	 *
-	 * @since 2.0.0
-	 * @param  array $setting Setting.
-	 * @return array
-	 */
-	public function filter_setting( $setting ) {
-		return array_intersect_key(
-			$setting,
-			array_flip( array_filter( array_keys( $setting ), array( $this, 'allowed_setting_keys' ) ) )
-		);
-	}
-
-	/**
-	 * Callback for allowed keys for each setting response.
-	 *
-	 * @param  string $key Key to check.
-	 * @return boolean
-	 */
-	public function allowed_setting_keys( $key ) {
-		return in_array( $key, array_keys( $this->setting_defaults() ), true );
-	}
-
-	/**
-	 * Returns default options for a setting. null means the field is required.
-	 *
-	 * @since  2.0.0
-	 * @return array
-	 */
-	protected function setting_defaults() {
-		return array(
-			'id'          => null,
-			'name'        => null,
-			'desc'        => '',
-			'options'     => array(),
-			'std'         => false,
-			'value'       => false,
-			'placeholder' => '',
-			'readonly'    => false,
-			'faux'        => false,
-			'section'     => 'main',
-			'tab'         => 'general',
-			'type'        => 'text',
-		);
-	}
-
-	/**
-	 * Sanitizes a setting's field.
-	 *
-	 * @param  array $setting The setting to sanitize.
-	 * @return array
-	 */
-	public function sanitize_setting( $setting ) {
-
-		$setting          = wp_parse_args( $setting, $this->setting_defaults() );
-		$setting['value'] = wpinv_get_option( $setting['id'], $setting['std'] );
-		return $this->filter_setting( $setting );
-
-	}
-
-	/**
-	 * Get setting data.
-	 *
-	 * @since  2.0.0
-	 * @param string $setting_id Setting ID.
-	 * @return array|WP_Error
-	 */
-	public function get_setting( $setting_id ) {
-
-		if ( empty( $setting_id ) ) {
-			return new WP_Error( 'rest_setting_setting_invalid', __( 'Invalid setting.', 'invoicing' ), array( 'status' => 404 ) );
-		}
-
-		$settings  = $this->get_settings();
-
-		foreach ( $settings as $tabs ) {
-
-			foreach ( $tabs as $sections ) {
-
-				if ( isset( $sections[ $setting_id ] ) ) {
-					if ( ! $this->is_setting_type_valid( $sections[ $setting_id ]['type'] ) ) {
-						return new WP_Error( 'rest_setting_setting_type_invalid', __( 'Invalid setting type.', 'invoicing' ), array( 'status' => 404 ) );
-					}
-
-					return $sections[ $setting_id ];
-				}
+        return rest_ensure_response( $prepared );
+    }
+
+    /**
+     * Return a single setting.
+     *
+     * @since  2.0.0
+     * @param  WP_REST_Request $request Request data.
+     * @return WP_Error|WP_REST_Response
+     */
+    public function get_item( $request ) {
+        $setting  = $this->get_setting( $request['id'] );
+
+        if ( is_wp_error( $setting ) ) {
+            return $setting;
+        }
+
+        $setting  = $this->sanitize_setting( $setting );
+        $response = $this->prepare_item_for_response( $setting, $request );
+        return rest_ensure_response( $response );
+    }
+
+    /**
+     * Update a single setting.
+     *
+     * @since  2.0.0
+     * @param  WP_REST_Request $request Request data.
+     * @return WP_Error|WP_REST_Response
+     */
+    public function update_item( $request ) {
+        $setting = $this->get_setting( $request['id'] );
+
+        if ( is_wp_error( $setting ) ) {
+            return $setting;
+        }
+
+        if ( is_callable( array( $this, 'validate_setting_' . $setting['type'] . '_field' ) ) ) {
+            $value = $this->{'validate_setting_' . $setting['type'] . '_field'}( $request['value'], $setting );
+        } else {
+            $value = $this->validate_setting_text_field( $request['value'], $setting );
+        }
+
+        if ( is_wp_error( $value ) ) {
+            return $value;
+        }
+
+        wpinv_update_option( $request['id'], $value );
+        $setting['value'] = $value;
+        $setting          = $this->sanitize_setting( $setting );
+        $response         = $this->prepare_item_for_response( $setting, $request );
+
+        return rest_ensure_response( $response );
+    }
+
+    /**
+     * Makes sure the current user has access to READ the settings APIs.
+     *
+     * @since  2.0.0
+     * @param WP_REST_Request $request Full data about the request.
+     * @return WP_Error|boolean
+     */
+    public function get_items_permissions_check( $request ) {
+        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+            return new WP_Error( 'rest_cannot_view', __( 'Sorry, you cannot list resources.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+        }
+
+        return true;
+    }
+
+    /**
+     * Makes sure the current user has access to WRITE the settings APIs.
+     *
+     * @since  2.0.0
+     * @param WP_REST_Request $request Full data about the request.
+     * @return WP_Error|boolean
+     */
+    public function update_items_permissions_check( $request ) {
+        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+            return new WP_Error( 'rest_cannot_edit', __( 'Sorry, you cannot edit this resource.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if a given request has access batch create, update and delete items.
+     *
+     * @param  WP_REST_Request $request Full details about the request.
+     *
+     * @return boolean|WP_Error
+     */
+    public function batch_items_permissions_check( $request ) {
+        return wpinv_current_user_can_manage_invoicing() ? true : new WP_Error( 'rest_cannot_batch', __( 'Sorry, you are not allowed to batch manipulate this resource.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+    }
+
+    /**
+     * Prepare links for the request.
+     *
+     * @param string $setting_id Setting ID.
+     * @return array Links for the given setting.
+     */
+    protected function prepare_links( $setting_id ) {
+
+        $links = array(
+            'self'       => array(
+                'href' => rest_url( sprintf( '/%s/%s/setting/%s', $this->namespace, $this->rest_base, $setting_id ) ),
+            ),
+            'collection' => array(
+                'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+            ),
+        );
+
+        return $links;
+    }
+
+    /**
+     * Prepare a settings object for serialization.
+     *
+     * @since  2.0.0
+     * @param array           $item Setting object.
+     * @param WP_REST_Request $request Request object.
+     * @return WP_REST_Response $response Response data.
+     */
+    public function prepare_item_for_response( $item, $request ) {
+        $context = empty( $request['context'] ) ? 'view' : $request['context'];
+        $data    = $this->add_additional_fields_to_object( $item, $request );
+        $data    = $this->filter_response_by_context( $data, $context );
+
+        $response = rest_ensure_response( $data );
+
+        $response->add_links( $this->prepare_links( $item['id'] ) );
+
+        return $response;
+    }
+
+    /**
+     * Filters out bad values from the settings array/filter so we
+     * only return known values via the API.
+     *
+     * @since 2.0.0
+     * @param  array $setting Setting.
+     * @return array
+     */
+    public function filter_setting( $setting ) {
+        return array_intersect_key(
+            $setting,
+            array_flip( array_filter( array_keys( $setting ), array( $this, 'allowed_setting_keys' ) ) )
+        );
+    }
+
+    /**
+     * Callback for allowed keys for each setting response.
+     *
+     * @param  string $key Key to check.
+     * @return boolean
+     */
+    public function allowed_setting_keys( $key ) {
+        return in_array( $key, array_keys( $this->setting_defaults() ), true );
+    }
+
+    /**
+     * Returns default options for a setting. null means the field is required.
+     *
+     * @since  2.0.0
+     * @return array
+     */
+    protected function setting_defaults() {
+        return array(
+            'id'          => null,
+            'name'        => null,
+            'desc'        => '',
+            'options'     => array(),
+            'std'         => false,
+            'value'       => false,
+            'placeholder' => '',
+            'readonly'    => false,
+            'faux'        => false,
+            'section'     => 'main',
+            'tab'         => 'general',
+            'type'        => 'text',
+        );
+    }
+
+    /**
+     * Sanitizes a setting's field.
+     *
+     * @param  array $setting The setting to sanitize.
+     * @return array
+     */
+    public function sanitize_setting( $setting ) {
+
+        $setting          = wp_parse_args( $setting, $this->setting_defaults() );
+        $setting['value'] = wpinv_get_option( $setting['id'], $setting['std'] );
+        return $this->filter_setting( $setting );
+
+    }
+
+    /**
+     * Get setting data.
+     *
+     * @since  2.0.0
+     * @param string $setting_id Setting ID.
+     * @return array|WP_Error
+     */
+    public function get_setting( $setting_id ) {
+
+        if ( empty( $setting_id ) ) {
+            return new WP_Error( 'rest_setting_setting_invalid', __( 'Invalid setting.', 'invoicing' ), array( 'status' => 404 ) );
+        }
+
+        $settings  = $this->get_settings();
+
+        foreach ( $settings as $tabs ) {
+
+            foreach ( $tabs as $sections ) {
+
+                if ( isset( $sections[ $setting_id ] ) ) {
+                    if ( ! $this->is_setting_type_valid( $sections[ $setting_id ]['type'] ) ) {
+                        return new WP_Error( 'rest_setting_setting_type_invalid', __( 'Invalid setting type.', 'invoicing' ), array( 'status' => 404 ) );
+                    }
+
+                    return $sections[ $setting_id ];
+                }
 }
 }
 
-		return new WP_Error( 'rest_setting_setting_invalid', __( 'Invalid setting.', 'invoicing' ), array( 'status' => 404 ) );
-	}
-
-	/**
-	 * Get all tabs.
-	 *
-	 * @param  WP_REST_Request $request Request data.
-	 * @return array
-	 */
-	public function get_tabs( $request ) {
-		$tabs     = wpinv_get_settings_tabs();
-		$prepared = array();
-
-		foreach ( $tabs as $id => $tab ) {
-
-			$_request        = $request;
-			$_request['tab'] = sanitize_title( $id );
-			$data            = array(
-				'id'       => sanitize_title( $id ),
-				'label'    => sanitize_text_field( $tab ),
-				'sections' => $this->get_sections( $_request ),
-			);
-
-			$data     = $this->add_additional_fields_to_object( $data, $request );
-			$response = rest_ensure_response( $data );
-
-			if ( ! is_wp_error( $response ) ) {
-				$links = array(
-					'sections'   => array(
-						'href' => rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $id ) ),
-					),
-					'collection' => array(
-						'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
-					),
-				);
-				$response->add_links( $links );
-				$response = $this->prepare_response_for_collection( $response );
-			}
-
-			$prepared[] = $response;
-
-		}
-
-		return rest_ensure_response( $prepared );
-	}
-
-	/**
-	 * Get all sections.
-	 *
-	 * @param  WP_REST_Request $request Request data.
-	 * @return array
-	 */
-	public function get_sections( $request ) {
-
-		$tab      = sanitize_title( $request['tab'] );
-		$sections = wpinv_get_settings_tab_sections( $tab );
-		$prepared = array();
-
-		foreach ( $sections as $id => $section ) {
-
-			$data            = array(
-				'id'    => sanitize_title( $id ),
-				'label' => sanitize_text_field( $section ),
-			);
-
-			$data     = $this->add_additional_fields_to_object( $data, $request );
-			$response = rest_ensure_response( $data );
-
-			if ( ! is_wp_error( $response ) ) {
-				$links = array(
-					'settings'   => array(
-						'href' => rest_url( sprintf( '/%s/%s/%s/%s', $this->namespace, $this->rest_base, $tab, $id ) ),
-					),
-					'collection' => array(
-						'href' => rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $tab ) ),
-					),
-					'tabs'       => array(
-						'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
-					),
-				);
-				$response->add_links( $links );
-				$response = $this->prepare_response_for_collection( $response );
-			}
-
-			$prepared[] = $response;
-
-		}
-
-		return rest_ensure_response( $prepared );
-	}
-
-	/**
-	 * Get all settings.
-	 *
-	 * @return array
-	 */
-	public function get_settings() {
-
-		if ( empty( $this->settings ) ) {
-			$this->settings = wpinv_get_registered_settings();
-		}
-
-		return $this->settings;
-
-	}
-
-	/**
-	 * Boolean for if a setting type is a valid supported setting type.
-	 *
-	 * @since  2.0.0
-	 * @param  string $type Type.
-	 * @return bool
-	 */
-	public function is_setting_type_valid( $type ) {
-
-		return in_array(
-			$type,
+        return new WP_Error( 'rest_setting_setting_invalid', __( 'Invalid setting.', 'invoicing' ), array( 'status' => 404 ) );
+    }
+
+    /**
+     * Get all tabs.
+     *
+     * @param  WP_REST_Request $request Request data.
+     * @return array
+     */
+    public function get_tabs( $request ) {
+        $tabs     = wpinv_get_settings_tabs();
+        $prepared = array();
+
+        foreach ( $tabs as $id => $tab ) {
+
+            $_request        = $request;
+            $_request['tab'] = sanitize_title( $id );
+            $data            = array(
+                'id'       => sanitize_title( $id ),
+                'label'    => sanitize_text_field( $tab ),
+                'sections' => $this->get_sections( $_request ),
+            );
+
+            $data     = $this->add_additional_fields_to_object( $data, $request );
+            $response = rest_ensure_response( $data );
+
+            if ( ! is_wp_error( $response ) ) {
+                $links = array(
+                    'sections'   => array(
+                        'href' => rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $id ) ),
+                    ),
+                    'collection' => array(
+                        'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+                    ),
+                );
+                $response->add_links( $links );
+                $response = $this->prepare_response_for_collection( $response );
+            }
+
+            $prepared[] = $response;
+
+        }
+
+        return rest_ensure_response( $prepared );
+    }
+
+    /**
+     * Get all sections.
+     *
+     * @param  WP_REST_Request $request Request data.
+     * @return array
+     */
+    public function get_sections( $request ) {
+
+        $tab      = sanitize_title( $request['tab'] );
+        $sections = wpinv_get_settings_tab_sections( $tab );
+        $prepared = array();
+
+        foreach ( $sections as $id => $section ) {
+
+            $data            = array(
+                'id'    => sanitize_title( $id ),
+                'label' => sanitize_text_field( $section ),
+            );
+
+            $data     = $this->add_additional_fields_to_object( $data, $request );
+            $response = rest_ensure_response( $data );
+
+            if ( ! is_wp_error( $response ) ) {
+                $links = array(
+                    'settings'   => array(
+                        'href' => rest_url( sprintf( '/%s/%s/%s/%s', $this->namespace, $this->rest_base, $tab, $id ) ),
+                    ),
+                    'collection' => array(
+                        'href' => rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $tab ) ),
+                    ),
+                    'tabs'       => array(
+                        'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+                    ),
+                );
+                $response->add_links( $links );
+                $response = $this->prepare_response_for_collection( $response );
+            }
+
+            $prepared[] = $response;
+
+        }
+
+        return rest_ensure_response( $prepared );
+    }
+
+    /**
+     * Get all settings.
+     *
+     * @return array
+     */
+    public function get_settings() {
+
+        if ( empty( $this->settings ) ) {
+            $this->settings = wpinv_get_registered_settings();
+        }
+
+        return $this->settings;
+
+    }
+
+    /**
+     * Boolean for if a setting type is a valid supported setting type.
+     *
+     * @since  2.0.0
+     * @param  string $type Type.
+     * @return bool
+     */
+    public function is_setting_type_valid( $type ) {
+
+        return in_array(
+            $type,
             array(
-				'text',         // Validates with validate_setting_text_field.
-				'email',        // Validates with validate_setting_text_field.
-				'number',       // Validates with validate_setting_text_field.
-				'color',        // Validates with validate_setting_text_field.
-				'password',     // Validates with validate_setting_text_field.
-				'textarea',     // Validates with validate_setting_textarea_field.
-				'select',       // Validates with validate_setting_select_field.
-				'multiselect',  // Validates with validate_setting_multiselect_field.
-				'radio',        // Validates with validate_setting_radio_field (-> validate_setting_select_field).
-				'checkbox',     // Validates with validate_setting_checkbox_field.
-				'header',       // Validates with validate_setting_text_field.
-			)
-		);
-
-	}
-
-	/**
-	 * Get the settings schema, conforming to JSON Schema.
-	 *
-	 * @return array
-	 */
-	public function get_item_schema() {
-
-		// Maybe retrieve the schema from cache.
-		if ( ! empty( $this->schema ) ) {
-			return $this->add_additional_fields_schema( $this->schema );
-		}
-
-		$schema = array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => 'setting',
-			'type'       => 'object',
-			'properties' => array(
-				'id'          => array(
-					'description' => __( 'A unique identifier for the setting.', 'invoicing' ),
-					'type'        => 'string',
-					'arg_options' => array(
-						'sanitize_callback' => 'sanitize_title',
-					),
-					'context'     => array( 'view', 'edit' ),
-					'readonly'    => true,
-				),
-				'tab'         => array(
-					'description' => __( 'An identifier for the tab this setting belongs to.', 'invoicing' ),
-					'type'        => 'string',
-					'arg_options' => array(
-						'sanitize_callback' => 'sanitize_title',
-					),
-					'context'     => array( 'view', 'edit' ),
-					'readonly'    => true,
-				),
-				'section'     => array(
-					'description' => __( 'An identifier for the section this setting belongs to.', 'invoicing' ),
-					'type'        => 'string',
-					'arg_options' => array(
-						'sanitize_callback' => 'sanitize_title',
-					),
-					'context'     => array( 'view', 'edit' ),
-					'readonly'    => true,
-				),
-				'name'        => array(
-					'description' => __( 'A human readable label for the setting used in interfaces.', 'invoicing' ),
-					'type'        => 'string',
-					'arg_options' => array(
-						'sanitize_callback' => 'sanitize_text_field',
-					),
-					'context'     => array( 'view', 'edit' ),
-					'readonly'    => true,
-				),
-				'desc'        => array(
-					'description' => __( 'A human readable description for the setting used in interfaces.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit' ),
-					'readonly'    => true,
-				),
-				'value'       => array(
-					'description' => __( 'The current value of this setting.', 'invoicing' ),
-					'type'        => 'mixed',
-					'context'     => array( 'view', 'edit' ),
-				),
-				'default'     => array(
-					'description' => __( 'Default value for the setting.', 'invoicing' ),
-					'type'        => 'mixed',
-					'context'     => array( 'view', 'edit' ),
-					'readonly'    => true,
-				),
-				'placeholder' => array(
-					'description' => __( 'Placeholder text to be displayed in text inputs.', 'invoicing' ),
-					'type'        => 'string',
-					'arg_options' => array(
-						'sanitize_callback' => 'sanitize_text_field',
-					),
-					'context'     => array( 'view', 'edit' ),
-					'readonly'    => true,
-				),
-				'type'        => array(
-					'description' => __( 'Type of setting.', 'invoicing' ),
-					'type'        => 'string',
-					'arg_options' => array(
-						'sanitize_callback' => 'sanitize_text_field',
-					),
-					'context'     => array( 'view', 'edit' ),
-					'enum'        => array( 'text', 'email', 'number', 'color', 'password', 'textarea', 'select', 'multiselect', 'radio', 'image_width', 'checkbox', 'raw_html' ),
-					'readonly'    => true,
-				),
-				'options'     => array(
-					'description' => __( 'Array of options (key value pairs) for inputs such as select, multiselect, and radio buttons.', 'invoicing' ),
-					'type'        => 'object',
-					'context'     => array( 'view', 'edit' ),
-					'readonly'    => true,
-				),
-				'readonly'    => array(
-					'description' => __( 'Whether or not this setting is readonly', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'faux'        => array(
-					'description' => __( 'Whether or not this setting is readonly/faux', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-			),
-		);
-
-		// Filters the settings schema for the REST API.
+                'text',         // Validates with validate_setting_text_field.
+                'email',        // Validates with validate_setting_text_field.
+                'number',       // Validates with validate_setting_text_field.
+                'color',        // Validates with validate_setting_text_field.
+                'password',     // Validates with validate_setting_text_field.
+                'textarea',     // Validates with validate_setting_textarea_field.
+                'select',       // Validates with validate_setting_select_field.
+                'multiselect',  // Validates with validate_setting_multiselect_field.
+                'radio',        // Validates with validate_setting_radio_field (-> validate_setting_select_field).
+                'checkbox',     // Validates with validate_setting_checkbox_field.
+                'header',       // Validates with validate_setting_text_field.
+            )
+        );
+
+    }
+
+    /**
+     * Get the settings schema, conforming to JSON Schema.
+     *
+     * @return array
+     */
+    public function get_item_schema() {
+
+        // Maybe retrieve the schema from cache.
+        if ( ! empty( $this->schema ) ) {
+            return $this->add_additional_fields_schema( $this->schema );
+        }
+
+        $schema = array(
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => 'setting',
+            'type'       => 'object',
+            'properties' => array(
+                'id'          => array(
+                    'description' => __( 'A unique identifier for the setting.', 'invoicing' ),
+                    'type'        => 'string',
+                    'arg_options' => array(
+                        'sanitize_callback' => 'sanitize_title',
+                    ),
+                    'context'     => array( 'view', 'edit' ),
+                    'readonly'    => true,
+                ),
+                'tab'         => array(
+                    'description' => __( 'An identifier for the tab this setting belongs to.', 'invoicing' ),
+                    'type'        => 'string',
+                    'arg_options' => array(
+                        'sanitize_callback' => 'sanitize_title',
+                    ),
+                    'context'     => array( 'view', 'edit' ),
+                    'readonly'    => true,
+                ),
+                'section'     => array(
+                    'description' => __( 'An identifier for the section this setting belongs to.', 'invoicing' ),
+                    'type'        => 'string',
+                    'arg_options' => array(
+                        'sanitize_callback' => 'sanitize_title',
+                    ),
+                    'context'     => array( 'view', 'edit' ),
+                    'readonly'    => true,
+                ),
+                'name'        => array(
+                    'description' => __( 'A human readable label for the setting used in interfaces.', 'invoicing' ),
+                    'type'        => 'string',
+                    'arg_options' => array(
+                        'sanitize_callback' => 'sanitize_text_field',
+                    ),
+                    'context'     => array( 'view', 'edit' ),
+                    'readonly'    => true,
+                ),
+                'desc'        => array(
+                    'description' => __( 'A human readable description for the setting used in interfaces.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit' ),
+                    'readonly'    => true,
+                ),
+                'value'       => array(
+                    'description' => __( 'The current value of this setting.', 'invoicing' ),
+                    'type'        => 'mixed',
+                    'context'     => array( 'view', 'edit' ),
+                ),
+                'default'     => array(
+                    'description' => __( 'Default value for the setting.', 'invoicing' ),
+                    'type'        => 'mixed',
+                    'context'     => array( 'view', 'edit' ),
+                    'readonly'    => true,
+                ),
+                'placeholder' => array(
+                    'description' => __( 'Placeholder text to be displayed in text inputs.', 'invoicing' ),
+                    'type'        => 'string',
+                    'arg_options' => array(
+                        'sanitize_callback' => 'sanitize_text_field',
+                    ),
+                    'context'     => array( 'view', 'edit' ),
+                    'readonly'    => true,
+                ),
+                'type'        => array(
+                    'description' => __( 'Type of setting.', 'invoicing' ),
+                    'type'        => 'string',
+                    'arg_options' => array(
+                        'sanitize_callback' => 'sanitize_text_field',
+                    ),
+                    'context'     => array( 'view', 'edit' ),
+                    'enum'        => array( 'text', 'email', 'number', 'color', 'password', 'textarea', 'select', 'multiselect', 'radio', 'image_width', 'checkbox', 'raw_html' ),
+                    'readonly'    => true,
+                ),
+                'options'     => array(
+                    'description' => __( 'Array of options (key value pairs) for inputs such as select, multiselect, and radio buttons.', 'invoicing' ),
+                    'type'        => 'object',
+                    'context'     => array( 'view', 'edit' ),
+                    'readonly'    => true,
+                ),
+                'readonly'    => array(
+                    'description' => __( 'Whether or not this setting is readonly', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'faux'        => array(
+                    'description' => __( 'Whether or not this setting is readonly/faux', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+            ),
+        );
+
+        // Filters the settings schema for the REST API.
         $schema = apply_filters( 'getpaid_rest_settings_schema', $schema );
 
-		// Cache the settings schema.
-		$this->schema = $schema;
-
-		return $this->add_additional_fields_schema( $this->schema );
-
-	}
-
-	/**
-	 * Validate a text value for a text based setting.
-	 *
-	 * @since 2.0.0
-	 * @param string $value Value.
-	 * @param array  $setting Setting.
-	 * @return string
-	 */
-	public function validate_setting_text_field( $value ) {
-		$value = is_null( $value ) ? '' : $value;
-		return wp_kses_post( trim( stripslashes( $value ) ) );
-	}
-
-	/**
-	 * Validate select based settings.
-	 *
-	 * @since 2.0.0
-	 * @param string $value Value.
-	 * @param array  $setting Setting.
-	 * @return string|WP_Error
-	 */
-	public function validate_setting_select_field( $value, $setting ) {
-		if ( array_key_exists( $value, $setting['options'] ) ) {
-			return $value;
-		} else {
-			return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'invoicing' ), array( 'status' => 400 ) );
-		}
-	}
-
-	/**
-	 * Validate multiselect based settings.
-	 *
-	 * @since 2.0.0
-	 * @param array $values Values.
-	 * @param array $setting Setting.
-	 * @return array|WP_Error
-	 */
-	public function validate_setting_multiselect_field( $values, $setting ) {
-		if ( empty( $values ) ) {
-			return array();
-		}
-
-		if ( ! is_array( $values ) ) {
-			return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'invoicing' ), array( 'status' => 400 ) );
-		}
-
-		$final_values = array();
-		foreach ( $values as $value ) {
-			if ( array_key_exists( $value, $setting['options'] ) ) {
-				$final_values[] = $value;
-			}
-		}
-
-		return $final_values;
-	}
-
-	/**
-	 * Validate radio based settings.
-	 *
-	 * @since 2.0.0
-	 * @param string $value Value.
-	 * @param array  $setting Setting.
-	 * @return string|WP_Error
-	 */
-	public function validate_setting_radio_field( $value, $setting ) {
-		return $this->validate_setting_select_field( $value, $setting );
-	}
-
-	/**
-	 * Validate checkbox based settings.
-	 *
-	 * @since 2.0.0
-	 * @param string $value Value.
-	 * @return int
-	 */
-	public function validate_setting_checkbox_field( $value ) {
-		return (int) ! empty( $value );
-	}
-
-	/**
-	 * Validate textarea based settings.
-	 *
-	 * @since 2.0.0
-	 * @param string $value Value.
-	 * @return string
-	 */
-	public function validate_setting_textarea_field( $value ) {
-		$value = is_null( $value ) ? '' : $value;
-		return wp_kses(
-			trim( stripslashes( $value ) ),
-			array_merge(
-				array(
-					'iframe' => array(
-						'src'   => true,
-						'style' => true,
-						'id'    => true,
-						'class' => true,
-					),
-				),
-				wp_kses_allowed_html( 'post' )
-			)
-		);
-	}
+        // Cache the settings schema.
+        $this->schema = $schema;
+
+        return $this->add_additional_fields_schema( $this->schema );
+
+    }
+
+    /**
+     * Validate a text value for a text based setting.
+     *
+     * @since 2.0.0
+     * @param string $value Value.
+     * @param array  $setting Setting.
+     * @return string
+     */
+    public function validate_setting_text_field( $value ) {
+        $value = is_null( $value ) ? '' : $value;
+        return wp_kses_post( trim( stripslashes( $value ) ) );
+    }
+
+    /**
+     * Validate select based settings.
+     *
+     * @since 2.0.0
+     * @param string $value Value.
+     * @param array  $setting Setting.
+     * @return string|WP_Error
+     */
+    public function validate_setting_select_field( $value, $setting ) {
+        if ( array_key_exists( $value, $setting['options'] ) ) {
+            return $value;
+        } else {
+            return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'invoicing' ), array( 'status' => 400 ) );
+        }
+    }
+
+    /**
+     * Validate multiselect based settings.
+     *
+     * @since 2.0.0
+     * @param array $values Values.
+     * @param array $setting Setting.
+     * @return array|WP_Error
+     */
+    public function validate_setting_multiselect_field( $values, $setting ) {
+        if ( empty( $values ) ) {
+            return array();
+        }
+
+        if ( ! is_array( $values ) ) {
+            return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'invoicing' ), array( 'status' => 400 ) );
+        }
+
+        $final_values = array();
+        foreach ( $values as $value ) {
+            if ( array_key_exists( $value, $setting['options'] ) ) {
+                $final_values[] = $value;
+            }
+        }
+
+        return $final_values;
+    }
+
+    /**
+     * Validate radio based settings.
+     *
+     * @since 2.0.0
+     * @param string $value Value.
+     * @param array  $setting Setting.
+     * @return string|WP_Error
+     */
+    public function validate_setting_radio_field( $value, $setting ) {
+        return $this->validate_setting_select_field( $value, $setting );
+    }
+
+    /**
+     * Validate checkbox based settings.
+     *
+     * @since 2.0.0
+     * @param string $value Value.
+     * @return int
+     */
+    public function validate_setting_checkbox_field( $value ) {
+        return (int) ! empty( $value );
+    }
+
+    /**
+     * Validate textarea based settings.
+     *
+     * @since 2.0.0
+     * @param string $value Value.
+     * @return string
+     */
+    public function validate_setting_textarea_field( $value ) {
+        $value = is_null( $value ) ? '' : $value;
+        return wp_kses(
+            trim( stripslashes( $value ) ),
+            array_merge(
+                array(
+                    'iframe' => array(
+                        'src'   => true,
+                        'style' => true,
+                        'id'    => true,
+                        'class' => true,
+                    ),
+                ),
+                wp_kses_allowed_html( 'post' )
+            )
+        );
+    }
 
 }

Spacing +184 added lines, -184 removed lines

@@ -9,7 +9,7 @@ 
  * @since   2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid REST Setting controller class.
@@ -39,7 +39,7 @@ 
 	 *
 	 * @see register_rest_route()
 	 */
-	public function register_namespace_routes( $namespace ) {
+	public function register_namespace_routes($namespace) {
 
 		// List all registered tabs.
 		register_rest_route(
@@ -48,8 +48,8 @@ 
 			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_tabs' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'callback'            => array($this, 'get_tabs'),
+					'permission_callback' => array($this, 'get_items_permissions_check'),
 				),
 				'schema' => '__return_empty_array',
 			)
@@ -62,23 +62,23 @@ 
 			array(
 				'args'   => array(
 					'id' => array(
-						'description' => __( 'Unique identifier for the setting.', 'invoicing' ),
+						'description' => __('Unique identifier for the setting.', 'invoicing'),
 						'type'        => 'string',
 						'required'    => true,
 					),
 				),
 				array(
 					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_item' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'callback'            => array($this, 'get_item'),
+					'permission_callback' => array($this, 'get_items_permissions_check'),
 				),
 				array(
 					'methods'             => WP_REST_Server::EDITABLE,
-					'callback'            => array( $this, 'update_item' ),
-					'permission_callback' => array( $this, 'update_items_permissions_check' ),
-					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+					'callback'            => array($this, 'update_item'),
+					'permission_callback' => array($this, 'update_items_permissions_check'),
+					'args'                => $this->get_endpoint_args_for_item_schema(WP_REST_Server::EDITABLE),
 				),
-				'schema' => array( $this, 'get_public_item_schema' ),
+				'schema' => array($this, 'get_public_item_schema'),
 			)
 		);
 
@@ -89,16 +89,16 @@ 
 			array(
 				'args'   => array(
 					'tab' => array(
-						'description' => __( 'Unique identifier for the tab whose sections should be retrieved.', 'invoicing' ),
+						'description' => __('Unique identifier for the tab whose sections should be retrieved.', 'invoicing'),
 						'type'        => 'string',
 						'required'    => true,
-						'enum'        => array_keys( wpinv_get_settings_tabs() ),
+						'enum'        => array_keys(wpinv_get_settings_tabs()),
 					),
 				),
 				array(
 					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_sections' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'callback'            => array($this, 'get_sections'),
+					'permission_callback' => array($this, 'get_items_permissions_check'),
 				),
 				'schema' => '__return_empty_array',
 			)
@@ -111,23 +111,23 @@ 
 			array(
 				'args'   => array(
 					'tab'     => array(
-						'description' => __( 'Unique identifier for the tab whose settings should be retrieved.', 'invoicing' ),
+						'description' => __('Unique identifier for the tab whose settings should be retrieved.', 'invoicing'),
 						'type'        => 'string',
 						'required'    => true,
-						'enum'        => array_keys( wpinv_get_settings_tabs() ),
+						'enum'        => array_keys(wpinv_get_settings_tabs()),
 					),
 					'section' => array(
-						'description' => __( 'The section in the tab whose settings should be retrieved.', 'invoicing' ),
+						'description' => __('The section in the tab whose settings should be retrieved.', 'invoicing'),
 						'type'        => 'string',
 						'required'    => true,
 					),
 				),
 				array(
 					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_items' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'callback'            => array($this, 'get_items'),
+					'permission_callback' => array($this, 'get_items_permissions_check'),
 				),
-				'schema' => array( $this, 'get_public_item_schema' ),
+				'schema' => array($this, 'get_public_item_schema'),
 			)
 		); 
 
@@ -137,17 +137,17 @@ 
 			array(
 				'args'   => array(
 					'id' => array(
-						'description' => __( 'Setting ID.', 'invoicing' ),
+						'description' => __('Setting ID.', 'invoicing'),
 						'type'        => 'string',
 					),
 				),
 				array(
 					'methods'             => WP_REST_Server::EDITABLE,
-					'callback'            => array( $this, 'batch_items' ),
-					'permission_callback' => array( $this, 'batch_items_permissions_check' ),
-					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+					'callback'            => array($this, 'batch_items'),
+					'permission_callback' => array($this, 'batch_items_permissions_check'),
+					'args'                => $this->get_endpoint_args_for_item_schema(WP_REST_Server::EDITABLE),
 				),
-				'schema' => array( $this, 'get_public_batch_schema' ),
+				'schema' => array($this, 'get_public_batch_schema'),
 			)
 		);
 
@@ -160,33 +160,33 @@ 
 	 * @param  WP_REST_Request $request Request data.
 	 * @return WP_Error|WP_REST_Response
 	 */
-	public function get_items( $request ) {
+	public function get_items($request) {
 
 		$settings = $this->get_settings();
 
-		if ( ! isset( $settings[ $request['tab'] ] ) ) {
-			return new WP_Error( 'rest_invalid_tab', __( 'Invalid tab.', 'invoicing' ), array( 'status' => 400 ) );
+		if (!isset($settings[$request['tab']])) {
+			return new WP_Error('rest_invalid_tab', __('Invalid tab.', 'invoicing'), array('status' => 400));
 		}
 
-		if ( ! isset( $settings[ $request['tab'] ][ $request['section'] ] ) ) {
-			return new WP_Error( 'rest_invalid_section', __( 'Invalid section.', 'invoicing' ), array( 'status' => 400 ) );
+		if (!isset($settings[$request['tab']][$request['section']])) {
+			return new WP_Error('rest_invalid_section', __('Invalid section.', 'invoicing'), array('status' => 400));
 		}
 
-		$settings = $settings[ $request['tab'] ][ $request['section'] ];
+		$settings = $settings[$request['tab']][$request['section']];
 		$prepared = array();
 
-		foreach ( $settings as $setting ) {
+		foreach ($settings as $setting) {
 
-			$setting      = $this->sanitize_setting( $setting );
-			$setting_data = $this->prepare_item_for_response( $setting, $request );
-			$setting_data = $this->prepare_response_for_collection( $setting_data );
+			$setting      = $this->sanitize_setting($setting);
+			$setting_data = $this->prepare_item_for_response($setting, $request);
+			$setting_data = $this->prepare_response_for_collection($setting_data);
 
-			if ( $this->is_setting_type_valid( $setting['type'] ) ) {
-				$prepared[]   = $setting_data;
+			if ($this->is_setting_type_valid($setting['type'])) {
+				$prepared[] = $setting_data;
 			}
 }
 
-		return rest_ensure_response( $prepared );
+		return rest_ensure_response($prepared);
 	}
 
 	/**
@@ -196,16 +196,16 @@ 
 	 * @param  WP_REST_Request $request Request data.
 	 * @return WP_Error|WP_REST_Response
 	 */
-	public function get_item( $request ) {
-		$setting  = $this->get_setting( $request['id'] );
+	public function get_item($request) {
+		$setting = $this->get_setting($request['id']);
 
-		if ( is_wp_error( $setting ) ) {
+		if (is_wp_error($setting)) {
 			return $setting;
 		}
 
-		$setting  = $this->sanitize_setting( $setting );
-		$response = $this->prepare_item_for_response( $setting, $request );
-		return rest_ensure_response( $response );
+		$setting  = $this->sanitize_setting($setting);
+		$response = $this->prepare_item_for_response($setting, $request);
+		return rest_ensure_response($response);
 	}
 
 	/**
@@ -215,29 +215,29 @@ 
 	 * @param  WP_REST_Request $request Request data.
 	 * @return WP_Error|WP_REST_Response
 	 */
-	public function update_item( $request ) {
-		$setting = $this->get_setting( $request['id'] );
+	public function update_item($request) {
+		$setting = $this->get_setting($request['id']);
 
-		if ( is_wp_error( $setting ) ) {
+		if (is_wp_error($setting)) {
 			return $setting;
 		}
 
-		if ( is_callable( array( $this, 'validate_setting_' . $setting['type'] . '_field' ) ) ) {
-			$value = $this->{'validate_setting_' . $setting['type'] . '_field'}( $request['value'], $setting );
+		if (is_callable(array($this, 'validate_setting_' . $setting['type'] . '_field'))) {
+			$value = $this->{'validate_setting_' . $setting['type'] . '_field'}($request['value'], $setting);
 		} else {
-			$value = $this->validate_setting_text_field( $request['value'], $setting );
+			$value = $this->validate_setting_text_field($request['value'], $setting);
 		}
 
-		if ( is_wp_error( $value ) ) {
+		if (is_wp_error($value)) {
 			return $value;
 		}
 
-		wpinv_update_option( $request['id'], $value );
+		wpinv_update_option($request['id'], $value);
 		$setting['value'] = $value;
-		$setting          = $this->sanitize_setting( $setting );
-		$response         = $this->prepare_item_for_response( $setting, $request );
+		$setting          = $this->sanitize_setting($setting);
+		$response         = $this->prepare_item_for_response($setting, $request);
 
-		return rest_ensure_response( $response );
+		return rest_ensure_response($response);
 	}
 
 	/**
@@ -247,9 +247,9 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|boolean
 	 */
-	public function get_items_permissions_check( $request ) {
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error( 'rest_cannot_view', __( 'Sorry, you cannot list resources.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+	public function get_items_permissions_check($request) {
+		if (!wpinv_current_user_can_manage_invoicing()) {
+			return new WP_Error('rest_cannot_view', __('Sorry, you cannot list resources.', 'invoicing'), array('status' => rest_authorization_required_code()));
 		}
 
 		return true;
@@ -262,9 +262,9 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|boolean
 	 */
-	public function update_items_permissions_check( $request ) {
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error( 'rest_cannot_edit', __( 'Sorry, you cannot edit this resource.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+	public function update_items_permissions_check($request) {
+		if (!wpinv_current_user_can_manage_invoicing()) {
+			return new WP_Error('rest_cannot_edit', __('Sorry, you cannot edit this resource.', 'invoicing'), array('status' => rest_authorization_required_code()));
 		}
 
 		return true;
@@ -277,8 +277,8 @@ 
 	 *
 	 * @return boolean|WP_Error
 	 */
-	public function batch_items_permissions_check( $request ) {
-		return wpinv_current_user_can_manage_invoicing() ? true : new WP_Error( 'rest_cannot_batch', __( 'Sorry, you are not allowed to batch manipulate this resource.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+	public function batch_items_permissions_check($request) {
+		return wpinv_current_user_can_manage_invoicing() ? true : new WP_Error('rest_cannot_batch', __('Sorry, you are not allowed to batch manipulate this resource.', 'invoicing'), array('status' => rest_authorization_required_code()));
 	}
 
 	/**
@@ -287,14 +287,14 @@ 
 	 * @param string $setting_id Setting ID.
 	 * @return array Links for the given setting.
 	 */
-	protected function prepare_links( $setting_id ) {
+	protected function prepare_links($setting_id) {
 
 		$links = array(
 			'self'       => array(
-				'href' => rest_url( sprintf( '/%s/%s/setting/%s', $this->namespace, $this->rest_base, $setting_id ) ),
+				'href' => rest_url(sprintf('/%s/%s/setting/%s', $this->namespace, $this->rest_base, $setting_id)),
 			),
 			'collection' => array(
-				'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+				'href' => rest_url(sprintf('/%s/%s', $this->namespace, $this->rest_base)),
 			),
 		);
 
@@ -309,14 +309,14 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response $response Response data.
 	 */
-	public function prepare_item_for_response( $item, $request ) {
-		$context = empty( $request['context'] ) ? 'view' : $request['context'];
-		$data    = $this->add_additional_fields_to_object( $item, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
+	public function prepare_item_for_response($item, $request) {
+		$context = empty($request['context']) ? 'view' : $request['context'];
+		$data    = $this->add_additional_fields_to_object($item, $request);
+		$data    = $this->filter_response_by_context($data, $context);
 
-		$response = rest_ensure_response( $data );
+		$response = rest_ensure_response($data);
 
-		$response->add_links( $this->prepare_links( $item['id'] ) );
+		$response->add_links($this->prepare_links($item['id']));
 
 		return $response;
 	}
@@ -329,10 +329,10 @@ 
 	 * @param  array $setting Setting.
 	 * @return array
 	 */
-	public function filter_setting( $setting ) {
+	public function filter_setting($setting) {
 		return array_intersect_key(
 			$setting,
-			array_flip( array_filter( array_keys( $setting ), array( $this, 'allowed_setting_keys' ) ) )
+			array_flip(array_filter(array_keys($setting), array($this, 'allowed_setting_keys')))
 		);
 	}
 
@@ -342,8 +342,8 @@ 
 	 * @param  string $key Key to check.
 	 * @return boolean
 	 */
-	public function allowed_setting_keys( $key ) {
-		return in_array( $key, array_keys( $this->setting_defaults() ), true );
+	public function allowed_setting_keys($key) {
+		return in_array($key, array_keys($this->setting_defaults()), true);
 	}
 
 	/**
@@ -375,11 +375,11 @@ 
 	 * @param  array $setting The setting to sanitize.
 	 * @return array
 	 */
-	public function sanitize_setting( $setting ) {
+	public function sanitize_setting($setting) {
 
-		$setting          = wp_parse_args( $setting, $this->setting_defaults() );
-		$setting['value'] = wpinv_get_option( $setting['id'], $setting['std'] );
-		return $this->filter_setting( $setting );
+		$setting          = wp_parse_args($setting, $this->setting_defaults());
+		$setting['value'] = wpinv_get_option($setting['id'], $setting['std']);
+		return $this->filter_setting($setting);
 
 	}
 
@@ -390,29 +390,29 @@ 
 	 * @param string $setting_id Setting ID.
 	 * @return array|WP_Error
 	 */
-	public function get_setting( $setting_id ) {
+	public function get_setting($setting_id) {
 
-		if ( empty( $setting_id ) ) {
-			return new WP_Error( 'rest_setting_setting_invalid', __( 'Invalid setting.', 'invoicing' ), array( 'status' => 404 ) );
+		if (empty($setting_id)) {
+			return new WP_Error('rest_setting_setting_invalid', __('Invalid setting.', 'invoicing'), array('status' => 404));
 		}
 
-		$settings  = $this->get_settings();
+		$settings = $this->get_settings();
 
-		foreach ( $settings as $tabs ) {
+		foreach ($settings as $tabs) {
 
-			foreach ( $tabs as $sections ) {
+			foreach ($tabs as $sections) {
 
-				if ( isset( $sections[ $setting_id ] ) ) {
-					if ( ! $this->is_setting_type_valid( $sections[ $setting_id ]['type'] ) ) {
-						return new WP_Error( 'rest_setting_setting_type_invalid', __( 'Invalid setting type.', 'invoicing' ), array( 'status' => 404 ) );
+				if (isset($sections[$setting_id])) {
+					if (!$this->is_setting_type_valid($sections[$setting_id]['type'])) {
+						return new WP_Error('rest_setting_setting_type_invalid', __('Invalid setting type.', 'invoicing'), array('status' => 404));
 					}
 
-					return $sections[ $setting_id ];
+					return $sections[$setting_id];
 				}
 }
 }
 
-		return new WP_Error( 'rest_setting_setting_invalid', __( 'Invalid setting.', 'invoicing' ), array( 'status' => 404 ) );
+		return new WP_Error('rest_setting_setting_invalid', __('Invalid setting.', 'invoicing'), array('status' => 404));
 	}
 
 	/**
@@ -421,41 +421,41 @@ 
 	 * @param  WP_REST_Request $request Request data.
 	 * @return array
 	 */
-	public function get_tabs( $request ) {
+	public function get_tabs($request) {
 		$tabs     = wpinv_get_settings_tabs();
 		$prepared = array();
 
-		foreach ( $tabs as $id => $tab ) {
+		foreach ($tabs as $id => $tab) {
 
 			$_request        = $request;
-			$_request['tab'] = sanitize_title( $id );
+			$_request['tab'] = sanitize_title($id);
 			$data            = array(
-				'id'       => sanitize_title( $id ),
-				'label'    => sanitize_text_field( $tab ),
-				'sections' => $this->get_sections( $_request ),
+				'id'       => sanitize_title($id),
+				'label'    => sanitize_text_field($tab),
+				'sections' => $this->get_sections($_request),
 			);
 
-			$data     = $this->add_additional_fields_to_object( $data, $request );
-			$response = rest_ensure_response( $data );
+			$data     = $this->add_additional_fields_to_object($data, $request);
+			$response = rest_ensure_response($data);
 
-			if ( ! is_wp_error( $response ) ) {
+			if (!is_wp_error($response)) {
 				$links = array(
 					'sections'   => array(
-						'href' => rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $id ) ),
+						'href' => rest_url(sprintf('/%s/%s/%s', $this->namespace, $this->rest_base, $id)),
 					),
 					'collection' => array(
-						'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+						'href' => rest_url(sprintf('/%s/%s', $this->namespace, $this->rest_base)),
 					),
 				);
-				$response->add_links( $links );
-				$response = $this->prepare_response_for_collection( $response );
+				$response->add_links($links);
+				$response = $this->prepare_response_for_collection($response);
 			}
 
 			$prepared[] = $response;
 
 		}
 
-		return rest_ensure_response( $prepared );
+		return rest_ensure_response($prepared);
 	}
 
 	/**
@@ -464,43 +464,43 @@ 
 	 * @param  WP_REST_Request $request Request data.
 	 * @return array
 	 */
-	public function get_sections( $request ) {
+	public function get_sections($request) {
 
-		$tab      = sanitize_title( $request['tab'] );
-		$sections = wpinv_get_settings_tab_sections( $tab );
+		$tab      = sanitize_title($request['tab']);
+		$sections = wpinv_get_settings_tab_sections($tab);
 		$prepared = array();
 
-		foreach ( $sections as $id => $section ) {
+		foreach ($sections as $id => $section) {
 
-			$data            = array(
-				'id'    => sanitize_title( $id ),
-				'label' => sanitize_text_field( $section ),
+			$data = array(
+				'id'    => sanitize_title($id),
+				'label' => sanitize_text_field($section),
 			);
 
-			$data     = $this->add_additional_fields_to_object( $data, $request );
-			$response = rest_ensure_response( $data );
+			$data     = $this->add_additional_fields_to_object($data, $request);
+			$response = rest_ensure_response($data);
 
-			if ( ! is_wp_error( $response ) ) {
+			if (!is_wp_error($response)) {
 				$links = array(
 					'settings'   => array(
-						'href' => rest_url( sprintf( '/%s/%s/%s/%s', $this->namespace, $this->rest_base, $tab, $id ) ),
+						'href' => rest_url(sprintf('/%s/%s/%s/%s', $this->namespace, $this->rest_base, $tab, $id)),
 					),
 					'collection' => array(
-						'href' => rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $tab ) ),
+						'href' => rest_url(sprintf('/%s/%s/%s', $this->namespace, $this->rest_base, $tab)),
 					),
 					'tabs'       => array(
-						'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+						'href' => rest_url(sprintf('/%s/%s', $this->namespace, $this->rest_base)),
 					),
 				);
-				$response->add_links( $links );
-				$response = $this->prepare_response_for_collection( $response );
+				$response->add_links($links);
+				$response = $this->prepare_response_for_collection($response);
 			}
 
 			$prepared[] = $response;
 
 		}
 
-		return rest_ensure_response( $prepared );
+		return rest_ensure_response($prepared);
 	}
 
 	/**
@@ -510,7 +510,7 @@ 
 	 */
 	public function get_settings() {
 
-		if ( empty( $this->settings ) ) {
+		if (empty($this->settings)) {
 			$this->settings = wpinv_get_registered_settings();
 		}
 
@@ -525,22 +525,22 @@ 
 	 * @param  string $type Type.
 	 * @return bool
 	 */
-	public function is_setting_type_valid( $type ) {
+	public function is_setting_type_valid($type) {
 
 		return in_array(
 			$type,
             array(
-				'text',         // Validates with validate_setting_text_field.
-				'email',        // Validates with validate_setting_text_field.
-				'number',       // Validates with validate_setting_text_field.
-				'color',        // Validates with validate_setting_text_field.
-				'password',     // Validates with validate_setting_text_field.
-				'textarea',     // Validates with validate_setting_textarea_field.
-				'select',       // Validates with validate_setting_select_field.
-				'multiselect',  // Validates with validate_setting_multiselect_field.
-				'radio',        // Validates with validate_setting_radio_field (-> validate_setting_select_field).
-				'checkbox',     // Validates with validate_setting_checkbox_field.
-				'header',       // Validates with validate_setting_text_field.
+				'text', // Validates with validate_setting_text_field.
+				'email', // Validates with validate_setting_text_field.
+				'number', // Validates with validate_setting_text_field.
+				'color', // Validates with validate_setting_text_field.
+				'password', // Validates with validate_setting_text_field.
+				'textarea', // Validates with validate_setting_textarea_field.
+				'select', // Validates with validate_setting_select_field.
+				'multiselect', // Validates with validate_setting_multiselect_field.
+				'radio', // Validates with validate_setting_radio_field (-> validate_setting_select_field).
+				'checkbox', // Validates with validate_setting_checkbox_field.
+				'header', // Validates with validate_setting_text_field.
 			)
 		);
 
@@ -554,8 +554,8 @@ 
 	public function get_item_schema() {
 
 		// Maybe retrieve the schema from cache.
-		if ( ! empty( $this->schema ) ) {
-			return $this->add_additional_fields_schema( $this->schema );
+		if (!empty($this->schema)) {
+			return $this->add_additional_fields_schema($this->schema);
 		}
 
 		$schema = array(
@@ -564,105 +564,105 @@ 
 			'type'       => 'object',
 			'properties' => array(
 				'id'          => array(
-					'description' => __( 'A unique identifier for the setting.', 'invoicing' ),
+					'description' => __('A unique identifier for the setting.', 'invoicing'),
 					'type'        => 'string',
 					'arg_options' => array(
 						'sanitize_callback' => 'sanitize_title',
 					),
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 					'readonly'    => true,
 				),
 				'tab'         => array(
-					'description' => __( 'An identifier for the tab this setting belongs to.', 'invoicing' ),
+					'description' => __('An identifier for the tab this setting belongs to.', 'invoicing'),
 					'type'        => 'string',
 					'arg_options' => array(
 						'sanitize_callback' => 'sanitize_title',
 					),
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 					'readonly'    => true,
 				),
 				'section'     => array(
-					'description' => __( 'An identifier for the section this setting belongs to.', 'invoicing' ),
+					'description' => __('An identifier for the section this setting belongs to.', 'invoicing'),
 					'type'        => 'string',
 					'arg_options' => array(
 						'sanitize_callback' => 'sanitize_title',
 					),
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 					'readonly'    => true,
 				),
 				'name'        => array(
-					'description' => __( 'A human readable label for the setting used in interfaces.', 'invoicing' ),
+					'description' => __('A human readable label for the setting used in interfaces.', 'invoicing'),
 					'type'        => 'string',
 					'arg_options' => array(
 						'sanitize_callback' => 'sanitize_text_field',
 					),
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 					'readonly'    => true,
 				),
 				'desc'        => array(
-					'description' => __( 'A human readable description for the setting used in interfaces.', 'invoicing' ),
+					'description' => __('A human readable description for the setting used in interfaces.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 					'readonly'    => true,
 				),
 				'value'       => array(
-					'description' => __( 'The current value of this setting.', 'invoicing' ),
+					'description' => __('The current value of this setting.', 'invoicing'),
 					'type'        => 'mixed',
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 				),
 				'default'     => array(
-					'description' => __( 'Default value for the setting.', 'invoicing' ),
+					'description' => __('Default value for the setting.', 'invoicing'),
 					'type'        => 'mixed',
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 					'readonly'    => true,
 				),
 				'placeholder' => array(
-					'description' => __( 'Placeholder text to be displayed in text inputs.', 'invoicing' ),
+					'description' => __('Placeholder text to be displayed in text inputs.', 'invoicing'),
 					'type'        => 'string',
 					'arg_options' => array(
 						'sanitize_callback' => 'sanitize_text_field',
 					),
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 					'readonly'    => true,
 				),
 				'type'        => array(
-					'description' => __( 'Type of setting.', 'invoicing' ),
+					'description' => __('Type of setting.', 'invoicing'),
 					'type'        => 'string',
 					'arg_options' => array(
 						'sanitize_callback' => 'sanitize_text_field',
 					),
-					'context'     => array( 'view', 'edit' ),
-					'enum'        => array( 'text', 'email', 'number', 'color', 'password', 'textarea', 'select', 'multiselect', 'radio', 'image_width', 'checkbox', 'raw_html' ),
+					'context'     => array('view', 'edit'),
+					'enum'        => array('text', 'email', 'number', 'color', 'password', 'textarea', 'select', 'multiselect', 'radio', 'image_width', 'checkbox', 'raw_html'),
 					'readonly'    => true,
 				),
 				'options'     => array(
-					'description' => __( 'Array of options (key value pairs) for inputs such as select, multiselect, and radio buttons.', 'invoicing' ),
+					'description' => __('Array of options (key value pairs) for inputs such as select, multiselect, and radio buttons.', 'invoicing'),
 					'type'        => 'object',
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 					'readonly'    => true,
 				),
 				'readonly'    => array(
-					'description' => __( 'Whether or not this setting is readonly', 'invoicing' ),
+					'description' => __('Whether or not this setting is readonly', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'faux'        => array(
-					'description' => __( 'Whether or not this setting is readonly/faux', 'invoicing' ),
+					'description' => __('Whether or not this setting is readonly/faux', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 			),
 		);
 
 		// Filters the settings schema for the REST API.
-        $schema = apply_filters( 'getpaid_rest_settings_schema', $schema );
+        $schema = apply_filters('getpaid_rest_settings_schema', $schema);
 
 		// Cache the settings schema.
 		$this->schema = $schema;
 
-		return $this->add_additional_fields_schema( $this->schema );
+		return $this->add_additional_fields_schema($this->schema);
 
 	}
 
@@ -674,9 +674,9 @@ 
 	 * @param array  $setting Setting.
 	 * @return string
 	 */
-	public function validate_setting_text_field( $value ) {
-		$value = is_null( $value ) ? '' : $value;
-		return wp_kses_post( trim( stripslashes( $value ) ) );
+	public function validate_setting_text_field($value) {
+		$value = is_null($value) ? '' : $value;
+		return wp_kses_post(trim(stripslashes($value)));
 	}
 
 	/**
@@ -687,11 +687,11 @@ 
 	 * @param array  $setting Setting.
 	 * @return string|WP_Error
 	 */
-	public function validate_setting_select_field( $value, $setting ) {
-		if ( array_key_exists( $value, $setting['options'] ) ) {
+	public function validate_setting_select_field($value, $setting) {
+		if (array_key_exists($value, $setting['options'])) {
 			return $value;
 		} else {
-			return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'invoicing' ), array( 'status' => 400 ) );
+			return new WP_Error('rest_setting_value_invalid', __('An invalid setting value was passed.', 'invoicing'), array('status' => 400));
 		}
 	}
 
@@ -703,18 +703,18 @@ 
 	 * @param array $setting Setting.
 	 * @return array|WP_Error
 	 */
-	public function validate_setting_multiselect_field( $values, $setting ) {
-		if ( empty( $values ) ) {
+	public function validate_setting_multiselect_field($values, $setting) {
+		if (empty($values)) {
 			return array();
 		}
 
-		if ( ! is_array( $values ) ) {
-			return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'invoicing' ), array( 'status' => 400 ) );
+		if (!is_array($values)) {
+			return new WP_Error('rest_setting_value_invalid', __('An invalid setting value was passed.', 'invoicing'), array('status' => 400));
 		}
 
 		$final_values = array();
-		foreach ( $values as $value ) {
-			if ( array_key_exists( $value, $setting['options'] ) ) {
+		foreach ($values as $value) {
+			if (array_key_exists($value, $setting['options'])) {
 				$final_values[] = $value;
 			}
 		}
@@ -730,8 +730,8 @@ 
 	 * @param array  $setting Setting.
 	 * @return string|WP_Error
 	 */
-	public function validate_setting_radio_field( $value, $setting ) {
-		return $this->validate_setting_select_field( $value, $setting );
+	public function validate_setting_radio_field($value, $setting) {
+		return $this->validate_setting_select_field($value, $setting);
 	}
 
 	/**
@@ -741,8 +741,8 @@ 
 	 * @param string $value Value.
 	 * @return int
 	 */
-	public function validate_setting_checkbox_field( $value ) {
-		return (int) ! empty( $value );
+	public function validate_setting_checkbox_field($value) {
+		return (int) !empty($value);
 	}
 
 	/**
@@ -752,10 +752,10 @@ 
 	 * @param string $value Value.
 	 * @return string
 	 */
-	public function validate_setting_textarea_field( $value ) {
-		$value = is_null( $value ) ? '' : $value;
+	public function validate_setting_textarea_field($value) {
+		$value = is_null($value) ? '' : $value;
 		return wp_kses(
-			trim( stripslashes( $value ) ),
+			trim(stripslashes($value)),
 			array_merge(
 				array(
 					'iframe' => array(
@@ -765,7 +765,7 @@ 
 						'class' => true,
 					),
 				),
-				wp_kses_allowed_html( 'post' )
+				wp_kses_allowed_html('post')
 			)
 		);
 	}

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

Indentation +18 added lines, -18 removed lines

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

Spacing +13 added lines, -13 removed lines

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

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

Indentation +2530 added lines, -2530 removed lines

@@ -11,21 +11,21 @@ 
  * @return mixed|void
  */
 function sd_pagenow_exclude() {
-	return apply_filters(
-		'sd_pagenow_exclude',
-		array(
-			'upload.php',
-			'edit-comments.php',
-			'edit-tags.php',
-			'index.php',
-			'media-new.php',
-			'options-discussion.php',
-			'options-writing.php',
-			'edit.php',
-			'themes.php',
-			'users.php',
-		)
-	);
+    return apply_filters(
+        'sd_pagenow_exclude',
+        array(
+            'upload.php',
+            'edit-comments.php',
+            'edit-tags.php',
+            'index.php',
+            'media-new.php',
+            'options-discussion.php',
+            'options-writing.php',
+            'edit.php',
+            'themes.php',
+            'users.php',
+        )
+    );
 }
 
 
@@ -37,7 +37,7 @@ 
  * @return mixed|void
  */
 function sd_widget_exclude() {
-	return apply_filters( 'sd_widget_exclude', array() );
+    return apply_filters( 'sd_widget_exclude', array() );
 }
 
 
@@ -50,83 +50,83 @@ 
  * @return array
  */
 function sd_get_margin_input( $type = 'mt', $overwrite = array(), $include_negatives = true ) {
-	global $aui_bs5;
-	$options = array(
-		''     => __( 'None', 'ayecode-connect' ),
-		'auto' => __( 'auto', 'ayecode-connect' ),
-		'0'    => '0',
-		'1'    => '1',
-		'2'    => '2',
-		'3'    => '3',
-		'4'    => '4',
-		'5'    => '5',
-		'6'    => '6',
-		'7'    => '7',
-		'8'    => '8',
-		'9'    => '9',
-		'10'   => '10',
-		'11'   => '11',
-		'12'   => '12',
-	);
-
-	if ( $include_negatives ) {
-		$options['n1']  = '-1';
-		$options['n2']  = '-2';
-		$options['n3']  = '-3';
-		$options['n4']  = '-4';
-		$options['n5']  = '-5';
-		$options['n6']  = '-6';
-		$options['n7']  = '-7';
-		$options['n8']  = '-8';
-		$options['n9']  = '-9';
-		$options['n10'] = '-10';
-		$options['n11'] = '-11';
-		$options['n12'] = '-12';
-	}
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Margin top', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	// title
-	if ( $type == 'mt' ) {
-		$defaults['title'] = __( 'Margin top', 'ayecode-connect' );
-		$defaults['icon']  = 'box-top';
-		$defaults['row']   = array(
-			'title' => __( 'Margins', 'ayecode-connect' ),
-			'key'   => 'wrapper-margins',
-			'open'  => true,
-			'class' => 'text-center',
-		);
-	} elseif ( $type == 'mr' ) {
-		$defaults['title'] = __( 'Margin right', 'ayecode-connect' );
-		$defaults['icon']  = 'box-right';
-		$defaults['row']   = array(
-			'key' => 'wrapper-margins',
-		);
-	} elseif ( $type == 'mb' ) {
-		$defaults['title'] = __( 'Margin bottom', 'ayecode-connect' );
-		$defaults['icon']  = 'box-bottom';
-		$defaults['row']   = array(
-			'key' => 'wrapper-margins',
-		);
-	} elseif ( $type == 'ml' ) {
-		$defaults['title'] = __( 'Margin left', 'ayecode-connect' );
-		$defaults['icon']  = 'box-left';
-		$defaults['row']   = array(
-			'key'   => 'wrapper-margins',
-			'close' => true,
-		);
-	}
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    global $aui_bs5;
+    $options = array(
+        ''     => __( 'None', 'ayecode-connect' ),
+        'auto' => __( 'auto', 'ayecode-connect' ),
+        '0'    => '0',
+        '1'    => '1',
+        '2'    => '2',
+        '3'    => '3',
+        '4'    => '4',
+        '5'    => '5',
+        '6'    => '6',
+        '7'    => '7',
+        '8'    => '8',
+        '9'    => '9',
+        '10'   => '10',
+        '11'   => '11',
+        '12'   => '12',
+    );
+
+    if ( $include_negatives ) {
+        $options['n1']  = '-1';
+        $options['n2']  = '-2';
+        $options['n3']  = '-3';
+        $options['n4']  = '-4';
+        $options['n5']  = '-5';
+        $options['n6']  = '-6';
+        $options['n7']  = '-7';
+        $options['n8']  = '-8';
+        $options['n9']  = '-9';
+        $options['n10'] = '-10';
+        $options['n11'] = '-11';
+        $options['n12'] = '-12';
+    }
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Margin top', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    // title
+    if ( $type == 'mt' ) {
+        $defaults['title'] = __( 'Margin top', 'ayecode-connect' );
+        $defaults['icon']  = 'box-top';
+        $defaults['row']   = array(
+            'title' => __( 'Margins', 'ayecode-connect' ),
+            'key'   => 'wrapper-margins',
+            'open'  => true,
+            'class' => 'text-center',
+        );
+    } elseif ( $type == 'mr' ) {
+        $defaults['title'] = __( 'Margin right', 'ayecode-connect' );
+        $defaults['icon']  = 'box-right';
+        $defaults['row']   = array(
+            'key' => 'wrapper-margins',
+        );
+    } elseif ( $type == 'mb' ) {
+        $defaults['title'] = __( 'Margin bottom', 'ayecode-connect' );
+        $defaults['icon']  = 'box-bottom';
+        $defaults['row']   = array(
+            'key' => 'wrapper-margins',
+        );
+    } elseif ( $type == 'ml' ) {
+        $defaults['title'] = __( 'Margin left', 'ayecode-connect' );
+        $defaults['icon']  = 'box-left';
+        $defaults['row']   = array(
+            'key'   => 'wrapper-margins',
+            'close' => true,
+        );
+    }
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -138,67 +138,67 @@ 
  * @return array
  */
 function sd_get_padding_input( $type = 'pt', $overwrite = array() ) {
-	$options = array(
-		''   => __( 'None', 'ayecode-connect' ),
-		'0'  => '0',
-		'1'  => '1',
-		'2'  => '2',
-		'3'  => '3',
-		'4'  => '4',
-		'5'  => '5',
-		'6'  => '6',
-		'7'  => '7',
-		'8'  => '8',
-		'9'  => '9',
-		'10' => '10',
-		'11' => '11',
-		'12' => '12',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Padding top', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	// title
-	if ( $type == 'pt' ) {
-		$defaults['title'] = __( 'Padding top', 'ayecode-connect' );
-		$defaults['icon']  = 'box-top';
-		$defaults['row']   = array(
-			'title' => __( 'Padding', 'ayecode-connect' ),
-			'key'   => 'wrapper-padding',
-			'open'  => true,
-			'class' => 'text-center',
-		);
-	} elseif ( $type == 'pr' ) {
-		$defaults['title'] = __( 'Padding right', 'ayecode-connect' );
-		$defaults['icon']  = 'box-right';
-		$defaults['row']   = array(
-			'key' => 'wrapper-padding',
-		);
-	} elseif ( $type == 'pb' ) {
-		$defaults['title'] = __( 'Padding bottom', 'ayecode-connect' );
-		$defaults['icon']  = 'box-bottom';
-		$defaults['row']   = array(
-			'key' => 'wrapper-padding',
-		);
-	} elseif ( $type == 'pl' ) {
-		$defaults['title'] = __( 'Padding left', 'ayecode-connect' );
-		$defaults['icon']  = 'box-left';
-		$defaults['row']   = array(
-			'key'   => 'wrapper-padding',
-			'close' => true,
-
-		);
-	}
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $options = array(
+        ''   => __( 'None', 'ayecode-connect' ),
+        '0'  => '0',
+        '1'  => '1',
+        '2'  => '2',
+        '3'  => '3',
+        '4'  => '4',
+        '5'  => '5',
+        '6'  => '6',
+        '7'  => '7',
+        '8'  => '8',
+        '9'  => '9',
+        '10' => '10',
+        '11' => '11',
+        '12' => '12',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Padding top', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    // title
+    if ( $type == 'pt' ) {
+        $defaults['title'] = __( 'Padding top', 'ayecode-connect' );
+        $defaults['icon']  = 'box-top';
+        $defaults['row']   = array(
+            'title' => __( 'Padding', 'ayecode-connect' ),
+            'key'   => 'wrapper-padding',
+            'open'  => true,
+            'class' => 'text-center',
+        );
+    } elseif ( $type == 'pr' ) {
+        $defaults['title'] = __( 'Padding right', 'ayecode-connect' );
+        $defaults['icon']  = 'box-right';
+        $defaults['row']   = array(
+            'key' => 'wrapper-padding',
+        );
+    } elseif ( $type == 'pb' ) {
+        $defaults['title'] = __( 'Padding bottom', 'ayecode-connect' );
+        $defaults['icon']  = 'box-bottom';
+        $defaults['row']   = array(
+            'key' => 'wrapper-padding',
+        );
+    } elseif ( $type == 'pl' ) {
+        $defaults['title'] = __( 'Padding left', 'ayecode-connect' );
+        $defaults['icon']  = 'box-left';
+        $defaults['row']   = array(
+            'key'   => 'wrapper-padding',
+            'close' => true,
+
+        );
+    }
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -210,97 +210,97 @@ 
  * @return array
  */
 function sd_get_border_input( $type = 'border', $overwrite = array() ) {
-	global $aui_bs5;
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Border', 'ayecode-connect' ),
-		'options'  => array(),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	// title
-	if ( 'rounded' === $type ) {
-		$defaults['title']           = __( 'Border radius type', 'ayecode-connect' );
-		$defaults['options']         = array(
-			''               => __( 'Default', 'ayecode-connect' ),
-			'rounded'        => 'rounded',
-			'rounded-top'    => 'rounded-top',
-			'rounded-right'  => 'rounded-right',
-			'rounded-bottom' => 'rounded-bottom',
-			'rounded-left'   => 'rounded-left',
-		);
-		$defaults['element_require'] = '[%border%]';
-	} elseif ( 'rounded_size' === $type ) {
-		$defaults['title'] = __( 'Border radius size', 'ayecode-connect' );
-
-		if ( $aui_bs5 ) {
-			$defaults['options'] = array(
-				''       => __( 'Default', 'ayecode-connect' ),
-				'0'      => '0',
-				'1'      => '1',
-				'2'      => '2',
-				'3'      => '3',
-				'4'      => '4',
-				'circle' => 'circle',
-				'pill'   => 'pill',
-			);
-		} else {
-			$defaults['options'] = array(
-				''   => __( 'Default', 'ayecode-connect' ),
-				'sm' => __( 'Small', 'ayecode-connect' ),
-				'lg' => __( 'Large', 'ayecode-connect' ),
-			);
-		}
-		$defaults['element_require'] = '[%border%]';
-	} elseif ( 'width' === $type ) { // BS%
-		$defaults['title']           = __( 'Border width', 'ayecode-connect' );
-		$defaults['options']         = array(
-			''         => __( 'Default', 'ayecode-connect' ),
-			'border-2' => '2',
-			'border-3' => '3',
-			'border-4' => '4',
-			'border-5' => '5',
-		);
-		$defaults['element_require'] = $aui_bs5 ? '[%border%]' : '1==2';
-	} elseif ( 'opacity' === $type ) { // BS%
-		$defaults['title']           = __( 'Border opacity', 'ayecode-connect' );
-		$defaults['options']         = array(
-			''                  => __( 'Default', 'ayecode-connect' ),
-			'border-opacity-75' => '75%',
-			'border-opacity-50' => '50%',
-			'border-opacity-25' => '25%',
-			'border-opacity-10' => '10%',
-		);
-		$defaults['element_require'] = $aui_bs5 ? '[%border%]' : '1==2';
-	} elseif ( 'type' === $type ) {
-		$defaults['title']           = __( 'Border show', 'ayecode-connect' );
-		$defaults['options']         = array(
-			'border'          => __( 'Full (set color to show)', 'ayecode-connect' ),
-			'border-top'      => __( 'Top', 'ayecode-connect' ),
-			'border-bottom'   => __( 'Bottom', 'ayecode-connect' ),
-			'border-left'     => __( 'Left', 'ayecode-connect' ),
-			'border-right'    => __( 'Right', 'ayecode-connect' ),
-			'border-top-0'    => __( '-Top', 'ayecode-connect' ),
-			'border-bottom-0' => __( '-Bottom', 'ayecode-connect' ),
-			'border-left-0'   => __( '-Left', 'ayecode-connect' ),
-			'border-right-0'  => __( '-Right', 'ayecode-connect' ),
-		);
-		$defaults['element_require'] = '[%border%]';
-
-	} else {
-		$defaults['title']   = __( 'Border color', 'ayecode-connect' );
-		$defaults['options'] = array(
-			                       ''  => __( 'Default', 'ayecode-connect' ),
-			                       '0' => __( 'None', 'ayecode-connect' ),
-		                       ) + sd_aui_colors();
-	}
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    global $aui_bs5;
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Border', 'ayecode-connect' ),
+        'options'  => array(),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    // title
+    if ( 'rounded' === $type ) {
+        $defaults['title']           = __( 'Border radius type', 'ayecode-connect' );
+        $defaults['options']         = array(
+            ''               => __( 'Default', 'ayecode-connect' ),
+            'rounded'        => 'rounded',
+            'rounded-top'    => 'rounded-top',
+            'rounded-right'  => 'rounded-right',
+            'rounded-bottom' => 'rounded-bottom',
+            'rounded-left'   => 'rounded-left',
+        );
+        $defaults['element_require'] = '[%border%]';
+    } elseif ( 'rounded_size' === $type ) {
+        $defaults['title'] = __( 'Border radius size', 'ayecode-connect' );
+
+        if ( $aui_bs5 ) {
+            $defaults['options'] = array(
+                ''       => __( 'Default', 'ayecode-connect' ),
+                '0'      => '0',
+                '1'      => '1',
+                '2'      => '2',
+                '3'      => '3',
+                '4'      => '4',
+                'circle' => 'circle',
+                'pill'   => 'pill',
+            );
+        } else {
+            $defaults['options'] = array(
+                ''   => __( 'Default', 'ayecode-connect' ),
+                'sm' => __( 'Small', 'ayecode-connect' ),
+                'lg' => __( 'Large', 'ayecode-connect' ),
+            );
+        }
+        $defaults['element_require'] = '[%border%]';
+    } elseif ( 'width' === $type ) { // BS%
+        $defaults['title']           = __( 'Border width', 'ayecode-connect' );
+        $defaults['options']         = array(
+            ''         => __( 'Default', 'ayecode-connect' ),
+            'border-2' => '2',
+            'border-3' => '3',
+            'border-4' => '4',
+            'border-5' => '5',
+        );
+        $defaults['element_require'] = $aui_bs5 ? '[%border%]' : '1==2';
+    } elseif ( 'opacity' === $type ) { // BS%
+        $defaults['title']           = __( 'Border opacity', 'ayecode-connect' );
+        $defaults['options']         = array(
+            ''                  => __( 'Default', 'ayecode-connect' ),
+            'border-opacity-75' => '75%',
+            'border-opacity-50' => '50%',
+            'border-opacity-25' => '25%',
+            'border-opacity-10' => '10%',
+        );
+        $defaults['element_require'] = $aui_bs5 ? '[%border%]' : '1==2';
+    } elseif ( 'type' === $type ) {
+        $defaults['title']           = __( 'Border show', 'ayecode-connect' );
+        $defaults['options']         = array(
+            'border'          => __( 'Full (set color to show)', 'ayecode-connect' ),
+            'border-top'      => __( 'Top', 'ayecode-connect' ),
+            'border-bottom'   => __( 'Bottom', 'ayecode-connect' ),
+            'border-left'     => __( 'Left', 'ayecode-connect' ),
+            'border-right'    => __( 'Right', 'ayecode-connect' ),
+            'border-top-0'    => __( '-Top', 'ayecode-connect' ),
+            'border-bottom-0' => __( '-Bottom', 'ayecode-connect' ),
+            'border-left-0'   => __( '-Left', 'ayecode-connect' ),
+            'border-right-0'  => __( '-Right', 'ayecode-connect' ),
+        );
+        $defaults['element_require'] = '[%border%]';
+
+    } else {
+        $defaults['title']   = __( 'Border color', 'ayecode-connect' );
+        $defaults['options'] = array(
+                                    ''  => __( 'Default', 'ayecode-connect' ),
+                                    '0' => __( 'None', 'ayecode-connect' ),
+                                ) + sd_aui_colors();
+    }
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -312,25 +312,25 @@ 
  * @return array
  */
 function sd_get_shadow_input( $type = 'shadow', $overwrite = array() ) {
-	$options = array(
-		''          => __( 'None', 'ayecode-connect' ),
-		'shadow-sm' => __( 'Small', 'ayecode-connect' ),
-		'shadow'    => __( 'Regular', 'ayecode-connect' ),
-		'shadow-lg' => __( 'Large', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''          => __( 'None', 'ayecode-connect' ),
+        'shadow-sm' => __( 'Small', 'ayecode-connect' ),
+        'shadow'    => __( 'Regular', 'ayecode-connect' ),
+        'shadow-lg' => __( 'Large', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Shadow', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Shadow', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -342,23 +342,23 @@ 
  * @return array
  */
 function sd_get_background_input( $type = 'bg', $overwrite = array() ) {
-	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
-	           ) + sd_aui_colors();
+    $options = array(
+                    ''            => __( 'None', 'ayecode-connect' ),
+                    'transparent' => __( 'Transparent', 'ayecode-connect' ),
+                ) + sd_aui_colors();
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Background color', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Background color', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -370,35 +370,35 @@ 
  * @return array
  */
 function sd_get_opacity_input( $type = 'opacity', $overwrite = array() ) {
-	$options = array(
-		''            => __( 'Default', 'ayecode-connect' ),
-		'opacity-10'  => '10%',
-		'opacity-15'  => '15%',
-		'opacity-25'  => '25%',
-		'opacity-35'  => '35%',
-		'opacity-40'  => '40%',
-		'opacity-50'  => '50%',
-		'opacity-60'  => '60%',
-		'opacity-65'  => '65%',
-		'opacity-70'  => '70%',
-		'opacity-75'  => '75%',
-		'opacity-80'  => '80%',
-		'opacity-90'  => '90%',
-		'opacity-100' => '100%',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Opacity', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $options = array(
+        ''            => __( 'Default', 'ayecode-connect' ),
+        'opacity-10'  => '10%',
+        'opacity-15'  => '15%',
+        'opacity-25'  => '25%',
+        'opacity-35'  => '35%',
+        'opacity-40'  => '40%',
+        'opacity-50'  => '50%',
+        'opacity-60'  => '60%',
+        'opacity-65'  => '65%',
+        'opacity-70'  => '70%',
+        'opacity-75'  => '75%',
+        'opacity-80'  => '80%',
+        'opacity-90'  => '90%',
+        'opacity-100' => '100%',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Opacity', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -411,124 +411,124 @@ 
  */
 function sd_get_background_inputs( $type = 'bg', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array(), $include_button_colors = false ) {
 
-	$color_options = $include_button_colors ? sd_aui_colors( false, true, true, true ) : sd_aui_colors();
-
-	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
-	           ) + $color_options;
-
-	if ( false !== $overwrite_color ) {
-		$options['custom-color'] = __( 'Custom Color', 'ayecode-connect' );
-	}
-
-	if ( false !== $overwrite_gradient ) {
-		$options['custom-gradient'] = __( 'Custom Gradient', 'ayecode-connect' );
-	}
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Background Color', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Background', 'ayecode-connect' ),
-	);
-
-	if ( $overwrite !== false ) {
-		$input[ $type ] = wp_parse_args( $overwrite, $defaults );
-	}
-
-	if ( $overwrite_color !== false ) {
-		$input[ $type . '_color' ] = wp_parse_args(
-			$overwrite_color,
-			array(
-				'type'            => 'color',
-				'title'           => __( 'Custom color', 'ayecode-connect' ),
-				'placeholder'     => '',
-				'default'         => '#0073aa',
-				'desc_tip'        => true,
-				'group'           => __( 'Background', 'ayecode-connect' ),
-				'element_require' => '[%' . $type . '%]=="custom-color"',
-			)
-		);
-	}
-
-	if ( $overwrite_gradient !== false ) {
-		$input[ $type . '_gradient' ] = wp_parse_args(
-			$overwrite_gradient,
-			array(
-				'type'            => 'gradient',
-				'title'           => __( 'Custom gradient', 'ayecode-connect' ),
-				'placeholder'     => '',
-				'default'         => 'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
-				'desc_tip'        => true,
-				'group'           => __( 'Background', 'ayecode-connect' ),
-				'element_require' => '[%' . $type . '%]=="custom-gradient"',
-			)
-		);
-	}
-
-	if ( $overwrite_image !== false ) {
-
-		$input[ $type . '_image_fixed' ] = array(
-			'type'            => 'checkbox',
-			'title'           => __( 'Fixed background', 'ayecode-connect' ),
-			'default'         => '',
-			'desc_tip'        => true,
-			'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
-			'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
-
-		);
-
-		$input[ $type . '_image_use_featured' ] = array(
-			'type'            => 'checkbox',
-			'title'           => __( 'Use featured image', 'ayecode-connect' ),
-			'default'         => '',
-			'desc_tip'        => true,
-			'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
-			'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
-
-		);
-
-		$input[ $type . '_image' ] = wp_parse_args(
-			$overwrite_image,
-			array(
-				'type'        => 'image',
-				'title'       => __( 'Custom image', 'ayecode-connect' ),
-				'placeholder' => '',
-				'default'     => '',
-				'desc_tip'    => true,
-				'group'       => __( 'Background', 'ayecode-connect' ),
-				//          'element_require' => ' ![%' . $type . '_image_use_featured%] '
-			)
-		);
-
-		$input[ $type . '_image_id' ] = wp_parse_args(
-			$overwrite_image,
-			array(
-				'type'        => 'hidden',
-				'hidden_type' => 'number',
-				'title'       => '',
-				'placeholder' => '',
-				'default'     => '',
-				'group'       => __( 'Background', 'ayecode-connect' ),
-			)
-		);
-
-		$input[ $type . '_image_xy' ] = wp_parse_args(
-			$overwrite_image,
-			array(
-				'type'        => 'image_xy',
-				'title'       => '',
-				'placeholder' => '',
-				'default'     => '',
-				'group'       => __( 'Background', 'ayecode-connect' ),
-			)
-		);
-	}
-
-	return $input;
+    $color_options = $include_button_colors ? sd_aui_colors( false, true, true, true ) : sd_aui_colors();
+
+    $options = array(
+                    ''            => __( 'None', 'ayecode-connect' ),
+                    'transparent' => __( 'Transparent', 'ayecode-connect' ),
+                ) + $color_options;
+
+    if ( false !== $overwrite_color ) {
+        $options['custom-color'] = __( 'Custom Color', 'ayecode-connect' );
+    }
+
+    if ( false !== $overwrite_gradient ) {
+        $options['custom-gradient'] = __( 'Custom Gradient', 'ayecode-connect' );
+    }
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Background Color', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Background', 'ayecode-connect' ),
+    );
+
+    if ( $overwrite !== false ) {
+        $input[ $type ] = wp_parse_args( $overwrite, $defaults );
+    }
+
+    if ( $overwrite_color !== false ) {
+        $input[ $type . '_color' ] = wp_parse_args(
+            $overwrite_color,
+            array(
+                'type'            => 'color',
+                'title'           => __( 'Custom color', 'ayecode-connect' ),
+                'placeholder'     => '',
+                'default'         => '#0073aa',
+                'desc_tip'        => true,
+                'group'           => __( 'Background', 'ayecode-connect' ),
+                'element_require' => '[%' . $type . '%]=="custom-color"',
+            )
+        );
+    }
+
+    if ( $overwrite_gradient !== false ) {
+        $input[ $type . '_gradient' ] = wp_parse_args(
+            $overwrite_gradient,
+            array(
+                'type'            => 'gradient',
+                'title'           => __( 'Custom gradient', 'ayecode-connect' ),
+                'placeholder'     => '',
+                'default'         => 'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
+                'desc_tip'        => true,
+                'group'           => __( 'Background', 'ayecode-connect' ),
+                'element_require' => '[%' . $type . '%]=="custom-gradient"',
+            )
+        );
+    }
+
+    if ( $overwrite_image !== false ) {
+
+        $input[ $type . '_image_fixed' ] = array(
+            'type'            => 'checkbox',
+            'title'           => __( 'Fixed background', 'ayecode-connect' ),
+            'default'         => '',
+            'desc_tip'        => true,
+            'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
+            'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
+
+        );
+
+        $input[ $type . '_image_use_featured' ] = array(
+            'type'            => 'checkbox',
+            'title'           => __( 'Use featured image', 'ayecode-connect' ),
+            'default'         => '',
+            'desc_tip'        => true,
+            'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
+            'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
+
+        );
+
+        $input[ $type . '_image' ] = wp_parse_args(
+            $overwrite_image,
+            array(
+                'type'        => 'image',
+                'title'       => __( 'Custom image', 'ayecode-connect' ),
+                'placeholder' => '',
+                'default'     => '',
+                'desc_tip'    => true,
+                'group'       => __( 'Background', 'ayecode-connect' ),
+                //          'element_require' => ' ![%' . $type . '_image_use_featured%] '
+            )
+        );
+
+        $input[ $type . '_image_id' ] = wp_parse_args(
+            $overwrite_image,
+            array(
+                'type'        => 'hidden',
+                'hidden_type' => 'number',
+                'title'       => '',
+                'placeholder' => '',
+                'default'     => '',
+                'group'       => __( 'Background', 'ayecode-connect' ),
+            )
+        );
+
+        $input[ $type . '_image_xy' ] = wp_parse_args(
+            $overwrite_image,
+            array(
+                'type'        => 'image_xy',
+                'title'       => '',
+                'placeholder' => '',
+                'default'     => '',
+                'group'       => __( 'Background', 'ayecode-connect' ),
+            )
+        );
+    }
+
+    return $input;
 }
 
 /**
@@ -541,175 +541,175 @@ 
  */
 function sd_get_shape_divider_inputs( $type = 'sd', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array() ) {
 
-	$options = array(
-		''                      => __( 'None', 'ayecode-connect' ),
-		'mountains'             => __( 'Mountains', 'ayecode-connect' ),
-		'drops'                 => __( 'Drops', 'ayecode-connect' ),
-		'clouds'                => __( 'Clouds', 'ayecode-connect' ),
-		'zigzag'                => __( 'Zigzag', 'ayecode-connect' ),
-		'pyramids'              => __( 'Pyramids', 'ayecode-connect' ),
-		'triangle'              => __( 'Triangle', 'ayecode-connect' ),
-		'triangle-asymmetrical' => __( 'Triangle Asymmetrical', 'ayecode-connect' ),
-		'tilt'                  => __( 'Tilt', 'ayecode-connect' ),
-		'opacity-tilt'          => __( 'Opacity Tilt', 'ayecode-connect' ),
-		'opacity-fan'           => __( 'Opacity Fan', 'ayecode-connect' ),
-		'curve'                 => __( 'Curve', 'ayecode-connect' ),
-		'curve-asymmetrical'    => __( 'Curve Asymmetrical', 'ayecode-connect' ),
-		'waves'                 => __( 'Waves', 'ayecode-connect' ),
-		'wave-brush'            => __( 'Wave Brush', 'ayecode-connect' ),
-		'waves-pattern'         => __( 'Waves Pattern', 'ayecode-connect' ),
-		'arrow'                 => __( 'Arrow', 'ayecode-connect' ),
-		'split'                 => __( 'Split', 'ayecode-connect' ),
-		'book'                  => __( 'Book', 'ayecode-connect' ),
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Type', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Shape Divider', 'ayecode-connect' ),
-	);
-
-	$input[ $type ] = wp_parse_args( $overwrite, $defaults );
-
-	$input[ $type . '_notice' ] = array(
-		'type'            => 'notice',
-		'desc'            => __( 'Parent element must be position `relative`', 'ayecode-connect' ),
-		'status'          => 'warning',
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => '[%' . $type . '%]!=""',
-	);
-
-	$input[ $type . '_position' ] = wp_parse_args(
-		$overwrite_color,
-		array(
-			'type'            => 'select',
-			'title'           => __( 'Position', 'ayecode-connect' ),
-			'options'         => array(
-				'top'    => __( 'Top', 'ayecode-connect' ),
-				'bottom' => __( 'Bottom', 'ayecode-connect' ),
-			),
-			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-			'element_require' => '[%' . $type . '%]!=""',
-		)
-	);
-
-	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
-	           ) + sd_aui_colors()
-	           + array(
-		           'custom-color' => __( 'Custom Color', 'ayecode-connect' ),
-	           );
-
-	$input[ $type . '_color' ] = wp_parse_args(
-		$overwrite_color,
-		array(
-			'type'            => 'select',
-			'title'           => __( 'Color', 'ayecode-connect' ),
-			'options'         => $options,
-			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-			'element_require' => '[%' . $type . '%]!=""',
-		)
-	);
-
-	$input[ $type . '_custom_color' ] = wp_parse_args(
-		$overwrite_color,
-		array(
-			'type'            => 'color',
-			'title'           => __( 'Custom color', 'ayecode-connect' ),
-			'placeholder'     => '',
-			'default'         => '#0073aa',
-			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-			'element_require' => '[%' . $type . '_color%]=="custom-color" && [%' . $type . '%]!=""',
-		)
-	);
-
-	$input[ $type . '_width' ] = wp_parse_args(
-		$overwrite_gradient,
-		array(
-			'type'              => 'range',
-			'title'             => __( 'Width', 'ayecode-connect' ),
-			'placeholder'       => '',
-			'default'           => '200',
-			'desc_tip'          => true,
-			'custom_attributes' => array(
-				'min' => 100,
-				'max' => 300,
-			),
-			'group'             => __( 'Shape Divider', 'ayecode-connect' ),
-			'element_require'   => '[%' . $type . '%]!=""',
-		)
-	);
-
-	$input[ $type . '_height' ] = array(
-		'type'              => 'range',
-		'title'             => __( 'Height', 'ayecode-connect' ),
-		'default'           => '100',
-		'desc_tip'          => true,
-		'custom_attributes' => array(
-			'min' => 0,
-			'max' => 500,
-		),
-		'group'             => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require'   => '[%' . $type . '%]!=""',
-	);
-
-	$requires = array(
-		'mountains'             => array( 'flip' ),
-		'drops'                 => array( 'flip', 'invert' ),
-		'clouds'                => array( 'flip', 'invert' ),
-		'zigzag'                => array(),
-		'pyramids'              => array( 'flip', 'invert' ),
-		'triangle'              => array( 'invert' ),
-		'triangle-asymmetrical' => array( 'flip', 'invert' ),
-		'tilt'                  => array( 'flip' ),
-		'opacity-tilt'          => array( 'flip' ),
-		'opacity-fan'           => array(),
-		'curve'                 => array( 'invert' ),
-		'curve-asymmetrical'    => array( 'flip', 'invert' ),
-		'waves'                 => array( 'flip', 'invert' ),
-		'wave-brush'            => array( 'flip' ),
-		'waves-pattern'         => array( 'flip' ),
-		'arrow'                 => array( 'invert' ),
-		'split'                 => array( 'invert' ),
-		'book'                  => array( 'invert' ),
-	);
-
-	$input[ $type . '_flip' ] = array(
-		'type'            => 'checkbox',
-		'title'           => __( 'Flip', 'ayecode-connect' ),
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => sd_get_element_require_string( $requires, 'flip', 'sd' ),
-	);
-
-	$input[ $type . '_invert' ] = array(
-		'type'            => 'checkbox',
-		'title'           => __( 'Invert', 'ayecode-connect' ),
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => sd_get_element_require_string( $requires, 'invert', 'sd' ),
-	);
-
-	$input[ $type . '_btf' ] = array(
-		'type'            => 'checkbox',
-		'title'           => __( 'Bring to front', 'ayecode-connect' ),
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => '[%' . $type . '%]!=""',
-
-	);
-
-	return $input;
+    $options = array(
+        ''                      => __( 'None', 'ayecode-connect' ),
+        'mountains'             => __( 'Mountains', 'ayecode-connect' ),
+        'drops'                 => __( 'Drops', 'ayecode-connect' ),
+        'clouds'                => __( 'Clouds', 'ayecode-connect' ),
+        'zigzag'                => __( 'Zigzag', 'ayecode-connect' ),
+        'pyramids'              => __( 'Pyramids', 'ayecode-connect' ),
+        'triangle'              => __( 'Triangle', 'ayecode-connect' ),
+        'triangle-asymmetrical' => __( 'Triangle Asymmetrical', 'ayecode-connect' ),
+        'tilt'                  => __( 'Tilt', 'ayecode-connect' ),
+        'opacity-tilt'          => __( 'Opacity Tilt', 'ayecode-connect' ),
+        'opacity-fan'           => __( 'Opacity Fan', 'ayecode-connect' ),
+        'curve'                 => __( 'Curve', 'ayecode-connect' ),
+        'curve-asymmetrical'    => __( 'Curve Asymmetrical', 'ayecode-connect' ),
+        'waves'                 => __( 'Waves', 'ayecode-connect' ),
+        'wave-brush'            => __( 'Wave Brush', 'ayecode-connect' ),
+        'waves-pattern'         => __( 'Waves Pattern', 'ayecode-connect' ),
+        'arrow'                 => __( 'Arrow', 'ayecode-connect' ),
+        'split'                 => __( 'Split', 'ayecode-connect' ),
+        'book'                  => __( 'Book', 'ayecode-connect' ),
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Type', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Shape Divider', 'ayecode-connect' ),
+    );
+
+    $input[ $type ] = wp_parse_args( $overwrite, $defaults );
+
+    $input[ $type . '_notice' ] = array(
+        'type'            => 'notice',
+        'desc'            => __( 'Parent element must be position `relative`', 'ayecode-connect' ),
+        'status'          => 'warning',
+        'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require' => '[%' . $type . '%]!=""',
+    );
+
+    $input[ $type . '_position' ] = wp_parse_args(
+        $overwrite_color,
+        array(
+            'type'            => 'select',
+            'title'           => __( 'Position', 'ayecode-connect' ),
+            'options'         => array(
+                'top'    => __( 'Top', 'ayecode-connect' ),
+                'bottom' => __( 'Bottom', 'ayecode-connect' ),
+            ),
+            'desc_tip'        => true,
+            'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+            'element_require' => '[%' . $type . '%]!=""',
+        )
+    );
+
+    $options = array(
+                    ''            => __( 'None', 'ayecode-connect' ),
+                    'transparent' => __( 'Transparent', 'ayecode-connect' ),
+                ) + sd_aui_colors()
+               + array(
+                    'custom-color' => __( 'Custom Color', 'ayecode-connect' ),
+                );
+
+    $input[ $type . '_color' ] = wp_parse_args(
+        $overwrite_color,
+        array(
+            'type'            => 'select',
+            'title'           => __( 'Color', 'ayecode-connect' ),
+            'options'         => $options,
+            'desc_tip'        => true,
+            'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+            'element_require' => '[%' . $type . '%]!=""',
+        )
+    );
+
+    $input[ $type . '_custom_color' ] = wp_parse_args(
+        $overwrite_color,
+        array(
+            'type'            => 'color',
+            'title'           => __( 'Custom color', 'ayecode-connect' ),
+            'placeholder'     => '',
+            'default'         => '#0073aa',
+            'desc_tip'        => true,
+            'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+            'element_require' => '[%' . $type . '_color%]=="custom-color" && [%' . $type . '%]!=""',
+        )
+    );
+
+    $input[ $type . '_width' ] = wp_parse_args(
+        $overwrite_gradient,
+        array(
+            'type'              => 'range',
+            'title'             => __( 'Width', 'ayecode-connect' ),
+            'placeholder'       => '',
+            'default'           => '200',
+            'desc_tip'          => true,
+            'custom_attributes' => array(
+                'min' => 100,
+                'max' => 300,
+            ),
+            'group'             => __( 'Shape Divider', 'ayecode-connect' ),
+            'element_require'   => '[%' . $type . '%]!=""',
+        )
+    );
+
+    $input[ $type . '_height' ] = array(
+        'type'              => 'range',
+        'title'             => __( 'Height', 'ayecode-connect' ),
+        'default'           => '100',
+        'desc_tip'          => true,
+        'custom_attributes' => array(
+            'min' => 0,
+            'max' => 500,
+        ),
+        'group'             => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require'   => '[%' . $type . '%]!=""',
+    );
+
+    $requires = array(
+        'mountains'             => array( 'flip' ),
+        'drops'                 => array( 'flip', 'invert' ),
+        'clouds'                => array( 'flip', 'invert' ),
+        'zigzag'                => array(),
+        'pyramids'              => array( 'flip', 'invert' ),
+        'triangle'              => array( 'invert' ),
+        'triangle-asymmetrical' => array( 'flip', 'invert' ),
+        'tilt'                  => array( 'flip' ),
+        'opacity-tilt'          => array( 'flip' ),
+        'opacity-fan'           => array(),
+        'curve'                 => array( 'invert' ),
+        'curve-asymmetrical'    => array( 'flip', 'invert' ),
+        'waves'                 => array( 'flip', 'invert' ),
+        'wave-brush'            => array( 'flip' ),
+        'waves-pattern'         => array( 'flip' ),
+        'arrow'                 => array( 'invert' ),
+        'split'                 => array( 'invert' ),
+        'book'                  => array( 'invert' ),
+    );
+
+    $input[ $type . '_flip' ] = array(
+        'type'            => 'checkbox',
+        'title'           => __( 'Flip', 'ayecode-connect' ),
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require' => sd_get_element_require_string( $requires, 'flip', 'sd' ),
+    );
+
+    $input[ $type . '_invert' ] = array(
+        'type'            => 'checkbox',
+        'title'           => __( 'Invert', 'ayecode-connect' ),
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require' => sd_get_element_require_string( $requires, 'invert', 'sd' ),
+    );
+
+    $input[ $type . '_btf' ] = array(
+        'type'            => 'checkbox',
+        'title'           => __( 'Bring to front', 'ayecode-connect' ),
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require' => '[%' . $type . '%]!=""',
+
+    );
+
+    return $input;
 }
 
 /**
@@ -722,22 +722,22 @@ 
  * @return string
  */
 function sd_get_element_require_string( $args, $key, $type ) {
-	$output   = '';
-	$requires = array();
+    $output   = '';
+    $requires = array();
 
-	if ( ! empty( $args ) ) {
-		foreach ( $args as $t => $k ) {
-			if ( in_array( $key, $k ) ) {
-				$requires[] = '[%' . $type . '%]=="' . $t . '"';
-			}
-		}
+    if ( ! empty( $args ) ) {
+        foreach ( $args as $t => $k ) {
+            if ( in_array( $key, $k ) ) {
+                $requires[] = '[%' . $type . '%]=="' . $t . '"';
+            }
+        }
 
-		if ( ! empty( $requires ) ) {
-			$output = '(' . implode( ' || ', $requires ) . ')';
-		}
-	}
+        if ( ! empty( $requires ) ) {
+            $output = '(' . implode( ' || ', $requires ) . ')';
+        }
+    }
 
-	return $output;
+    return $output;
 }
 
 /**
@@ -749,41 +749,41 @@ 
  * @return array
  */
 function sd_get_text_color_input( $type = 'text_color', $overwrite = array(), $has_custom = false ) {
-	$options = array(
-		           '' => __( 'None', 'ayecode-connect' ),
-	           ) + sd_aui_colors();
+    $options = array(
+                    '' => __( 'None', 'ayecode-connect' ),
+                ) + sd_aui_colors();
 
-	if ( $has_custom ) {
-		$options['custom'] = __( 'Custom color', 'ayecode-connect' );
-	}
+    if ( $has_custom ) {
+        $options['custom'] = __( 'Custom color', 'ayecode-connect' );
+    }
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Text color', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Text color', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 function sd_get_text_color_input_group( $type = 'text_color', $overwrite = array(), $overwrite_custom = array() ) {
-	$inputs = array();
+    $inputs = array();
 
-	if ( $overwrite !== false ) {
-		$inputs[ $type ] = sd_get_text_color_input( $type, $overwrite, true );
-	}
+    if ( $overwrite !== false ) {
+        $inputs[ $type ] = sd_get_text_color_input( $type, $overwrite, true );
+    }
 
-	if ( $overwrite_custom !== false ) {
-		$custom            = $type . '_custom';
-		$inputs[ $custom ] = sd_get_custom_color_input( $custom, $overwrite_custom, $type );
-	}
+    if ( $overwrite_custom !== false ) {
+        $custom            = $type . '_custom';
+        $inputs[ $custom ] = sd_get_custom_color_input( $custom, $overwrite_custom, $type );
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 /**
@@ -796,22 +796,22 @@ 
  */
 function sd_get_custom_color_input( $type = 'color_custom', $overwrite = array(), $parent_type = '' ) {
 
-	$defaults = array(
-		'type'        => 'color',
-		'title'       => __( 'Custom color', 'ayecode-connect' ),
-		'default'     => '',
-		'placeholder' => '',
-		'desc_tip'    => true,
-		'group'       => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'        => 'color',
+        'title'       => __( 'Custom color', 'ayecode-connect' ),
+        'default'     => '',
+        'placeholder' => '',
+        'desc_tip'    => true,
+        'group'       => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	if ( $parent_type ) {
-		$defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
-	}
+    if ( $parent_type ) {
+        $defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
+    }
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -824,44 +824,44 @@ 
  */
 function sd_get_col_input( $type = 'col', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''     => __( 'Default', 'ayecode-connect' ),
-		'auto' => __( 'auto', 'ayecode-connect' ),
-		'1'    => '1/12',
-		'2'    => '2/12',
-		'3'    => '3/12',
-		'4'    => '4/12',
-		'5'    => '5/12',
-		'6'    => '6/12',
-		'7'    => '7/12',
-		'8'    => '8/12',
-		'9'    => '9/12',
-		'10'   => '10/12',
-		'11'   => '11/12',
-		'12'   => '12/12',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Column width', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Container', 'ayecode-connect' ),
-		'element_require' => '[%container%]=="col"',
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''     => __( 'Default', 'ayecode-connect' ),
+        'auto' => __( 'auto', 'ayecode-connect' ),
+        '1'    => '1/12',
+        '2'    => '2/12',
+        '3'    => '3/12',
+        '4'    => '4/12',
+        '5'    => '5/12',
+        '6'    => '6/12',
+        '7'    => '7/12',
+        '8'    => '8/12',
+        '9'    => '9/12',
+        '10'   => '10/12',
+        '11'   => '11/12',
+        '12'   => '12/12',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Column width', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Container', 'ayecode-connect' ),
+        'element_require' => '[%container%]=="col"',
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -874,37 +874,37 @@ 
  */
 function sd_get_row_cols_input( $type = 'row_cols', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''  => __( 'auto', 'ayecode-connect' ),
-		'1' => '1',
-		'2' => '2',
-		'3' => '3',
-		'4' => '4',
-		'5' => '5',
-		'6' => '6',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Row columns', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Container', 'ayecode-connect' ),
-		'element_require' => '[%container%]=="row"',
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''  => __( 'auto', 'ayecode-connect' ),
+        '1' => '1',
+        '2' => '2',
+        '3' => '3',
+        '4' => '4',
+        '5' => '5',
+        '6' => '6',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Row columns', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Container', 'ayecode-connect' ),
+        'element_require' => '[%container%]=="row"',
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -917,33 +917,33 @@ 
  */
 function sd_get_text_align_input( $type = 'text_align', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                => __( 'Default', 'ayecode-connect' ),
-		'text' . $device_size . '-left'   => __( 'Left', 'ayecode-connect' ),
-		'text' . $device_size . '-right'  => __( 'Right', 'ayecode-connect' ),
-		'text' . $device_size . '-center' => __( 'Center', 'ayecode-connect' ),
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Text align', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                => __( 'Default', 'ayecode-connect' ),
+        'text' . $device_size . '-left'   => __( 'Left', 'ayecode-connect' ),
+        'text' . $device_size . '-right'  => __( 'Right', 'ayecode-connect' ),
+        'text' . $device_size . '-center' => __( 'Center', 'ayecode-connect' ),
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Text align', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -956,39 +956,39 @@ 
  */
 function sd_get_display_input( $type = 'display', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                   => __( 'Default', 'ayecode-connect' ),
-		'd' . $device_size . '-none'         => 'none',
-		'd' . $device_size . '-inline'       => 'inline',
-		'd' . $device_size . '-inline-block' => 'inline-block',
-		'd' . $device_size . '-block'        => 'block',
-		'd' . $device_size . '-table'        => 'table',
-		'd' . $device_size . '-table-cell'   => 'table-cell',
-		'd' . $device_size . '-table-row'    => 'table-row',
-		'd' . $device_size . '-flex'         => 'flex',
-		'd' . $device_size . '-inline-flex'  => 'inline-flex',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Display', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                   => __( 'Default', 'ayecode-connect' ),
+        'd' . $device_size . '-none'         => 'none',
+        'd' . $device_size . '-inline'       => 'inline',
+        'd' . $device_size . '-inline-block' => 'inline-block',
+        'd' . $device_size . '-block'        => 'block',
+        'd' . $device_size . '-table'        => 'table',
+        'd' . $device_size . '-table-cell'   => 'table-cell',
+        'd' . $device_size . '-table-row'    => 'table-row',
+        'd' . $device_size . '-flex'         => 'flex',
+        'd' . $device_size . '-inline-flex'  => 'inline-flex',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Display', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1001,17 +1001,17 @@ 
  */
 function sd_get_text_justify_input( $type = 'text_justify', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'checkbox',
-		'title'    => __( 'Text justify', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'checkbox',
+        'title'    => __( 'Text justify', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1024,72 +1024,72 @@ 
  * @return array
  */
 function sd_aui_colors( $include_branding = false, $include_outlines = false, $outline_button_only_text = false, $include_translucent = false ) {
-	$theme_colors = array();
-
-	$theme_colors['primary']   = __( 'Primary', 'ayecode-connect' );
-	$theme_colors['secondary'] = __( 'Secondary', 'ayecode-connect' );
-	$theme_colors['success']   = __( 'Success', 'ayecode-connect' );
-	$theme_colors['danger']    = __( 'Danger', 'ayecode-connect' );
-	$theme_colors['warning']   = __( 'Warning', 'ayecode-connect' );
-	$theme_colors['info']      = __( 'Info', 'ayecode-connect' );
-	$theme_colors['light']     = __( 'Light', 'ayecode-connect' );
-	$theme_colors['dark']      = __( 'Dark', 'ayecode-connect' );
-	$theme_colors['black']     = __( 'Black', 'ayecode-connect' );
-	$theme_colors['white']     = __( 'White', 'ayecode-connect' );
-	$theme_colors['purple']    = __( 'Purple', 'ayecode-connect' );
-	$theme_colors['salmon']    = __( 'Salmon', 'ayecode-connect' );
-	$theme_colors['cyan']      = __( 'Cyan', 'ayecode-connect' );
-	$theme_colors['gray']      = __( 'Gray', 'ayecode-connect' );
-	$theme_colors['muted']     = __( 'Muted', 'ayecode-connect' );
-	$theme_colors['gray-dark'] = __( 'Gray dark', 'ayecode-connect' );
-	$theme_colors['indigo']    = __( 'Indigo', 'ayecode-connect' );
-	$theme_colors['orange']    = __( 'Orange', 'ayecode-connect' );
-
-	if ( $include_outlines ) {
-		$button_only                       = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
-		$theme_colors['outline-primary']   = __( 'Primary outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-secondary'] = __( 'Secondary outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-success']   = __( 'Success outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-danger']    = __( 'Danger outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-warning']   = __( 'Warning outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-info']      = __( 'Info outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-light']     = __( 'Light outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-dark']      = __( 'Dark outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-white']     = __( 'White outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-purple']    = __( 'Purple outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-salmon']    = __( 'Salmon outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-cyan']      = __( 'Cyan outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-gray']      = __( 'Gray outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-gray-dark'] = __( 'Gray dark outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-indigo']    = __( 'Indigo outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-orange']    = __( 'Orange outline', 'ayecode-connect' ) . $button_only;
-	}
-
-	if ( $include_branding ) {
-		$theme_colors = $theme_colors + sd_aui_branding_colors();
-	}
-
-	if ( $include_translucent ) {
-		$button_only                           = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
-		$theme_colors['translucent-primary']   = __( 'Primary translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-secondary'] = __( 'Secondary translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-success']   = __( 'Success translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-danger']    = __( 'Danger translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-warning']   = __( 'Warning translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-info']      = __( 'Info translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-light']     = __( 'Light translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-dark']      = __( 'Dark translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-white']     = __( 'White translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-purple']    = __( 'Purple translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-salmon']    = __( 'Salmon translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-cyan']      = __( 'Cyan translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-gray']      = __( 'Gray translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-gray-dark'] = __( 'Gray dark translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-indigo']    = __( 'Indigo translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-orange']    = __( 'Orange translucent', 'ayecode-connect' ) . $button_only;
-	}
-
-	return apply_filters( 'sd_aui_colors', $theme_colors, $include_outlines, $include_branding );
+    $theme_colors = array();
+
+    $theme_colors['primary']   = __( 'Primary', 'ayecode-connect' );
+    $theme_colors['secondary'] = __( 'Secondary', 'ayecode-connect' );
+    $theme_colors['success']   = __( 'Success', 'ayecode-connect' );
+    $theme_colors['danger']    = __( 'Danger', 'ayecode-connect' );
+    $theme_colors['warning']   = __( 'Warning', 'ayecode-connect' );
+    $theme_colors['info']      = __( 'Info', 'ayecode-connect' );
+    $theme_colors['light']     = __( 'Light', 'ayecode-connect' );
+    $theme_colors['dark']      = __( 'Dark', 'ayecode-connect' );
+    $theme_colors['black']     = __( 'Black', 'ayecode-connect' );
+    $theme_colors['white']     = __( 'White', 'ayecode-connect' );
+    $theme_colors['purple']    = __( 'Purple', 'ayecode-connect' );
+    $theme_colors['salmon']    = __( 'Salmon', 'ayecode-connect' );
+    $theme_colors['cyan']      = __( 'Cyan', 'ayecode-connect' );
+    $theme_colors['gray']      = __( 'Gray', 'ayecode-connect' );
+    $theme_colors['muted']     = __( 'Muted', 'ayecode-connect' );
+    $theme_colors['gray-dark'] = __( 'Gray dark', 'ayecode-connect' );
+    $theme_colors['indigo']    = __( 'Indigo', 'ayecode-connect' );
+    $theme_colors['orange']    = __( 'Orange', 'ayecode-connect' );
+
+    if ( $include_outlines ) {
+        $button_only                       = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
+        $theme_colors['outline-primary']   = __( 'Primary outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-secondary'] = __( 'Secondary outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-success']   = __( 'Success outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-danger']    = __( 'Danger outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-warning']   = __( 'Warning outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-info']      = __( 'Info outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-light']     = __( 'Light outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-dark']      = __( 'Dark outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-white']     = __( 'White outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-purple']    = __( 'Purple outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-salmon']    = __( 'Salmon outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-cyan']      = __( 'Cyan outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-gray']      = __( 'Gray outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-gray-dark'] = __( 'Gray dark outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-indigo']    = __( 'Indigo outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-orange']    = __( 'Orange outline', 'ayecode-connect' ) . $button_only;
+    }
+
+    if ( $include_branding ) {
+        $theme_colors = $theme_colors + sd_aui_branding_colors();
+    }
+
+    if ( $include_translucent ) {
+        $button_only                           = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
+        $theme_colors['translucent-primary']   = __( 'Primary translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-secondary'] = __( 'Secondary translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-success']   = __( 'Success translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-danger']    = __( 'Danger translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-warning']   = __( 'Warning translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-info']      = __( 'Info translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-light']     = __( 'Light translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-dark']      = __( 'Dark translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-white']     = __( 'White translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-purple']    = __( 'Purple translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-salmon']    = __( 'Salmon translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-cyan']      = __( 'Cyan translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-gray']      = __( 'Gray translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-gray-dark'] = __( 'Gray dark translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-indigo']    = __( 'Indigo translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-orange']    = __( 'Orange translucent', 'ayecode-connect' ) . $button_only;
+    }
+
+    return apply_filters( 'sd_aui_colors', $theme_colors, $include_outlines, $include_branding );
 }
 
 /**
@@ -1098,19 +1098,19 @@ 
  * @return array
  */
 function sd_aui_branding_colors() {
-	return array(
-		'facebook'  => __( 'Facebook', 'ayecode-connect' ),
-		'twitter'   => __( 'Twitter', 'ayecode-connect' ),
-		'instagram' => __( 'Instagram', 'ayecode-connect' ),
-		'linkedin'  => __( 'Linkedin', 'ayecode-connect' ),
-		'flickr'    => __( 'Flickr', 'ayecode-connect' ),
-		'github'    => __( 'GitHub', 'ayecode-connect' ),
-		'youtube'   => __( 'YouTube', 'ayecode-connect' ),
-		'wordpress' => __( 'WordPress', 'ayecode-connect' ),
-		'google'    => __( 'Google', 'ayecode-connect' ),
-		'yahoo'     => __( 'Yahoo', 'ayecode-connect' ),
-		'vkontakte' => __( 'Vkontakte', 'ayecode-connect' ),
-	);
+    return array(
+        'facebook'  => __( 'Facebook', 'ayecode-connect' ),
+        'twitter'   => __( 'Twitter', 'ayecode-connect' ),
+        'instagram' => __( 'Instagram', 'ayecode-connect' ),
+        'linkedin'  => __( 'Linkedin', 'ayecode-connect' ),
+        'flickr'    => __( 'Flickr', 'ayecode-connect' ),
+        'github'    => __( 'GitHub', 'ayecode-connect' ),
+        'youtube'   => __( 'YouTube', 'ayecode-connect' ),
+        'wordpress' => __( 'WordPress', 'ayecode-connect' ),
+        'google'    => __( 'Google', 'ayecode-connect' ),
+        'yahoo'     => __( 'Yahoo', 'ayecode-connect' ),
+        'vkontakte' => __( 'Vkontakte', 'ayecode-connect' ),
+    );
 }
 
 
@@ -1124,38 +1124,38 @@ 
  */
 function sd_get_container_class_input( $type = 'container', $overwrite = array() ) {
 
-	$options = array(
-		'container'       => __( 'container (default)', 'ayecode-connect' ),
-		'container-sm'    => 'container-sm',
-		'container-md'    => 'container-md',
-		'container-lg'    => 'container-lg',
-		'container-xl'    => 'container-xl',
-		'container-xxl'   => 'container-xxl',
-		'container-fluid' => 'container-fluid',
-		'row'             => 'row',
-		'col'             => 'col',
-		'card'            => 'card',
-		'card-header'     => 'card-header',
-		'card-img-top'    => 'card-img-top',
-		'card-body'       => 'card-body',
-		'card-footer'     => 'card-footer',
-		'list-group'      => 'list-group',
-		'list-group-item' => 'list-group-item',
-		''                => __( 'no container class', 'ayecode-connect' ),
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Type', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Container', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $options = array(
+        'container'       => __( 'container (default)', 'ayecode-connect' ),
+        'container-sm'    => 'container-sm',
+        'container-md'    => 'container-md',
+        'container-lg'    => 'container-lg',
+        'container-xl'    => 'container-xl',
+        'container-xxl'   => 'container-xxl',
+        'container-fluid' => 'container-fluid',
+        'row'             => 'row',
+        'col'             => 'col',
+        'card'            => 'card',
+        'card-header'     => 'card-header',
+        'card-img-top'    => 'card-img-top',
+        'card-body'       => 'card-body',
+        'card-footer'     => 'card-footer',
+        'list-group'      => 'list-group',
+        'list-group-item' => 'list-group-item',
+        ''                => __( 'no container class', 'ayecode-connect' ),
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Type', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Container', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1168,30 +1168,30 @@ 
  */
 function sd_get_position_class_input( $type = 'position', $overwrite = array() ) {
 
-	$options = array(
-		''                  => __( 'Default', 'ayecode-connect' ),
-		'position-static'   => 'static',
-		'position-relative' => 'relative',
-		'position-absolute' => 'absolute',
-		'position-fixed'    => 'fixed',
-		'position-sticky'   => 'sticky',
-		'fixed-top'         => 'fixed-top',
-		'fixed-bottom'      => 'fixed-bottom',
-		'sticky-top'        => 'sticky-top',
-	);
+    $options = array(
+        ''                  => __( 'Default', 'ayecode-connect' ),
+        'position-static'   => 'static',
+        'position-relative' => 'relative',
+        'position-absolute' => 'absolute',
+        'position-fixed'    => 'fixed',
+        'position-sticky'   => 'sticky',
+        'fixed-top'         => 'fixed-top',
+        'fixed-bottom'      => 'fixed-bottom',
+        'sticky-top'        => 'sticky-top',
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Position', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Position', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1202,32 +1202,32 @@ 
  */
 function sd_get_absolute_position_input( $type = 'absolute_position', $overwrite = array() ) {
 
-	$options = array(
-		''              => __( 'Default', 'ayecode-connect' ),
-		'top-left'      => 'top-left',
-		'top-center'    => 'top-center',
-		'top-right'     => 'top-right',
-		'center-left'   => 'middle-left',
-		'center'        => 'center',
-		'center-right'  => 'middle-right',
-		'bottom-left'   => 'bottom-left',
-		'bottom-center' => 'bottom-center',
-		'bottom-right'  => 'bottom-right',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Absolute Position', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => '[%position%]=="position-absolute"',
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $options = array(
+        ''              => __( 'Default', 'ayecode-connect' ),
+        'top-left'      => 'top-left',
+        'top-center'    => 'top-center',
+        'top-right'     => 'top-right',
+        'center-left'   => 'middle-left',
+        'center'        => 'center',
+        'center-right'  => 'middle-right',
+        'bottom-left'   => 'bottom-left',
+        'bottom-center' => 'bottom-center',
+        'bottom-right'  => 'bottom-right',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Absolute Position', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => '[%position%]=="position-absolute"',
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1240,38 +1240,38 @@ 
  */
 function sd_get_sticky_offset_input( $type = 'top', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'            => 'number',
-		'title'           => __( 'Sticky offset', 'ayecode-connect' ),
-		//'desc' =>  __( 'Sticky offset', 'ayecode-connect' ),
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => '[%position%]=="sticky" || [%position%]=="sticky-top"',
-	);
-
-	// title
-	if ( $type == 'top' ) {
-		$defaults['title'] = __( 'Top offset', 'ayecode-connect' );
-		$defaults['icon']  = 'box-top';
-		$defaults['row']   = array(
-			'title' => __( 'Sticky offset', 'ayecode-connect' ),
-			'key'   => 'sticky-offset',
-			'open'  => true,
-			'class' => 'text-center',
-		);
-	} elseif ( $type == 'bottom' ) {
-		$defaults['title'] = __( 'Bottom offset', 'ayecode-connect' );
-		$defaults['icon']  = 'box-bottom';
-		$defaults['row']   = array(
-			'key'   => 'sticky-offset',
-			'close' => true,
-		);
-	}
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $defaults = array(
+        'type'            => 'number',
+        'title'           => __( 'Sticky offset', 'ayecode-connect' ),
+        //'desc' =>  __( 'Sticky offset', 'ayecode-connect' ),
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => '[%position%]=="sticky" || [%position%]=="sticky-top"',
+    );
+
+    // title
+    if ( $type == 'top' ) {
+        $defaults['title'] = __( 'Top offset', 'ayecode-connect' );
+        $defaults['icon']  = 'box-top';
+        $defaults['row']   = array(
+            'title' => __( 'Sticky offset', 'ayecode-connect' ),
+            'key'   => 'sticky-offset',
+            'open'  => true,
+            'class' => 'text-center',
+        );
+    } elseif ( $type == 'bottom' ) {
+        $defaults['title'] = __( 'Bottom offset', 'ayecode-connect' );
+        $defaults['icon']  = 'box-bottom';
+        $defaults['row']   = array(
+            'key'   => 'sticky-offset',
+            'close' => true,
+        );
+    }
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1283,61 +1283,61 @@ 
  * @return array
  */
 function sd_get_font_size_input( $type = 'font_size', $overwrite = array(), $has_custom = false ) {
-	global $aui_bs5;
-
-	$options[] = __( 'Inherit from parent', 'ayecode-connect' );
-	if ( $aui_bs5 ) {
-		// responsive font sizes
-		$options['fs-base'] = 'fs-base (body default)';
-		$options['fs-6']    = 'fs-6';
-		$options['fs-5']    = 'fs-5';
-		$options['fs-4']    = 'fs-4';
-		$options['fs-3']    = 'fs-3';
-		$options['fs-2']    = 'fs-2';
-		$options['fs-1']    = 'fs-1';
-
-		// custom
-		$options['fs-lg']  = 'fs-lg';
-		$options['fs-sm']  = 'fs-sm';
-		$options['fs-xs']  = 'fs-xs';
-		$options['fs-xxs'] = 'fs-xxs';
-
-	}
-
-	$options = $options + array(
-			'h6'        => 'h6',
-			'h5'        => 'h5',
-			'h4'        => 'h4',
-			'h3'        => 'h3',
-			'h2'        => 'h2',
-			'h1'        => 'h1',
-			'display-1' => 'display-1',
-			'display-2' => 'display-2',
-			'display-3' => 'display-3',
-			'display-4' => 'display-4',
-		);
-
-	if ( $aui_bs5 ) {
-		$options['display-5'] = 'display-5';
-		$options['display-6'] = 'display-6';
-	}
-
-	if ( $has_custom ) {
-		$options['custom'] = __( 'Custom size', 'ayecode-connect' );
-	}
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Font size', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    global $aui_bs5;
+
+    $options[] = __( 'Inherit from parent', 'ayecode-connect' );
+    if ( $aui_bs5 ) {
+        // responsive font sizes
+        $options['fs-base'] = 'fs-base (body default)';
+        $options['fs-6']    = 'fs-6';
+        $options['fs-5']    = 'fs-5';
+        $options['fs-4']    = 'fs-4';
+        $options['fs-3']    = 'fs-3';
+        $options['fs-2']    = 'fs-2';
+        $options['fs-1']    = 'fs-1';
+
+        // custom
+        $options['fs-lg']  = 'fs-lg';
+        $options['fs-sm']  = 'fs-sm';
+        $options['fs-xs']  = 'fs-xs';
+        $options['fs-xxs'] = 'fs-xxs';
+
+    }
+
+    $options = $options + array(
+            'h6'        => 'h6',
+            'h5'        => 'h5',
+            'h4'        => 'h4',
+            'h3'        => 'h3',
+            'h2'        => 'h2',
+            'h1'        => 'h1',
+            'display-1' => 'display-1',
+            'display-2' => 'display-2',
+            'display-3' => 'display-3',
+            'display-4' => 'display-4',
+        );
+
+    if ( $aui_bs5 ) {
+        $options['display-5'] = 'display-5';
+        $options['display-6'] = 'display-6';
+    }
+
+    if ( $has_custom ) {
+        $options['custom'] = __( 'Custom size', 'ayecode-connect' );
+    }
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Font size', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1350,27 +1350,27 @@ 
  */
 function sd_get_font_custom_size_input( $type = 'font_size_custom', $overwrite = array(), $parent_type = '' ) {
 
-	$defaults = array(
-		'type'              => 'number',
-		'title'             => __( 'Font size (rem)', 'ayecode-connect' ),
-		'default'           => '',
-		'placeholder'       => '1.25',
-		'custom_attributes' => array(
-			'step' => '0.1',
-			'min'  => '0',
-			'max'  => '100',
-		),
-		'desc_tip'          => true,
-		'group'             => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'              => 'number',
+        'title'             => __( 'Font size (rem)', 'ayecode-connect' ),
+        'default'           => '',
+        'placeholder'       => '1.25',
+        'custom_attributes' => array(
+            'step' => '0.1',
+            'min'  => '0',
+            'max'  => '100',
+        ),
+        'desc_tip'          => true,
+        'group'             => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	if ( $parent_type ) {
-		$defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
-	}
+    if ( $parent_type ) {
+        $defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
+    }
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1383,23 +1383,23 @@ 
  */
 function sd_get_font_line_height_input( $type = 'font_line_height', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'              => 'number',
-		'title'             => __( 'Font Line Height', 'ayecode-connect' ),
-		'default'           => '',
-		'placeholder'       => '1.75',
-		'custom_attributes' => array(
-			'step' => '0.1',
-			'min'  => '0',
-			'max'  => '100',
-		),
-		'desc_tip'          => true,
-		'group'             => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'              => 'number',
+        'title'             => __( 'Font Line Height', 'ayecode-connect' ),
+        'default'           => '',
+        'placeholder'       => '1.75',
+        'custom_attributes' => array(
+            'step' => '0.1',
+            'min'  => '0',
+            'max'  => '100',
+        ),
+        'desc_tip'          => true,
+        'group'             => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1412,18 +1412,18 @@ 
  */
 function sd_get_font_size_input_group( $type = 'font_size', $overwrite = array(), $overwrite_custom = array() ) {
 
-	$inputs = array();
+    $inputs = array();
 
-	if ( $overwrite !== false ) {
-		$inputs[ $type ] = sd_get_font_size_input( $type, $overwrite, true );
-	}
+    if ( $overwrite !== false ) {
+        $inputs[ $type ] = sd_get_font_size_input( $type, $overwrite, true );
+    }
 
-	if ( $overwrite_custom !== false ) {
-		$custom            = $type . '_custom';
-		$inputs[ $custom ] = sd_get_font_custom_size_input( $custom, $overwrite_custom, $type );
-	}
+    if ( $overwrite_custom !== false ) {
+        $custom            = $type . '_custom';
+        $inputs[ $custom ] = sd_get_font_custom_size_input( $custom, $overwrite_custom, $type );
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 /**
@@ -1436,33 +1436,33 @@ 
  */
 function sd_get_font_weight_input( $type = 'font_weight', $overwrite = array() ) {
 
-	$options = array(
-		''                                => __( 'Inherit', 'ayecode-connect' ),
-		'font-weight-bold'                => 'bold',
-		'font-weight-bolder'              => 'bolder',
-		'font-weight-normal'              => 'normal',
-		'font-weight-light'               => 'light',
-		'font-weight-lighter'             => 'lighter',
-		'font-italic'                     => 'italic',
-		'font-weight-bold font-italic'    => 'bold italic',
-		'font-weight-bolder font-italic'  => 'bolder italic',
-		'font-weight-normal font-italic'  => 'normal italic',
-		'font-weight-light font-italic'   => 'light italic',
-		'font-weight-lighter font-italic' => 'lighter italic',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Appearance', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $options = array(
+        ''                                => __( 'Inherit', 'ayecode-connect' ),
+        'font-weight-bold'                => 'bold',
+        'font-weight-bolder'              => 'bolder',
+        'font-weight-normal'              => 'normal',
+        'font-weight-light'               => 'light',
+        'font-weight-lighter'             => 'lighter',
+        'font-italic'                     => 'italic',
+        'font-weight-bold font-italic'    => 'bold italic',
+        'font-weight-bolder font-italic'  => 'bolder italic',
+        'font-weight-normal font-italic'  => 'normal italic',
+        'font-weight-light font-italic'   => 'light italic',
+        'font-weight-lighter font-italic' => 'lighter italic',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Appearance', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1475,25 +1475,25 @@ 
  */
 function sd_get_font_case_input( $type = 'font_weight', $overwrite = array() ) {
 
-	$options = array(
-		''                => __( 'Default', 'ayecode-connect' ),
-		'text-lowercase'  => __( 'lowercase', 'ayecode-connect' ),
-		'text-uppercase'  => __( 'UPPERCASE', 'ayecode-connect' ),
-		'text-capitalize' => __( 'Capitalize', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''                => __( 'Default', 'ayecode-connect' ),
+        'text-lowercase'  => __( 'lowercase', 'ayecode-connect' ),
+        'text-uppercase'  => __( 'UPPERCASE', 'ayecode-connect' ),
+        'text-capitalize' => __( 'Capitalize', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Letter case', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Letter case', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1507,23 +1507,23 @@ 
  */
 function sd_get_font_italic_input( $type = 'font_italic', $overwrite = array() ) {
 
-	$options = array(
-		''            => __( 'No', 'ayecode-connect' ),
-		'font-italic' => __( 'Yes', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''            => __( 'No', 'ayecode-connect' ),
+        'font-italic' => __( 'Yes', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Font italic', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Font italic', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1536,18 +1536,18 @@ 
  */
 function sd_get_anchor_input( $type = 'anchor', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'text',
-		'title'    => __( 'HTML anchor', 'ayecode-connect' ),
-		'desc'     => __( 'Enter a word or two — without spaces — to make a unique web address just for this block, called an “anchor.” Then, you’ll be able to link directly to this section of your page.', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'text',
+        'title'    => __( 'HTML anchor', 'ayecode-connect' ),
+        'desc'     => __( 'Enter a word or two — without spaces — to make a unique web address just for this block, called an “anchor.” Then, you’ll be able to link directly to this section of your page.', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Advanced', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1560,18 +1560,18 @@ 
  */
 function sd_get_class_input( $type = 'css_class', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'text',
-		'title'    => __( 'Additional CSS class(es)', 'ayecode-connect' ),
-		'desc'     => __( 'Separate multiple classes with spaces.', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'text',
+        'title'    => __( 'Additional CSS class(es)', 'ayecode-connect' ),
+        'desc'     => __( 'Separate multiple classes with spaces.', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Advanced', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1584,341 +1584,341 @@ 
  */
 function sd_get_hover_animations_input( $type = 'hover_animations', $overwrite = array() ) {
 
-	$options = array(
-		''                 => __( 'none', 'ayecode-connect' ),
-		'hover-zoom'       => __( 'Zoom', 'ayecode-connect' ),
-		'hover-shadow'     => __( 'Shadow', 'ayecode-connect' ),
-		'hover-move-up'    => __( 'Move up', 'ayecode-connect' ),
-		'hover-move-down'  => __( 'Move down', 'ayecode-connect' ),
-		'hover-move-left'  => __( 'Move left', 'ayecode-connect' ),
-		'hover-move-right' => __( 'Move right', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''                 => __( 'none', 'ayecode-connect' ),
+        'hover-zoom'       => __( 'Zoom', 'ayecode-connect' ),
+        'hover-shadow'     => __( 'Shadow', 'ayecode-connect' ),
+        'hover-move-up'    => __( 'Move up', 'ayecode-connect' ),
+        'hover-move-down'  => __( 'Move down', 'ayecode-connect' ),
+        'hover-move-left'  => __( 'Move left', 'ayecode-connect' ),
+        'hover-move-right' => __( 'Move right', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'multiple' => true,
-		'title'    => __( 'Hover Animations', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Hover Animations', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'multiple' => true,
+        'title'    => __( 'Hover Animations', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Hover Animations', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 
 function sd_get_flex_align_items_input( $type = 'align-items', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                         => __( 'Default', 'ayecode-connect' ),
-		'align-items' . $device_size . '-start'    => 'align-items-start',
-		'align-items' . $device_size . '-end'      => 'align-items-end',
-		'align-items' . $device_size . '-center'   => 'align-items-center',
-		'align-items' . $device_size . '-baseline' => 'align-items-baseline',
-		'align-items' . $device_size . '-stretch'  => 'align-items-stretch',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Vertical Align Items', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => ' ( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
-
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                         => __( 'Default', 'ayecode-connect' ),
+        'align-items' . $device_size . '-start'    => 'align-items-start',
+        'align-items' . $device_size . '-end'      => 'align-items-end',
+        'align-items' . $device_size . '-center'   => 'align-items-center',
+        'align-items' . $device_size . '-baseline' => 'align-items-baseline',
+        'align-items' . $device_size . '-stretch'  => 'align-items-stretch',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Vertical Align Items', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => ' ( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
+
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_flex_align_items_input_group( $type = 'flex_align_items', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_align_items_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_align_items_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 function sd_get_flex_justify_content_input( $type = 'flex_justify_content', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                            => __( 'Default', 'ayecode-connect' ),
-		'justify-content' . $device_size . '-start'   => 'justify-content-start',
-		'justify-content' . $device_size . '-end'     => 'justify-content-end',
-		'justify-content' . $device_size . '-center'  => 'justify-content-center',
-		'justify-content' . $device_size . '-between' => 'justify-content-between',
-		'justify-content' . $device_size . '-stretch' => 'justify-content-around',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Justify content', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => '( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
-
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                            => __( 'Default', 'ayecode-connect' ),
+        'justify-content' . $device_size . '-start'   => 'justify-content-start',
+        'justify-content' . $device_size . '-end'     => 'justify-content-end',
+        'justify-content' . $device_size . '-center'  => 'justify-content-center',
+        'justify-content' . $device_size . '-between' => 'justify-content-between',
+        'justify-content' . $device_size . '-stretch' => 'justify-content-around',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Justify content', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => '( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
+
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_flex_justify_content_input_group( $type = 'flex_justify_content', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_justify_content_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_justify_content_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 
 function sd_get_flex_align_self_input( $type = 'flex_align_self', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                         => __( 'Default', 'ayecode-connect' ),
-		'align-items' . $device_size . '-start'    => 'align-items-start',
-		'align-items' . $device_size . '-end'      => 'align-items-end',
-		'align-items' . $device_size . '-center'   => 'align-items-center',
-		'align-items' . $device_size . '-baseline' => 'align-items-baseline',
-		'align-items' . $device_size . '-stretch'  => 'align-items-stretch',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Align Self', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => ' [%container%]=="col" ',
-
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                         => __( 'Default', 'ayecode-connect' ),
+        'align-items' . $device_size . '-start'    => 'align-items-start',
+        'align-items' . $device_size . '-end'      => 'align-items-end',
+        'align-items' . $device_size . '-center'   => 'align-items-center',
+        'align-items' . $device_size . '-baseline' => 'align-items-baseline',
+        'align-items' . $device_size . '-stretch'  => 'align-items-stretch',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Align Self', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => ' [%container%]=="col" ',
+
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_flex_align_self_input_group( $type = 'flex_align_self', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_align_self_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_align_self_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 function sd_get_flex_order_input( $type = 'flex_order', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		'' => __( 'Default', 'ayecode-connect' ),
-	);
-
-	$i = 0;
-	while ( $i <= 5 ) {
-		$options[ 'order' . $device_size . '-' . $i ] = $i;
-		$i++;
-	}
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Flex Order', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => ' [%container%]=="col" ',
-
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        '' => __( 'Default', 'ayecode-connect' ),
+    );
+
+    $i = 0;
+    while ( $i <= 5 ) {
+        $options[ 'order' . $device_size . '-' . $i ] = $i;
+        $i++;
+    }
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Flex Order', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => ' [%container%]=="col" ',
+
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_flex_order_input_group( $type = 'flex_order', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_order_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_order_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 function sd_get_flex_wrap_group( $type = 'flex_wrap', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_wrap_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_wrap_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 function sd_get_flex_wrap_input( $type = 'flex_wrap', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                      => __( 'Default', 'ayecode-connect' ),
-		'flex' . $device_size . '-nowrap'       => 'nowrap',
-		'flex' . $device_size . '-wrap'         => 'wrap',
-		'flex' . $device_size . '-wrap-reverse' => 'wrap-reverse',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Flex wrap', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                      => __( 'Default', 'ayecode-connect' ),
+        'flex' . $device_size . '-nowrap'       => 'nowrap',
+        'flex' . $device_size . '-wrap'         => 'wrap',
+        'flex' . $device_size . '-wrap-reverse' => 'wrap-reverse',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Flex wrap', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_float_group( $type = 'float', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_float_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_float_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 function sd_get_float_input( $type = 'float', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                      => __( 'Default', 'ayecode-connect' ),
-		'float' . $device_size . '-start'       => 'left',
-		'float' . $device_size . '-end'         => 'right',
-		'float' . $device_size . '-none' => 'none',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Float', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                      => __( 'Default', 'ayecode-connect' ),
+        'float' . $device_size . '-start'       => 'left',
+        'float' . $device_size . '-end'         => 'right',
+        'float' . $device_size . '-none' => 'none',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Float', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1929,26 +1929,26 @@ 
  */
 function sd_get_zindex_input( $type = 'zindex', $overwrite = array() ) {
 
-	$options = array(
-		''          => __( 'Default', 'ayecode-connect' ),
-		'zindex-0'  => '0',
-		'zindex-1'  => '1',
-		'zindex-5'  => '5',
-		'zindex-10' => '10',
-	);
+    $options = array(
+        ''          => __( 'Default', 'ayecode-connect' ),
+        'zindex-0'  => '0',
+        'zindex-1'  => '1',
+        'zindex-5'  => '5',
+        'zindex-10' => '10',
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Z-index', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Z-index', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1959,26 +1959,26 @@ 
  */
 function sd_get_overflow_input( $type = 'overflow', $overwrite = array() ) {
 
-	$options = array(
-		''                 => __( 'Default', 'ayecode-connect' ),
-		'overflow-auto'    => __( 'Auto', 'ayecode-connect' ),
-		'overflow-hidden'  => __( 'Hidden', 'ayecode-connect' ),
-		'overflow-visible' => __( 'Visible', 'ayecode-connect' ),
-		'overflow-scroll'  => __( 'Scroll', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''                 => __( 'Default', 'ayecode-connect' ),
+        'overflow-auto'    => __( 'Auto', 'ayecode-connect' ),
+        'overflow-hidden'  => __( 'Hidden', 'ayecode-connect' ),
+        'overflow-visible' => __( 'Visible', 'ayecode-connect' ),
+        'overflow-scroll'  => __( 'Scroll', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Overflow', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Overflow', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1989,19 +1989,19 @@ 
  */
 function sd_get_max_height_input( $type = 'max_height', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'        => 'text',
-		'title'       => __( 'Max height', 'ayecode-connect' ),
-		'value'       => '',
-		'default'     => '',
-		'placeholder' => '',
-		'desc_tip'    => true,
-		'group'       => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'        => 'text',
+        'title'       => __( 'Max height', 'ayecode-connect' ),
+        'value'       => '',
+        'default'     => '',
+        'placeholder' => '',
+        'desc_tip'    => true,
+        'group'       => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2012,23 +2012,23 @@ 
  */
 function sd_get_scrollbars_input( $type = 'scrollbars', $overwrite = array() ) {
 
-	$options = array(
-		''               => __( 'Default', 'ayecode-connect' ),
-		'scrollbars-ios' => __( 'IOS Style', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''               => __( 'Default', 'ayecode-connect' ),
+        'scrollbars-ios' => __( 'IOS Style', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Scrollbars', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Scrollbars', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2040,415 +2040,415 @@ 
  * @todo find best way to use px- py- or general p-
  */
 function sd_build_aui_class( $args ) {
-	global $aui_bs5;
-
-	$classes = array();
-
-	if ( $aui_bs5 ) {
-		$p_ml = 'ms-';
-		$p_mr = 'me-';
-
-		$p_pl = 'ps-';
-		$p_pr = 'pe-';
-	} else {
-		$p_ml = 'ml-';
-		$p_mr = 'mr-';
-
-		$p_pl = 'pl-';
-		$p_pr = 'pr-';
-	}
-
-	// margins.
-	if ( isset( $args['mt'] ) && $args['mt'] !== '' ) {
-		$classes[] = 'mt-' . sanitize_html_class( $args['mt'] );
-		$mt        = $args['mt'];
-	} else {
-		$mt = null;
-	}
-	if ( isset( $args['mr'] ) && $args['mr'] !== '' ) {
-		$classes[] = $p_mr . sanitize_html_class( $args['mr'] );
-		$mr        = $args['mr'];
-	} else {
-		$mr = null;
-	}
-	if ( isset( $args['mb'] ) && $args['mb'] !== '' ) {
-		$classes[] = 'mb-' . sanitize_html_class( $args['mb'] );
-		$mb        = $args['mb'];
-	} else {
-		$mb = null;
-	}
-	if ( isset( $args['ml'] ) && $args['ml'] !== '' ) {
-		$classes[] = $p_ml . sanitize_html_class( $args['ml'] );
-		$ml        = $args['ml'];
-	} else {
-		$ml = null;
-	}
-
-	// margins tablet.
-	if ( isset( $args['mt_md'] ) && $args['mt_md'] !== '' ) {
-		$classes[] = 'mt-md-' . sanitize_html_class( $args['mt_md'] );
-		$mt_md     = $args['mt_md'];
-	} else {
-		$mt_md = null;
-	}
-	if ( isset( $args['mr_md'] ) && $args['mr_md'] !== '' ) {
-		$classes[] = $p_mr . 'md-' . sanitize_html_class( $args['mr_md'] );
-		$mt_md     = $args['mr_md'];
-	} else {
-		$mr_md = null;
-	}
-	if ( isset( $args['mb_md'] ) && $args['mb_md'] !== '' ) {
-		$classes[] = 'mb-md-' . sanitize_html_class( $args['mb_md'] );
-		$mt_md     = $args['mb_md'];
-	} else {
-		$mb_md = null;
-	}
-	if ( isset( $args['ml_md'] ) && $args['ml_md'] !== '' ) {
-		$classes[] = $p_ml . 'md-' . sanitize_html_class( $args['ml_md'] );
-		$mt_md     = $args['ml_md'];
-	} else {
-		$ml_md = null;
-	}
-
-	// margins desktop.
-	if ( isset( $args['mt_lg'] ) && $args['mt_lg'] !== '' ) {
-		if ( $mt == null && $mt_md == null ) {
-			$classes[] = 'mt-' . sanitize_html_class( $args['mt_lg'] );
-		} else {
-			$classes[] = 'mt-lg-' . sanitize_html_class( $args['mt_lg'] );
-		}
-	}
-	if ( isset( $args['mr_lg'] ) && $args['mr_lg'] !== '' ) {
-		if ( $mr == null && $mr_md == null ) {
-			$classes[] = $p_mr . sanitize_html_class( $args['mr_lg'] );
-		} else {
-			$classes[] = $p_mr . 'lg-' . sanitize_html_class( $args['mr_lg'] );
-		}
-	}
-	if ( isset( $args['mb_lg'] ) && $args['mb_lg'] !== '' ) {
-		if ( $mb == null && $mb_md == null ) {
-			$classes[] = 'mb-' . sanitize_html_class( $args['mb_lg'] );
-		} else {
-			$classes[] = 'mb-lg-' . sanitize_html_class( $args['mb_lg'] );
-		}
-	}
-	if ( isset( $args['ml_lg'] ) && $args['ml_lg'] !== '' ) {
-		if ( $ml == null && $ml_md == null ) {
-			$classes[] = $p_ml . sanitize_html_class( $args['ml_lg'] );
-		} else {
-			$classes[] = $p_ml . 'lg-' . sanitize_html_class( $args['ml_lg'] );
-		}
-	}
-
-	// padding.
-	if ( isset( $args['pt'] ) && $args['pt'] !== '' ) {
-		$classes[] = 'pt-' . sanitize_html_class( $args['pt'] );
-		$pt        = $args['pt'];
-	} else {
-		$pt = null;
-	}
-	if ( isset( $args['pr'] ) && $args['pr'] !== '' ) {
-		$classes[] = $p_pr . sanitize_html_class( $args['pr'] );
-		$pr        = $args['pr'];
-	} else {
-		$pr = null;
-	}
-	if ( isset( $args['pb'] ) && $args['pb'] !== '' ) {
-		$classes[] = 'pb-' . sanitize_html_class( $args['pb'] );
-		$pb        = $args['pb'];
-	} else {
-		$pb = null;
-	}
-	if ( isset( $args['pl'] ) && $args['pl'] !== '' ) {
-		$classes[] = $p_pl . sanitize_html_class( $args['pl'] );
-		$pl        = $args['pl'];
-	} else {
-		$pl = null;
-	}
-
-	// padding tablet.
-	if ( isset( $args['pt_md'] ) && $args['pt_md'] !== '' ) {
-		$classes[] = 'pt-md-' . sanitize_html_class( $args['pt_md'] );
-		$pt_md     = $args['pt_md'];
-	} else {
-		$pt_md = null;
-	}
-	if ( isset( $args['pr_md'] ) && $args['pr_md'] !== '' ) {
-		$classes[] = $p_pr . 'md-' . sanitize_html_class( $args['pr_md'] );
-		$pr_md     = $args['pr_md'];
-	} else {
-		$pr_md = null;
-	}
-	if ( isset( $args['pb_md'] ) && $args['pb_md'] !== '' ) {
-		$classes[] = 'pb-md-' . sanitize_html_class( $args['pb_md'] );
-		$pb_md     = $args['pb_md'];
-	} else {
-		$pb_md = null;
-	}
-	if ( isset( $args['pl_md'] ) && $args['pl_md'] !== '' ) {
-		$classes[] = $p_pl . 'md-' . sanitize_html_class( $args['pl_md'] );
-		$pl_md     = $args['pl_md'];
-	} else {
-		$pl_md = null;
-	}
-
-	// padding desktop.
-	if ( isset( $args['pt_lg'] ) && $args['pt_lg'] !== '' ) {
-		if ( $pt == null && $pt_md == null ) {
-			$classes[] = 'pt-' . sanitize_html_class( $args['pt_lg'] );
-		} else {
-			$classes[] = 'pt-lg-' . sanitize_html_class( $args['pt_lg'] );
-		}
-	}
-	if ( isset( $args['pr_lg'] ) && $args['pr_lg'] !== '' ) {
-		if ( $pr == null && $pr_md == null ) {
-			$classes[] = $p_pr . sanitize_html_class( $args['pr_lg'] );
-		} else {
-			$classes[] = $p_pr . 'lg-' . sanitize_html_class( $args['pr_lg'] );
-		}
-	}
-	if ( isset( $args['pb_lg'] ) && $args['pb_lg'] !== '' ) {
-		if ( $pb == null && $pb_md == null ) {
-			$classes[] = 'pb-' . sanitize_html_class( $args['pb_lg'] );
-		} else {
-			$classes[] = 'pb-lg-' . sanitize_html_class( $args['pb_lg'] );
-		}
-	}
-	if ( isset( $args['pl_lg'] ) && $args['pl_lg'] !== '' ) {
-		if ( $pl == null && $pl_md == null ) {
-			$classes[] = $p_pl . sanitize_html_class( $args['pl_lg'] );
-		} else {
-			$classes[] = $p_pl . 'lg-' . sanitize_html_class( $args['pl_lg'] );
-		}
-	}
-
-	// row cols, mobile, tablet, desktop
-	if ( ! empty( $args['row_cols'] ) && $args['row_cols'] !== '' ) {
-		$classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols'] );
-		$row_cols  = $args['row_cols'];
-	} else {
-		$row_cols = null;
-	}
-	if ( ! empty( $args['row_cols_md'] ) && $args['row_cols_md'] !== '' ) {
-		$classes[]   = sanitize_html_class( 'row-cols-md-' . $args['row_cols_md'] );
-		$row_cols_md = $args['row_cols_md'];
-	} else {
-		$row_cols_md = null;
-	}
-	if ( ! empty( $args['row_cols_lg'] ) && $args['row_cols_lg'] !== '' ) {
-		if ( $row_cols == null && $row_cols_md == null ) {
-			$classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols_lg'] );
-		} else {
-			$classes[] = sanitize_html_class( 'row-cols-lg-' . $args['row_cols_lg'] );
-		}
-	}
-
-	// columns , mobile, tablet, desktop
-	if ( ! empty( $args['col'] ) && $args['col'] !== '' ) {
-		$classes[] = sanitize_html_class( 'col-' . $args['col'] );
-		$col       = $args['col'];
-	} else {
-		$col = null;
-	}
-	if ( ! empty( $args['col_md'] ) && $args['col_md'] !== '' ) {
-		$classes[] = sanitize_html_class( 'col-md-' . $args['col_md'] );
-		$col_md    = $args['col_md'];
-	} else {
-		$col_md = null;
-	}
-	if ( ! empty( $args['col_lg'] ) && $args['col_lg'] !== '' ) {
-		if ( $col == null && $col_md == null ) {
-			$classes[] = sanitize_html_class( 'col-' . $args['col_lg'] );
-		} else {
-			$classes[] = sanitize_html_class( 'col-lg-' . $args['col_lg'] );
-		}
-	}
-
-	// border
-	if ( isset( $args['border'] ) && ( $args['border'] == 'none' || $args['border'] === '0' || $args['border'] === 0 ) ) {
-		$classes[] = 'border-0';
-	} elseif ( ! empty( $args['border'] ) ) {
-		$border_class = 'border';
-		if ( ! empty( $args['border_type'] ) && strpos( $args['border_type'], '-0' ) === false ) {
-			$border_class = '';
-		}
-		$classes[] = $border_class . ' border-' . sanitize_html_class( $args['border'] );
-	}
-
-	// border radius type
-	if ( ! empty( $args['rounded'] ) ) {
-		$classes[] = sanitize_html_class( $args['rounded'] );
-	}
-
-	// border radius size BS4
-	if ( isset( $args['rounded_size'] ) && in_array( $args['rounded_size'], array( 'sm', 'lg' ) ) ) {
-		$classes[] = 'rounded-' . sanitize_html_class( $args['rounded_size'] );
-		// if we set a size then we need to remove "rounded" if set
-		if ( ( $key = array_search( 'rounded', $classes ) ) !== false ) {
-			unset( $classes[ $key ] );
-		}
-	} else {
-
-		// border radius size , mobile, tablet, desktop
-		if ( isset( $args['rounded_size'] ) && $args['rounded_size'] !== '' ) {
-			$classes[]    = sanitize_html_class( 'rounded-' . $args['rounded_size'] );
-			$rounded_size = $args['rounded_size'];
-		} else {
-			$rounded_size = null;
-		}
-		if ( isset( $args['rounded_size_md'] ) && $args['rounded_size_md'] !== '' ) {
-			$classes[]       = sanitize_html_class( 'rounded-md-' . $args['rounded_size_md'] );
-			$rounded_size_md = $args['rounded_size_md'];
-		} else {
-			$rounded_size_md = null;
-		}
-		if ( isset( $args['rounded_size_lg'] ) && $args['rounded_size_lg'] !== '' ) {
-			if ( $rounded_size == null && $rounded_size_md == null ) {
-				$classes[] = sanitize_html_class( 'rounded-' . $args['rounded_size_lg'] );
-			} else {
-				$classes[] = sanitize_html_class( 'rounded-lg-' . $args['rounded_size_lg'] );
-			}
-		}
-	}
-
-	// shadow
-	//if ( !empty( $args['shadow'] ) ) { $classes[] = sanitize_html_class($args['shadow']); }
-
-	// background
-	if ( ! empty( $args['bg'] ) ) {
-		$classes[] = 'bg-' . sanitize_html_class( $args['bg'] );
-	}
-
-	// text_color
-	if ( ! empty( $args['text_color'] ) ) {
-		$classes[] = 'text-' . sanitize_html_class( $args['text_color'] );
-	}
-
-	// text_align
-	if ( ! empty( $args['text_justify'] ) ) {
-		$classes[] = 'text-justify';
-	} else {
-		if ( ! empty( $args['text_align'] ) ) {
-			$classes[]  = sanitize_html_class( $args['text_align'] );
-			$text_align = $args['text_align'];
-		} else {
-			$text_align = null;
-		}
-		if ( ! empty( $args['text_align_md'] ) && $args['text_align_md'] !== '' ) {
-			$classes[]     = sanitize_html_class( $args['text_align_md'] );
-			$text_align_md = $args['text_align_md'];
-		} else {
-			$text_align_md = null;
-		}
-		if ( ! empty( $args['text_align_lg'] ) && $args['text_align_lg'] !== '' ) {
-			if ( $text_align == null && $text_align_md == null ) {
-				$classes[] = sanitize_html_class( str_replace( '-lg', '', $args['text_align_lg'] ) );
-			} else {
-				$classes[] = sanitize_html_class( $args['text_align_lg'] );
-			}
-		}
-	}
-
-	// display
-	if ( ! empty( $args['display'] ) ) {
-		$classes[] = sanitize_html_class( $args['display'] );
-		$display   = $args['display'];
-	} else {
-		$display = null;
-	}
-	if ( ! empty( $args['display_md'] ) && $args['display_md'] !== '' ) {
-		$classes[]  = sanitize_html_class( $args['display_md'] );
-		$display_md = $args['display_md'];
-	} else {
-		$display_md = null;
-	}
-	if ( ! empty( $args['display_lg'] ) && $args['display_lg'] !== '' ) {
-		if ( $display == null && $display_md == null ) {
-			$classes[] = sanitize_html_class( str_replace( '-lg', '', $args['display_lg'] ) );
-		} else {
-			$classes[] = sanitize_html_class( $args['display_lg'] );
-		}
-	}
-
-	// bgtus - background transparent until scroll
-	if ( ! empty( $args['bgtus'] ) ) {
-		$classes[] = sanitize_html_class( 'bg-transparent-until-scroll' );
-	}
-
-	// cscos - change color scheme on scroll
-	if ( ! empty( $args['bgtus'] ) && ! empty( $args['cscos'] ) ) {
-		$classes[] = sanitize_html_class( 'color-scheme-flip-on-scroll' );
-	}
-
-	// hover animations
-	if ( ! empty( $args['hover_animations'] ) ) {
-		$classes[] = sd_sanitize_html_classes( str_replace( ',', ' ', $args['hover_animations'] ) );
-	}
-
-	// absolute_position
-	if ( ! empty( $args['absolute_position'] ) ) {
-		if ( 'top-left' === $args['absolute_position'] ) {
-			$classes[] = 'start-0 top-0';
-		} elseif ( 'top-center' === $args['absolute_position'] ) {
-			$classes[] = 'start-50 top-0 translate-middle';
-		} elseif ( 'top-right' === $args['absolute_position'] ) {
-			$classes[] = 'end-0 top-0';
-		} elseif ( 'center-left' === $args['absolute_position'] ) {
-			$classes[] = 'start-0 top-50';
-		} elseif ( 'center' === $args['absolute_position'] ) {
-			$classes[] = 'start-50 top-50 translate-middle';
-		} elseif ( 'center-right' === $args['absolute_position'] ) {
-			$classes[] = 'end-0 top-50';
-		} elseif ( 'bottom-left' === $args['absolute_position'] ) {
-			$classes[] = 'start-0 bottom-0';
-		} elseif ( 'bottom-center' === $args['absolute_position'] ) {
-			$classes[] = 'start-50 bottom-0 translate-middle';
-		} elseif ( 'bottom-right' === $args['absolute_position'] ) {
-			$classes[] = 'end-0 bottom-0';
-		}
-	}
-
-	// build classes from build keys
-	$build_keys = sd_get_class_build_keys();
-	if ( ! empty( $build_keys ) ) {
-		foreach ( $build_keys as $key ) {
-
-			if ( substr( $key, -4 ) == '-MTD' ) {
-
-				$k = str_replace( '-MTD', '', $key );
-
-				// Mobile, Tablet, Desktop
-				if ( ! empty( $args[ $k ] ) && $args[ $k ] !== '' ) {
-					$classes[] = sanitize_html_class( $args[ $k ] );
-					$v         = $args[ $k ];
-				} else {
-					$v = null;
-				}
-				if ( ! empty( $args[ $k . '_md' ] ) && $args[ $k . '_md' ] !== '' ) {
-					$classes[] = sanitize_html_class( $args[ $k . '_md' ] );
-					$v_md      = $args[ $k . '_md' ];
-				} else {
-					$v_md = null;
-				}
-				if ( ! empty( $args[ $k . '_lg' ] ) && $args[ $k . '_lg' ] !== '' ) {
-					if ( $v == null && $v_md == null ) {
-						$classes[] = sanitize_html_class( str_replace( '-lg', '', $args[ $k . '_lg' ] ) );
-					} else {
-						$classes[] = sanitize_html_class( $args[ $k . '_lg' ] );
-					}
-				}
-			} else {
-				if ( $key == 'font_size' && ! empty( $args[ $key ] ) && $args[ $key ] == 'custom' ) {
-					continue;
-				}
-				if ( ! empty( $args[ $key ] ) ) {
-					$classes[] = sd_sanitize_html_classes( $args[ $key ] );
-				}
-			}
-		}
-	}
-
-	return implode( ' ', $classes );
+    global $aui_bs5;
+
+    $classes = array();
+
+    if ( $aui_bs5 ) {
+        $p_ml = 'ms-';
+        $p_mr = 'me-';
+
+        $p_pl = 'ps-';
+        $p_pr = 'pe-';
+    } else {
+        $p_ml = 'ml-';
+        $p_mr = 'mr-';
+
+        $p_pl = 'pl-';
+        $p_pr = 'pr-';
+    }
+
+    // margins.
+    if ( isset( $args['mt'] ) && $args['mt'] !== '' ) {
+        $classes[] = 'mt-' . sanitize_html_class( $args['mt'] );
+        $mt        = $args['mt'];
+    } else {
+        $mt = null;
+    }
+    if ( isset( $args['mr'] ) && $args['mr'] !== '' ) {
+        $classes[] = $p_mr . sanitize_html_class( $args['mr'] );
+        $mr        = $args['mr'];
+    } else {
+        $mr = null;
+    }
+    if ( isset( $args['mb'] ) && $args['mb'] !== '' ) {
+        $classes[] = 'mb-' . sanitize_html_class( $args['mb'] );
+        $mb        = $args['mb'];
+    } else {
+        $mb = null;
+    }
+    if ( isset( $args['ml'] ) && $args['ml'] !== '' ) {
+        $classes[] = $p_ml . sanitize_html_class( $args['ml'] );
+        $ml        = $args['ml'];
+    } else {
+        $ml = null;
+    }
+
+    // margins tablet.
+    if ( isset( $args['mt_md'] ) && $args['mt_md'] !== '' ) {
+        $classes[] = 'mt-md-' . sanitize_html_class( $args['mt_md'] );
+        $mt_md     = $args['mt_md'];
+    } else {
+        $mt_md = null;
+    }
+    if ( isset( $args['mr_md'] ) && $args['mr_md'] !== '' ) {
+        $classes[] = $p_mr . 'md-' . sanitize_html_class( $args['mr_md'] );
+        $mt_md     = $args['mr_md'];
+    } else {
+        $mr_md = null;
+    }
+    if ( isset( $args['mb_md'] ) && $args['mb_md'] !== '' ) {
+        $classes[] = 'mb-md-' . sanitize_html_class( $args['mb_md'] );
+        $mt_md     = $args['mb_md'];
+    } else {
+        $mb_md = null;
+    }
+    if ( isset( $args['ml_md'] ) && $args['ml_md'] !== '' ) {
+        $classes[] = $p_ml . 'md-' . sanitize_html_class( $args['ml_md'] );
+        $mt_md     = $args['ml_md'];
+    } else {
+        $ml_md = null;
+    }
+
+    // margins desktop.
+    if ( isset( $args['mt_lg'] ) && $args['mt_lg'] !== '' ) {
+        if ( $mt == null && $mt_md == null ) {
+            $classes[] = 'mt-' . sanitize_html_class( $args['mt_lg'] );
+        } else {
+            $classes[] = 'mt-lg-' . sanitize_html_class( $args['mt_lg'] );
+        }
+    }
+    if ( isset( $args['mr_lg'] ) && $args['mr_lg'] !== '' ) {
+        if ( $mr == null && $mr_md == null ) {
+            $classes[] = $p_mr . sanitize_html_class( $args['mr_lg'] );
+        } else {
+            $classes[] = $p_mr . 'lg-' . sanitize_html_class( $args['mr_lg'] );
+        }
+    }
+    if ( isset( $args['mb_lg'] ) && $args['mb_lg'] !== '' ) {
+        if ( $mb == null && $mb_md == null ) {
+            $classes[] = 'mb-' . sanitize_html_class( $args['mb_lg'] );
+        } else {
+            $classes[] = 'mb-lg-' . sanitize_html_class( $args['mb_lg'] );
+        }
+    }
+    if ( isset( $args['ml_lg'] ) && $args['ml_lg'] !== '' ) {
+        if ( $ml == null && $ml_md == null ) {
+            $classes[] = $p_ml . sanitize_html_class( $args['ml_lg'] );
+        } else {
+            $classes[] = $p_ml . 'lg-' . sanitize_html_class( $args['ml_lg'] );
+        }
+    }
+
+    // padding.
+    if ( isset( $args['pt'] ) && $args['pt'] !== '' ) {
+        $classes[] = 'pt-' . sanitize_html_class( $args['pt'] );
+        $pt        = $args['pt'];
+    } else {
+        $pt = null;
+    }
+    if ( isset( $args['pr'] ) && $args['pr'] !== '' ) {
+        $classes[] = $p_pr . sanitize_html_class( $args['pr'] );
+        $pr        = $args['pr'];
+    } else {
+        $pr = null;
+    }
+    if ( isset( $args['pb'] ) && $args['pb'] !== '' ) {
+        $classes[] = 'pb-' . sanitize_html_class( $args['pb'] );
+        $pb        = $args['pb'];
+    } else {
+        $pb = null;
+    }
+    if ( isset( $args['pl'] ) && $args['pl'] !== '' ) {
+        $classes[] = $p_pl . sanitize_html_class( $args['pl'] );
+        $pl        = $args['pl'];
+    } else {
+        $pl = null;
+    }
+
+    // padding tablet.
+    if ( isset( $args['pt_md'] ) && $args['pt_md'] !== '' ) {
+        $classes[] = 'pt-md-' . sanitize_html_class( $args['pt_md'] );
+        $pt_md     = $args['pt_md'];
+    } else {
+        $pt_md = null;
+    }
+    if ( isset( $args['pr_md'] ) && $args['pr_md'] !== '' ) {
+        $classes[] = $p_pr . 'md-' . sanitize_html_class( $args['pr_md'] );
+        $pr_md     = $args['pr_md'];
+    } else {
+        $pr_md = null;
+    }
+    if ( isset( $args['pb_md'] ) && $args['pb_md'] !== '' ) {
+        $classes[] = 'pb-md-' . sanitize_html_class( $args['pb_md'] );
+        $pb_md     = $args['pb_md'];
+    } else {
+        $pb_md = null;
+    }
+    if ( isset( $args['pl_md'] ) && $args['pl_md'] !== '' ) {
+        $classes[] = $p_pl . 'md-' . sanitize_html_class( $args['pl_md'] );
+        $pl_md     = $args['pl_md'];
+    } else {
+        $pl_md = null;
+    }
+
+    // padding desktop.
+    if ( isset( $args['pt_lg'] ) && $args['pt_lg'] !== '' ) {
+        if ( $pt == null && $pt_md == null ) {
+            $classes[] = 'pt-' . sanitize_html_class( $args['pt_lg'] );
+        } else {
+            $classes[] = 'pt-lg-' . sanitize_html_class( $args['pt_lg'] );
+        }
+    }
+    if ( isset( $args['pr_lg'] ) && $args['pr_lg'] !== '' ) {
+        if ( $pr == null && $pr_md == null ) {
+            $classes[] = $p_pr . sanitize_html_class( $args['pr_lg'] );
+        } else {
+            $classes[] = $p_pr . 'lg-' . sanitize_html_class( $args['pr_lg'] );
+        }
+    }
+    if ( isset( $args['pb_lg'] ) && $args['pb_lg'] !== '' ) {
+        if ( $pb == null && $pb_md == null ) {
+            $classes[] = 'pb-' . sanitize_html_class( $args['pb_lg'] );
+        } else {
+            $classes[] = 'pb-lg-' . sanitize_html_class( $args['pb_lg'] );
+        }
+    }
+    if ( isset( $args['pl_lg'] ) && $args['pl_lg'] !== '' ) {
+        if ( $pl == null && $pl_md == null ) {
+            $classes[] = $p_pl . sanitize_html_class( $args['pl_lg'] );
+        } else {
+            $classes[] = $p_pl . 'lg-' . sanitize_html_class( $args['pl_lg'] );
+        }
+    }
+
+    // row cols, mobile, tablet, desktop
+    if ( ! empty( $args['row_cols'] ) && $args['row_cols'] !== '' ) {
+        $classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols'] );
+        $row_cols  = $args['row_cols'];
+    } else {
+        $row_cols = null;
+    }
+    if ( ! empty( $args['row_cols_md'] ) && $args['row_cols_md'] !== '' ) {
+        $classes[]   = sanitize_html_class( 'row-cols-md-' . $args['row_cols_md'] );
+        $row_cols_md = $args['row_cols_md'];
+    } else {
+        $row_cols_md = null;
+    }
+    if ( ! empty( $args['row_cols_lg'] ) && $args['row_cols_lg'] !== '' ) {
+        if ( $row_cols == null && $row_cols_md == null ) {
+            $classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols_lg'] );
+        } else {
+            $classes[] = sanitize_html_class( 'row-cols-lg-' . $args['row_cols_lg'] );
+        }
+    }
+
+    // columns , mobile, tablet, desktop
+    if ( ! empty( $args['col'] ) && $args['col'] !== '' ) {
+        $classes[] = sanitize_html_class( 'col-' . $args['col'] );
+        $col       = $args['col'];
+    } else {
+        $col = null;
+    }
+    if ( ! empty( $args['col_md'] ) && $args['col_md'] !== '' ) {
+        $classes[] = sanitize_html_class( 'col-md-' . $args['col_md'] );
+        $col_md    = $args['col_md'];
+    } else {
+        $col_md = null;
+    }
+    if ( ! empty( $args['col_lg'] ) && $args['col_lg'] !== '' ) {
+        if ( $col == null && $col_md == null ) {
+            $classes[] = sanitize_html_class( 'col-' . $args['col_lg'] );
+        } else {
+            $classes[] = sanitize_html_class( 'col-lg-' . $args['col_lg'] );
+        }
+    }
+
+    // border
+    if ( isset( $args['border'] ) && ( $args['border'] == 'none' || $args['border'] === '0' || $args['border'] === 0 ) ) {
+        $classes[] = 'border-0';
+    } elseif ( ! empty( $args['border'] ) ) {
+        $border_class = 'border';
+        if ( ! empty( $args['border_type'] ) && strpos( $args['border_type'], '-0' ) === false ) {
+            $border_class = '';
+        }
+        $classes[] = $border_class . ' border-' . sanitize_html_class( $args['border'] );
+    }
+
+    // border radius type
+    if ( ! empty( $args['rounded'] ) ) {
+        $classes[] = sanitize_html_class( $args['rounded'] );
+    }
+
+    // border radius size BS4
+    if ( isset( $args['rounded_size'] ) && in_array( $args['rounded_size'], array( 'sm', 'lg' ) ) ) {
+        $classes[] = 'rounded-' . sanitize_html_class( $args['rounded_size'] );
+        // if we set a size then we need to remove "rounded" if set
+        if ( ( $key = array_search( 'rounded', $classes ) ) !== false ) {
+            unset( $classes[ $key ] );
+        }
+    } else {
+
+        // border radius size , mobile, tablet, desktop
+        if ( isset( $args['rounded_size'] ) && $args['rounded_size'] !== '' ) {
+            $classes[]    = sanitize_html_class( 'rounded-' . $args['rounded_size'] );
+            $rounded_size = $args['rounded_size'];
+        } else {
+            $rounded_size = null;
+        }
+        if ( isset( $args['rounded_size_md'] ) && $args['rounded_size_md'] !== '' ) {
+            $classes[]       = sanitize_html_class( 'rounded-md-' . $args['rounded_size_md'] );
+            $rounded_size_md = $args['rounded_size_md'];
+        } else {
+            $rounded_size_md = null;
+        }
+        if ( isset( $args['rounded_size_lg'] ) && $args['rounded_size_lg'] !== '' ) {
+            if ( $rounded_size == null && $rounded_size_md == null ) {
+                $classes[] = sanitize_html_class( 'rounded-' . $args['rounded_size_lg'] );
+            } else {
+                $classes[] = sanitize_html_class( 'rounded-lg-' . $args['rounded_size_lg'] );
+            }
+        }
+    }
+
+    // shadow
+    //if ( !empty( $args['shadow'] ) ) { $classes[] = sanitize_html_class($args['shadow']); }
+
+    // background
+    if ( ! empty( $args['bg'] ) ) {
+        $classes[] = 'bg-' . sanitize_html_class( $args['bg'] );
+    }
+
+    // text_color
+    if ( ! empty( $args['text_color'] ) ) {
+        $classes[] = 'text-' . sanitize_html_class( $args['text_color'] );
+    }
+
+    // text_align
+    if ( ! empty( $args['text_justify'] ) ) {
+        $classes[] = 'text-justify';
+    } else {
+        if ( ! empty( $args['text_align'] ) ) {
+            $classes[]  = sanitize_html_class( $args['text_align'] );
+            $text_align = $args['text_align'];
+        } else {
+            $text_align = null;
+        }
+        if ( ! empty( $args['text_align_md'] ) && $args['text_align_md'] !== '' ) {
+            $classes[]     = sanitize_html_class( $args['text_align_md'] );
+            $text_align_md = $args['text_align_md'];
+        } else {
+            $text_align_md = null;
+        }
+        if ( ! empty( $args['text_align_lg'] ) && $args['text_align_lg'] !== '' ) {
+            if ( $text_align == null && $text_align_md == null ) {
+                $classes[] = sanitize_html_class( str_replace( '-lg', '', $args['text_align_lg'] ) );
+            } else {
+                $classes[] = sanitize_html_class( $args['text_align_lg'] );
+            }
+        }
+    }
+
+    // display
+    if ( ! empty( $args['display'] ) ) {
+        $classes[] = sanitize_html_class( $args['display'] );
+        $display   = $args['display'];
+    } else {
+        $display = null;
+    }
+    if ( ! empty( $args['display_md'] ) && $args['display_md'] !== '' ) {
+        $classes[]  = sanitize_html_class( $args['display_md'] );
+        $display_md = $args['display_md'];
+    } else {
+        $display_md = null;
+    }
+    if ( ! empty( $args['display_lg'] ) && $args['display_lg'] !== '' ) {
+        if ( $display == null && $display_md == null ) {
+            $classes[] = sanitize_html_class( str_replace( '-lg', '', $args['display_lg'] ) );
+        } else {
+            $classes[] = sanitize_html_class( $args['display_lg'] );
+        }
+    }
+
+    // bgtus - background transparent until scroll
+    if ( ! empty( $args['bgtus'] ) ) {
+        $classes[] = sanitize_html_class( 'bg-transparent-until-scroll' );
+    }
+
+    // cscos - change color scheme on scroll
+    if ( ! empty( $args['bgtus'] ) && ! empty( $args['cscos'] ) ) {
+        $classes[] = sanitize_html_class( 'color-scheme-flip-on-scroll' );
+    }
+
+    // hover animations
+    if ( ! empty( $args['hover_animations'] ) ) {
+        $classes[] = sd_sanitize_html_classes( str_replace( ',', ' ', $args['hover_animations'] ) );
+    }
+
+    // absolute_position
+    if ( ! empty( $args['absolute_position'] ) ) {
+        if ( 'top-left' === $args['absolute_position'] ) {
+            $classes[] = 'start-0 top-0';
+        } elseif ( 'top-center' === $args['absolute_position'] ) {
+            $classes[] = 'start-50 top-0 translate-middle';
+        } elseif ( 'top-right' === $args['absolute_position'] ) {
+            $classes[] = 'end-0 top-0';
+        } elseif ( 'center-left' === $args['absolute_position'] ) {
+            $classes[] = 'start-0 top-50';
+        } elseif ( 'center' === $args['absolute_position'] ) {
+            $classes[] = 'start-50 top-50 translate-middle';
+        } elseif ( 'center-right' === $args['absolute_position'] ) {
+            $classes[] = 'end-0 top-50';
+        } elseif ( 'bottom-left' === $args['absolute_position'] ) {
+            $classes[] = 'start-0 bottom-0';
+        } elseif ( 'bottom-center' === $args['absolute_position'] ) {
+            $classes[] = 'start-50 bottom-0 translate-middle';
+        } elseif ( 'bottom-right' === $args['absolute_position'] ) {
+            $classes[] = 'end-0 bottom-0';
+        }
+    }
+
+    // build classes from build keys
+    $build_keys = sd_get_class_build_keys();
+    if ( ! empty( $build_keys ) ) {
+        foreach ( $build_keys as $key ) {
+
+            if ( substr( $key, -4 ) == '-MTD' ) {
+
+                $k = str_replace( '-MTD', '', $key );
+
+                // Mobile, Tablet, Desktop
+                if ( ! empty( $args[ $k ] ) && $args[ $k ] !== '' ) {
+                    $classes[] = sanitize_html_class( $args[ $k ] );
+                    $v         = $args[ $k ];
+                } else {
+                    $v = null;
+                }
+                if ( ! empty( $args[ $k . '_md' ] ) && $args[ $k . '_md' ] !== '' ) {
+                    $classes[] = sanitize_html_class( $args[ $k . '_md' ] );
+                    $v_md      = $args[ $k . '_md' ];
+                } else {
+                    $v_md = null;
+                }
+                if ( ! empty( $args[ $k . '_lg' ] ) && $args[ $k . '_lg' ] !== '' ) {
+                    if ( $v == null && $v_md == null ) {
+                        $classes[] = sanitize_html_class( str_replace( '-lg', '', $args[ $k . '_lg' ] ) );
+                    } else {
+                        $classes[] = sanitize_html_class( $args[ $k . '_lg' ] );
+                    }
+                }
+            } else {
+                if ( $key == 'font_size' && ! empty( $args[ $key ] ) && $args[ $key ] == 'custom' ) {
+                    continue;
+                }
+                if ( ! empty( $args[ $key ] ) ) {
+                    $classes[] = sd_sanitize_html_classes( $args[ $key ] );
+                }
+            }
+        }
+    }
+
+    return implode( ' ', $classes );
 }
 
 /**
@@ -2460,90 +2460,90 @@ 
  */
 function sd_build_aui_styles( $args ) {
 
-	$styles = array();
-
-	// background color
-	if ( ! empty( $args['bg'] ) && $args['bg'] !== '' ) {
-		if ( $args['bg'] == 'custom-color' ) {
-			$styles['background-color'] = $args['bg_color'];
-		} elseif ( $args['bg'] == 'custom-gradient' ) {
-			$styles['background-image'] = $args['bg_gradient'];
-
-			// use background on text.
-			if ( ! empty( $args['bg_on_text'] ) && $args['bg_on_text'] ) {
-				$styles['background-clip']         = 'text';
-				$styles['-webkit-background-clip'] = 'text';
-				$styles['text-fill-color']         = 'transparent';
-				$styles['-webkit-text-fill-color'] = 'transparent';
-			}
-		}
-	}
-
-	if ( ! empty( $args['bg_image'] ) && $args['bg_image'] !== '' ) {
-		$hasImage = true;
-		if ( ! empty( $styles['background-color'] ) && $args['bg'] == 'custom-color' ) {
-			$styles['background-image']      = 'url(' . $args['bg_image'] . ')';
-			$styles['background-blend-mode'] = 'overlay';
-		} elseif ( ! empty( $styles['background-image'] ) && $args['bg'] == 'custom-gradient' ) {
-			$styles['background-image'] .= ',url(' . $args['bg_image'] . ')';
-		} elseif ( ! empty( $args['bg'] ) && $args['bg'] != '' && $args['bg'] != 'transparent' ) {
-			// do nothing as we alreay have a preset
-			$hasImage = false;
-		} else {
-			$styles['background-image'] = 'url(' . $args['bg_image'] . ')';
-		}
-
-		if ( $hasImage ) {
-			$styles['background-size'] = 'cover';
-
-			if ( ! empty( $args['bg_image_fixed'] ) && $args['bg_image_fixed'] ) {
-				$styles['background-attachment'] = 'fixed';
-			}
-		}
-
-		if ( $hasImage && ! empty( $args['bg_image_xy'] ) && ! empty( $args['bg_image_xy']['x'] ) ) {
-			$styles['background-position'] = ( $args['bg_image_xy']['x'] * 100 ) . '% ' . ( $args['bg_image_xy']['y'] * 100 ) . '%';
-		}
-	}
-
-	// sticky offset top
-	if ( ! empty( $args['sticky_offset_top'] ) && $args['sticky_offset_top'] !== '' ) {
-		$styles['top'] = absint( $args['sticky_offset_top'] );
-	}
-
-	// sticky offset bottom
-	if ( ! empty( $args['sticky_offset_bottom'] ) && $args['sticky_offset_bottom'] !== '' ) {
-		$styles['bottom'] = absint( $args['sticky_offset_bottom'] );
-	}
-
-	// font size
-	if ( ! empty( $args['font_size_custom'] ) && $args['font_size_custom'] !== '' ) {
-		$styles['font-size'] = (float) $args['font_size_custom'] . 'rem';
-	}
-
-	// font color
-	if ( ! empty( $args['text_color_custom'] ) && $args['text_color_custom'] !== '' ) {
-		$styles['color'] = esc_attr( $args['text_color_custom'] );
-	}
-
-	// font line height
-	if ( ! empty( $args['font_line_height'] ) && $args['font_line_height'] !== '' ) {
-		$styles['line-height'] = esc_attr( $args['font_line_height'] );
-	}
-
-	// max height
-	if ( ! empty( $args['max_height'] ) && $args['max_height'] !== '' ) {
-		$styles['max-height'] = esc_attr( $args['max_height'] );
-	}
-
-	$style_string = '';
-	if ( ! empty( $styles ) ) {
-		foreach ( $styles as $key => $val ) {
-			$style_string .= esc_attr( $key ) . ':' . esc_attr( $val ) . ';';
-		}
-	}
-
-	return $style_string;
+    $styles = array();
+
+    // background color
+    if ( ! empty( $args['bg'] ) && $args['bg'] !== '' ) {
+        if ( $args['bg'] == 'custom-color' ) {
+            $styles['background-color'] = $args['bg_color'];
+        } elseif ( $args['bg'] == 'custom-gradient' ) {
+            $styles['background-image'] = $args['bg_gradient'];
+
+            // use background on text.
+            if ( ! empty( $args['bg_on_text'] ) && $args['bg_on_text'] ) {
+                $styles['background-clip']         = 'text';
+                $styles['-webkit-background-clip'] = 'text';
+                $styles['text-fill-color']         = 'transparent';
+                $styles['-webkit-text-fill-color'] = 'transparent';
+            }
+        }
+    }
+
+    if ( ! empty( $args['bg_image'] ) && $args['bg_image'] !== '' ) {
+        $hasImage = true;
+        if ( ! empty( $styles['background-color'] ) && $args['bg'] == 'custom-color' ) {
+            $styles['background-image']      = 'url(' . $args['bg_image'] . ')';
+            $styles['background-blend-mode'] = 'overlay';
+        } elseif ( ! empty( $styles['background-image'] ) && $args['bg'] == 'custom-gradient' ) {
+            $styles['background-image'] .= ',url(' . $args['bg_image'] . ')';
+        } elseif ( ! empty( $args['bg'] ) && $args['bg'] != '' && $args['bg'] != 'transparent' ) {
+            // do nothing as we alreay have a preset
+            $hasImage = false;
+        } else {
+            $styles['background-image'] = 'url(' . $args['bg_image'] . ')';
+        }
+
+        if ( $hasImage ) {
+            $styles['background-size'] = 'cover';
+
+            if ( ! empty( $args['bg_image_fixed'] ) && $args['bg_image_fixed'] ) {
+                $styles['background-attachment'] = 'fixed';
+            }
+        }
+
+        if ( $hasImage && ! empty( $args['bg_image_xy'] ) && ! empty( $args['bg_image_xy']['x'] ) ) {
+            $styles['background-position'] = ( $args['bg_image_xy']['x'] * 100 ) . '% ' . ( $args['bg_image_xy']['y'] * 100 ) . '%';
+        }
+    }
+
+    // sticky offset top
+    if ( ! empty( $args['sticky_offset_top'] ) && $args['sticky_offset_top'] !== '' ) {
+        $styles['top'] = absint( $args['sticky_offset_top'] );
+    }
+
+    // sticky offset bottom
+    if ( ! empty( $args['sticky_offset_bottom'] ) && $args['sticky_offset_bottom'] !== '' ) {
+        $styles['bottom'] = absint( $args['sticky_offset_bottom'] );
+    }
+
+    // font size
+    if ( ! empty( $args['font_size_custom'] ) && $args['font_size_custom'] !== '' ) {
+        $styles['font-size'] = (float) $args['font_size_custom'] . 'rem';
+    }
+
+    // font color
+    if ( ! empty( $args['text_color_custom'] ) && $args['text_color_custom'] !== '' ) {
+        $styles['color'] = esc_attr( $args['text_color_custom'] );
+    }
+
+    // font line height
+    if ( ! empty( $args['font_line_height'] ) && $args['font_line_height'] !== '' ) {
+        $styles['line-height'] = esc_attr( $args['font_line_height'] );
+    }
+
+    // max height
+    if ( ! empty( $args['max_height'] ) && $args['max_height'] !== '' ) {
+        $styles['max-height'] = esc_attr( $args['max_height'] );
+    }
+
+    $style_string = '';
+    if ( ! empty( $styles ) ) {
+        foreach ( $styles as $key => $val ) {
+            $style_string .= esc_attr( $key ) . ':' . esc_attr( $val ) . ';';
+        }
+    }
+
+    return $style_string;
 
 }
 
@@ -2556,34 +2556,34 @@ 
  * @return string
  */
 function sd_build_hover_styles( $args, $is_preview = false ) {
-	$rules = '';
-	// text color
-	if ( ! empty( $args['styleid'] ) ) {
-		$styleid = $is_preview ? 'html .editor-styles-wrapper .' . esc_attr( $args['styleid'] ) : 'html .' . esc_attr( $args['styleid'] );
-
-		// text
-		if ( ! empty( $args['text_color_hover'] ) ) {
-			$key    = 'custom' === $args['text_color_hover'] && ! empty( $args['text_color_hover_custom'] ) ? 'text_color_hover_custom' : 'text_color_hover';
-			$color  = sd_get_color_from_var( $args[ $key ] );
-			$rules .= $styleid . ':hover {color: ' . $color . ' !important;} ';
-		}
-
-		// bg
-		if ( ! empty( $args['bg_hover'] ) ) {
-			if ( 'custom-gradient' === $args['bg_hover'] ) {
-				$color  = $args['bg_hover_gradient'];
-				$rules .= $styleid . ':hover {background-image: ' . $color . ' !important;} ';
-				$rules .= $styleid . '.btn:hover {border-color: transparent !important;} ';
-			} else {
-				$key    = 'custom-color' === $args['bg_hover'] ? 'bg_hover_color' : 'bg_hover';
-				$color  = sd_get_color_from_var( $args[ $key ] );
-				$rules .= $styleid . ':hover {background: ' . $color . ' !important;} ';
-				$rules .= $styleid . '.btn:hover {border-color: ' . $color . ' !important;} ';
-			}
-		}
-	}
-
-	return $rules ? '<style>' . $rules . '</style>' : '';
+    $rules = '';
+    // text color
+    if ( ! empty( $args['styleid'] ) ) {
+        $styleid = $is_preview ? 'html .editor-styles-wrapper .' . esc_attr( $args['styleid'] ) : 'html .' . esc_attr( $args['styleid'] );
+
+        // text
+        if ( ! empty( $args['text_color_hover'] ) ) {
+            $key    = 'custom' === $args['text_color_hover'] && ! empty( $args['text_color_hover_custom'] ) ? 'text_color_hover_custom' : 'text_color_hover';
+            $color  = sd_get_color_from_var( $args[ $key ] );
+            $rules .= $styleid . ':hover {color: ' . $color . ' !important;} ';
+        }
+
+        // bg
+        if ( ! empty( $args['bg_hover'] ) ) {
+            if ( 'custom-gradient' === $args['bg_hover'] ) {
+                $color  = $args['bg_hover_gradient'];
+                $rules .= $styleid . ':hover {background-image: ' . $color . ' !important;} ';
+                $rules .= $styleid . '.btn:hover {border-color: transparent !important;} ';
+            } else {
+                $key    = 'custom-color' === $args['bg_hover'] ? 'bg_hover_color' : 'bg_hover';
+                $color  = sd_get_color_from_var( $args[ $key ] );
+                $rules .= $styleid . ':hover {background: ' . $color . ' !important;} ';
+                $rules .= $styleid . '.btn:hover {border-color: ' . $color . ' !important;} ';
+            }
+        }
+    }
+
+    return $rules ? '<style>' . $rules . '</style>' : '';
 }
 
 /**
@@ -2595,12 +2595,12 @@ 
  */
 function sd_get_color_from_var( $var ) {
 
-	//sanitize_hex_color() @todo this does not cover transparency
-	if ( strpos( $var, '#' ) === false ) {
-		$var = defined( 'BLOCKSTRAP_BLOCKS_VERSION' ) ? 'var(--wp--preset--color--' . esc_attr( $var ) . ')' : 'var(--' . esc_attr( $var ) . ')';
-	}
+    //sanitize_hex_color() @todo this does not cover transparency
+    if ( strpos( $var, '#' ) === false ) {
+        $var = defined( 'BLOCKSTRAP_BLOCKS_VERSION' ) ? 'var(--wp--preset--color--' . esc_attr( $var ) . ')' : 'var(--' . esc_attr( $var ) . ')';
+    }
 
-	return $var;
+    return $var;
 }
 
 /**
@@ -2612,19 +2612,19 @@ 
  * @return string
  */
 function sd_sanitize_html_classes( $classes, $sep = ' ' ) {
-	$return = '';
+    $return = '';
 
-	if ( ! is_array( $classes ) ) {
-		$classes = explode( $sep, $classes );
-	}
+    if ( ! is_array( $classes ) ) {
+        $classes = explode( $sep, $classes );
+    }
 
-	if ( ! empty( $classes ) ) {
-		foreach ( $classes as $class ) {
-			$return .= sanitize_html_class( $class ) . ' ';
-		}
-	}
+    if ( ! empty( $classes ) ) {
+        foreach ( $classes as $class ) {
+            $return .= sanitize_html_class( $class ) . ' ';
+        }
+    }
 
-	return $return;
+    return $return;
 }
 
 
@@ -2634,38 +2634,38 @@ 
  * @return void
  */
 function sd_get_class_build_keys() {
-	$keys = array(
-		'container',
-		'position',
-		'flex_direction',
-		'shadow',
-		'rounded',
-		'nav_style',
-		'horizontal_alignment',
-		'nav_fill',
-		'width',
-		'font_weight',
-		'font_size',
-		'font_case',
-		'css_class',
-		'flex_align_items-MTD',
-		'flex_justify_content-MTD',
-		'flex_align_self-MTD',
-		'flex_order-MTD',
-		'styleid',
-		'border_opacity',
-		'border_width',
-		'border_type',
-		'opacity',
-		'zindex',
-		'flex_wrap-MTD',
-		'h100',
-		'overflow',
-		'scrollbars',
-		'float-MTD'
-	);
-
-	return apply_filters( 'sd_class_build_keys', $keys );
+    $keys = array(
+        'container',
+        'position',
+        'flex_direction',
+        'shadow',
+        'rounded',
+        'nav_style',
+        'horizontal_alignment',
+        'nav_fill',
+        'width',
+        'font_weight',
+        'font_size',
+        'font_case',
+        'css_class',
+        'flex_align_items-MTD',
+        'flex_justify_content-MTD',
+        'flex_align_self-MTD',
+        'flex_order-MTD',
+        'styleid',
+        'border_opacity',
+        'border_width',
+        'border_type',
+        'opacity',
+        'zindex',
+        'flex_wrap-MTD',
+        'h100',
+        'overflow',
+        'scrollbars',
+        'float-MTD'
+    );
+
+    return apply_filters( 'sd_class_build_keys', $keys );
 }
 
 /**
@@ -2677,18 +2677,18 @@ 
  * @return array
  */
 function sd_get_visibility_conditions_input( $type = 'visibility_conditions', $overwrite = array() ) {
-	$defaults = array(
-		'type'         => 'visibility_conditions',
-		'title'        => __( 'Block Visibility', 'ayecode-connect' ),
-		'button_title' => __( 'Set Block Visibility', 'ayecode-connect' ),
-		'default'      => '',
-		'desc_tip'     => true,
-		'group'        => __( 'Visibility Conditions', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'         => 'visibility_conditions',
+        'title'        => __( 'Block Visibility', 'ayecode-connect' ),
+        'button_title' => __( 'Set Block Visibility', 'ayecode-connect' ),
+        'default'      => '',
+        'desc_tip'     => true,
+        'group'        => __( 'Visibility Conditions', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2700,21 +2700,21 @@ 
  * @return array An array of roles.
  */
 function sd_user_roles_options( $exclude = array() ) {
-	$user_roles = array();
+    $user_roles = array();
 
-	if ( !function_exists('get_editable_roles') ) {
-		require_once( ABSPATH . '/wp-admin/includes/user.php' );
-	}
+    if ( !function_exists('get_editable_roles') ) {
+        require_once( ABSPATH . '/wp-admin/includes/user.php' );
+    }
 
-	$roles = get_editable_roles();
+    $roles = get_editable_roles();
 
-	foreach ( $roles as $role => $data ) {
-		if ( ! ( ! empty( $exclude ) && in_array( $role, $exclude ) ) ) {
-			$user_roles[ esc_attr( $role ) ] = translate_user_role( $data['name'] );
-		}
-	}
+    foreach ( $roles as $role => $data ) {
+        if ( ! ( ! empty( $exclude ) && in_array( $role, $exclude ) ) ) {
+            $user_roles[ esc_attr( $role ) ] = translate_user_role( $data['name'] );
+        }
+    }
 
-	return apply_filters( 'sd_user_roles_options', $user_roles );
+    return apply_filters( 'sd_user_roles_options', $user_roles );
 }
 
 /**
@@ -2725,18 +2725,18 @@ 
  * @return array Rule options.
  */
 function sd_visibility_rules_options() {
-	$options = array(
-		'logged_in'  => __( 'Logged In', 'ayecode-connect' ),
-		'logged_out' => __( 'Logged Out', 'ayecode-connect' ),
-		'post_author'  => __( 'Post Author', 'ayecode-connect' ),
-		'user_roles' => __( 'Specific User Roles', 'ayecode-connect' )
-	);
+    $options = array(
+        'logged_in'  => __( 'Logged In', 'ayecode-connect' ),
+        'logged_out' => __( 'Logged Out', 'ayecode-connect' ),
+        'post_author'  => __( 'Post Author', 'ayecode-connect' ),
+        'user_roles' => __( 'Specific User Roles', 'ayecode-connect' )
+    );
 
-	if ( class_exists( 'GeoDirectory' ) ) {
-		$options['gd_field'] = __( 'GD Field', 'ayecode-connect' );
-	}
+    if ( class_exists( 'GeoDirectory' ) ) {
+        $options['gd_field'] = __( 'GD Field', 'ayecode-connect' );
+    }
 
-	return apply_filters( 'sd_visibility_rules_options', $options );
+    return apply_filters( 'sd_visibility_rules_options', $options );
 }
 
 /**
@@ -2745,39 +2745,39 @@ 
  * @return array
  */
 function sd_visibility_gd_field_options() {
-	$fields = geodir_post_custom_fields( '', 'all', 'all', 'none' );
+    $fields = geodir_post_custom_fields( '', 'all', 'all', 'none' );
 
-	$keys = array();
-	if ( ! empty( $fields ) ) {
-		foreach( $fields as $field ) {
-			if ( apply_filters( 'geodir_badge_field_skip_key', false, $field ) ) {
-				continue;
-			}
+    $keys = array();
+    if ( ! empty( $fields ) ) {
+        foreach( $fields as $field ) {
+            if ( apply_filters( 'geodir_badge_field_skip_key', false, $field ) ) {
+                continue;
+            }
 
-			$keys[ $field['htmlvar_name'] ] = $field['htmlvar_name'] . ' ( ' . __( $field['admin_title'], 'geodirectory' ) . ' )';
+            $keys[ $field['htmlvar_name'] ] = $field['htmlvar_name'] . ' ( ' . __( $field['admin_title'], 'geodirectory' ) . ' )';
 
-			// Extra address fields
-			if ( $field['htmlvar_name'] == 'address' && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
-				foreach ( $address_fields as $_field => $args ) {
-					if ( $_field != 'map_directions' && $_field != 'street' ) {
-						$keys[ $_field ] = $_field . ' ( ' . $args['frontend_title'] . ' )';
-					}
-				}
-			}
-		}
-	}
+            // Extra address fields
+            if ( $field['htmlvar_name'] == 'address' && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
+                foreach ( $address_fields as $_field => $args ) {
+                    if ( $_field != 'map_directions' && $_field != 'street' ) {
+                        $keys[ $_field ] = $_field . ' ( ' . $args['frontend_title'] . ' )';
+                    }
+                }
+            }
+        }
+    }
 
-	$standard_fields = sd_visibility_gd_standard_field_options();
+    $standard_fields = sd_visibility_gd_standard_field_options();
 
-	if ( ! empty( $standard_fields ) ) {
-		foreach ( $standard_fields as $key => $option ) {
-			$keys[ $key ] = $option;
-		}
-	}
+    if ( ! empty( $standard_fields ) ) {
+        foreach ( $standard_fields as $key => $option ) {
+            $keys[ $key ] = $option;
+        }
+    }
 
-	$options = apply_filters( 'geodir_badge_field_keys', $keys );
+    $options = apply_filters( 'geodir_badge_field_keys', $keys );
 
-	return apply_filters( 'sd_visibility_gd_field_options', $options );
+    return apply_filters( 'sd_visibility_gd_field_options', $options );
 }
 
 /**
@@ -2786,17 +2786,17 @@ 
  * @return array
  */
 function sd_visibility_gd_standard_field_options( $post_type = '' ) {
-	$fields = sd_visibility_gd_standard_fields( $post_type );
+    $fields = sd_visibility_gd_standard_fields( $post_type );
 
-	$options = array();
+    $options = array();
 
-	foreach ( $fields as $key => $field ) {
-		if ( ! empty( $field['frontend_title'] ) ) {
-			$options[ $key ] = $key . ' ( ' . $field['frontend_title'] . ' )';
-		}
-	}
+    foreach ( $fields as $key => $field ) {
+        if ( ! empty( $field['frontend_title'] ) ) {
+            $options[ $key ] = $key . ' ( ' . $field['frontend_title'] . ' )';
+        }
+    }
 
-	return apply_filters( 'sd_visibility_gd_standard_field_options', $options, $fields );
+    return apply_filters( 'sd_visibility_gd_standard_field_options', $options, $fields );
 }
 
 /**
@@ -2805,17 +2805,17 @@ 
  * @return array
  */
 function sd_visibility_gd_standard_fields( $post_type = '' ) {
-	$standard_fields = geodir_post_meta_standard_fields( $post_type );
+    $standard_fields = geodir_post_meta_standard_fields( $post_type );
 
-	$fields = array();
+    $fields = array();
 
-	foreach ( $standard_fields as $key => $field ) {
-		if ( $key != 'post_link' && strpos( $key, 'event' ) === false && ! empty( $field['frontend_title'] ) ) {
-			$fields[ $key ] = $field;
-		}
-	}
+    foreach ( $standard_fields as $key => $field ) {
+        if ( $key != 'post_link' && strpos( $key, 'event' ) === false && ! empty( $field['frontend_title'] ) ) {
+            $fields[ $key ] = $field;
+        }
+    }
 
-	return apply_filters( 'sd_visibility_gd_standard_fields', $fields );
+    return apply_filters( 'sd_visibility_gd_standard_fields', $fields );
 }
 
 /**
@@ -2824,18 +2824,18 @@ 
  * @return array
  */
 function sd_visibility_field_condition_options(){
-	$options = array(
-		'is_empty' => __( 'is empty', 'ayecode-connect' ),
-		'is_not_empty' => __( 'is not empty', 'ayecode-connect' ),
-		'is_equal' => __( 'is equal', 'ayecode-connect' ),
-		'is_not_equal' => __( 'is not equal', 'ayecode-connect' ),
-		'is_greater_than' => __( 'is greater than', 'ayecode-connect' ),
-		'is_less_than' => __( 'is less than', 'ayecode-connect' ),
-		'is_contains' => __( 'is contains', 'ayecode-connect' ),
-		'is_not_contains' => __( 'is not contains', 'ayecode-connect' ),
-	);
+    $options = array(
+        'is_empty' => __( 'is empty', 'ayecode-connect' ),
+        'is_not_empty' => __( 'is not empty', 'ayecode-connect' ),
+        'is_equal' => __( 'is equal', 'ayecode-connect' ),
+        'is_not_equal' => __( 'is not equal', 'ayecode-connect' ),
+        'is_greater_than' => __( 'is greater than', 'ayecode-connect' ),
+        'is_less_than' => __( 'is less than', 'ayecode-connect' ),
+        'is_contains' => __( 'is contains', 'ayecode-connect' ),
+        'is_not_contains' => __( 'is not contains', 'ayecode-connect' ),
+    );
 
-	return apply_filters( 'sd_visibility_field_condition_options', $options );
+    return apply_filters( 'sd_visibility_field_condition_options', $options );
 }
 
 /**
@@ -2846,14 +2846,14 @@ 
  * @return array Template type options.
  */
 function sd_visibility_output_options() {
-	$options = array(
-		'hide'          => __( 'Hide Block', 'ayecode-connect' ),
-		'message'       => __( 'Show Custom Message', 'ayecode-connect' ),
-		'page'          => __( 'Show Page Content', 'ayecode-connect' ),
-		'template_part' => __( 'Show Template Part', 'ayecode-connect' ),
-	);
+    $options = array(
+        'hide'          => __( 'Hide Block', 'ayecode-connect' ),
+        'message'       => __( 'Show Custom Message', 'ayecode-connect' ),
+        'page'          => __( 'Show Page Content', 'ayecode-connect' ),
+        'template_part' => __( 'Show Template Part', 'ayecode-connect' ),
+    );
 
-	return apply_filters( 'sd_visibility_output_options', $options );
+    return apply_filters( 'sd_visibility_output_options', $options );
 }
 
 /**
@@ -2865,45 +2865,45 @@ 
  * @return array Template page options.
  */
 function sd_template_page_options( $args = array() ) {
-	global $sd_tmpl_page_options;
+    global $sd_tmpl_page_options;
 
-	if ( ! empty( $sd_tmpl_page_options ) ) {
-		return $sd_tmpl_page_options;
-	}
+    if ( ! empty( $sd_tmpl_page_options ) ) {
+        return $sd_tmpl_page_options;
+    }
 
-	$args = wp_parse_args( $args, array(
-		'child_of'    => 0,
-		'sort_column' => 'post_title',
-		'sort_order'  => 'ASC'
-	) );
+    $args = wp_parse_args( $args, array(
+        'child_of'    => 0,
+        'sort_column' => 'post_title',
+        'sort_order'  => 'ASC'
+    ) );
 
-	$exclude_pages = array();
-	if ( $page_on_front = get_option( 'page_on_front' ) ) {
-		$exclude_pages[] = $page_on_front;
-	}
+    $exclude_pages = array();
+    if ( $page_on_front = get_option( 'page_on_front' ) ) {
+        $exclude_pages[] = $page_on_front;
+    }
 
-	if ( $page_for_posts = get_option( 'page_for_posts' ) ) {
-		$exclude_pages[] = $page_for_posts;
-	}
+    if ( $page_for_posts = get_option( 'page_for_posts' ) ) {
+        $exclude_pages[] = $page_for_posts;
+    }
 
-	if ( ! empty( $exclude_pages ) ) {
-		$args['exclude'] = $exclude_pages;
-	}
+    if ( ! empty( $exclude_pages ) ) {
+        $args['exclude'] = $exclude_pages;
+    }
 
-	$pages = get_pages( $args );
+    $pages = get_pages( $args );
 
-	$options = array( '' => __( 'Select Page...', 'ayecode-connect' ) );
-	if ( ! empty( $pages ) ) {
-		foreach ( $pages as $page ) {
-			if ( ! empty( $page->ID ) && ! empty( $page->post_title ) ) {
-				$options[ $page->ID ] = $page->post_title . ' (#' . $page->ID . ')';
-			}
-		}
-	}
+    $options = array( '' => __( 'Select Page...', 'ayecode-connect' ) );
+    if ( ! empty( $pages ) ) {
+        foreach ( $pages as $page ) {
+            if ( ! empty( $page->ID ) && ! empty( $page->post_title ) ) {
+                $options[ $page->ID ] = $page->post_title . ' (#' . $page->ID . ')';
+            }
+        }
+    }
 
-	$sd_tmpl_page_options = $options;
+    $sd_tmpl_page_options = $options;
 
-	return apply_filters( 'sd_template_page_options', $options );
+    return apply_filters( 'sd_template_page_options', $options );
 }
 
 /**
@@ -2915,25 +2915,25 @@ 
  * @return array Template part options.
  */
 function sd_template_part_options( $args = array() ) {
-	global $sd_tmpl_part_options;
+    global $sd_tmpl_part_options;
 
-	if ( ! empty( $sd_tmpl_part_options ) ) {
-		return $sd_tmpl_part_options;
-	}
+    if ( ! empty( $sd_tmpl_part_options ) ) {
+        return $sd_tmpl_part_options;
+    }
 
-	$options = array( '' => __( 'Select Template Part...', 'ayecode-connect' ) );
+    $options = array( '' => __( 'Select Template Part...', 'ayecode-connect' ) );
 
-	$parts = get_block_templates( array(), 'wp_template_part' );
+    $parts = get_block_templates( array(), 'wp_template_part' );
 
-	if ( ! empty( $parts ) ) {
-		foreach ( $parts as $part ) {
-			$options[ $part->slug ] = $part->title . ' (#' . $part->slug . ')';
-		}
-	}
+    if ( ! empty( $parts ) ) {
+        foreach ( $parts as $part ) {
+            $options[ $part->slug ] = $part->title . ' (#' . $part->slug . ')';
+        }
+    }
 
-	$sd_tmpl_part_options = $options;
+    $sd_tmpl_part_options = $options;
 
-	return apply_filters( 'sd_template_part_options', $options, $args );
+    return apply_filters( 'sd_template_part_options', $options, $args );
 }
 
 /**
@@ -2945,25 +2945,25 @@ 
  * @return array Template part object.
  */
 function sd_get_template_part_by_slug( $slug ) {
-	global $bs_tmpl_part_by_slug;
+    global $bs_tmpl_part_by_slug;
 
-	if ( empty( $bs_tmpl_part_by_slug ) ) {
-		$bs_tmpl_part_by_slug = array();
-	}
+    if ( empty( $bs_tmpl_part_by_slug ) ) {
+        $bs_tmpl_part_by_slug = array();
+    }
 
-	if ( isset( $bs_tmpl_part_by_slug[ $slug ] ) ) {
-		return $bs_tmpl_part_by_slug[ $slug ];
-	}
+    if ( isset( $bs_tmpl_part_by_slug[ $slug ] ) ) {
+        return $bs_tmpl_part_by_slug[ $slug ];
+    }
 
-	$template_query = get_block_templates( array( 'slug__in' => array( $slug ) ), 'wp_template_part' );
+    $template_query = get_block_templates( array( 'slug__in' => array( $slug ) ), 'wp_template_part' );
 
-	$query_post = ! empty( $template_query ) ? $template_query[0] : array();
+    $query_post = ! empty( $template_query ) ? $template_query[0] : array();
 
-	$template_part = ! empty( $query_post ) && $query_post->status == 'publish' ? $query_post : array();
+    $template_part = ! empty( $query_post ) && $query_post->status == 'publish' ? $query_post : array();
 
-	$bs_tmpl_part_by_slug[ $slug ] = $template_part;
+    $bs_tmpl_part_by_slug[ $slug ] = $template_part;
 
-	return apply_filters( 'sd_get_template_part_by_slug', $template_part, $slug );
+    return apply_filters( 'sd_get_template_part_by_slug', $template_part, $slug );
 }
 
 /**
@@ -2976,388 +2976,388 @@ 
  * @param WP_Block $instance      The block instance.
  */
 function sd_render_block( $block_content, $block, $instance = '' ) {
-	// No block visibility conditions set.
-	if ( empty( $block['attrs']['visibility_conditions'] ) ) {
-		return $block_content;
-	}
-
-	$attributes = json_decode( $block['attrs']['visibility_conditions'], true );
-	$rules = ! empty( $attributes ) ? sd_block_parse_rules( $attributes ) : array();
-
-	// No rules set.
-	if ( empty( $rules ) ) {
-		return $block_content;
-	}
-
-	$_block_content = $block_content;
-
-	if ( ! empty( $rules ) && sd_block_check_rules( $rules ) ) {
-		if ( ! empty( $attributes['output']['type'] ) ) {
-			switch ( $attributes['output']['type'] ) {
-				case 'hide':
-					$valid_type = true;
-					$content = '';
-
-					break;
-				case 'message':
-					$valid_type = true;
-
-					if ( isset( $attributes['output']['message'] ) ) {
-						$content = $attributes['output']['message'] != '' ? __( stripslashes( $attributes['output']['message'] ), 'ayecode-connect' ) : $attributes['output']['message'];
-
-						if ( ! empty( $attributes['output']['message_type'] ) ) {
-							$content = aui()->alert( array(
-									'type'=> $attributes['output']['message_type'],
-									'content'=> $content
-								)
-							);
-						}
-					}
-
-					break;
-				case 'page':
-					$valid_type = true;
-
-					$page_id = ! empty( $attributes['output']['page'] ) ? absint( $attributes['output']['page'] ) : 0;
-					$content = sd_get_page_content( $page_id );
-
-					break;
-				case 'template_part':
-					$valid_type = true;
-
-					$template_part = ! empty( $attributes['output']['template_part'] ) ? $attributes['output']['template_part'] : '';
-					$content = sd_get_template_part_content( $template_part );
-
-					break;
-				default:
-					$valid_type = false;
-					break;
-			}
-
-			if ( $valid_type ) {
-				$block_content = '<div class="' . esc_attr( wp_get_block_default_classname( $instance->name ) ) . ' sd-block-has-rule">' . $content . '</div>';
-			}
-		}
-	}
-
-	return apply_filters( 'sd_render_block_visibility_content', $block_content, $_block_content, $attributes, $block, $instance );
+    // No block visibility conditions set.
+    if ( empty( $block['attrs']['visibility_conditions'] ) ) {
+        return $block_content;
+    }
+
+    $attributes = json_decode( $block['attrs']['visibility_conditions'], true );
+    $rules = ! empty( $attributes ) ? sd_block_parse_rules( $attributes ) : array();
+
+    // No rules set.
+    if ( empty( $rules ) ) {
+        return $block_content;
+    }
+
+    $_block_content = $block_content;
+
+    if ( ! empty( $rules ) && sd_block_check_rules( $rules ) ) {
+        if ( ! empty( $attributes['output']['type'] ) ) {
+            switch ( $attributes['output']['type'] ) {
+                case 'hide':
+                    $valid_type = true;
+                    $content = '';
+
+                    break;
+                case 'message':
+                    $valid_type = true;
+
+                    if ( isset( $attributes['output']['message'] ) ) {
+                        $content = $attributes['output']['message'] != '' ? __( stripslashes( $attributes['output']['message'] ), 'ayecode-connect' ) : $attributes['output']['message'];
+
+                        if ( ! empty( $attributes['output']['message_type'] ) ) {
+                            $content = aui()->alert( array(
+                                    'type'=> $attributes['output']['message_type'],
+                                    'content'=> $content
+                                )
+                            );
+                        }
+                    }
+
+                    break;
+                case 'page':
+                    $valid_type = true;
+
+                    $page_id = ! empty( $attributes['output']['page'] ) ? absint( $attributes['output']['page'] ) : 0;
+                    $content = sd_get_page_content( $page_id );
+
+                    break;
+                case 'template_part':
+                    $valid_type = true;
+
+                    $template_part = ! empty( $attributes['output']['template_part'] ) ? $attributes['output']['template_part'] : '';
+                    $content = sd_get_template_part_content( $template_part );
+
+                    break;
+                default:
+                    $valid_type = false;
+                    break;
+            }
+
+            if ( $valid_type ) {
+                $block_content = '<div class="' . esc_attr( wp_get_block_default_classname( $instance->name ) ) . ' sd-block-has-rule">' . $content . '</div>';
+            }
+        }
+    }
+
+    return apply_filters( 'sd_render_block_visibility_content', $block_content, $_block_content, $attributes, $block, $instance );
 }
 add_filter( 'render_block', 'sd_render_block', 9, 3 );
 
 function sd_get_page_content( $page_id ) {
-	$content = $page_id > 0 ? get_post_field( 'post_content', (int) $page_id ) : '';
+    $content = $page_id > 0 ? get_post_field( 'post_content', (int) $page_id ) : '';
 
-	// Maybe bypass content
-	$bypass_content = apply_filters( 'sd_bypass_page_content', '', $content, $page_id );
-	if ( $bypass_content ) {
-		return $bypass_content;
-	}
+    // Maybe bypass content
+    $bypass_content = apply_filters( 'sd_bypass_page_content', '', $content, $page_id );
+    if ( $bypass_content ) {
+        return $bypass_content;
+    }
 
-	// Run the shortcodes on the content.
-	$content = do_shortcode( $content );
+    // Run the shortcodes on the content.
+    $content = do_shortcode( $content );
 
-	// Run block content if its available.
-	if ( function_exists( 'do_blocks' ) ) {
-		$content = do_blocks( $content );
-	}
+    // Run block content if its available.
+    if ( function_exists( 'do_blocks' ) ) {
+        $content = do_blocks( $content );
+    }
 
-	return apply_filters( 'sd_get_page_content', $content, $page_id );
+    return apply_filters( 'sd_get_page_content', $content, $page_id );
 }
 
 function sd_get_template_part_content( $template_part ) {
-	$template_part_post = $template_part ? sd_get_template_part_by_slug( $template_part ) : array();
-	$content = ! empty( $template_part_post ) ? $template_part_post->content : '';
+    $template_part_post = $template_part ? sd_get_template_part_by_slug( $template_part ) : array();
+    $content = ! empty( $template_part_post ) ? $template_part_post->content : '';
 
-	// Maybe bypass content
-	$bypass_content = apply_filters( 'sd_bypass_template_part_content', '', $content, $template_part );
-	if ( $bypass_content ) {
-		return $bypass_content;
-	}
+    // Maybe bypass content
+    $bypass_content = apply_filters( 'sd_bypass_template_part_content', '', $content, $template_part );
+    if ( $bypass_content ) {
+        return $bypass_content;
+    }
 
-	// Run the shortcodes on the content.
-	$content = do_shortcode( $content );
+    // Run the shortcodes on the content.
+    $content = do_shortcode( $content );
 
-	// Run block content if its available.
-	if ( function_exists( 'do_blocks' ) ) {
-		$content = do_blocks( $content );
-	}
+    // Run block content if its available.
+    if ( function_exists( 'do_blocks' ) ) {
+        $content = do_blocks( $content );
+    }
 
-	return apply_filters( 'sd_get_template_part_content', $content, $template_part );
+    return apply_filters( 'sd_get_template_part_content', $content, $template_part );
 }
 
 function sd_block_parse_rules( $attrs ) {
-	$rules = array();
+    $rules = array();
 
-	if ( ! empty( $attrs ) && is_array( $attrs ) ) {
-		$attrs_keys = array_keys( $attrs );
+    if ( ! empty( $attrs ) && is_array( $attrs ) ) {
+        $attrs_keys = array_keys( $attrs );
 
-		for ( $i = 1; $i <= count( $attrs_keys ); $i++ ) {
-			if ( ! empty( $attrs[ 'rule' . $i ] ) && is_array( $attrs[ 'rule' . $i ] ) ) {
-				$rules[] = $attrs[ 'rule' . $i ];
-			}
-		}
-	}
+        for ( $i = 1; $i <= count( $attrs_keys ); $i++ ) {
+            if ( ! empty( $attrs[ 'rule' . $i ] ) && is_array( $attrs[ 'rule' . $i ] ) ) {
+                $rules[] = $attrs[ 'rule' . $i ];
+            }
+        }
+    }
 
-	return apply_filters( 'sd_block_parse_rules', $rules, $attrs );
+    return apply_filters( 'sd_block_parse_rules', $rules, $attrs );
 }
 
 function sd_block_check_rules( $rules ) {
-	if ( ! ( is_array( $rules ) && ! empty( $rules ) ) ) {
-		return true;
-	}
+    if ( ! ( is_array( $rules ) && ! empty( $rules ) ) ) {
+        return true;
+    }
 
-	foreach ( $rules as $key => $rule ) {
-		$match = apply_filters( 'sd_block_check_rule', true, $rule );
+    foreach ( $rules as $key => $rule ) {
+        $match = apply_filters( 'sd_block_check_rule', true, $rule );
 
-		if ( ! $match ) {
-			break;
-		}
-	}
+        if ( ! $match ) {
+            break;
+        }
+    }
 
-	return apply_filters( 'sd_block_check_rules', $match, $rules );
+    return apply_filters( 'sd_block_check_rules', $match, $rules );
 }
 
 function sd_block_check_rule( $match, $rule ) {
-	global $post;
+    global $post;
 
-	if ( $match && ! empty( $rule['type'] ) ) {
-		switch ( $rule['type'] ) {
-			case 'logged_in':
-				$match = (bool) is_user_logged_in();
+    if ( $match && ! empty( $rule['type'] ) ) {
+        switch ( $rule['type'] ) {
+            case 'logged_in':
+                $match = (bool) is_user_logged_in();
 
-				break;
-			case 'logged_out':
-				$match = ! is_user_logged_in();
+                break;
+            case 'logged_out':
+                $match = ! is_user_logged_in();
 
-				break;
-			case 'post_author':
-				if ( ! empty( $post ) && $post->post_type != 'page' && ! empty( $post->post_author ) && is_user_logged_in() ) {
-					$match = (int) $post->post_author === (int) get_current_user_id() ? true : false;
-				} else {
-					$match = false;
-				}
+                break;
+            case 'post_author':
+                if ( ! empty( $post ) && $post->post_type != 'page' && ! empty( $post->post_author ) && is_user_logged_in() ) {
+                    $match = (int) $post->post_author === (int) get_current_user_id() ? true : false;
+                } else {
+                    $match = false;
+                }
 
-				break;
-			case 'user_roles':
-				$match = false;
+                break;
+            case 'user_roles':
+                $match = false;
 
-				if ( ! empty( $rule['user_roles'] ) ) {
-					$user_roles = is_scalar( $rule['user_roles'] ) ? explode( ",", $rule['user_roles'] ) : $rule['user_roles'];
+                if ( ! empty( $rule['user_roles'] ) ) {
+                    $user_roles = is_scalar( $rule['user_roles'] ) ? explode( ",", $rule['user_roles'] ) : $rule['user_roles'];
 
-					if ( is_array( $user_roles ) ) {
-						$user_roles = array_filter( array_map( 'trim', $user_roles ) );
-					}
+                    if ( is_array( $user_roles ) ) {
+                        $user_roles = array_filter( array_map( 'trim', $user_roles ) );
+                    }
 
-					if ( ! empty( $user_roles ) && is_array( $user_roles ) && is_user_logged_in() && ( $current_user = wp_get_current_user() ) ) {
-						$current_user_roles = $current_user->roles;
+                    if ( ! empty( $user_roles ) && is_array( $user_roles ) && is_user_logged_in() && ( $current_user = wp_get_current_user() ) ) {
+                        $current_user_roles = $current_user->roles;
 
-						foreach ( $user_roles as $role ) {
-							if ( in_array( $role, $current_user_roles ) ) {
-								$match = true;
-							}
-						}
-					}
-				}
+                        foreach ( $user_roles as $role ) {
+                            if ( in_array( $role, $current_user_roles ) ) {
+                                $match = true;
+                            }
+                        }
+                    }
+                }
 
-				break;
-			case 'gd_field':
-				$match = sd_block_check_rule_gd_field( $rule );
+                break;
+            case 'gd_field':
+                $match = sd_block_check_rule_gd_field( $rule );
 
-				break;
-		}
-	}
+                break;
+        }
+    }
 
-	return $match;
+    return $match;
 }
 add_filter( 'sd_block_check_rule', 'sd_block_check_rule', 10, 2 );
 
 function sd_block_check_rule_gd_field( $rule ) {
-	global $gd_post;
-
-	$match_found = false;
-
-	if ( class_exists( 'GeoDirectory' ) && ! empty( $gd_post->ID ) && ! empty( $rule['field'] ) && ! empty( $rule['condition'] ) ) {
-		$args['block_visibility'] = true;
-		$args['key'] = $rule['field'];
-		$args['condition'] = $rule['condition'];
-		$args['search'] = isset( $rule['search'] ) ? $rule['search'] : '';
-
-		if ( $args['key'] == 'street' ) {
-			$args['key'] = 'address';
-		}
-
-		$match_field = $_match_field = $args['key'];
-
-		if ( $match_field == 'address' ) {
-			$match_field = 'street';
-		} elseif ( $match_field == 'post_images' ) {
-			$match_field = 'featured_image';
-		}
-
-		$find_post = $gd_post;
-		$find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
-
-		if ( ! empty( $find_post->ID ) && ! in_array( 'post_category', $find_post_keys ) ) {
-			$find_post = geodir_get_post_info( (int) $find_post->ID );
-			$find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
-		}
-
-		if ( $match_field === '' || ( ! empty( $find_post_keys ) && ( in_array( $match_field, $find_post_keys ) || in_array( $_match_field, $find_post_keys ) ) ) ) {
-			$address_fields = array( 'street2', 'neighbourhood', 'city', 'region', 'country', 'zip', 'latitude', 'longitude' ); // Address fields
-			$field = array();
-
-			$standard_fields = sd_visibility_gd_standard_fields();
-
-			if ( $match_field && ! in_array( $match_field, array_keys( $standard_fields ) ) && ! in_array( $match_field, $address_fields ) ) {
-				$package_id = geodir_get_post_package_id( $find_post->ID, $find_post->post_type );
-				$fields = geodir_post_custom_fields( $package_id, 'all', $find_post->post_type, 'none' );
-
-				foreach ( $fields as $field_info ) {
-					if ( $match_field == $field_info['htmlvar_name'] ) {
-						$field = $field_info;
-						break;
-					} elseif( $_match_field == $field_info['htmlvar_name'] ) {
-						$field = $field_info;
-						break;
-					}
-				}
-
-				if ( empty( $field ) ) {
-					return false;
-				}
-			}
-
-			// Address fields.
-			if ( in_array( $match_field, $address_fields ) && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
-				if ( ! empty( $address_fields[ $match_field ] ) ) {
-					$field = $address_fields[ $match_field ];
-				}
-			} else if ( in_array( $match_field, array_keys( $standard_fields ) ) ) {
-				if ( ! empty( $standard_fields[ $match_field ] ) ) {
-					$field = $standard_fields[ $match_field ];
-				}
-			}
-
-			// Parse search.
-			$search = sd_gd_field_rule_search( $args['search'], $find_post->post_type, $rule, $field, $find_post );
-
-			$is_date = ( ! empty( $field['type'] ) && $field['type'] == 'datepicker' ) || in_array( $match_field, array( 'post_date', 'post_modified' ) ) ? true : false;
-			$is_date = apply_filters( 'geodir_post_badge_is_date', $is_date, $match_field, $field, $args, $find_post );
-
-			$match_value = isset($find_post->{$match_field}) ? esc_attr( trim( $find_post->{$match_field} ) ) : '';
-			$match_found = $match_field === '' ? true : false;
-
-			if ( ! $match_found ) {
-				if ( ( $match_field == 'post_date' || $match_field == 'post_modified' ) && ( empty( $args['condition'] ) || $args['condition'] == 'is_greater_than' || $args['condition'] == 'is_less_than' ) ) {
-					if ( strpos( $search, '+' ) === false && strpos( $search, '-' ) === false ) {
-						$search = '+' . $search;
-					}
-					$the_time = $match_field == 'post_modified' ? get_the_modified_date( 'Y-m-d', $find_post ) : get_the_time( 'Y-m-d', $find_post );
-					$until_time = strtotime( $the_time . ' ' . $search . ' days' );
-					$now_time   = strtotime( date_i18n( 'Y-m-d', current_time( 'timestamp' ) ) );
-					if ( ( empty( $args['condition'] ) || $args['condition'] == 'is_less_than' ) && $until_time > $now_time ) {
-						$match_found = true;
-					} elseif ( $args['condition'] == 'is_greater_than' && $until_time < $now_time ) {
-						$match_found = true;
-					}
-				} else {
-					switch ( $args['condition'] ) {
-						case 'is_equal':
-							$match_found = (bool) ( $search != '' && $match_value == $search );
-							break;
-						case 'is_not_equal':
-							$match_found = (bool) ( $search != '' && $match_value != $search );
-							break;
-						case 'is_greater_than':
-							$match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value > $search );
-							break;
-						case 'is_less_than':
-							$match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value < $search );
-							break;
-						case 'is_empty':
-							$match_found = (bool) ( $match_value === '' || $match_value === false || $match_value === '0' || is_null( $match_value ) );
-							break;
-						case 'is_not_empty':
-							$match_found = (bool) ( $match_value !== '' && $match_value !== false && $match_value !== '0' && ! is_null( $match_value ) );
-							break;
-						case 'is_contains':
-							$match_found = (bool) ( $search != '' && stripos( $match_value, $search ) !== false );
-							break;
-						case 'is_not_contains':
-							$match_found = (bool) ( $search != '' && stripos( $match_value, $search ) === false );
-							break;
-					}
-				}
-			}
-
-			$match_found = apply_filters( 'geodir_post_badge_check_match_found', $match_found, $args, $find_post );
-		}
-	}
-
-	return $match_found;
+    global $gd_post;
+
+    $match_found = false;
+
+    if ( class_exists( 'GeoDirectory' ) && ! empty( $gd_post->ID ) && ! empty( $rule['field'] ) && ! empty( $rule['condition'] ) ) {
+        $args['block_visibility'] = true;
+        $args['key'] = $rule['field'];
+        $args['condition'] = $rule['condition'];
+        $args['search'] = isset( $rule['search'] ) ? $rule['search'] : '';
+
+        if ( $args['key'] == 'street' ) {
+            $args['key'] = 'address';
+        }
+
+        $match_field = $_match_field = $args['key'];
+
+        if ( $match_field == 'address' ) {
+            $match_field = 'street';
+        } elseif ( $match_field == 'post_images' ) {
+            $match_field = 'featured_image';
+        }
+
+        $find_post = $gd_post;
+        $find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
+
+        if ( ! empty( $find_post->ID ) && ! in_array( 'post_category', $find_post_keys ) ) {
+            $find_post = geodir_get_post_info( (int) $find_post->ID );
+            $find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
+        }
+
+        if ( $match_field === '' || ( ! empty( $find_post_keys ) && ( in_array( $match_field, $find_post_keys ) || in_array( $_match_field, $find_post_keys ) ) ) ) {
+            $address_fields = array( 'street2', 'neighbourhood', 'city', 'region', 'country', 'zip', 'latitude', 'longitude' ); // Address fields
+            $field = array();
+
+            $standard_fields = sd_visibility_gd_standard_fields();
+
+            if ( $match_field && ! in_array( $match_field, array_keys( $standard_fields ) ) && ! in_array( $match_field, $address_fields ) ) {
+                $package_id = geodir_get_post_package_id( $find_post->ID, $find_post->post_type );
+                $fields = geodir_post_custom_fields( $package_id, 'all', $find_post->post_type, 'none' );
+
+                foreach ( $fields as $field_info ) {
+                    if ( $match_field == $field_info['htmlvar_name'] ) {
+                        $field = $field_info;
+                        break;
+                    } elseif( $_match_field == $field_info['htmlvar_name'] ) {
+                        $field = $field_info;
+                        break;
+                    }
+                }
+
+                if ( empty( $field ) ) {
+                    return false;
+                }
+            }
+
+            // Address fields.
+            if ( in_array( $match_field, $address_fields ) && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
+                if ( ! empty( $address_fields[ $match_field ] ) ) {
+                    $field = $address_fields[ $match_field ];
+                }
+            } else if ( in_array( $match_field, array_keys( $standard_fields ) ) ) {
+                if ( ! empty( $standard_fields[ $match_field ] ) ) {
+                    $field = $standard_fields[ $match_field ];
+                }
+            }
+
+            // Parse search.
+            $search = sd_gd_field_rule_search( $args['search'], $find_post->post_type, $rule, $field, $find_post );
+
+            $is_date = ( ! empty( $field['type'] ) && $field['type'] == 'datepicker' ) || in_array( $match_field, array( 'post_date', 'post_modified' ) ) ? true : false;
+            $is_date = apply_filters( 'geodir_post_badge_is_date', $is_date, $match_field, $field, $args, $find_post );
+
+            $match_value = isset($find_post->{$match_field}) ? esc_attr( trim( $find_post->{$match_field} ) ) : '';
+            $match_found = $match_field === '' ? true : false;
+
+            if ( ! $match_found ) {
+                if ( ( $match_field == 'post_date' || $match_field == 'post_modified' ) && ( empty( $args['condition'] ) || $args['condition'] == 'is_greater_than' || $args['condition'] == 'is_less_than' ) ) {
+                    if ( strpos( $search, '+' ) === false && strpos( $search, '-' ) === false ) {
+                        $search = '+' . $search;
+                    }
+                    $the_time = $match_field == 'post_modified' ? get_the_modified_date( 'Y-m-d', $find_post ) : get_the_time( 'Y-m-d', $find_post );
+                    $until_time = strtotime( $the_time . ' ' . $search . ' days' );
+                    $now_time   = strtotime( date_i18n( 'Y-m-d', current_time( 'timestamp' ) ) );
+                    if ( ( empty( $args['condition'] ) || $args['condition'] == 'is_less_than' ) && $until_time > $now_time ) {
+                        $match_found = true;
+                    } elseif ( $args['condition'] == 'is_greater_than' && $until_time < $now_time ) {
+                        $match_found = true;
+                    }
+                } else {
+                    switch ( $args['condition'] ) {
+                        case 'is_equal':
+                            $match_found = (bool) ( $search != '' && $match_value == $search );
+                            break;
+                        case 'is_not_equal':
+                            $match_found = (bool) ( $search != '' && $match_value != $search );
+                            break;
+                        case 'is_greater_than':
+                            $match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value > $search );
+                            break;
+                        case 'is_less_than':
+                            $match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value < $search );
+                            break;
+                        case 'is_empty':
+                            $match_found = (bool) ( $match_value === '' || $match_value === false || $match_value === '0' || is_null( $match_value ) );
+                            break;
+                        case 'is_not_empty':
+                            $match_found = (bool) ( $match_value !== '' && $match_value !== false && $match_value !== '0' && ! is_null( $match_value ) );
+                            break;
+                        case 'is_contains':
+                            $match_found = (bool) ( $search != '' && stripos( $match_value, $search ) !== false );
+                            break;
+                        case 'is_not_contains':
+                            $match_found = (bool) ( $search != '' && stripos( $match_value, $search ) === false );
+                            break;
+                    }
+                }
+            }
+
+            $match_found = apply_filters( 'geodir_post_badge_check_match_found', $match_found, $args, $find_post );
+        }
+    }
+
+    return $match_found;
 }
 
 function sd_gd_field_rule_search( $search, $post_type, $rule, $field = array(), $gd_post = array() ) {
-	global $post;
-
-	if ( ! $search ) {
-		return $search;
-	}
-
-	$orig_search = $search;
-	$_search = strtolower( $search );
-
-	if ( ! empty( $rule['field'] ) && $rule['field'] == 'post_author' ) {
-		if ( $search == 'current_user' ) {
-			$search = is_user_logged_in() ? (int) get_current_user_id() : - 1;
-		} else if ( $search == 'current_author' ) {
-			$search = ( ! empty( $post ) && $post->post_type != 'page' && isset( $post->post_author ) ) ? absint( $post->post_author ) : - 1;
-		}
-	} else if ( $_search == 'date_today' ) {
-		$search = date( 'Y-m-d' );
-	} else if ( $_search == 'date_tomorrow' ) {
-		$search = date( 'Y-m-d', strtotime( "+1 day" ) );
-	} else if ( $_search == 'date_yesterday' ) {
-		$search = date( 'Y-m-d', strtotime( "-1 day" ) );
-	} else if ( $_search == 'time_his' ) {
-		$search = date( 'H:i:s' );
-	} else if ( $_search == 'time_hi' ) {
-		$search = date( 'H:i' );
-	} else if ( $_search == 'datetime_now' ) {
-		$search = date( 'Y-m-d H:i:s' );
-	} else if ( strpos( $_search, 'datetime_after_' ) === 0 ) {
-		$_searches = explode( 'datetime_after_', $_search, 2 );
-
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d H:i:s', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
-		} else {
-			$search = date( 'Y-m-d H:i:s' );
-		}
-	} else if ( strpos( $_search, 'datetime_before_' ) === 0 ) {
-		$_searches = explode( 'datetime_before_', $_search, 2 );
-
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d H:i:s', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
-		} else {
-			$search = date( 'Y-m-d H:i:s' );
-		}
-	} else if ( strpos( $_search, 'date_after_' ) === 0 ) {
-		$_searches = explode( 'date_after_', $_search, 2 );
-
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
-		} else {
-			$search = date( 'Y-m-d' );
-		}
-	} else if ( strpos( $_search, 'date_before_' ) === 0 ) {
-		$_searches = explode( 'date_before_', $_search, 2 );
-
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
-		} else {
-			$search = date( 'Y-m-d' );
-		}
-	}
-
-	return apply_filters( 'sd_gd_field_rule_search', $search, $post_type, $rule, $orig_search );
+    global $post;
+
+    if ( ! $search ) {
+        return $search;
+    }
+
+    $orig_search = $search;
+    $_search = strtolower( $search );
+
+    if ( ! empty( $rule['field'] ) && $rule['field'] == 'post_author' ) {
+        if ( $search == 'current_user' ) {
+            $search = is_user_logged_in() ? (int) get_current_user_id() : - 1;
+        } else if ( $search == 'current_author' ) {
+            $search = ( ! empty( $post ) && $post->post_type != 'page' && isset( $post->post_author ) ) ? absint( $post->post_author ) : - 1;
+        }
+    } else if ( $_search == 'date_today' ) {
+        $search = date( 'Y-m-d' );
+    } else if ( $_search == 'date_tomorrow' ) {
+        $search = date( 'Y-m-d', strtotime( "+1 day" ) );
+    } else if ( $_search == 'date_yesterday' ) {
+        $search = date( 'Y-m-d', strtotime( "-1 day" ) );
+    } else if ( $_search == 'time_his' ) {
+        $search = date( 'H:i:s' );
+    } else if ( $_search == 'time_hi' ) {
+        $search = date( 'H:i' );
+    } else if ( $_search == 'datetime_now' ) {
+        $search = date( 'Y-m-d H:i:s' );
+    } else if ( strpos( $_search, 'datetime_after_' ) === 0 ) {
+        $_searches = explode( 'datetime_after_', $_search, 2 );
+
+        if ( ! empty( $_searches[1] ) ) {
+            $search = date( 'Y-m-d H:i:s', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
+        } else {
+            $search = date( 'Y-m-d H:i:s' );
+        }
+    } else if ( strpos( $_search, 'datetime_before_' ) === 0 ) {
+        $_searches = explode( 'datetime_before_', $_search, 2 );
+
+        if ( ! empty( $_searches[1] ) ) {
+            $search = date( 'Y-m-d H:i:s', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
+        } else {
+            $search = date( 'Y-m-d H:i:s' );
+        }
+    } else if ( strpos( $_search, 'date_after_' ) === 0 ) {
+        $_searches = explode( 'date_after_', $_search, 2 );
+
+        if ( ! empty( $_searches[1] ) ) {
+            $search = date( 'Y-m-d', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
+        } else {
+            $search = date( 'Y-m-d' );
+        }
+    } else if ( strpos( $_search, 'date_before_' ) === 0 ) {
+        $_searches = explode( 'date_before_', $_search, 2 );
+
+        if ( ! empty( $_searches[1] ) ) {
+            $search = date( 'Y-m-d', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
+        } else {
+            $search = date( 'Y-m-d' );
+        }
+    }
+
+    return apply_filters( 'sd_gd_field_rule_search', $search, $post_type, $rule, $orig_search );
 }
\ No newline at end of file

Spacing +956 added lines, -956 removed lines

@@ -37,7 +37,7 @@ 
  * @return mixed|void
  */
 function sd_widget_exclude() {
-	return apply_filters( 'sd_widget_exclude', array() );
+	return apply_filters('sd_widget_exclude', array());
 }
 
 
@@ -49,11 +49,11 @@ 
  *
  * @return array
  */
-function sd_get_margin_input( $type = 'mt', $overwrite = array(), $include_negatives = true ) {
+function sd_get_margin_input($type = 'mt', $overwrite = array(), $include_negatives = true) {
 	global $aui_bs5;
 	$options = array(
-		''     => __( 'None', 'ayecode-connect' ),
-		'auto' => __( 'auto', 'ayecode-connect' ),
+		''     => __('None', 'ayecode-connect'),
+		'auto' => __('auto', 'ayecode-connect'),
 		'0'    => '0',
 		'1'    => '1',
 		'2'    => '2',
@@ -69,7 +69,7 @@ 
 		'12'   => '12',
 	);
 
-	if ( $include_negatives ) {
+	if ($include_negatives) {
 		$options['n1']  = '-1';
 		$options['n2']  = '-2';
 		$options['n3']  = '-3';
@@ -86,37 +86,37 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Margin top', 'ayecode-connect' ),
+		'title'    => __('Margin top', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
 	// title
-	if ( $type == 'mt' ) {
-		$defaults['title'] = __( 'Margin top', 'ayecode-connect' );
+	if ($type == 'mt') {
+		$defaults['title'] = __('Margin top', 'ayecode-connect');
 		$defaults['icon']  = 'box-top';
 		$defaults['row']   = array(
-			'title' => __( 'Margins', 'ayecode-connect' ),
+			'title' => __('Margins', 'ayecode-connect'),
 			'key'   => 'wrapper-margins',
 			'open'  => true,
 			'class' => 'text-center',
 		);
-	} elseif ( $type == 'mr' ) {
-		$defaults['title'] = __( 'Margin right', 'ayecode-connect' );
+	} elseif ($type == 'mr') {
+		$defaults['title'] = __('Margin right', 'ayecode-connect');
 		$defaults['icon']  = 'box-right';
 		$defaults['row']   = array(
 			'key' => 'wrapper-margins',
 		);
-	} elseif ( $type == 'mb' ) {
-		$defaults['title'] = __( 'Margin bottom', 'ayecode-connect' );
+	} elseif ($type == 'mb') {
+		$defaults['title'] = __('Margin bottom', 'ayecode-connect');
 		$defaults['icon']  = 'box-bottom';
 		$defaults['row']   = array(
 			'key' => 'wrapper-margins',
 		);
-	} elseif ( $type == 'ml' ) {
-		$defaults['title'] = __( 'Margin left', 'ayecode-connect' );
+	} elseif ($type == 'ml') {
+		$defaults['title'] = __('Margin left', 'ayecode-connect');
 		$defaults['icon']  = 'box-left';
 		$defaults['row']   = array(
 			'key'   => 'wrapper-margins',
@@ -124,7 +124,7 @@ 
 		);
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -137,9 +137,9 @@ 
  *
  * @return array
  */
-function sd_get_padding_input( $type = 'pt', $overwrite = array() ) {
+function sd_get_padding_input($type = 'pt', $overwrite = array()) {
 	$options = array(
-		''   => __( 'None', 'ayecode-connect' ),
+		''   => __('None', 'ayecode-connect'),
 		'0'  => '0',
 		'1'  => '1',
 		'2'  => '2',
@@ -157,37 +157,37 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Padding top', 'ayecode-connect' ),
+		'title'    => __('Padding top', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
 	// title
-	if ( $type == 'pt' ) {
-		$defaults['title'] = __( 'Padding top', 'ayecode-connect' );
+	if ($type == 'pt') {
+		$defaults['title'] = __('Padding top', 'ayecode-connect');
 		$defaults['icon']  = 'box-top';
 		$defaults['row']   = array(
-			'title' => __( 'Padding', 'ayecode-connect' ),
+			'title' => __('Padding', 'ayecode-connect'),
 			'key'   => 'wrapper-padding',
 			'open'  => true,
 			'class' => 'text-center',
 		);
-	} elseif ( $type == 'pr' ) {
-		$defaults['title'] = __( 'Padding right', 'ayecode-connect' );
+	} elseif ($type == 'pr') {
+		$defaults['title'] = __('Padding right', 'ayecode-connect');
 		$defaults['icon']  = 'box-right';
 		$defaults['row']   = array(
 			'key' => 'wrapper-padding',
 		);
-	} elseif ( $type == 'pb' ) {
-		$defaults['title'] = __( 'Padding bottom', 'ayecode-connect' );
+	} elseif ($type == 'pb') {
+		$defaults['title'] = __('Padding bottom', 'ayecode-connect');
 		$defaults['icon']  = 'box-bottom';
 		$defaults['row']   = array(
 			'key' => 'wrapper-padding',
 		);
-	} elseif ( $type == 'pl' ) {
-		$defaults['title'] = __( 'Padding left', 'ayecode-connect' );
+	} elseif ($type == 'pl') {
+		$defaults['title'] = __('Padding left', 'ayecode-connect');
 		$defaults['icon']  = 'box-left';
 		$defaults['row']   = array(
 			'key'   => 'wrapper-padding',
@@ -196,7 +196,7 @@ 
 		);
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -209,23 +209,23 @@ 
  *
  * @return array
  */
-function sd_get_border_input( $type = 'border', $overwrite = array() ) {
+function sd_get_border_input($type = 'border', $overwrite = array()) {
 	global $aui_bs5;
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Border', 'ayecode-connect' ),
+		'title'    => __('Border', 'ayecode-connect'),
 		'options'  => array(),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
 	// title
-	if ( 'rounded' === $type ) {
-		$defaults['title']           = __( 'Border radius type', 'ayecode-connect' );
+	if ('rounded' === $type) {
+		$defaults['title']           = __('Border radius type', 'ayecode-connect');
 		$defaults['options']         = array(
-			''               => __( 'Default', 'ayecode-connect' ),
+			''               => __('Default', 'ayecode-connect'),
 			'rounded'        => 'rounded',
 			'rounded-top'    => 'rounded-top',
 			'rounded-right'  => 'rounded-right',
@@ -233,12 +233,12 @@ 
 			'rounded-left'   => 'rounded-left',
 		);
 		$defaults['element_require'] = '[%border%]';
-	} elseif ( 'rounded_size' === $type ) {
-		$defaults['title'] = __( 'Border radius size', 'ayecode-connect' );
+	} elseif ('rounded_size' === $type) {
+		$defaults['title'] = __('Border radius size', 'ayecode-connect');
 
-		if ( $aui_bs5 ) {
+		if ($aui_bs5) {
 			$defaults['options'] = array(
-				''       => __( 'Default', 'ayecode-connect' ),
+				''       => __('Default', 'ayecode-connect'),
 				'0'      => '0',
 				'1'      => '1',
 				'2'      => '2',
@@ -249,56 +249,56 @@ 
 			);
 		} else {
 			$defaults['options'] = array(
-				''   => __( 'Default', 'ayecode-connect' ),
-				'sm' => __( 'Small', 'ayecode-connect' ),
-				'lg' => __( 'Large', 'ayecode-connect' ),
+				''   => __('Default', 'ayecode-connect'),
+				'sm' => __('Small', 'ayecode-connect'),
+				'lg' => __('Large', 'ayecode-connect'),
 			);
 		}
 		$defaults['element_require'] = '[%border%]';
-	} elseif ( 'width' === $type ) { // BS%
-		$defaults['title']           = __( 'Border width', 'ayecode-connect' );
+	} elseif ('width' === $type) { // BS%
+		$defaults['title']           = __('Border width', 'ayecode-connect');
 		$defaults['options']         = array(
-			''         => __( 'Default', 'ayecode-connect' ),
+			''         => __('Default', 'ayecode-connect'),
 			'border-2' => '2',
 			'border-3' => '3',
 			'border-4' => '4',
 			'border-5' => '5',
 		);
 		$defaults['element_require'] = $aui_bs5 ? '[%border%]' : '1==2';
-	} elseif ( 'opacity' === $type ) { // BS%
-		$defaults['title']           = __( 'Border opacity', 'ayecode-connect' );
+	} elseif ('opacity' === $type) { // BS%
+		$defaults['title']           = __('Border opacity', 'ayecode-connect');
 		$defaults['options']         = array(
-			''                  => __( 'Default', 'ayecode-connect' ),
+			''                  => __('Default', 'ayecode-connect'),
 			'border-opacity-75' => '75%',
 			'border-opacity-50' => '50%',
 			'border-opacity-25' => '25%',
 			'border-opacity-10' => '10%',
 		);
 		$defaults['element_require'] = $aui_bs5 ? '[%border%]' : '1==2';
-	} elseif ( 'type' === $type ) {
-		$defaults['title']           = __( 'Border show', 'ayecode-connect' );
+	} elseif ('type' === $type) {
+		$defaults['title']           = __('Border show', 'ayecode-connect');
 		$defaults['options']         = array(
-			'border'          => __( 'Full (set color to show)', 'ayecode-connect' ),
-			'border-top'      => __( 'Top', 'ayecode-connect' ),
-			'border-bottom'   => __( 'Bottom', 'ayecode-connect' ),
-			'border-left'     => __( 'Left', 'ayecode-connect' ),
-			'border-right'    => __( 'Right', 'ayecode-connect' ),
-			'border-top-0'    => __( '-Top', 'ayecode-connect' ),
-			'border-bottom-0' => __( '-Bottom', 'ayecode-connect' ),
-			'border-left-0'   => __( '-Left', 'ayecode-connect' ),
-			'border-right-0'  => __( '-Right', 'ayecode-connect' ),
+			'border'          => __('Full (set color to show)', 'ayecode-connect'),
+			'border-top'      => __('Top', 'ayecode-connect'),
+			'border-bottom'   => __('Bottom', 'ayecode-connect'),
+			'border-left'     => __('Left', 'ayecode-connect'),
+			'border-right'    => __('Right', 'ayecode-connect'),
+			'border-top-0'    => __('-Top', 'ayecode-connect'),
+			'border-bottom-0' => __('-Bottom', 'ayecode-connect'),
+			'border-left-0'   => __('-Left', 'ayecode-connect'),
+			'border-right-0'  => __('-Right', 'ayecode-connect'),
 		);
 		$defaults['element_require'] = '[%border%]';
 
 	} else {
-		$defaults['title']   = __( 'Border color', 'ayecode-connect' );
+		$defaults['title']   = __('Border color', 'ayecode-connect');
 		$defaults['options'] = array(
-			                       ''  => __( 'Default', 'ayecode-connect' ),
-			                       '0' => __( 'None', 'ayecode-connect' ),
+			                       ''  => __('Default', 'ayecode-connect'),
+			                       '0' => __('None', 'ayecode-connect'),
 		                       ) + sd_aui_colors();
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -311,24 +311,24 @@ 
  *
  * @return array
  */
-function sd_get_shadow_input( $type = 'shadow', $overwrite = array() ) {
+function sd_get_shadow_input($type = 'shadow', $overwrite = array()) {
 	$options = array(
-		''          => __( 'None', 'ayecode-connect' ),
-		'shadow-sm' => __( 'Small', 'ayecode-connect' ),
-		'shadow'    => __( 'Regular', 'ayecode-connect' ),
-		'shadow-lg' => __( 'Large', 'ayecode-connect' ),
+		''          => __('None', 'ayecode-connect'),
+		'shadow-sm' => __('Small', 'ayecode-connect'),
+		'shadow'    => __('Regular', 'ayecode-connect'),
+		'shadow-lg' => __('Large', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Shadow', 'ayecode-connect' ),
+		'title'    => __('Shadow', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -341,22 +341,22 @@ 
  *
  * @return array
  */
-function sd_get_background_input( $type = 'bg', $overwrite = array() ) {
+function sd_get_background_input($type = 'bg', $overwrite = array()) {
 	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
+		           ''            => __('None', 'ayecode-connect'),
+		           'transparent' => __('Transparent', 'ayecode-connect'),
 	           ) + sd_aui_colors();
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Background color', 'ayecode-connect' ),
+		'title'    => __('Background color', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -369,9 +369,9 @@ 
  *
  * @return array
  */
-function sd_get_opacity_input( $type = 'opacity', $overwrite = array() ) {
+function sd_get_opacity_input($type = 'opacity', $overwrite = array()) {
 	$options = array(
-		''            => __( 'Default', 'ayecode-connect' ),
+		''            => __('Default', 'ayecode-connect'),
 		'opacity-10'  => '10%',
 		'opacity-15'  => '15%',
 		'opacity-25'  => '25%',
@@ -389,14 +389,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Opacity', 'ayecode-connect' ),
+		'title'    => __('Opacity', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -409,102 +409,102 @@ 
  *
  * @return array
  */
-function sd_get_background_inputs( $type = 'bg', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array(), $include_button_colors = false ) {
+function sd_get_background_inputs($type = 'bg', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array(), $include_button_colors = false) {
 
-	$color_options = $include_button_colors ? sd_aui_colors( false, true, true, true ) : sd_aui_colors();
+	$color_options = $include_button_colors ? sd_aui_colors(false, true, true, true) : sd_aui_colors();
 
 	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
+		           ''            => __('None', 'ayecode-connect'),
+		           'transparent' => __('Transparent', 'ayecode-connect'),
 	           ) + $color_options;
 
-	if ( false !== $overwrite_color ) {
-		$options['custom-color'] = __( 'Custom Color', 'ayecode-connect' );
+	if (false !== $overwrite_color) {
+		$options['custom-color'] = __('Custom Color', 'ayecode-connect');
 	}
 
-	if ( false !== $overwrite_gradient ) {
-		$options['custom-gradient'] = __( 'Custom Gradient', 'ayecode-connect' );
+	if (false !== $overwrite_gradient) {
+		$options['custom-gradient'] = __('Custom Gradient', 'ayecode-connect');
 	}
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Background Color', 'ayecode-connect' ),
+		'title'    => __('Background Color', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Background', 'ayecode-connect' ),
+		'group'    => __('Background', 'ayecode-connect'),
 	);
 
-	if ( $overwrite !== false ) {
-		$input[ $type ] = wp_parse_args( $overwrite, $defaults );
+	if ($overwrite !== false) {
+		$input[$type] = wp_parse_args($overwrite, $defaults);
 	}
 
-	if ( $overwrite_color !== false ) {
-		$input[ $type . '_color' ] = wp_parse_args(
+	if ($overwrite_color !== false) {
+		$input[$type . '_color'] = wp_parse_args(
 			$overwrite_color,
 			array(
 				'type'            => 'color',
-				'title'           => __( 'Custom color', 'ayecode-connect' ),
+				'title'           => __('Custom color', 'ayecode-connect'),
 				'placeholder'     => '',
 				'default'         => '#0073aa',
 				'desc_tip'        => true,
-				'group'           => __( 'Background', 'ayecode-connect' ),
+				'group'           => __('Background', 'ayecode-connect'),
 				'element_require' => '[%' . $type . '%]=="custom-color"',
 			)
 		);
 	}
 
-	if ( $overwrite_gradient !== false ) {
-		$input[ $type . '_gradient' ] = wp_parse_args(
+	if ($overwrite_gradient !== false) {
+		$input[$type . '_gradient'] = wp_parse_args(
 			$overwrite_gradient,
 			array(
 				'type'            => 'gradient',
-				'title'           => __( 'Custom gradient', 'ayecode-connect' ),
+				'title'           => __('Custom gradient', 'ayecode-connect'),
 				'placeholder'     => '',
 				'default'         => 'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
 				'desc_tip'        => true,
-				'group'           => __( 'Background', 'ayecode-connect' ),
+				'group'           => __('Background', 'ayecode-connect'),
 				'element_require' => '[%' . $type . '%]=="custom-gradient"',
 			)
 		);
 	}
 
-	if ( $overwrite_image !== false ) {
+	if ($overwrite_image !== false) {
 
-		$input[ $type . '_image_fixed' ] = array(
+		$input[$type . '_image_fixed'] = array(
 			'type'            => 'checkbox',
-			'title'           => __( 'Fixed background', 'ayecode-connect' ),
+			'title'           => __('Fixed background', 'ayecode-connect'),
 			'default'         => '',
 			'desc_tip'        => true,
-			'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
+			'group'           => !empty($overwrite_image['group']) ? $overwrite_image['group'] : __('Background', 'ayecode-connect'),
 			'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
 
 		);
 
-		$input[ $type . '_image_use_featured' ] = array(
+		$input[$type . '_image_use_featured'] = array(
 			'type'            => 'checkbox',
-			'title'           => __( 'Use featured image', 'ayecode-connect' ),
+			'title'           => __('Use featured image', 'ayecode-connect'),
 			'default'         => '',
 			'desc_tip'        => true,
-			'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
+			'group'           => !empty($overwrite_image['group']) ? $overwrite_image['group'] : __('Background', 'ayecode-connect'),
 			'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
 
 		);
 
-		$input[ $type . '_image' ] = wp_parse_args(
+		$input[$type . '_image'] = wp_parse_args(
 			$overwrite_image,
 			array(
 				'type'        => 'image',
-				'title'       => __( 'Custom image', 'ayecode-connect' ),
+				'title'       => __('Custom image', 'ayecode-connect'),
 				'placeholder' => '',
 				'default'     => '',
 				'desc_tip'    => true,
-				'group'       => __( 'Background', 'ayecode-connect' ),
+				'group'       => __('Background', 'ayecode-connect'),
 				//          'element_require' => ' ![%' . $type . '_image_use_featured%] '
 			)
 		);
 
-		$input[ $type . '_image_id' ] = wp_parse_args(
+		$input[$type . '_image_id'] = wp_parse_args(
 			$overwrite_image,
 			array(
 				'type'        => 'hidden',
@@ -512,18 +512,18 @@ 
 				'title'       => '',
 				'placeholder' => '',
 				'default'     => '',
-				'group'       => __( 'Background', 'ayecode-connect' ),
+				'group'       => __('Background', 'ayecode-connect'),
 			)
 		);
 
-		$input[ $type . '_image_xy' ] = wp_parse_args(
+		$input[$type . '_image_xy'] = wp_parse_args(
 			$overwrite_image,
 			array(
 				'type'        => 'image_xy',
 				'title'       => '',
 				'placeholder' => '',
 				'default'     => '',
-				'group'       => __( 'Background', 'ayecode-connect' ),
+				'group'       => __('Background', 'ayecode-connect'),
 			)
 		);
 	}
@@ -539,102 +539,102 @@ 
  *
  * @return array
  */
-function sd_get_shape_divider_inputs( $type = 'sd', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array() ) {
+function sd_get_shape_divider_inputs($type = 'sd', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array()) {
 
 	$options = array(
-		''                      => __( 'None', 'ayecode-connect' ),
-		'mountains'             => __( 'Mountains', 'ayecode-connect' ),
-		'drops'                 => __( 'Drops', 'ayecode-connect' ),
-		'clouds'                => __( 'Clouds', 'ayecode-connect' ),
-		'zigzag'                => __( 'Zigzag', 'ayecode-connect' ),
-		'pyramids'              => __( 'Pyramids', 'ayecode-connect' ),
-		'triangle'              => __( 'Triangle', 'ayecode-connect' ),
-		'triangle-asymmetrical' => __( 'Triangle Asymmetrical', 'ayecode-connect' ),
-		'tilt'                  => __( 'Tilt', 'ayecode-connect' ),
-		'opacity-tilt'          => __( 'Opacity Tilt', 'ayecode-connect' ),
-		'opacity-fan'           => __( 'Opacity Fan', 'ayecode-connect' ),
-		'curve'                 => __( 'Curve', 'ayecode-connect' ),
-		'curve-asymmetrical'    => __( 'Curve Asymmetrical', 'ayecode-connect' ),
-		'waves'                 => __( 'Waves', 'ayecode-connect' ),
-		'wave-brush'            => __( 'Wave Brush', 'ayecode-connect' ),
-		'waves-pattern'         => __( 'Waves Pattern', 'ayecode-connect' ),
-		'arrow'                 => __( 'Arrow', 'ayecode-connect' ),
-		'split'                 => __( 'Split', 'ayecode-connect' ),
-		'book'                  => __( 'Book', 'ayecode-connect' ),
+		''                      => __('None', 'ayecode-connect'),
+		'mountains'             => __('Mountains', 'ayecode-connect'),
+		'drops'                 => __('Drops', 'ayecode-connect'),
+		'clouds'                => __('Clouds', 'ayecode-connect'),
+		'zigzag'                => __('Zigzag', 'ayecode-connect'),
+		'pyramids'              => __('Pyramids', 'ayecode-connect'),
+		'triangle'              => __('Triangle', 'ayecode-connect'),
+		'triangle-asymmetrical' => __('Triangle Asymmetrical', 'ayecode-connect'),
+		'tilt'                  => __('Tilt', 'ayecode-connect'),
+		'opacity-tilt'          => __('Opacity Tilt', 'ayecode-connect'),
+		'opacity-fan'           => __('Opacity Fan', 'ayecode-connect'),
+		'curve'                 => __('Curve', 'ayecode-connect'),
+		'curve-asymmetrical'    => __('Curve Asymmetrical', 'ayecode-connect'),
+		'waves'                 => __('Waves', 'ayecode-connect'),
+		'wave-brush'            => __('Wave Brush', 'ayecode-connect'),
+		'waves-pattern'         => __('Waves Pattern', 'ayecode-connect'),
+		'arrow'                 => __('Arrow', 'ayecode-connect'),
+		'split'                 => __('Split', 'ayecode-connect'),
+		'book'                  => __('Book', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Type', 'ayecode-connect' ),
+		'title'    => __('Type', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Shape Divider', 'ayecode-connect' ),
+		'group'    => __('Shape Divider', 'ayecode-connect'),
 	);
 
-	$input[ $type ] = wp_parse_args( $overwrite, $defaults );
+	$input[$type] = wp_parse_args($overwrite, $defaults);
 
-	$input[ $type . '_notice' ] = array(
+	$input[$type . '_notice'] = array(
 		'type'            => 'notice',
-		'desc'            => __( 'Parent element must be position `relative`', 'ayecode-connect' ),
+		'desc'            => __('Parent element must be position `relative`', 'ayecode-connect'),
 		'status'          => 'warning',
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+		'group'           => __('Shape Divider', 'ayecode-connect'),
 		'element_require' => '[%' . $type . '%]!=""',
 	);
 
-	$input[ $type . '_position' ] = wp_parse_args(
+	$input[$type . '_position'] = wp_parse_args(
 		$overwrite_color,
 		array(
 			'type'            => 'select',
-			'title'           => __( 'Position', 'ayecode-connect' ),
+			'title'           => __('Position', 'ayecode-connect'),
 			'options'         => array(
-				'top'    => __( 'Top', 'ayecode-connect' ),
-				'bottom' => __( 'Bottom', 'ayecode-connect' ),
+				'top'    => __('Top', 'ayecode-connect'),
+				'bottom' => __('Bottom', 'ayecode-connect'),
 			),
 			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+			'group'           => __('Shape Divider', 'ayecode-connect'),
 			'element_require' => '[%' . $type . '%]!=""',
 		)
 	);
 
 	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
+		           ''            => __('None', 'ayecode-connect'),
+		           'transparent' => __('Transparent', 'ayecode-connect'),
 	           ) + sd_aui_colors()
 	           + array(
-		           'custom-color' => __( 'Custom Color', 'ayecode-connect' ),
+		           'custom-color' => __('Custom Color', 'ayecode-connect'),
 	           );
 
-	$input[ $type . '_color' ] = wp_parse_args(
+	$input[$type . '_color'] = wp_parse_args(
 		$overwrite_color,
 		array(
 			'type'            => 'select',
-			'title'           => __( 'Color', 'ayecode-connect' ),
+			'title'           => __('Color', 'ayecode-connect'),
 			'options'         => $options,
 			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+			'group'           => __('Shape Divider', 'ayecode-connect'),
 			'element_require' => '[%' . $type . '%]!=""',
 		)
 	);
 
-	$input[ $type . '_custom_color' ] = wp_parse_args(
+	$input[$type . '_custom_color'] = wp_parse_args(
 		$overwrite_color,
 		array(
 			'type'            => 'color',
-			'title'           => __( 'Custom color', 'ayecode-connect' ),
+			'title'           => __('Custom color', 'ayecode-connect'),
 			'placeholder'     => '',
 			'default'         => '#0073aa',
 			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+			'group'           => __('Shape Divider', 'ayecode-connect'),
 			'element_require' => '[%' . $type . '_color%]=="custom-color" && [%' . $type . '%]!=""',
 		)
 	);
 
-	$input[ $type . '_width' ] = wp_parse_args(
+	$input[$type . '_width'] = wp_parse_args(
 		$overwrite_gradient,
 		array(
 			'type'              => 'range',
-			'title'             => __( 'Width', 'ayecode-connect' ),
+			'title'             => __('Width', 'ayecode-connect'),
 			'placeholder'       => '',
 			'default'           => '200',
 			'desc_tip'          => true,
@@ -642,69 +642,69 @@ 
 				'min' => 100,
 				'max' => 300,
 			),
-			'group'             => __( 'Shape Divider', 'ayecode-connect' ),
+			'group'             => __('Shape Divider', 'ayecode-connect'),
 			'element_require'   => '[%' . $type . '%]!=""',
 		)
 	);
 
-	$input[ $type . '_height' ] = array(
+	$input[$type . '_height'] = array(
 		'type'              => 'range',
-		'title'             => __( 'Height', 'ayecode-connect' ),
+		'title'             => __('Height', 'ayecode-connect'),
 		'default'           => '100',
 		'desc_tip'          => true,
 		'custom_attributes' => array(
 			'min' => 0,
 			'max' => 500,
 		),
-		'group'             => __( 'Shape Divider', 'ayecode-connect' ),
+		'group'             => __('Shape Divider', 'ayecode-connect'),
 		'element_require'   => '[%' . $type . '%]!=""',
 	);
 
 	$requires = array(
-		'mountains'             => array( 'flip' ),
-		'drops'                 => array( 'flip', 'invert' ),
-		'clouds'                => array( 'flip', 'invert' ),
+		'mountains'             => array('flip'),
+		'drops'                 => array('flip', 'invert'),
+		'clouds'                => array('flip', 'invert'),
 		'zigzag'                => array(),
-		'pyramids'              => array( 'flip', 'invert' ),
-		'triangle'              => array( 'invert' ),
-		'triangle-asymmetrical' => array( 'flip', 'invert' ),
-		'tilt'                  => array( 'flip' ),
-		'opacity-tilt'          => array( 'flip' ),
+		'pyramids'              => array('flip', 'invert'),
+		'triangle'              => array('invert'),
+		'triangle-asymmetrical' => array('flip', 'invert'),
+		'tilt'                  => array('flip'),
+		'opacity-tilt'          => array('flip'),
 		'opacity-fan'           => array(),
-		'curve'                 => array( 'invert' ),
-		'curve-asymmetrical'    => array( 'flip', 'invert' ),
-		'waves'                 => array( 'flip', 'invert' ),
-		'wave-brush'            => array( 'flip' ),
-		'waves-pattern'         => array( 'flip' ),
-		'arrow'                 => array( 'invert' ),
-		'split'                 => array( 'invert' ),
-		'book'                  => array( 'invert' ),
+		'curve'                 => array('invert'),
+		'curve-asymmetrical'    => array('flip', 'invert'),
+		'waves'                 => array('flip', 'invert'),
+		'wave-brush'            => array('flip'),
+		'waves-pattern'         => array('flip'),
+		'arrow'                 => array('invert'),
+		'split'                 => array('invert'),
+		'book'                  => array('invert'),
 	);
 
-	$input[ $type . '_flip' ] = array(
+	$input[$type . '_flip'] = array(
 		'type'            => 'checkbox',
-		'title'           => __( 'Flip', 'ayecode-connect' ),
+		'title'           => __('Flip', 'ayecode-connect'),
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => sd_get_element_require_string( $requires, 'flip', 'sd' ),
+		'group'           => __('Shape Divider', 'ayecode-connect'),
+		'element_require' => sd_get_element_require_string($requires, 'flip', 'sd'),
 	);
 
-	$input[ $type . '_invert' ] = array(
+	$input[$type . '_invert'] = array(
 		'type'            => 'checkbox',
-		'title'           => __( 'Invert', 'ayecode-connect' ),
+		'title'           => __('Invert', 'ayecode-connect'),
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => sd_get_element_require_string( $requires, 'invert', 'sd' ),
+		'group'           => __('Shape Divider', 'ayecode-connect'),
+		'element_require' => sd_get_element_require_string($requires, 'invert', 'sd'),
 	);
 
-	$input[ $type . '_btf' ] = array(
+	$input[$type . '_btf'] = array(
 		'type'            => 'checkbox',
-		'title'           => __( 'Bring to front', 'ayecode-connect' ),
+		'title'           => __('Bring to front', 'ayecode-connect'),
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+		'group'           => __('Shape Divider', 'ayecode-connect'),
 		'element_require' => '[%' . $type . '%]!=""',
 
 	);
@@ -721,19 +721,19 @@ 
  *
  * @return string
  */
-function sd_get_element_require_string( $args, $key, $type ) {
+function sd_get_element_require_string($args, $key, $type) {
 	$output   = '';
 	$requires = array();
 
-	if ( ! empty( $args ) ) {
-		foreach ( $args as $t => $k ) {
-			if ( in_array( $key, $k ) ) {
+	if (!empty($args)) {
+		foreach ($args as $t => $k) {
+			if (in_array($key, $k)) {
 				$requires[] = '[%' . $type . '%]=="' . $t . '"';
 			}
 		}
 
-		if ( ! empty( $requires ) ) {
-			$output = '(' . implode( ' || ', $requires ) . ')';
+		if (!empty($requires)) {
+			$output = '(' . implode(' || ', $requires) . ')';
 		}
 	}
 
@@ -748,39 +748,39 @@ 
  *
  * @return array
  */
-function sd_get_text_color_input( $type = 'text_color', $overwrite = array(), $has_custom = false ) {
+function sd_get_text_color_input($type = 'text_color', $overwrite = array(), $has_custom = false) {
 	$options = array(
-		           '' => __( 'None', 'ayecode-connect' ),
+		           '' => __('None', 'ayecode-connect'),
 	           ) + sd_aui_colors();
 
-	if ( $has_custom ) {
-		$options['custom'] = __( 'Custom color', 'ayecode-connect' );
+	if ($has_custom) {
+		$options['custom'] = __('Custom color', 'ayecode-connect');
 	}
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Text color', 'ayecode-connect' ),
+		'title'    => __('Text color', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
+		'group'    => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_text_color_input_group( $type = 'text_color', $overwrite = array(), $overwrite_custom = array() ) {
+function sd_get_text_color_input_group($type = 'text_color', $overwrite = array(), $overwrite_custom = array()) {
 	$inputs = array();
 
-	if ( $overwrite !== false ) {
-		$inputs[ $type ] = sd_get_text_color_input( $type, $overwrite, true );
+	if ($overwrite !== false) {
+		$inputs[$type] = sd_get_text_color_input($type, $overwrite, true);
 	}
 
-	if ( $overwrite_custom !== false ) {
+	if ($overwrite_custom !== false) {
 		$custom            = $type . '_custom';
-		$inputs[ $custom ] = sd_get_custom_color_input( $custom, $overwrite_custom, $type );
+		$inputs[$custom] = sd_get_custom_color_input($custom, $overwrite_custom, $type);
 	}
 
 	return $inputs;
@@ -794,22 +794,22 @@ 
  *
  * @return array
  */
-function sd_get_custom_color_input( $type = 'color_custom', $overwrite = array(), $parent_type = '' ) {
+function sd_get_custom_color_input($type = 'color_custom', $overwrite = array(), $parent_type = '') {
 
 	$defaults = array(
 		'type'        => 'color',
-		'title'       => __( 'Custom color', 'ayecode-connect' ),
+		'title'       => __('Custom color', 'ayecode-connect'),
 		'default'     => '',
 		'placeholder' => '',
 		'desc_tip'    => true,
-		'group'       => __( 'Typography', 'ayecode-connect' ),
+		'group'       => __('Typography', 'ayecode-connect'),
 	);
 
-	if ( $parent_type ) {
+	if ($parent_type) {
 		$defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -822,19 +822,19 @@ 
  *
  * @return array
  */
-function sd_get_col_input( $type = 'col', $overwrite = array() ) {
+function sd_get_col_input($type = 'col', $overwrite = array()) {
 
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''     => __( 'Default', 'ayecode-connect' ),
-		'auto' => __( 'auto', 'ayecode-connect' ),
+		''     => __('Default', 'ayecode-connect'),
+		'auto' => __('auto', 'ayecode-connect'),
 		'1'    => '1/12',
 		'2'    => '2/12',
 		'3'    => '3/12',
@@ -851,15 +851,15 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Column width', 'ayecode-connect' ),
+		'title'           => __('Column width', 'ayecode-connect'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Container', 'ayecode-connect' ),
+		'group'           => __('Container', 'ayecode-connect'),
 		'element_require' => '[%container%]=="col"',
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -872,18 +872,18 @@ 
  *
  * @return array
  */
-function sd_get_row_cols_input( $type = 'row_cols', $overwrite = array() ) {
+function sd_get_row_cols_input($type = 'row_cols', $overwrite = array()) {
 
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''  => __( 'auto', 'ayecode-connect' ),
+		''  => __('auto', 'ayecode-connect'),
 		'1' => '1',
 		'2' => '2',
 		'3' => '3',
@@ -894,15 +894,15 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Row columns', 'ayecode-connect' ),
+		'title'           => __('Row columns', 'ayecode-connect'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Container', 'ayecode-connect' ),
+		'group'           => __('Container', 'ayecode-connect'),
 		'element_require' => '[%container%]=="row"',
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -915,33 +915,33 @@ 
  *
  * @return array
  */
-function sd_get_text_align_input( $type = 'text_align', $overwrite = array() ) {
+function sd_get_text_align_input($type = 'text_align', $overwrite = array()) {
 
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                => __( 'Default', 'ayecode-connect' ),
-		'text' . $device_size . '-left'   => __( 'Left', 'ayecode-connect' ),
-		'text' . $device_size . '-right'  => __( 'Right', 'ayecode-connect' ),
-		'text' . $device_size . '-center' => __( 'Center', 'ayecode-connect' ),
+		''                                => __('Default', 'ayecode-connect'),
+		'text' . $device_size . '-left'   => __('Left', 'ayecode-connect'),
+		'text' . $device_size . '-right'  => __('Right', 'ayecode-connect'),
+		'text' . $device_size . '-center' => __('Center', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Text align', 'ayecode-connect' ),
+		'title'    => __('Text align', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
+		'group'    => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -954,18 +954,18 @@ 
  *
  * @return array
  */
-function sd_get_display_input( $type = 'display', $overwrite = array() ) {
+function sd_get_display_input($type = 'display', $overwrite = array()) {
 
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                   => __( 'Default', 'ayecode-connect' ),
+		''                                   => __('Default', 'ayecode-connect'),
 		'd' . $device_size . '-none'         => 'none',
 		'd' . $device_size . '-inline'       => 'inline',
 		'd' . $device_size . '-inline-block' => 'inline-block',
@@ -979,14 +979,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Display', 'ayecode-connect' ),
+		'title'    => __('Display', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -999,17 +999,17 @@ 
  *
  * @return array
  */
-function sd_get_text_justify_input( $type = 'text_justify', $overwrite = array() ) {
+function sd_get_text_justify_input($type = 'text_justify', $overwrite = array()) {
 
 	$defaults = array(
 		'type'     => 'checkbox',
-		'title'    => __( 'Text justify', 'ayecode-connect' ),
+		'title'    => __('Text justify', 'ayecode-connect'),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
+		'group'    => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1023,73 +1023,73 @@ 
  *
  * @return array
  */
-function sd_aui_colors( $include_branding = false, $include_outlines = false, $outline_button_only_text = false, $include_translucent = false ) {
+function sd_aui_colors($include_branding = false, $include_outlines = false, $outline_button_only_text = false, $include_translucent = false) {
 	$theme_colors = array();
 
-	$theme_colors['primary']   = __( 'Primary', 'ayecode-connect' );
-	$theme_colors['secondary'] = __( 'Secondary', 'ayecode-connect' );
-	$theme_colors['success']   = __( 'Success', 'ayecode-connect' );
-	$theme_colors['danger']    = __( 'Danger', 'ayecode-connect' );
-	$theme_colors['warning']   = __( 'Warning', 'ayecode-connect' );
-	$theme_colors['info']      = __( 'Info', 'ayecode-connect' );
-	$theme_colors['light']     = __( 'Light', 'ayecode-connect' );
-	$theme_colors['dark']      = __( 'Dark', 'ayecode-connect' );
-	$theme_colors['black']     = __( 'Black', 'ayecode-connect' );
-	$theme_colors['white']     = __( 'White', 'ayecode-connect' );
-	$theme_colors['purple']    = __( 'Purple', 'ayecode-connect' );
-	$theme_colors['salmon']    = __( 'Salmon', 'ayecode-connect' );
-	$theme_colors['cyan']      = __( 'Cyan', 'ayecode-connect' );
-	$theme_colors['gray']      = __( 'Gray', 'ayecode-connect' );
-	$theme_colors['muted']     = __( 'Muted', 'ayecode-connect' );
-	$theme_colors['gray-dark'] = __( 'Gray dark', 'ayecode-connect' );
-	$theme_colors['indigo']    = __( 'Indigo', 'ayecode-connect' );
-	$theme_colors['orange']    = __( 'Orange', 'ayecode-connect' );
-
-	if ( $include_outlines ) {
-		$button_only                       = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
-		$theme_colors['outline-primary']   = __( 'Primary outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-secondary'] = __( 'Secondary outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-success']   = __( 'Success outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-danger']    = __( 'Danger outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-warning']   = __( 'Warning outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-info']      = __( 'Info outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-light']     = __( 'Light outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-dark']      = __( 'Dark outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-white']     = __( 'White outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-purple']    = __( 'Purple outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-salmon']    = __( 'Salmon outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-cyan']      = __( 'Cyan outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-gray']      = __( 'Gray outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-gray-dark'] = __( 'Gray dark outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-indigo']    = __( 'Indigo outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-orange']    = __( 'Orange outline', 'ayecode-connect' ) . $button_only;
-	}
-
-	if ( $include_branding ) {
+	$theme_colors['primary']   = __('Primary', 'ayecode-connect');
+	$theme_colors['secondary'] = __('Secondary', 'ayecode-connect');
+	$theme_colors['success']   = __('Success', 'ayecode-connect');
+	$theme_colors['danger']    = __('Danger', 'ayecode-connect');
+	$theme_colors['warning']   = __('Warning', 'ayecode-connect');
+	$theme_colors['info']      = __('Info', 'ayecode-connect');
+	$theme_colors['light']     = __('Light', 'ayecode-connect');
+	$theme_colors['dark']      = __('Dark', 'ayecode-connect');
+	$theme_colors['black']     = __('Black', 'ayecode-connect');
+	$theme_colors['white']     = __('White', 'ayecode-connect');
+	$theme_colors['purple']    = __('Purple', 'ayecode-connect');
+	$theme_colors['salmon']    = __('Salmon', 'ayecode-connect');
+	$theme_colors['cyan']      = __('Cyan', 'ayecode-connect');
+	$theme_colors['gray']      = __('Gray', 'ayecode-connect');
+	$theme_colors['muted']     = __('Muted', 'ayecode-connect');
+	$theme_colors['gray-dark'] = __('Gray dark', 'ayecode-connect');
+	$theme_colors['indigo']    = __('Indigo', 'ayecode-connect');
+	$theme_colors['orange']    = __('Orange', 'ayecode-connect');
+
+	if ($include_outlines) {
+		$button_only                       = $outline_button_only_text ? ' ' . __('(button only)', 'ayecode-connect') : '';
+		$theme_colors['outline-primary']   = __('Primary outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-secondary'] = __('Secondary outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-success']   = __('Success outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-danger']    = __('Danger outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-warning']   = __('Warning outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-info']      = __('Info outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-light']     = __('Light outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-dark']      = __('Dark outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-white']     = __('White outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-purple']    = __('Purple outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-salmon']    = __('Salmon outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-cyan']      = __('Cyan outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-gray']      = __('Gray outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-gray-dark'] = __('Gray dark outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-indigo']    = __('Indigo outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-orange']    = __('Orange outline', 'ayecode-connect') . $button_only;
+	}
+
+	if ($include_branding) {
 		$theme_colors = $theme_colors + sd_aui_branding_colors();
 	}
 
-	if ( $include_translucent ) {
-		$button_only                           = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
-		$theme_colors['translucent-primary']   = __( 'Primary translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-secondary'] = __( 'Secondary translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-success']   = __( 'Success translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-danger']    = __( 'Danger translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-warning']   = __( 'Warning translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-info']      = __( 'Info translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-light']     = __( 'Light translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-dark']      = __( 'Dark translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-white']     = __( 'White translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-purple']    = __( 'Purple translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-salmon']    = __( 'Salmon translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-cyan']      = __( 'Cyan translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-gray']      = __( 'Gray translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-gray-dark'] = __( 'Gray dark translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-indigo']    = __( 'Indigo translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-orange']    = __( 'Orange translucent', 'ayecode-connect' ) . $button_only;
+	if ($include_translucent) {
+		$button_only                           = $outline_button_only_text ? ' ' . __('(button only)', 'ayecode-connect') : '';
+		$theme_colors['translucent-primary']   = __('Primary translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-secondary'] = __('Secondary translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-success']   = __('Success translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-danger']    = __('Danger translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-warning']   = __('Warning translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-info']      = __('Info translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-light']     = __('Light translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-dark']      = __('Dark translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-white']     = __('White translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-purple']    = __('Purple translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-salmon']    = __('Salmon translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-cyan']      = __('Cyan translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-gray']      = __('Gray translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-gray-dark'] = __('Gray dark translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-indigo']    = __('Indigo translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-orange']    = __('Orange translucent', 'ayecode-connect') . $button_only;
 	}
 
-	return apply_filters( 'sd_aui_colors', $theme_colors, $include_outlines, $include_branding );
+	return apply_filters('sd_aui_colors', $theme_colors, $include_outlines, $include_branding);
 }
 
 /**
@@ -1099,17 +1099,17 @@ 
  */
 function sd_aui_branding_colors() {
 	return array(
-		'facebook'  => __( 'Facebook', 'ayecode-connect' ),
-		'twitter'   => __( 'Twitter', 'ayecode-connect' ),
-		'instagram' => __( 'Instagram', 'ayecode-connect' ),
-		'linkedin'  => __( 'Linkedin', 'ayecode-connect' ),
-		'flickr'    => __( 'Flickr', 'ayecode-connect' ),
-		'github'    => __( 'GitHub', 'ayecode-connect' ),
-		'youtube'   => __( 'YouTube', 'ayecode-connect' ),
-		'wordpress' => __( 'WordPress', 'ayecode-connect' ),
-		'google'    => __( 'Google', 'ayecode-connect' ),
-		'yahoo'     => __( 'Yahoo', 'ayecode-connect' ),
-		'vkontakte' => __( 'Vkontakte', 'ayecode-connect' ),
+		'facebook'  => __('Facebook', 'ayecode-connect'),
+		'twitter'   => __('Twitter', 'ayecode-connect'),
+		'instagram' => __('Instagram', 'ayecode-connect'),
+		'linkedin'  => __('Linkedin', 'ayecode-connect'),
+		'flickr'    => __('Flickr', 'ayecode-connect'),
+		'github'    => __('GitHub', 'ayecode-connect'),
+		'youtube'   => __('YouTube', 'ayecode-connect'),
+		'wordpress' => __('WordPress', 'ayecode-connect'),
+		'google'    => __('Google', 'ayecode-connect'),
+		'yahoo'     => __('Yahoo', 'ayecode-connect'),
+		'vkontakte' => __('Vkontakte', 'ayecode-connect'),
 	);
 }
 
@@ -1122,10 +1122,10 @@ 
  *
  * @return array
  */
-function sd_get_container_class_input( $type = 'container', $overwrite = array() ) {
+function sd_get_container_class_input($type = 'container', $overwrite = array()) {
 
 	$options = array(
-		'container'       => __( 'container (default)', 'ayecode-connect' ),
+		'container'       => __('container (default)', 'ayecode-connect'),
 		'container-sm'    => 'container-sm',
 		'container-md'    => 'container-md',
 		'container-lg'    => 'container-lg',
@@ -1141,19 +1141,19 @@ 
 		'card-footer'     => 'card-footer',
 		'list-group'      => 'list-group',
 		'list-group-item' => 'list-group-item',
-		''                => __( 'no container class', 'ayecode-connect' ),
+		''                => __('no container class', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Type', 'ayecode-connect' ),
+		'title'    => __('Type', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Container', 'ayecode-connect' ),
+		'group'    => __('Container', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1166,10 +1166,10 @@ 
  *
  * @return array
  */
-function sd_get_position_class_input( $type = 'position', $overwrite = array() ) {
+function sd_get_position_class_input($type = 'position', $overwrite = array()) {
 
 	$options = array(
-		''                  => __( 'Default', 'ayecode-connect' ),
+		''                  => __('Default', 'ayecode-connect'),
 		'position-static'   => 'static',
 		'position-relative' => 'relative',
 		'position-absolute' => 'absolute',
@@ -1182,14 +1182,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Position', 'ayecode-connect' ),
+		'title'    => __('Position', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1200,10 +1200,10 @@ 
  *
  * @return array
  */
-function sd_get_absolute_position_input( $type = 'absolute_position', $overwrite = array() ) {
+function sd_get_absolute_position_input($type = 'absolute_position', $overwrite = array()) {
 
 	$options = array(
-		''              => __( 'Default', 'ayecode-connect' ),
+		''              => __('Default', 'ayecode-connect'),
 		'top-left'      => 'top-left',
 		'top-center'    => 'top-center',
 		'top-right'     => 'top-right',
@@ -1217,15 +1217,15 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Absolute Position', 'ayecode-connect' ),
+		'title'           => __('Absolute Position', 'ayecode-connect'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'           => __('Wrapper Styles', 'ayecode-connect'),
 		'element_require' => '[%position%]=="position-absolute"',
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1238,30 +1238,30 @@ 
  *
  * @return array
  */
-function sd_get_sticky_offset_input( $type = 'top', $overwrite = array() ) {
+function sd_get_sticky_offset_input($type = 'top', $overwrite = array()) {
 
 	$defaults = array(
 		'type'            => 'number',
-		'title'           => __( 'Sticky offset', 'ayecode-connect' ),
+		'title'           => __('Sticky offset', 'ayecode-connect'),
 		//'desc' =>  __( 'Sticky offset', 'ayecode-connect' ),
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'           => __('Wrapper Styles', 'ayecode-connect'),
 		'element_require' => '[%position%]=="sticky" || [%position%]=="sticky-top"',
 	);
 
 	// title
-	if ( $type == 'top' ) {
-		$defaults['title'] = __( 'Top offset', 'ayecode-connect' );
+	if ($type == 'top') {
+		$defaults['title'] = __('Top offset', 'ayecode-connect');
 		$defaults['icon']  = 'box-top';
 		$defaults['row']   = array(
-			'title' => __( 'Sticky offset', 'ayecode-connect' ),
+			'title' => __('Sticky offset', 'ayecode-connect'),
 			'key'   => 'sticky-offset',
 			'open'  => true,
 			'class' => 'text-center',
 		);
-	} elseif ( $type == 'bottom' ) {
-		$defaults['title'] = __( 'Bottom offset', 'ayecode-connect' );
+	} elseif ($type == 'bottom') {
+		$defaults['title'] = __('Bottom offset', 'ayecode-connect');
 		$defaults['icon']  = 'box-bottom';
 		$defaults['row']   = array(
 			'key'   => 'sticky-offset',
@@ -1269,7 +1269,7 @@ 
 		);
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1282,11 +1282,11 @@ 
  *
  * @return array
  */
-function sd_get_font_size_input( $type = 'font_size', $overwrite = array(), $has_custom = false ) {
+function sd_get_font_size_input($type = 'font_size', $overwrite = array(), $has_custom = false) {
 	global $aui_bs5;
 
-	$options[] = __( 'Inherit from parent', 'ayecode-connect' );
-	if ( $aui_bs5 ) {
+	$options[] = __('Inherit from parent', 'ayecode-connect');
+	if ($aui_bs5) {
 		// responsive font sizes
 		$options['fs-base'] = 'fs-base (body default)';
 		$options['fs-6']    = 'fs-6';
@@ -1317,25 +1317,25 @@ 
 			'display-4' => 'display-4',
 		);
 
-	if ( $aui_bs5 ) {
+	if ($aui_bs5) {
 		$options['display-5'] = 'display-5';
 		$options['display-6'] = 'display-6';
 	}
 
-	if ( $has_custom ) {
-		$options['custom'] = __( 'Custom size', 'ayecode-connect' );
+	if ($has_custom) {
+		$options['custom'] = __('Custom size', 'ayecode-connect');
 	}
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Font size', 'ayecode-connect' ),
+		'title'    => __('Font size', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
+		'group'    => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1348,11 +1348,11 @@ 
  *
  * @return array
  */
-function sd_get_font_custom_size_input( $type = 'font_size_custom', $overwrite = array(), $parent_type = '' ) {
+function sd_get_font_custom_size_input($type = 'font_size_custom', $overwrite = array(), $parent_type = '') {
 
 	$defaults = array(
 		'type'              => 'number',
-		'title'             => __( 'Font size (rem)', 'ayecode-connect' ),
+		'title'             => __('Font size (rem)', 'ayecode-connect'),
 		'default'           => '',
 		'placeholder'       => '1.25',
 		'custom_attributes' => array(
@@ -1361,14 +1361,14 @@ 
 			'max'  => '100',
 		),
 		'desc_tip'          => true,
-		'group'             => __( 'Typography', 'ayecode-connect' ),
+		'group'             => __('Typography', 'ayecode-connect'),
 	);
 
-	if ( $parent_type ) {
+	if ($parent_type) {
 		$defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1381,11 +1381,11 @@ 
  *
  * @return array
  */
-function sd_get_font_line_height_input( $type = 'font_line_height', $overwrite = array() ) {
+function sd_get_font_line_height_input($type = 'font_line_height', $overwrite = array()) {
 
 	$defaults = array(
 		'type'              => 'number',
-		'title'             => __( 'Font Line Height', 'ayecode-connect' ),
+		'title'             => __('Font Line Height', 'ayecode-connect'),
 		'default'           => '',
 		'placeholder'       => '1.75',
 		'custom_attributes' => array(
@@ -1394,10 +1394,10 @@ 
 			'max'  => '100',
 		),
 		'desc_tip'          => true,
-		'group'             => __( 'Typography', 'ayecode-connect' ),
+		'group'             => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1410,17 +1410,17 @@ 
  *
  * @return array
  */
-function sd_get_font_size_input_group( $type = 'font_size', $overwrite = array(), $overwrite_custom = array() ) {
+function sd_get_font_size_input_group($type = 'font_size', $overwrite = array(), $overwrite_custom = array()) {
 
 	$inputs = array();
 
-	if ( $overwrite !== false ) {
-		$inputs[ $type ] = sd_get_font_size_input( $type, $overwrite, true );
+	if ($overwrite !== false) {
+		$inputs[$type] = sd_get_font_size_input($type, $overwrite, true);
 	}
 
-	if ( $overwrite_custom !== false ) {
+	if ($overwrite_custom !== false) {
 		$custom            = $type . '_custom';
-		$inputs[ $custom ] = sd_get_font_custom_size_input( $custom, $overwrite_custom, $type );
+		$inputs[$custom] = sd_get_font_custom_size_input($custom, $overwrite_custom, $type);
 	}
 
 	return $inputs;
@@ -1434,10 +1434,10 @@ 
  *
  * @return array
  */
-function sd_get_font_weight_input( $type = 'font_weight', $overwrite = array() ) {
+function sd_get_font_weight_input($type = 'font_weight', $overwrite = array()) {
 
 	$options = array(
-		''                                => __( 'Inherit', 'ayecode-connect' ),
+		''                                => __('Inherit', 'ayecode-connect'),
 		'font-weight-bold'                => 'bold',
 		'font-weight-bolder'              => 'bolder',
 		'font-weight-normal'              => 'normal',
@@ -1453,14 +1453,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Appearance', 'ayecode-connect' ),
+		'title'    => __('Appearance', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
+		'group'    => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1473,25 +1473,25 @@ 
  *
  * @return array
  */
-function sd_get_font_case_input( $type = 'font_weight', $overwrite = array() ) {
+function sd_get_font_case_input($type = 'font_weight', $overwrite = array()) {
 
 	$options = array(
-		''                => __( 'Default', 'ayecode-connect' ),
-		'text-lowercase'  => __( 'lowercase', 'ayecode-connect' ),
-		'text-uppercase'  => __( 'UPPERCASE', 'ayecode-connect' ),
-		'text-capitalize' => __( 'Capitalize', 'ayecode-connect' ),
+		''                => __('Default', 'ayecode-connect'),
+		'text-lowercase'  => __('lowercase', 'ayecode-connect'),
+		'text-uppercase'  => __('UPPERCASE', 'ayecode-connect'),
+		'text-capitalize' => __('Capitalize', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Letter case', 'ayecode-connect' ),
+		'title'    => __('Letter case', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
+		'group'    => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1505,23 +1505,23 @@ 
  * A helper function for font size
  *
  */
-function sd_get_font_italic_input( $type = 'font_italic', $overwrite = array() ) {
+function sd_get_font_italic_input($type = 'font_italic', $overwrite = array()) {
 
 	$options = array(
-		''            => __( 'No', 'ayecode-connect' ),
-		'font-italic' => __( 'Yes', 'ayecode-connect' ),
+		''            => __('No', 'ayecode-connect'),
+		'font-italic' => __('Yes', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Font italic', 'ayecode-connect' ),
+		'title'    => __('Font italic', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
+		'group'    => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1534,18 +1534,18 @@ 
  *
  * @return array
  */
-function sd_get_anchor_input( $type = 'anchor', $overwrite = array() ) {
+function sd_get_anchor_input($type = 'anchor', $overwrite = array()) {
 
 	$defaults = array(
 		'type'     => 'text',
-		'title'    => __( 'HTML anchor', 'ayecode-connect' ),
-		'desc'     => __( 'Enter a word or two — without spaces — to make a unique web address just for this block, called an “anchor.” Then, you’ll be able to link directly to this section of your page.', 'ayecode-connect' ),
+		'title'    => __('HTML anchor', 'ayecode-connect'),
+		'desc'     => __('Enter a word or two — without spaces — to make a unique web address just for this block, called an “anchor.” Then, you’ll be able to link directly to this section of your page.', 'ayecode-connect'),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'ayecode-connect' ),
+		'group'    => __('Advanced', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1558,18 +1558,18 @@ 
  *
  * @return array
  */
-function sd_get_class_input( $type = 'css_class', $overwrite = array() ) {
+function sd_get_class_input($type = 'css_class', $overwrite = array()) {
 
 	$defaults = array(
 		'type'     => 'text',
-		'title'    => __( 'Additional CSS class(es)', 'ayecode-connect' ),
-		'desc'     => __( 'Separate multiple classes with spaces.', 'ayecode-connect' ),
+		'title'    => __('Additional CSS class(es)', 'ayecode-connect'),
+		'desc'     => __('Separate multiple classes with spaces.', 'ayecode-connect'),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'ayecode-connect' ),
+		'group'    => __('Advanced', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1582,45 +1582,45 @@ 
  *
  * @return array
  */
-function sd_get_hover_animations_input( $type = 'hover_animations', $overwrite = array() ) {
+function sd_get_hover_animations_input($type = 'hover_animations', $overwrite = array()) {
 
 	$options = array(
-		''                 => __( 'none', 'ayecode-connect' ),
-		'hover-zoom'       => __( 'Zoom', 'ayecode-connect' ),
-		'hover-shadow'     => __( 'Shadow', 'ayecode-connect' ),
-		'hover-move-up'    => __( 'Move up', 'ayecode-connect' ),
-		'hover-move-down'  => __( 'Move down', 'ayecode-connect' ),
-		'hover-move-left'  => __( 'Move left', 'ayecode-connect' ),
-		'hover-move-right' => __( 'Move right', 'ayecode-connect' ),
+		''                 => __('none', 'ayecode-connect'),
+		'hover-zoom'       => __('Zoom', 'ayecode-connect'),
+		'hover-shadow'     => __('Shadow', 'ayecode-connect'),
+		'hover-move-up'    => __('Move up', 'ayecode-connect'),
+		'hover-move-down'  => __('Move down', 'ayecode-connect'),
+		'hover-move-left'  => __('Move left', 'ayecode-connect'),
+		'hover-move-right' => __('Move right', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
 		'multiple' => true,
-		'title'    => __( 'Hover Animations', 'ayecode-connect' ),
+		'title'    => __('Hover Animations', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Hover Animations', 'ayecode-connect' ),
+		'group'    => __('Hover Animations', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
 
-function sd_get_flex_align_items_input( $type = 'align-items', $overwrite = array() ) {
+function sd_get_flex_align_items_input($type = 'align-items', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                         => __( 'Default', 'ayecode-connect' ),
+		''                                         => __('Default', 'ayecode-connect'),
 		'align-items' . $device_size . '-start'    => 'align-items-start',
 		'align-items' . $device_size . '-end'      => 'align-items-end',
 		'align-items' . $device_size . '-center'   => 'align-items-center',
@@ -1630,21 +1630,21 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Vertical Align Items', 'ayecode-connect' ),
+		'title'           => __('Vertical Align Items', 'ayecode-connect'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'           => __('Wrapper Styles', 'ayecode-connect'),
 		'element_require' => ' ( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
 
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_flex_align_items_input_group( $type = 'flex_align_items', $overwrite = array() ) {
+function sd_get_flex_align_items_input_group($type = 'flex_align_items', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1652,28 +1652,28 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_align_items_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_align_items_input($type, $overwrite);
 		}
 	}
 
 	return $inputs;
 }
 
-function sd_get_flex_justify_content_input( $type = 'flex_justify_content', $overwrite = array() ) {
+function sd_get_flex_justify_content_input($type = 'flex_justify_content', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                            => __( 'Default', 'ayecode-connect' ),
+		''                                            => __('Default', 'ayecode-connect'),
 		'justify-content' . $device_size . '-start'   => 'justify-content-start',
 		'justify-content' . $device_size . '-end'     => 'justify-content-end',
 		'justify-content' . $device_size . '-center'  => 'justify-content-center',
@@ -1683,21 +1683,21 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Justify content', 'ayecode-connect' ),
+		'title'           => __('Justify content', 'ayecode-connect'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'           => __('Wrapper Styles', 'ayecode-connect'),
 		'element_require' => '( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
 
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_flex_justify_content_input_group( $type = 'flex_justify_content', $overwrite = array() ) {
+function sd_get_flex_justify_content_input_group($type = 'flex_justify_content', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1705,11 +1705,11 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_justify_content_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_justify_content_input($type, $overwrite);
 		}
 	}
 
@@ -1717,17 +1717,17 @@ 
 }
 
 
-function sd_get_flex_align_self_input( $type = 'flex_align_self', $overwrite = array() ) {
+function sd_get_flex_align_self_input($type = 'flex_align_self', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                         => __( 'Default', 'ayecode-connect' ),
+		''                                         => __('Default', 'ayecode-connect'),
 		'align-items' . $device_size . '-start'    => 'align-items-start',
 		'align-items' . $device_size . '-end'      => 'align-items-end',
 		'align-items' . $device_size . '-center'   => 'align-items-center',
@@ -1737,21 +1737,21 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Align Self', 'ayecode-connect' ),
+		'title'           => __('Align Self', 'ayecode-connect'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'           => __('Wrapper Styles', 'ayecode-connect'),
 		'element_require' => ' [%container%]=="col" ',
 
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_flex_align_self_input_group( $type = 'flex_align_self', $overwrite = array() ) {
+function sd_get_flex_align_self_input_group($type = 'flex_align_self', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1759,53 +1759,53 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_align_self_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_align_self_input($type, $overwrite);
 		}
 	}
 
 	return $inputs;
 }
 
-function sd_get_flex_order_input( $type = 'flex_order', $overwrite = array() ) {
+function sd_get_flex_order_input($type = 'flex_order', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		'' => __( 'Default', 'ayecode-connect' ),
+		'' => __('Default', 'ayecode-connect'),
 	);
 
 	$i = 0;
-	while ( $i <= 5 ) {
-		$options[ 'order' . $device_size . '-' . $i ] = $i;
+	while ($i <= 5) {
+		$options['order' . $device_size . '-' . $i] = $i;
 		$i++;
 	}
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Flex Order', 'ayecode-connect' ),
+		'title'           => __('Flex Order', 'ayecode-connect'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'           => __('Wrapper Styles', 'ayecode-connect'),
 		'element_require' => ' [%container%]=="col" ',
 
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_flex_order_input_group( $type = 'flex_order', $overwrite = array() ) {
+function sd_get_flex_order_input_group($type = 'flex_order', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1813,18 +1813,18 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_order_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_order_input($type, $overwrite);
 		}
 	}
 
 	return $inputs;
 }
 
-function sd_get_flex_wrap_group( $type = 'flex_wrap', $overwrite = array() ) {
+function sd_get_flex_wrap_group($type = 'flex_wrap', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1832,28 +1832,28 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_wrap_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_wrap_input($type, $overwrite);
 		}
 	}
 
 	return $inputs;
 }
 
-function sd_get_flex_wrap_input( $type = 'flex_wrap', $overwrite = array() ) {
+function sd_get_flex_wrap_input($type = 'flex_wrap', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                      => __( 'Default', 'ayecode-connect' ),
+		''                                      => __('Default', 'ayecode-connect'),
 		'flex' . $device_size . '-nowrap'       => 'nowrap',
 		'flex' . $device_size . '-wrap'         => 'wrap',
 		'flex' . $device_size . '-wrap-reverse' => 'wrap-reverse',
@@ -1861,19 +1861,19 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Flex wrap', 'ayecode-connect' ),
+		'title'    => __('Flex wrap', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_float_group( $type = 'float', $overwrite = array() ) {
+function sd_get_float_group($type = 'float', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1881,27 +1881,27 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_float_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_float_input($type, $overwrite);
 		}
 	}
 
 	return $inputs;
 }
-function sd_get_float_input( $type = 'float', $overwrite = array() ) {
+function sd_get_float_input($type = 'float', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                      => __( 'Default', 'ayecode-connect' ),
+		''                                      => __('Default', 'ayecode-connect'),
 		'float' . $device_size . '-start'       => 'left',
 		'float' . $device_size . '-end'         => 'right',
 		'float' . $device_size . '-none' => 'none',
@@ -1909,14 +1909,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Float', 'ayecode-connect' ),
+		'title'    => __('Float', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1927,10 +1927,10 @@ 
  *
  * @return array
  */
-function sd_get_zindex_input( $type = 'zindex', $overwrite = array() ) {
+function sd_get_zindex_input($type = 'zindex', $overwrite = array()) {
 
 	$options = array(
-		''          => __( 'Default', 'ayecode-connect' ),
+		''          => __('Default', 'ayecode-connect'),
 		'zindex-0'  => '0',
 		'zindex-1'  => '1',
 		'zindex-5'  => '5',
@@ -1939,14 +1939,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Z-index', 'ayecode-connect' ),
+		'title'    => __('Z-index', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1957,26 +1957,26 @@ 
  *
  * @return array
  */
-function sd_get_overflow_input( $type = 'overflow', $overwrite = array() ) {
+function sd_get_overflow_input($type = 'overflow', $overwrite = array()) {
 
 	$options = array(
-		''                 => __( 'Default', 'ayecode-connect' ),
-		'overflow-auto'    => __( 'Auto', 'ayecode-connect' ),
-		'overflow-hidden'  => __( 'Hidden', 'ayecode-connect' ),
-		'overflow-visible' => __( 'Visible', 'ayecode-connect' ),
-		'overflow-scroll'  => __( 'Scroll', 'ayecode-connect' ),
+		''                 => __('Default', 'ayecode-connect'),
+		'overflow-auto'    => __('Auto', 'ayecode-connect'),
+		'overflow-hidden'  => __('Hidden', 'ayecode-connect'),
+		'overflow-visible' => __('Visible', 'ayecode-connect'),
+		'overflow-scroll'  => __('Scroll', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Overflow', 'ayecode-connect' ),
+		'title'    => __('Overflow', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1987,19 +1987,19 @@ 
  *
  * @return array
  */
-function sd_get_max_height_input( $type = 'max_height', $overwrite = array() ) {
+function sd_get_max_height_input($type = 'max_height', $overwrite = array()) {
 
 	$defaults = array(
 		'type'        => 'text',
-		'title'       => __( 'Max height', 'ayecode-connect' ),
+		'title'       => __('Max height', 'ayecode-connect'),
 		'value'       => '',
 		'default'     => '',
 		'placeholder' => '',
 		'desc_tip'    => true,
-		'group'       => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'       => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -2010,23 +2010,23 @@ 
  *
  * @return array
  */
-function sd_get_scrollbars_input( $type = 'scrollbars', $overwrite = array() ) {
+function sd_get_scrollbars_input($type = 'scrollbars', $overwrite = array()) {
 
 	$options = array(
-		''               => __( 'Default', 'ayecode-connect' ),
-		'scrollbars-ios' => __( 'IOS Style', 'ayecode-connect' ),
+		''               => __('Default', 'ayecode-connect'),
+		'scrollbars-ios' => __('IOS Style', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Scrollbars', 'ayecode-connect' ),
+		'title'    => __('Scrollbars', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -2039,12 +2039,12 @@ 
  * @return string
  * @todo find best way to use px- py- or general p-
  */
-function sd_build_aui_class( $args ) {
+function sd_build_aui_class($args) {
 	global $aui_bs5;
 
 	$classes = array();
 
-	if ( $aui_bs5 ) {
+	if ($aui_bs5) {
 		$p_ml = 'ms-';
 		$p_mr = 'me-';
 
@@ -2059,254 +2059,254 @@ 
 	}
 
 	// margins.
-	if ( isset( $args['mt'] ) && $args['mt'] !== '' ) {
-		$classes[] = 'mt-' . sanitize_html_class( $args['mt'] );
+	if (isset($args['mt']) && $args['mt'] !== '') {
+		$classes[] = 'mt-' . sanitize_html_class($args['mt']);
 		$mt        = $args['mt'];
 	} else {
 		$mt = null;
 	}
-	if ( isset( $args['mr'] ) && $args['mr'] !== '' ) {
-		$classes[] = $p_mr . sanitize_html_class( $args['mr'] );
+	if (isset($args['mr']) && $args['mr'] !== '') {
+		$classes[] = $p_mr . sanitize_html_class($args['mr']);
 		$mr        = $args['mr'];
 	} else {
 		$mr = null;
 	}
-	if ( isset( $args['mb'] ) && $args['mb'] !== '' ) {
-		$classes[] = 'mb-' . sanitize_html_class( $args['mb'] );
+	if (isset($args['mb']) && $args['mb'] !== '') {
+		$classes[] = 'mb-' . sanitize_html_class($args['mb']);
 		$mb        = $args['mb'];
 	} else {
 		$mb = null;
 	}
-	if ( isset( $args['ml'] ) && $args['ml'] !== '' ) {
-		$classes[] = $p_ml . sanitize_html_class( $args['ml'] );
+	if (isset($args['ml']) && $args['ml'] !== '') {
+		$classes[] = $p_ml . sanitize_html_class($args['ml']);
 		$ml        = $args['ml'];
 	} else {
 		$ml = null;
 	}
 
 	// margins tablet.
-	if ( isset( $args['mt_md'] ) && $args['mt_md'] !== '' ) {
-		$classes[] = 'mt-md-' . sanitize_html_class( $args['mt_md'] );
+	if (isset($args['mt_md']) && $args['mt_md'] !== '') {
+		$classes[] = 'mt-md-' . sanitize_html_class($args['mt_md']);
 		$mt_md     = $args['mt_md'];
 	} else {
 		$mt_md = null;
 	}
-	if ( isset( $args['mr_md'] ) && $args['mr_md'] !== '' ) {
-		$classes[] = $p_mr . 'md-' . sanitize_html_class( $args['mr_md'] );
+	if (isset($args['mr_md']) && $args['mr_md'] !== '') {
+		$classes[] = $p_mr . 'md-' . sanitize_html_class($args['mr_md']);
 		$mt_md     = $args['mr_md'];
 	} else {
 		$mr_md = null;
 	}
-	if ( isset( $args['mb_md'] ) && $args['mb_md'] !== '' ) {
-		$classes[] = 'mb-md-' . sanitize_html_class( $args['mb_md'] );
+	if (isset($args['mb_md']) && $args['mb_md'] !== '') {
+		$classes[] = 'mb-md-' . sanitize_html_class($args['mb_md']);
 		$mt_md     = $args['mb_md'];
 	} else {
 		$mb_md = null;
 	}
-	if ( isset( $args['ml_md'] ) && $args['ml_md'] !== '' ) {
-		$classes[] = $p_ml . 'md-' . sanitize_html_class( $args['ml_md'] );
+	if (isset($args['ml_md']) && $args['ml_md'] !== '') {
+		$classes[] = $p_ml . 'md-' . sanitize_html_class($args['ml_md']);
 		$mt_md     = $args['ml_md'];
 	} else {
 		$ml_md = null;
 	}
 
 	// margins desktop.
-	if ( isset( $args['mt_lg'] ) && $args['mt_lg'] !== '' ) {
-		if ( $mt == null && $mt_md == null ) {
-			$classes[] = 'mt-' . sanitize_html_class( $args['mt_lg'] );
+	if (isset($args['mt_lg']) && $args['mt_lg'] !== '') {
+		if ($mt == null && $mt_md == null) {
+			$classes[] = 'mt-' . sanitize_html_class($args['mt_lg']);
 		} else {
-			$classes[] = 'mt-lg-' . sanitize_html_class( $args['mt_lg'] );
+			$classes[] = 'mt-lg-' . sanitize_html_class($args['mt_lg']);
 		}
 	}
-	if ( isset( $args['mr_lg'] ) && $args['mr_lg'] !== '' ) {
-		if ( $mr == null && $mr_md == null ) {
-			$classes[] = $p_mr . sanitize_html_class( $args['mr_lg'] );
+	if (isset($args['mr_lg']) && $args['mr_lg'] !== '') {
+		if ($mr == null && $mr_md == null) {
+			$classes[] = $p_mr . sanitize_html_class($args['mr_lg']);
 		} else {
-			$classes[] = $p_mr . 'lg-' . sanitize_html_class( $args['mr_lg'] );
+			$classes[] = $p_mr . 'lg-' . sanitize_html_class($args['mr_lg']);
 		}
 	}
-	if ( isset( $args['mb_lg'] ) && $args['mb_lg'] !== '' ) {
-		if ( $mb == null && $mb_md == null ) {
-			$classes[] = 'mb-' . sanitize_html_class( $args['mb_lg'] );
+	if (isset($args['mb_lg']) && $args['mb_lg'] !== '') {
+		if ($mb == null && $mb_md == null) {
+			$classes[] = 'mb-' . sanitize_html_class($args['mb_lg']);
 		} else {
-			$classes[] = 'mb-lg-' . sanitize_html_class( $args['mb_lg'] );
+			$classes[] = 'mb-lg-' . sanitize_html_class($args['mb_lg']);
 		}
 	}
-	if ( isset( $args['ml_lg'] ) && $args['ml_lg'] !== '' ) {
-		if ( $ml == null && $ml_md == null ) {
-			$classes[] = $p_ml . sanitize_html_class( $args['ml_lg'] );
+	if (isset($args['ml_lg']) && $args['ml_lg'] !== '') {
+		if ($ml == null && $ml_md == null) {
+			$classes[] = $p_ml . sanitize_html_class($args['ml_lg']);
 		} else {
-			$classes[] = $p_ml . 'lg-' . sanitize_html_class( $args['ml_lg'] );
+			$classes[] = $p_ml . 'lg-' . sanitize_html_class($args['ml_lg']);
 		}
 	}
 
 	// padding.
-	if ( isset( $args['pt'] ) && $args['pt'] !== '' ) {
-		$classes[] = 'pt-' . sanitize_html_class( $args['pt'] );
+	if (isset($args['pt']) && $args['pt'] !== '') {
+		$classes[] = 'pt-' . sanitize_html_class($args['pt']);
 		$pt        = $args['pt'];
 	} else {
 		$pt = null;
 	}
-	if ( isset( $args['pr'] ) && $args['pr'] !== '' ) {
-		$classes[] = $p_pr . sanitize_html_class( $args['pr'] );
+	if (isset($args['pr']) && $args['pr'] !== '') {
+		$classes[] = $p_pr . sanitize_html_class($args['pr']);
 		$pr        = $args['pr'];
 	} else {
 		$pr = null;
 	}
-	if ( isset( $args['pb'] ) && $args['pb'] !== '' ) {
-		$classes[] = 'pb-' . sanitize_html_class( $args['pb'] );
+	if (isset($args['pb']) && $args['pb'] !== '') {
+		$classes[] = 'pb-' . sanitize_html_class($args['pb']);
 		$pb        = $args['pb'];
 	} else {
 		$pb = null;
 	}
-	if ( isset( $args['pl'] ) && $args['pl'] !== '' ) {
-		$classes[] = $p_pl . sanitize_html_class( $args['pl'] );
+	if (isset($args['pl']) && $args['pl'] !== '') {
+		$classes[] = $p_pl . sanitize_html_class($args['pl']);
 		$pl        = $args['pl'];
 	} else {
 		$pl = null;
 	}
 
 	// padding tablet.
-	if ( isset( $args['pt_md'] ) && $args['pt_md'] !== '' ) {
-		$classes[] = 'pt-md-' . sanitize_html_class( $args['pt_md'] );
+	if (isset($args['pt_md']) && $args['pt_md'] !== '') {
+		$classes[] = 'pt-md-' . sanitize_html_class($args['pt_md']);
 		$pt_md     = $args['pt_md'];
 	} else {
 		$pt_md = null;
 	}
-	if ( isset( $args['pr_md'] ) && $args['pr_md'] !== '' ) {
-		$classes[] = $p_pr . 'md-' . sanitize_html_class( $args['pr_md'] );
+	if (isset($args['pr_md']) && $args['pr_md'] !== '') {
+		$classes[] = $p_pr . 'md-' . sanitize_html_class($args['pr_md']);
 		$pr_md     = $args['pr_md'];
 	} else {
 		$pr_md = null;
 	}
-	if ( isset( $args['pb_md'] ) && $args['pb_md'] !== '' ) {
-		$classes[] = 'pb-md-' . sanitize_html_class( $args['pb_md'] );
+	if (isset($args['pb_md']) && $args['pb_md'] !== '') {
+		$classes[] = 'pb-md-' . sanitize_html_class($args['pb_md']);
 		$pb_md     = $args['pb_md'];
 	} else {
 		$pb_md = null;
 	}
-	if ( isset( $args['pl_md'] ) && $args['pl_md'] !== '' ) {
-		$classes[] = $p_pl . 'md-' . sanitize_html_class( $args['pl_md'] );
+	if (isset($args['pl_md']) && $args['pl_md'] !== '') {
+		$classes[] = $p_pl . 'md-' . sanitize_html_class($args['pl_md']);
 		$pl_md     = $args['pl_md'];
 	} else {
 		$pl_md = null;
 	}
 
 	// padding desktop.
-	if ( isset( $args['pt_lg'] ) && $args['pt_lg'] !== '' ) {
-		if ( $pt == null && $pt_md == null ) {
-			$classes[] = 'pt-' . sanitize_html_class( $args['pt_lg'] );
+	if (isset($args['pt_lg']) && $args['pt_lg'] !== '') {
+		if ($pt == null && $pt_md == null) {
+			$classes[] = 'pt-' . sanitize_html_class($args['pt_lg']);
 		} else {
-			$classes[] = 'pt-lg-' . sanitize_html_class( $args['pt_lg'] );
+			$classes[] = 'pt-lg-' . sanitize_html_class($args['pt_lg']);
 		}
 	}
-	if ( isset( $args['pr_lg'] ) && $args['pr_lg'] !== '' ) {
-		if ( $pr == null && $pr_md == null ) {
-			$classes[] = $p_pr . sanitize_html_class( $args['pr_lg'] );
+	if (isset($args['pr_lg']) && $args['pr_lg'] !== '') {
+		if ($pr == null && $pr_md == null) {
+			$classes[] = $p_pr . sanitize_html_class($args['pr_lg']);
 		} else {
-			$classes[] = $p_pr . 'lg-' . sanitize_html_class( $args['pr_lg'] );
+			$classes[] = $p_pr . 'lg-' . sanitize_html_class($args['pr_lg']);
 		}
 	}
-	if ( isset( $args['pb_lg'] ) && $args['pb_lg'] !== '' ) {
-		if ( $pb == null && $pb_md == null ) {
-			$classes[] = 'pb-' . sanitize_html_class( $args['pb_lg'] );
+	if (isset($args['pb_lg']) && $args['pb_lg'] !== '') {
+		if ($pb == null && $pb_md == null) {
+			$classes[] = 'pb-' . sanitize_html_class($args['pb_lg']);
 		} else {
-			$classes[] = 'pb-lg-' . sanitize_html_class( $args['pb_lg'] );
+			$classes[] = 'pb-lg-' . sanitize_html_class($args['pb_lg']);
 		}
 	}
-	if ( isset( $args['pl_lg'] ) && $args['pl_lg'] !== '' ) {
-		if ( $pl == null && $pl_md == null ) {
-			$classes[] = $p_pl . sanitize_html_class( $args['pl_lg'] );
+	if (isset($args['pl_lg']) && $args['pl_lg'] !== '') {
+		if ($pl == null && $pl_md == null) {
+			$classes[] = $p_pl . sanitize_html_class($args['pl_lg']);
 		} else {
-			$classes[] = $p_pl . 'lg-' . sanitize_html_class( $args['pl_lg'] );
+			$classes[] = $p_pl . 'lg-' . sanitize_html_class($args['pl_lg']);
 		}
 	}
 
 	// row cols, mobile, tablet, desktop
-	if ( ! empty( $args['row_cols'] ) && $args['row_cols'] !== '' ) {
-		$classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols'] );
+	if (!empty($args['row_cols']) && $args['row_cols'] !== '') {
+		$classes[] = sanitize_html_class('row-cols-' . $args['row_cols']);
 		$row_cols  = $args['row_cols'];
 	} else {
 		$row_cols = null;
 	}
-	if ( ! empty( $args['row_cols_md'] ) && $args['row_cols_md'] !== '' ) {
-		$classes[]   = sanitize_html_class( 'row-cols-md-' . $args['row_cols_md'] );
+	if (!empty($args['row_cols_md']) && $args['row_cols_md'] !== '') {
+		$classes[]   = sanitize_html_class('row-cols-md-' . $args['row_cols_md']);
 		$row_cols_md = $args['row_cols_md'];
 	} else {
 		$row_cols_md = null;
 	}
-	if ( ! empty( $args['row_cols_lg'] ) && $args['row_cols_lg'] !== '' ) {
-		if ( $row_cols == null && $row_cols_md == null ) {
-			$classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols_lg'] );
+	if (!empty($args['row_cols_lg']) && $args['row_cols_lg'] !== '') {
+		if ($row_cols == null && $row_cols_md == null) {
+			$classes[] = sanitize_html_class('row-cols-' . $args['row_cols_lg']);
 		} else {
-			$classes[] = sanitize_html_class( 'row-cols-lg-' . $args['row_cols_lg'] );
+			$classes[] = sanitize_html_class('row-cols-lg-' . $args['row_cols_lg']);
 		}
 	}
 
 	// columns , mobile, tablet, desktop
-	if ( ! empty( $args['col'] ) && $args['col'] !== '' ) {
-		$classes[] = sanitize_html_class( 'col-' . $args['col'] );
+	if (!empty($args['col']) && $args['col'] !== '') {
+		$classes[] = sanitize_html_class('col-' . $args['col']);
 		$col       = $args['col'];
 	} else {
 		$col = null;
 	}
-	if ( ! empty( $args['col_md'] ) && $args['col_md'] !== '' ) {
-		$classes[] = sanitize_html_class( 'col-md-' . $args['col_md'] );
+	if (!empty($args['col_md']) && $args['col_md'] !== '') {
+		$classes[] = sanitize_html_class('col-md-' . $args['col_md']);
 		$col_md    = $args['col_md'];
 	} else {
 		$col_md = null;
 	}
-	if ( ! empty( $args['col_lg'] ) && $args['col_lg'] !== '' ) {
-		if ( $col == null && $col_md == null ) {
-			$classes[] = sanitize_html_class( 'col-' . $args['col_lg'] );
+	if (!empty($args['col_lg']) && $args['col_lg'] !== '') {
+		if ($col == null && $col_md == null) {
+			$classes[] = sanitize_html_class('col-' . $args['col_lg']);
 		} else {
-			$classes[] = sanitize_html_class( 'col-lg-' . $args['col_lg'] );
+			$classes[] = sanitize_html_class('col-lg-' . $args['col_lg']);
 		}
 	}
 
 	// border
-	if ( isset( $args['border'] ) && ( $args['border'] == 'none' || $args['border'] === '0' || $args['border'] === 0 ) ) {
+	if (isset($args['border']) && ($args['border'] == 'none' || $args['border'] === '0' || $args['border'] === 0)) {
 		$classes[] = 'border-0';
-	} elseif ( ! empty( $args['border'] ) ) {
+	} elseif (!empty($args['border'])) {
 		$border_class = 'border';
-		if ( ! empty( $args['border_type'] ) && strpos( $args['border_type'], '-0' ) === false ) {
+		if (!empty($args['border_type']) && strpos($args['border_type'], '-0') === false) {
 			$border_class = '';
 		}
-		$classes[] = $border_class . ' border-' . sanitize_html_class( $args['border'] );
+		$classes[] = $border_class . ' border-' . sanitize_html_class($args['border']);
 	}
 
 	// border radius type
-	if ( ! empty( $args['rounded'] ) ) {
-		$classes[] = sanitize_html_class( $args['rounded'] );
+	if (!empty($args['rounded'])) {
+		$classes[] = sanitize_html_class($args['rounded']);
 	}
 
 	// border radius size BS4
-	if ( isset( $args['rounded_size'] ) && in_array( $args['rounded_size'], array( 'sm', 'lg' ) ) ) {
-		$classes[] = 'rounded-' . sanitize_html_class( $args['rounded_size'] );
+	if (isset($args['rounded_size']) && in_array($args['rounded_size'], array('sm', 'lg'))) {
+		$classes[] = 'rounded-' . sanitize_html_class($args['rounded_size']);
 		// if we set a size then we need to remove "rounded" if set
-		if ( ( $key = array_search( 'rounded', $classes ) ) !== false ) {
-			unset( $classes[ $key ] );
+		if (($key = array_search('rounded', $classes)) !== false) {
+			unset($classes[$key]);
 		}
 	} else {
 
 		// border radius size , mobile, tablet, desktop
-		if ( isset( $args['rounded_size'] ) && $args['rounded_size'] !== '' ) {
-			$classes[]    = sanitize_html_class( 'rounded-' . $args['rounded_size'] );
+		if (isset($args['rounded_size']) && $args['rounded_size'] !== '') {
+			$classes[]    = sanitize_html_class('rounded-' . $args['rounded_size']);
 			$rounded_size = $args['rounded_size'];
 		} else {
 			$rounded_size = null;
 		}
-		if ( isset( $args['rounded_size_md'] ) && $args['rounded_size_md'] !== '' ) {
-			$classes[]       = sanitize_html_class( 'rounded-md-' . $args['rounded_size_md'] );
+		if (isset($args['rounded_size_md']) && $args['rounded_size_md'] !== '') {
+			$classes[]       = sanitize_html_class('rounded-md-' . $args['rounded_size_md']);
 			$rounded_size_md = $args['rounded_size_md'];
 		} else {
 			$rounded_size_md = null;
 		}
-		if ( isset( $args['rounded_size_lg'] ) && $args['rounded_size_lg'] !== '' ) {
-			if ( $rounded_size == null && $rounded_size_md == null ) {
-				$classes[] = sanitize_html_class( 'rounded-' . $args['rounded_size_lg'] );
+		if (isset($args['rounded_size_lg']) && $args['rounded_size_lg'] !== '') {
+			if ($rounded_size == null && $rounded_size_md == null) {
+				$classes[] = sanitize_html_class('rounded-' . $args['rounded_size_lg']);
 			} else {
-				$classes[] = sanitize_html_class( 'rounded-lg-' . $args['rounded_size_lg'] );
+				$classes[] = sanitize_html_class('rounded-lg-' . $args['rounded_size_lg']);
 			}
 		}
 	}
@@ -2315,140 +2315,140 @@ 
 	//if ( !empty( $args['shadow'] ) ) { $classes[] = sanitize_html_class($args['shadow']); }
 
 	// background
-	if ( ! empty( $args['bg'] ) ) {
-		$classes[] = 'bg-' . sanitize_html_class( $args['bg'] );
+	if (!empty($args['bg'])) {
+		$classes[] = 'bg-' . sanitize_html_class($args['bg']);
 	}
 
 	// text_color
-	if ( ! empty( $args['text_color'] ) ) {
-		$classes[] = 'text-' . sanitize_html_class( $args['text_color'] );
+	if (!empty($args['text_color'])) {
+		$classes[] = 'text-' . sanitize_html_class($args['text_color']);
 	}
 
 	// text_align
-	if ( ! empty( $args['text_justify'] ) ) {
+	if (!empty($args['text_justify'])) {
 		$classes[] = 'text-justify';
 	} else {
-		if ( ! empty( $args['text_align'] ) ) {
-			$classes[]  = sanitize_html_class( $args['text_align'] );
+		if (!empty($args['text_align'])) {
+			$classes[]  = sanitize_html_class($args['text_align']);
 			$text_align = $args['text_align'];
 		} else {
 			$text_align = null;
 		}
-		if ( ! empty( $args['text_align_md'] ) && $args['text_align_md'] !== '' ) {
-			$classes[]     = sanitize_html_class( $args['text_align_md'] );
+		if (!empty($args['text_align_md']) && $args['text_align_md'] !== '') {
+			$classes[]     = sanitize_html_class($args['text_align_md']);
 			$text_align_md = $args['text_align_md'];
 		} else {
 			$text_align_md = null;
 		}
-		if ( ! empty( $args['text_align_lg'] ) && $args['text_align_lg'] !== '' ) {
-			if ( $text_align == null && $text_align_md == null ) {
-				$classes[] = sanitize_html_class( str_replace( '-lg', '', $args['text_align_lg'] ) );
+		if (!empty($args['text_align_lg']) && $args['text_align_lg'] !== '') {
+			if ($text_align == null && $text_align_md == null) {
+				$classes[] = sanitize_html_class(str_replace('-lg', '', $args['text_align_lg']));
 			} else {
-				$classes[] = sanitize_html_class( $args['text_align_lg'] );
+				$classes[] = sanitize_html_class($args['text_align_lg']);
 			}
 		}
 	}
 
 	// display
-	if ( ! empty( $args['display'] ) ) {
-		$classes[] = sanitize_html_class( $args['display'] );
+	if (!empty($args['display'])) {
+		$classes[] = sanitize_html_class($args['display']);
 		$display   = $args['display'];
 	} else {
 		$display = null;
 	}
-	if ( ! empty( $args['display_md'] ) && $args['display_md'] !== '' ) {
-		$classes[]  = sanitize_html_class( $args['display_md'] );
+	if (!empty($args['display_md']) && $args['display_md'] !== '') {
+		$classes[]  = sanitize_html_class($args['display_md']);
 		$display_md = $args['display_md'];
 	} else {
 		$display_md = null;
 	}
-	if ( ! empty( $args['display_lg'] ) && $args['display_lg'] !== '' ) {
-		if ( $display == null && $display_md == null ) {
-			$classes[] = sanitize_html_class( str_replace( '-lg', '', $args['display_lg'] ) );
+	if (!empty($args['display_lg']) && $args['display_lg'] !== '') {
+		if ($display == null && $display_md == null) {
+			$classes[] = sanitize_html_class(str_replace('-lg', '', $args['display_lg']));
 		} else {
-			$classes[] = sanitize_html_class( $args['display_lg'] );
+			$classes[] = sanitize_html_class($args['display_lg']);
 		}
 	}
 
 	// bgtus - background transparent until scroll
-	if ( ! empty( $args['bgtus'] ) ) {
-		$classes[] = sanitize_html_class( 'bg-transparent-until-scroll' );
+	if (!empty($args['bgtus'])) {
+		$classes[] = sanitize_html_class('bg-transparent-until-scroll');
 	}
 
 	// cscos - change color scheme on scroll
-	if ( ! empty( $args['bgtus'] ) && ! empty( $args['cscos'] ) ) {
-		$classes[] = sanitize_html_class( 'color-scheme-flip-on-scroll' );
+	if (!empty($args['bgtus']) && !empty($args['cscos'])) {
+		$classes[] = sanitize_html_class('color-scheme-flip-on-scroll');
 	}
 
 	// hover animations
-	if ( ! empty( $args['hover_animations'] ) ) {
-		$classes[] = sd_sanitize_html_classes( str_replace( ',', ' ', $args['hover_animations'] ) );
+	if (!empty($args['hover_animations'])) {
+		$classes[] = sd_sanitize_html_classes(str_replace(',', ' ', $args['hover_animations']));
 	}
 
 	// absolute_position
-	if ( ! empty( $args['absolute_position'] ) ) {
-		if ( 'top-left' === $args['absolute_position'] ) {
+	if (!empty($args['absolute_position'])) {
+		if ('top-left' === $args['absolute_position']) {
 			$classes[] = 'start-0 top-0';
-		} elseif ( 'top-center' === $args['absolute_position'] ) {
+		} elseif ('top-center' === $args['absolute_position']) {
 			$classes[] = 'start-50 top-0 translate-middle';
-		} elseif ( 'top-right' === $args['absolute_position'] ) {
+		} elseif ('top-right' === $args['absolute_position']) {
 			$classes[] = 'end-0 top-0';
-		} elseif ( 'center-left' === $args['absolute_position'] ) {
+		} elseif ('center-left' === $args['absolute_position']) {
 			$classes[] = 'start-0 top-50';
-		} elseif ( 'center' === $args['absolute_position'] ) {
+		} elseif ('center' === $args['absolute_position']) {
 			$classes[] = 'start-50 top-50 translate-middle';
-		} elseif ( 'center-right' === $args['absolute_position'] ) {
+		} elseif ('center-right' === $args['absolute_position']) {
 			$classes[] = 'end-0 top-50';
-		} elseif ( 'bottom-left' === $args['absolute_position'] ) {
+		} elseif ('bottom-left' === $args['absolute_position']) {
 			$classes[] = 'start-0 bottom-0';
-		} elseif ( 'bottom-center' === $args['absolute_position'] ) {
+		} elseif ('bottom-center' === $args['absolute_position']) {
 			$classes[] = 'start-50 bottom-0 translate-middle';
-		} elseif ( 'bottom-right' === $args['absolute_position'] ) {
+		} elseif ('bottom-right' === $args['absolute_position']) {
 			$classes[] = 'end-0 bottom-0';
 		}
 	}
 
 	// build classes from build keys
 	$build_keys = sd_get_class_build_keys();
-	if ( ! empty( $build_keys ) ) {
-		foreach ( $build_keys as $key ) {
+	if (!empty($build_keys)) {
+		foreach ($build_keys as $key) {
 
-			if ( substr( $key, -4 ) == '-MTD' ) {
+			if (substr($key, -4) == '-MTD') {
 
-				$k = str_replace( '-MTD', '', $key );
+				$k = str_replace('-MTD', '', $key);
 
 				// Mobile, Tablet, Desktop
-				if ( ! empty( $args[ $k ] ) && $args[ $k ] !== '' ) {
-					$classes[] = sanitize_html_class( $args[ $k ] );
-					$v         = $args[ $k ];
+				if (!empty($args[$k]) && $args[$k] !== '') {
+					$classes[] = sanitize_html_class($args[$k]);
+					$v         = $args[$k];
 				} else {
 					$v = null;
 				}
-				if ( ! empty( $args[ $k . '_md' ] ) && $args[ $k . '_md' ] !== '' ) {
-					$classes[] = sanitize_html_class( $args[ $k . '_md' ] );
-					$v_md      = $args[ $k . '_md' ];
+				if (!empty($args[$k . '_md']) && $args[$k . '_md'] !== '') {
+					$classes[] = sanitize_html_class($args[$k . '_md']);
+					$v_md      = $args[$k . '_md'];
 				} else {
 					$v_md = null;
 				}
-				if ( ! empty( $args[ $k . '_lg' ] ) && $args[ $k . '_lg' ] !== '' ) {
-					if ( $v == null && $v_md == null ) {
-						$classes[] = sanitize_html_class( str_replace( '-lg', '', $args[ $k . '_lg' ] ) );
+				if (!empty($args[$k . '_lg']) && $args[$k . '_lg'] !== '') {
+					if ($v == null && $v_md == null) {
+						$classes[] = sanitize_html_class(str_replace('-lg', '', $args[$k . '_lg']));
 					} else {
-						$classes[] = sanitize_html_class( $args[ $k . '_lg' ] );
+						$classes[] = sanitize_html_class($args[$k . '_lg']);
 					}
 				}
 			} else {
-				if ( $key == 'font_size' && ! empty( $args[ $key ] ) && $args[ $key ] == 'custom' ) {
+				if ($key == 'font_size' && !empty($args[$key]) && $args[$key] == 'custom') {
 					continue;
 				}
-				if ( ! empty( $args[ $key ] ) ) {
-					$classes[] = sd_sanitize_html_classes( $args[ $key ] );
+				if (!empty($args[$key])) {
+					$classes[] = sd_sanitize_html_classes($args[$key]);
 				}
 			}
 		}
 	}
 
-	return implode( ' ', $classes );
+	return implode(' ', $classes);
 }
 
 /**
@@ -2458,19 +2458,19 @@ 
  *
  * @return array
  */
-function sd_build_aui_styles( $args ) {
+function sd_build_aui_styles($args) {
 
 	$styles = array();
 
 	// background color
-	if ( ! empty( $args['bg'] ) && $args['bg'] !== '' ) {
-		if ( $args['bg'] == 'custom-color' ) {
+	if (!empty($args['bg']) && $args['bg'] !== '') {
+		if ($args['bg'] == 'custom-color') {
 			$styles['background-color'] = $args['bg_color'];
-		} elseif ( $args['bg'] == 'custom-gradient' ) {
+		} elseif ($args['bg'] == 'custom-gradient') {
 			$styles['background-image'] = $args['bg_gradient'];
 
 			// use background on text.
-			if ( ! empty( $args['bg_on_text'] ) && $args['bg_on_text'] ) {
+			if (!empty($args['bg_on_text']) && $args['bg_on_text']) {
 				$styles['background-clip']         = 'text';
 				$styles['-webkit-background-clip'] = 'text';
 				$styles['text-fill-color']         = 'transparent';
@@ -2479,67 +2479,67 @@ 
 		}
 	}
 
-	if ( ! empty( $args['bg_image'] ) && $args['bg_image'] !== '' ) {
+	if (!empty($args['bg_image']) && $args['bg_image'] !== '') {
 		$hasImage = true;
-		if ( ! empty( $styles['background-color'] ) && $args['bg'] == 'custom-color' ) {
+		if (!empty($styles['background-color']) && $args['bg'] == 'custom-color') {
 			$styles['background-image']      = 'url(' . $args['bg_image'] . ')';
 			$styles['background-blend-mode'] = 'overlay';
-		} elseif ( ! empty( $styles['background-image'] ) && $args['bg'] == 'custom-gradient' ) {
+		} elseif (!empty($styles['background-image']) && $args['bg'] == 'custom-gradient') {
 			$styles['background-image'] .= ',url(' . $args['bg_image'] . ')';
-		} elseif ( ! empty( $args['bg'] ) && $args['bg'] != '' && $args['bg'] != 'transparent' ) {
+		} elseif (!empty($args['bg']) && $args['bg'] != '' && $args['bg'] != 'transparent') {
 			// do nothing as we alreay have a preset
 			$hasImage = false;
 		} else {
 			$styles['background-image'] = 'url(' . $args['bg_image'] . ')';
 		}
 
-		if ( $hasImage ) {
+		if ($hasImage) {
 			$styles['background-size'] = 'cover';
 
-			if ( ! empty( $args['bg_image_fixed'] ) && $args['bg_image_fixed'] ) {
+			if (!empty($args['bg_image_fixed']) && $args['bg_image_fixed']) {
 				$styles['background-attachment'] = 'fixed';
 			}
 		}
 
-		if ( $hasImage && ! empty( $args['bg_image_xy'] ) && ! empty( $args['bg_image_xy']['x'] ) ) {
-			$styles['background-position'] = ( $args['bg_image_xy']['x'] * 100 ) . '% ' . ( $args['bg_image_xy']['y'] * 100 ) . '%';
+		if ($hasImage && !empty($args['bg_image_xy']) && !empty($args['bg_image_xy']['x'])) {
+			$styles['background-position'] = ($args['bg_image_xy']['x'] * 100) . '% ' . ($args['bg_image_xy']['y'] * 100) . '%';
 		}
 	}
 
 	// sticky offset top
-	if ( ! empty( $args['sticky_offset_top'] ) && $args['sticky_offset_top'] !== '' ) {
-		$styles['top'] = absint( $args['sticky_offset_top'] );
+	if (!empty($args['sticky_offset_top']) && $args['sticky_offset_top'] !== '') {
+		$styles['top'] = absint($args['sticky_offset_top']);
 	}
 
 	// sticky offset bottom
-	if ( ! empty( $args['sticky_offset_bottom'] ) && $args['sticky_offset_bottom'] !== '' ) {
-		$styles['bottom'] = absint( $args['sticky_offset_bottom'] );
+	if (!empty($args['sticky_offset_bottom']) && $args['sticky_offset_bottom'] !== '') {
+		$styles['bottom'] = absint($args['sticky_offset_bottom']);
 	}
 
 	// font size
-	if ( ! empty( $args['font_size_custom'] ) && $args['font_size_custom'] !== '' ) {
+	if (!empty($args['font_size_custom']) && $args['font_size_custom'] !== '') {
 		$styles['font-size'] = (float) $args['font_size_custom'] . 'rem';
 	}
 
 	// font color
-	if ( ! empty( $args['text_color_custom'] ) && $args['text_color_custom'] !== '' ) {
-		$styles['color'] = esc_attr( $args['text_color_custom'] );
+	if (!empty($args['text_color_custom']) && $args['text_color_custom'] !== '') {
+		$styles['color'] = esc_attr($args['text_color_custom']);
 	}
 
 	// font line height
-	if ( ! empty( $args['font_line_height'] ) && $args['font_line_height'] !== '' ) {
-		$styles['line-height'] = esc_attr( $args['font_line_height'] );
+	if (!empty($args['font_line_height']) && $args['font_line_height'] !== '') {
+		$styles['line-height'] = esc_attr($args['font_line_height']);
 	}
 
 	// max height
-	if ( ! empty( $args['max_height'] ) && $args['max_height'] !== '' ) {
-		$styles['max-height'] = esc_attr( $args['max_height'] );
+	if (!empty($args['max_height']) && $args['max_height'] !== '') {
+		$styles['max-height'] = esc_attr($args['max_height']);
 	}
 
 	$style_string = '';
-	if ( ! empty( $styles ) ) {
-		foreach ( $styles as $key => $val ) {
-			$style_string .= esc_attr( $key ) . ':' . esc_attr( $val ) . ';';
+	if (!empty($styles)) {
+		foreach ($styles as $key => $val) {
+			$style_string .= esc_attr($key) . ':' . esc_attr($val) . ';';
 		}
 	}
 
@@ -2555,28 +2555,28 @@ 
  *
  * @return string
  */
-function sd_build_hover_styles( $args, $is_preview = false ) {
+function sd_build_hover_styles($args, $is_preview = false) {
 	$rules = '';
 	// text color
-	if ( ! empty( $args['styleid'] ) ) {
-		$styleid = $is_preview ? 'html .editor-styles-wrapper .' . esc_attr( $args['styleid'] ) : 'html .' . esc_attr( $args['styleid'] );
+	if (!empty($args['styleid'])) {
+		$styleid = $is_preview ? 'html .editor-styles-wrapper .' . esc_attr($args['styleid']) : 'html .' . esc_attr($args['styleid']);
 
 		// text
-		if ( ! empty( $args['text_color_hover'] ) ) {
-			$key    = 'custom' === $args['text_color_hover'] && ! empty( $args['text_color_hover_custom'] ) ? 'text_color_hover_custom' : 'text_color_hover';
-			$color  = sd_get_color_from_var( $args[ $key ] );
+		if (!empty($args['text_color_hover'])) {
+			$key    = 'custom' === $args['text_color_hover'] && !empty($args['text_color_hover_custom']) ? 'text_color_hover_custom' : 'text_color_hover';
+			$color  = sd_get_color_from_var($args[$key]);
 			$rules .= $styleid . ':hover {color: ' . $color . ' !important;} ';
 		}
 
 		// bg
-		if ( ! empty( $args['bg_hover'] ) ) {
-			if ( 'custom-gradient' === $args['bg_hover'] ) {
+		if (!empty($args['bg_hover'])) {
+			if ('custom-gradient' === $args['bg_hover']) {
 				$color  = $args['bg_hover_gradient'];
 				$rules .= $styleid . ':hover {background-image: ' . $color . ' !important;} ';
 				$rules .= $styleid . '.btn:hover {border-color: transparent !important;} ';
 			} else {
 				$key    = 'custom-color' === $args['bg_hover'] ? 'bg_hover_color' : 'bg_hover';
-				$color  = sd_get_color_from_var( $args[ $key ] );
+				$color  = sd_get_color_from_var($args[$key]);
 				$rules .= $styleid . ':hover {background: ' . $color . ' !important;} ';
 				$rules .= $styleid . '.btn:hover {border-color: ' . $color . ' !important;} ';
 			}
@@ -2593,11 +2593,11 @@ 
  *
  * @return mixed|string
  */
-function sd_get_color_from_var( $var ) {
+function sd_get_color_from_var($var) {
 
 	//sanitize_hex_color() @todo this does not cover transparency
-	if ( strpos( $var, '#' ) === false ) {
-		$var = defined( 'BLOCKSTRAP_BLOCKS_VERSION' ) ? 'var(--wp--preset--color--' . esc_attr( $var ) . ')' : 'var(--' . esc_attr( $var ) . ')';
+	if (strpos($var, '#') === false) {
+		$var = defined('BLOCKSTRAP_BLOCKS_VERSION') ? 'var(--wp--preset--color--' . esc_attr($var) . ')' : 'var(--' . esc_attr($var) . ')';
 	}
 
 	return $var;
@@ -2611,16 +2611,16 @@ 
  *
  * @return string
  */
-function sd_sanitize_html_classes( $classes, $sep = ' ' ) {
+function sd_sanitize_html_classes($classes, $sep = ' ') {
 	$return = '';
 
-	if ( ! is_array( $classes ) ) {
-		$classes = explode( $sep, $classes );
+	if (!is_array($classes)) {
+		$classes = explode($sep, $classes);
 	}
 
-	if ( ! empty( $classes ) ) {
-		foreach ( $classes as $class ) {
-			$return .= sanitize_html_class( $class ) . ' ';
+	if (!empty($classes)) {
+		foreach ($classes as $class) {
+			$return .= sanitize_html_class($class) . ' ';
 		}
 	}
 
@@ -2665,7 +2665,7 @@ 
 		'float-MTD'
 	);
 
-	return apply_filters( 'sd_class_build_keys', $keys );
+	return apply_filters('sd_class_build_keys', $keys);
 }
 
 /**
@@ -2676,17 +2676,17 @@ 
  *
  * @return array
  */
-function sd_get_visibility_conditions_input( $type = 'visibility_conditions', $overwrite = array() ) {
+function sd_get_visibility_conditions_input($type = 'visibility_conditions', $overwrite = array()) {
 	$defaults = array(
 		'type'         => 'visibility_conditions',
-		'title'        => __( 'Block Visibility', 'ayecode-connect' ),
-		'button_title' => __( 'Set Block Visibility', 'ayecode-connect' ),
+		'title'        => __('Block Visibility', 'ayecode-connect'),
+		'button_title' => __('Set Block Visibility', 'ayecode-connect'),
 		'default'      => '',
 		'desc_tip'     => true,
-		'group'        => __( 'Visibility Conditions', 'ayecode-connect' ),
+		'group'        => __('Visibility Conditions', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -2699,22 +2699,22 @@ 
  * @param array $exclude An array of roles to exclude from the return array.
  * @return array An array of roles.
  */
-function sd_user_roles_options( $exclude = array() ) {
+function sd_user_roles_options($exclude = array()) {
 	$user_roles = array();
 
-	if ( !function_exists('get_editable_roles') ) {
-		require_once( ABSPATH . '/wp-admin/includes/user.php' );
+	if (!function_exists('get_editable_roles')) {
+		require_once(ABSPATH . '/wp-admin/includes/user.php');
 	}
 
 	$roles = get_editable_roles();
 
-	foreach ( $roles as $role => $data ) {
-		if ( ! ( ! empty( $exclude ) && in_array( $role, $exclude ) ) ) {
-			$user_roles[ esc_attr( $role ) ] = translate_user_role( $data['name'] );
+	foreach ($roles as $role => $data) {
+		if (!(!empty($exclude) && in_array($role, $exclude))) {
+			$user_roles[esc_attr($role)] = translate_user_role($data['name']);
 		}
 	}
 
-	return apply_filters( 'sd_user_roles_options', $user_roles );
+	return apply_filters('sd_user_roles_options', $user_roles);
 }
 
 /**
@@ -2726,17 +2726,17 @@ 
  */
 function sd_visibility_rules_options() {
 	$options = array(
-		'logged_in'  => __( 'Logged In', 'ayecode-connect' ),
-		'logged_out' => __( 'Logged Out', 'ayecode-connect' ),
-		'post_author'  => __( 'Post Author', 'ayecode-connect' ),
-		'user_roles' => __( 'Specific User Roles', 'ayecode-connect' )
+		'logged_in'  => __('Logged In', 'ayecode-connect'),
+		'logged_out' => __('Logged Out', 'ayecode-connect'),
+		'post_author'  => __('Post Author', 'ayecode-connect'),
+		'user_roles' => __('Specific User Roles', 'ayecode-connect')
 	);
 
-	if ( class_exists( 'GeoDirectory' ) ) {
-		$options['gd_field'] = __( 'GD Field', 'ayecode-connect' );
+	if (class_exists('GeoDirectory')) {
+		$options['gd_field'] = __('GD Field', 'ayecode-connect');
 	}
 
-	return apply_filters( 'sd_visibility_rules_options', $options );
+	return apply_filters('sd_visibility_rules_options', $options);
 }
 
 /**
@@ -2745,22 +2745,22 @@ 
  * @return array
  */
 function sd_visibility_gd_field_options() {
-	$fields = geodir_post_custom_fields( '', 'all', 'all', 'none' );
+	$fields = geodir_post_custom_fields('', 'all', 'all', 'none');
 
 	$keys = array();
-	if ( ! empty( $fields ) ) {
-		foreach( $fields as $field ) {
-			if ( apply_filters( 'geodir_badge_field_skip_key', false, $field ) ) {
+	if (!empty($fields)) {
+		foreach ($fields as $field) {
+			if (apply_filters('geodir_badge_field_skip_key', false, $field)) {
 				continue;
 			}
 
-			$keys[ $field['htmlvar_name'] ] = $field['htmlvar_name'] . ' ( ' . __( $field['admin_title'], 'geodirectory' ) . ' )';
+			$keys[$field['htmlvar_name']] = $field['htmlvar_name'] . ' ( ' . __($field['admin_title'], 'geodirectory') . ' )';
 
 			// Extra address fields
-			if ( $field['htmlvar_name'] == 'address' && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
-				foreach ( $address_fields as $_field => $args ) {
-					if ( $_field != 'map_directions' && $_field != 'street' ) {
-						$keys[ $_field ] = $_field . ' ( ' . $args['frontend_title'] . ' )';
+			if ($field['htmlvar_name'] == 'address' && ($address_fields = geodir_post_meta_address_fields(''))) {
+				foreach ($address_fields as $_field => $args) {
+					if ($_field != 'map_directions' && $_field != 'street') {
+						$keys[$_field] = $_field . ' ( ' . $args['frontend_title'] . ' )';
 					}
 				}
 			}
@@ -2769,15 +2769,15 @@ 
 
 	$standard_fields = sd_visibility_gd_standard_field_options();
 
-	if ( ! empty( $standard_fields ) ) {
-		foreach ( $standard_fields as $key => $option ) {
-			$keys[ $key ] = $option;
+	if (!empty($standard_fields)) {
+		foreach ($standard_fields as $key => $option) {
+			$keys[$key] = $option;
 		}
 	}
 
-	$options = apply_filters( 'geodir_badge_field_keys', $keys );
+	$options = apply_filters('geodir_badge_field_keys', $keys);
 
-	return apply_filters( 'sd_visibility_gd_field_options', $options );
+	return apply_filters('sd_visibility_gd_field_options', $options);
 }
 
 /**
@@ -2785,18 +2785,18 @@ 
  *
  * @return array
  */
-function sd_visibility_gd_standard_field_options( $post_type = '' ) {
-	$fields = sd_visibility_gd_standard_fields( $post_type );
+function sd_visibility_gd_standard_field_options($post_type = '') {
+	$fields = sd_visibility_gd_standard_fields($post_type);
 
 	$options = array();
 
-	foreach ( $fields as $key => $field ) {
-		if ( ! empty( $field['frontend_title'] ) ) {
-			$options[ $key ] = $key . ' ( ' . $field['frontend_title'] . ' )';
+	foreach ($fields as $key => $field) {
+		if (!empty($field['frontend_title'])) {
+			$options[$key] = $key . ' ( ' . $field['frontend_title'] . ' )';
 		}
 	}
 
-	return apply_filters( 'sd_visibility_gd_standard_field_options', $options, $fields );
+	return apply_filters('sd_visibility_gd_standard_field_options', $options, $fields);
 }
 
 /**
@@ -2804,18 +2804,18 @@ 
  *
  * @return array
  */
-function sd_visibility_gd_standard_fields( $post_type = '' ) {
-	$standard_fields = geodir_post_meta_standard_fields( $post_type );
+function sd_visibility_gd_standard_fields($post_type = '') {
+	$standard_fields = geodir_post_meta_standard_fields($post_type);
 
 	$fields = array();
 
-	foreach ( $standard_fields as $key => $field ) {
-		if ( $key != 'post_link' && strpos( $key, 'event' ) === false && ! empty( $field['frontend_title'] ) ) {
-			$fields[ $key ] = $field;
+	foreach ($standard_fields as $key => $field) {
+		if ($key != 'post_link' && strpos($key, 'event') === false && !empty($field['frontend_title'])) {
+			$fields[$key] = $field;
 		}
 	}
 
-	return apply_filters( 'sd_visibility_gd_standard_fields', $fields );
+	return apply_filters('sd_visibility_gd_standard_fields', $fields);
 }
 
 /**
@@ -2823,19 +2823,19 @@ 
  *
  * @return array
  */
-function sd_visibility_field_condition_options(){
+function sd_visibility_field_condition_options() {
 	$options = array(
-		'is_empty' => __( 'is empty', 'ayecode-connect' ),
-		'is_not_empty' => __( 'is not empty', 'ayecode-connect' ),
-		'is_equal' => __( 'is equal', 'ayecode-connect' ),
-		'is_not_equal' => __( 'is not equal', 'ayecode-connect' ),
-		'is_greater_than' => __( 'is greater than', 'ayecode-connect' ),
-		'is_less_than' => __( 'is less than', 'ayecode-connect' ),
-		'is_contains' => __( 'is contains', 'ayecode-connect' ),
-		'is_not_contains' => __( 'is not contains', 'ayecode-connect' ),
+		'is_empty' => __('is empty', 'ayecode-connect'),
+		'is_not_empty' => __('is not empty', 'ayecode-connect'),
+		'is_equal' => __('is equal', 'ayecode-connect'),
+		'is_not_equal' => __('is not equal', 'ayecode-connect'),
+		'is_greater_than' => __('is greater than', 'ayecode-connect'),
+		'is_less_than' => __('is less than', 'ayecode-connect'),
+		'is_contains' => __('is contains', 'ayecode-connect'),
+		'is_not_contains' => __('is not contains', 'ayecode-connect'),
 	);
 
-	return apply_filters( 'sd_visibility_field_condition_options', $options );
+	return apply_filters('sd_visibility_field_condition_options', $options);
 }
 
 /**
@@ -2847,13 +2847,13 @@ 
  */
 function sd_visibility_output_options() {
 	$options = array(
-		'hide'          => __( 'Hide Block', 'ayecode-connect' ),
-		'message'       => __( 'Show Custom Message', 'ayecode-connect' ),
-		'page'          => __( 'Show Page Content', 'ayecode-connect' ),
-		'template_part' => __( 'Show Template Part', 'ayecode-connect' ),
+		'hide'          => __('Hide Block', 'ayecode-connect'),
+		'message'       => __('Show Custom Message', 'ayecode-connect'),
+		'page'          => __('Show Page Content', 'ayecode-connect'),
+		'template_part' => __('Show Template Part', 'ayecode-connect'),
 	);
 
-	return apply_filters( 'sd_visibility_output_options', $options );
+	return apply_filters('sd_visibility_output_options', $options);
 }
 
 /**
@@ -2864,46 +2864,46 @@ 
  * @param array $args Array of arguments.
  * @return array Template page options.
  */
-function sd_template_page_options( $args = array() ) {
+function sd_template_page_options($args = array()) {
 	global $sd_tmpl_page_options;
 
-	if ( ! empty( $sd_tmpl_page_options ) ) {
+	if (!empty($sd_tmpl_page_options)) {
 		return $sd_tmpl_page_options;
 	}
 
-	$args = wp_parse_args( $args, array(
+	$args = wp_parse_args($args, array(
 		'child_of'    => 0,
 		'sort_column' => 'post_title',
 		'sort_order'  => 'ASC'
-	) );
+	));
 
 	$exclude_pages = array();
-	if ( $page_on_front = get_option( 'page_on_front' ) ) {
+	if ($page_on_front = get_option('page_on_front')) {
 		$exclude_pages[] = $page_on_front;
 	}
 
-	if ( $page_for_posts = get_option( 'page_for_posts' ) ) {
+	if ($page_for_posts = get_option('page_for_posts')) {
 		$exclude_pages[] = $page_for_posts;
 	}
 
-	if ( ! empty( $exclude_pages ) ) {
+	if (!empty($exclude_pages)) {
 		$args['exclude'] = $exclude_pages;
 	}
 
-	$pages = get_pages( $args );
+	$pages = get_pages($args);
 
-	$options = array( '' => __( 'Select Page...', 'ayecode-connect' ) );
-	if ( ! empty( $pages ) ) {
-		foreach ( $pages as $page ) {
-			if ( ! empty( $page->ID ) && ! empty( $page->post_title ) ) {
-				$options[ $page->ID ] = $page->post_title . ' (#' . $page->ID . ')';
+	$options = array('' => __('Select Page...', 'ayecode-connect'));
+	if (!empty($pages)) {
+		foreach ($pages as $page) {
+			if (!empty($page->ID) && !empty($page->post_title)) {
+				$options[$page->ID] = $page->post_title . ' (#' . $page->ID . ')';
 			}
 		}
 	}
 
 	$sd_tmpl_page_options = $options;
 
-	return apply_filters( 'sd_template_page_options', $options );
+	return apply_filters('sd_template_page_options', $options);
 }
 
 /**
@@ -2914,26 +2914,26 @@ 
  * @param array $args Array of arguments.
  * @return array Template part options.
  */
-function sd_template_part_options( $args = array() ) {
+function sd_template_part_options($args = array()) {
 	global $sd_tmpl_part_options;
 
-	if ( ! empty( $sd_tmpl_part_options ) ) {
+	if (!empty($sd_tmpl_part_options)) {
 		return $sd_tmpl_part_options;
 	}
 
-	$options = array( '' => __( 'Select Template Part...', 'ayecode-connect' ) );
+	$options = array('' => __('Select Template Part...', 'ayecode-connect'));
 
-	$parts = get_block_templates( array(), 'wp_template_part' );
+	$parts = get_block_templates(array(), 'wp_template_part');
 
-	if ( ! empty( $parts ) ) {
-		foreach ( $parts as $part ) {
-			$options[ $part->slug ] = $part->title . ' (#' . $part->slug . ')';
+	if (!empty($parts)) {
+		foreach ($parts as $part) {
+			$options[$part->slug] = $part->title . ' (#' . $part->slug . ')';
 		}
 	}
 
 	$sd_tmpl_part_options = $options;
 
-	return apply_filters( 'sd_template_part_options', $options, $args );
+	return apply_filters('sd_template_part_options', $options, $args);
 }
 
 /**
@@ -2944,26 +2944,26 @@ 
  * @param string $slug Template slug.
  * @return array Template part object.
  */
-function sd_get_template_part_by_slug( $slug ) {
+function sd_get_template_part_by_slug($slug) {
 	global $bs_tmpl_part_by_slug;
 
-	if ( empty( $bs_tmpl_part_by_slug ) ) {
+	if (empty($bs_tmpl_part_by_slug)) {
 		$bs_tmpl_part_by_slug = array();
 	}
 
-	if ( isset( $bs_tmpl_part_by_slug[ $slug ] ) ) {
-		return $bs_tmpl_part_by_slug[ $slug ];
+	if (isset($bs_tmpl_part_by_slug[$slug])) {
+		return $bs_tmpl_part_by_slug[$slug];
 	}
 
-	$template_query = get_block_templates( array( 'slug__in' => array( $slug ) ), 'wp_template_part' );
+	$template_query = get_block_templates(array('slug__in' => array($slug)), 'wp_template_part');
 
-	$query_post = ! empty( $template_query ) ? $template_query[0] : array();
+	$query_post = !empty($template_query) ? $template_query[0] : array();
 
-	$template_part = ! empty( $query_post ) && $query_post->status == 'publish' ? $query_post : array();
+	$template_part = !empty($query_post) && $query_post->status == 'publish' ? $query_post : array();
 
-	$bs_tmpl_part_by_slug[ $slug ] = $template_part;
+	$bs_tmpl_part_by_slug[$slug] = $template_part;
 
-	return apply_filters( 'sd_get_template_part_by_slug', $template_part, $slug );
+	return apply_filters('sd_get_template_part_by_slug', $template_part, $slug);
 }
 
 /**
@@ -2975,25 +2975,25 @@ 
  * @param array    $block         The full block, including name and attributes.
  * @param WP_Block $instance      The block instance.
  */
-function sd_render_block( $block_content, $block, $instance = '' ) {
+function sd_render_block($block_content, $block, $instance = '') {
 	// No block visibility conditions set.
-	if ( empty( $block['attrs']['visibility_conditions'] ) ) {
+	if (empty($block['attrs']['visibility_conditions'])) {
 		return $block_content;
 	}
 
-	$attributes = json_decode( $block['attrs']['visibility_conditions'], true );
-	$rules = ! empty( $attributes ) ? sd_block_parse_rules( $attributes ) : array();
+	$attributes = json_decode($block['attrs']['visibility_conditions'], true);
+	$rules = !empty($attributes) ? sd_block_parse_rules($attributes) : array();
 
 	// No rules set.
-	if ( empty( $rules ) ) {
+	if (empty($rules)) {
 		return $block_content;
 	}
 
 	$_block_content = $block_content;
 
-	if ( ! empty( $rules ) && sd_block_check_rules( $rules ) ) {
-		if ( ! empty( $attributes['output']['type'] ) ) {
-			switch ( $attributes['output']['type'] ) {
+	if (!empty($rules) && sd_block_check_rules($rules)) {
+		if (!empty($attributes['output']['type'])) {
+			switch ($attributes['output']['type']) {
 				case 'hide':
 					$valid_type = true;
 					$content = '';
@@ -3002,11 +3002,11 @@ 
 				case 'message':
 					$valid_type = true;
 
-					if ( isset( $attributes['output']['message'] ) ) {
-						$content = $attributes['output']['message'] != '' ? __( stripslashes( $attributes['output']['message'] ), 'ayecode-connect' ) : $attributes['output']['message'];
+					if (isset($attributes['output']['message'])) {
+						$content = $attributes['output']['message'] != '' ? __(stripslashes($attributes['output']['message']), 'ayecode-connect') : $attributes['output']['message'];
 
-						if ( ! empty( $attributes['output']['message_type'] ) ) {
-							$content = aui()->alert( array(
+						if (!empty($attributes['output']['message_type'])) {
+							$content = aui()->alert(array(
 									'type'=> $attributes['output']['message_type'],
 									'content'=> $content
 								)
@@ -3018,15 +3018,15 @@ 
 				case 'page':
 					$valid_type = true;
 
-					$page_id = ! empty( $attributes['output']['page'] ) ? absint( $attributes['output']['page'] ) : 0;
-					$content = sd_get_page_content( $page_id );
+					$page_id = !empty($attributes['output']['page']) ? absint($attributes['output']['page']) : 0;
+					$content = sd_get_page_content($page_id);
 
 					break;
 				case 'template_part':
 					$valid_type = true;
 
-					$template_part = ! empty( $attributes['output']['template_part'] ) ? $attributes['output']['template_part'] : '';
-					$content = sd_get_template_part_content( $template_part );
+					$template_part = !empty($attributes['output']['template_part']) ? $attributes['output']['template_part'] : '';
+					$content = sd_get_template_part_content($template_part);
 
 					break;
 				default:
@@ -3034,104 +3034,104 @@ 
 					break;
 			}
 
-			if ( $valid_type ) {
-				$block_content = '<div class="' . esc_attr( wp_get_block_default_classname( $instance->name ) ) . ' sd-block-has-rule">' . $content . '</div>';
+			if ($valid_type) {
+				$block_content = '<div class="' . esc_attr(wp_get_block_default_classname($instance->name)) . ' sd-block-has-rule">' . $content . '</div>';
 			}
 		}
 	}
 
-	return apply_filters( 'sd_render_block_visibility_content', $block_content, $_block_content, $attributes, $block, $instance );
+	return apply_filters('sd_render_block_visibility_content', $block_content, $_block_content, $attributes, $block, $instance);
 }
-add_filter( 'render_block', 'sd_render_block', 9, 3 );
+add_filter('render_block', 'sd_render_block', 9, 3);
 
-function sd_get_page_content( $page_id ) {
-	$content = $page_id > 0 ? get_post_field( 'post_content', (int) $page_id ) : '';
+function sd_get_page_content($page_id) {
+	$content = $page_id > 0 ? get_post_field('post_content', (int) $page_id) : '';
 
 	// Maybe bypass content
-	$bypass_content = apply_filters( 'sd_bypass_page_content', '', $content, $page_id );
-	if ( $bypass_content ) {
+	$bypass_content = apply_filters('sd_bypass_page_content', '', $content, $page_id);
+	if ($bypass_content) {
 		return $bypass_content;
 	}
 
 	// Run the shortcodes on the content.
-	$content = do_shortcode( $content );
+	$content = do_shortcode($content);
 
 	// Run block content if its available.
-	if ( function_exists( 'do_blocks' ) ) {
-		$content = do_blocks( $content );
+	if (function_exists('do_blocks')) {
+		$content = do_blocks($content);
 	}
 
-	return apply_filters( 'sd_get_page_content', $content, $page_id );
+	return apply_filters('sd_get_page_content', $content, $page_id);
 }
 
-function sd_get_template_part_content( $template_part ) {
-	$template_part_post = $template_part ? sd_get_template_part_by_slug( $template_part ) : array();
-	$content = ! empty( $template_part_post ) ? $template_part_post->content : '';
+function sd_get_template_part_content($template_part) {
+	$template_part_post = $template_part ? sd_get_template_part_by_slug($template_part) : array();
+	$content = !empty($template_part_post) ? $template_part_post->content : '';
 
 	// Maybe bypass content
-	$bypass_content = apply_filters( 'sd_bypass_template_part_content', '', $content, $template_part );
-	if ( $bypass_content ) {
+	$bypass_content = apply_filters('sd_bypass_template_part_content', '', $content, $template_part);
+	if ($bypass_content) {
 		return $bypass_content;
 	}
 
 	// Run the shortcodes on the content.
-	$content = do_shortcode( $content );
+	$content = do_shortcode($content);
 
 	// Run block content if its available.
-	if ( function_exists( 'do_blocks' ) ) {
-		$content = do_blocks( $content );
+	if (function_exists('do_blocks')) {
+		$content = do_blocks($content);
 	}
 
-	return apply_filters( 'sd_get_template_part_content', $content, $template_part );
+	return apply_filters('sd_get_template_part_content', $content, $template_part);
 }
 
-function sd_block_parse_rules( $attrs ) {
+function sd_block_parse_rules($attrs) {
 	$rules = array();
 
-	if ( ! empty( $attrs ) && is_array( $attrs ) ) {
-		$attrs_keys = array_keys( $attrs );
+	if (!empty($attrs) && is_array($attrs)) {
+		$attrs_keys = array_keys($attrs);
 
-		for ( $i = 1; $i <= count( $attrs_keys ); $i++ ) {
-			if ( ! empty( $attrs[ 'rule' . $i ] ) && is_array( $attrs[ 'rule' . $i ] ) ) {
-				$rules[] = $attrs[ 'rule' . $i ];
+		for ($i = 1; $i <= count($attrs_keys); $i++) {
+			if (!empty($attrs['rule' . $i]) && is_array($attrs['rule' . $i])) {
+				$rules[] = $attrs['rule' . $i];
 			}
 		}
 	}
 
-	return apply_filters( 'sd_block_parse_rules', $rules, $attrs );
+	return apply_filters('sd_block_parse_rules', $rules, $attrs);
 }
 
-function sd_block_check_rules( $rules ) {
-	if ( ! ( is_array( $rules ) && ! empty( $rules ) ) ) {
+function sd_block_check_rules($rules) {
+	if (!(is_array($rules) && !empty($rules))) {
 		return true;
 	}
 
-	foreach ( $rules as $key => $rule ) {
-		$match = apply_filters( 'sd_block_check_rule', true, $rule );
+	foreach ($rules as $key => $rule) {
+		$match = apply_filters('sd_block_check_rule', true, $rule);
 
-		if ( ! $match ) {
+		if (!$match) {
 			break;
 		}
 	}
 
-	return apply_filters( 'sd_block_check_rules', $match, $rules );
+	return apply_filters('sd_block_check_rules', $match, $rules);
 }
 
-function sd_block_check_rule( $match, $rule ) {
+function sd_block_check_rule($match, $rule) {
 	global $post;
 
-	if ( $match && ! empty( $rule['type'] ) ) {
-		switch ( $rule['type'] ) {
+	if ($match && !empty($rule['type'])) {
+		switch ($rule['type']) {
 			case 'logged_in':
 				$match = (bool) is_user_logged_in();
 
 				break;
 			case 'logged_out':
-				$match = ! is_user_logged_in();
+				$match = !is_user_logged_in();
 
 				break;
 			case 'post_author':
-				if ( ! empty( $post ) && $post->post_type != 'page' && ! empty( $post->post_author ) && is_user_logged_in() ) {
+				if (!empty($post) && $post->post_type != 'page' && !empty($post->post_author) && is_user_logged_in()) {
 					$match = (int) $post->post_author === (int) get_current_user_id() ? true : false;
 				} else {
 					$match = false;
@@ -3141,18 +3141,18 @@ 
 			case 'user_roles':
 				$match = false;
 
-				if ( ! empty( $rule['user_roles'] ) ) {
-					$user_roles = is_scalar( $rule['user_roles'] ) ? explode( ",", $rule['user_roles'] ) : $rule['user_roles'];
+				if (!empty($rule['user_roles'])) {
+					$user_roles = is_scalar($rule['user_roles']) ? explode(",", $rule['user_roles']) : $rule['user_roles'];
 
-					if ( is_array( $user_roles ) ) {
-						$user_roles = array_filter( array_map( 'trim', $user_roles ) );
+					if (is_array($user_roles)) {
+						$user_roles = array_filter(array_map('trim', $user_roles));
 					}
 
-					if ( ! empty( $user_roles ) && is_array( $user_roles ) && is_user_logged_in() && ( $current_user = wp_get_current_user() ) ) {
+					if (!empty($user_roles) && is_array($user_roles) && is_user_logged_in() && ($current_user = wp_get_current_user())) {
 						$current_user_roles = $current_user->roles;
 
-						foreach ( $user_roles as $role ) {
-							if ( in_array( $role, $current_user_roles ) ) {
+						foreach ($user_roles as $role) {
+							if (in_array($role, $current_user_roles)) {
 								$match = true;
 							}
 						}
@@ -3161,7 +3161,7 @@ 
 
 				break;
 			case 'gd_field':
-				$match = sd_block_check_rule_gd_field( $rule );
+				$match = sd_block_check_rule_gd_field($rule);
 
 				break;
 		}
@@ -3169,195 +3169,195 @@ 
 
 	return $match;
 }
-add_filter( 'sd_block_check_rule', 'sd_block_check_rule', 10, 2 );
+add_filter('sd_block_check_rule', 'sd_block_check_rule', 10, 2);
 
-function sd_block_check_rule_gd_field( $rule ) {
+function sd_block_check_rule_gd_field($rule) {
 	global $gd_post;
 
 	$match_found = false;
 
-	if ( class_exists( 'GeoDirectory' ) && ! empty( $gd_post->ID ) && ! empty( $rule['field'] ) && ! empty( $rule['condition'] ) ) {
+	if (class_exists('GeoDirectory') && !empty($gd_post->ID) && !empty($rule['field']) && !empty($rule['condition'])) {
 		$args['block_visibility'] = true;
 		$args['key'] = $rule['field'];
 		$args['condition'] = $rule['condition'];
-		$args['search'] = isset( $rule['search'] ) ? $rule['search'] : '';
+		$args['search'] = isset($rule['search']) ? $rule['search'] : '';
 
-		if ( $args['key'] == 'street' ) {
+		if ($args['key'] == 'street') {
 			$args['key'] = 'address';
 		}
 
 		$match_field = $_match_field = $args['key'];
 
-		if ( $match_field == 'address' ) {
+		if ($match_field == 'address') {
 			$match_field = 'street';
-		} elseif ( $match_field == 'post_images' ) {
+		} elseif ($match_field == 'post_images') {
 			$match_field = 'featured_image';
 		}
 
 		$find_post = $gd_post;
-		$find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
+		$find_post_keys = !empty($find_post) ? array_keys((array) $find_post) : array();
 
-		if ( ! empty( $find_post->ID ) && ! in_array( 'post_category', $find_post_keys ) ) {
-			$find_post = geodir_get_post_info( (int) $find_post->ID );
-			$find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
+		if (!empty($find_post->ID) && !in_array('post_category', $find_post_keys)) {
+			$find_post = geodir_get_post_info((int) $find_post->ID);
+			$find_post_keys = !empty($find_post) ? array_keys((array) $find_post) : array();
 		}
 
-		if ( $match_field === '' || ( ! empty( $find_post_keys ) && ( in_array( $match_field, $find_post_keys ) || in_array( $_match_field, $find_post_keys ) ) ) ) {
-			$address_fields = array( 'street2', 'neighbourhood', 'city', 'region', 'country', 'zip', 'latitude', 'longitude' ); // Address fields
+		if ($match_field === '' || (!empty($find_post_keys) && (in_array($match_field, $find_post_keys) || in_array($_match_field, $find_post_keys)))) {
+			$address_fields = array('street2', 'neighbourhood', 'city', 'region', 'country', 'zip', 'latitude', 'longitude'); // Address fields
 			$field = array();
 
 			$standard_fields = sd_visibility_gd_standard_fields();
 
-			if ( $match_field && ! in_array( $match_field, array_keys( $standard_fields ) ) && ! in_array( $match_field, $address_fields ) ) {
-				$package_id = geodir_get_post_package_id( $find_post->ID, $find_post->post_type );
-				$fields = geodir_post_custom_fields( $package_id, 'all', $find_post->post_type, 'none' );
+			if ($match_field && !in_array($match_field, array_keys($standard_fields)) && !in_array($match_field, $address_fields)) {
+				$package_id = geodir_get_post_package_id($find_post->ID, $find_post->post_type);
+				$fields = geodir_post_custom_fields($package_id, 'all', $find_post->post_type, 'none');
 
-				foreach ( $fields as $field_info ) {
-					if ( $match_field == $field_info['htmlvar_name'] ) {
+				foreach ($fields as $field_info) {
+					if ($match_field == $field_info['htmlvar_name']) {
 						$field = $field_info;
 						break;
-					} elseif( $_match_field == $field_info['htmlvar_name'] ) {
+					} elseif ($_match_field == $field_info['htmlvar_name']) {
 						$field = $field_info;
 						break;
 					}
 				}
 
-				if ( empty( $field ) ) {
+				if (empty($field)) {
 					return false;
 				}
 			}
 
 			// Address fields.
-			if ( in_array( $match_field, $address_fields ) && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
-				if ( ! empty( $address_fields[ $match_field ] ) ) {
-					$field = $address_fields[ $match_field ];
+			if (in_array($match_field, $address_fields) && ($address_fields = geodir_post_meta_address_fields(''))) {
+				if (!empty($address_fields[$match_field])) {
+					$field = $address_fields[$match_field];
 				}
-			} else if ( in_array( $match_field, array_keys( $standard_fields ) ) ) {
-				if ( ! empty( $standard_fields[ $match_field ] ) ) {
-					$field = $standard_fields[ $match_field ];
+			} else if (in_array($match_field, array_keys($standard_fields))) {
+				if (!empty($standard_fields[$match_field])) {
+					$field = $standard_fields[$match_field];
 				}
 			}
 
 			// Parse search.
-			$search = sd_gd_field_rule_search( $args['search'], $find_post->post_type, $rule, $field, $find_post );
+			$search = sd_gd_field_rule_search($args['search'], $find_post->post_type, $rule, $field, $find_post);
 
-			$is_date = ( ! empty( $field['type'] ) && $field['type'] == 'datepicker' ) || in_array( $match_field, array( 'post_date', 'post_modified' ) ) ? true : false;
-			$is_date = apply_filters( 'geodir_post_badge_is_date', $is_date, $match_field, $field, $args, $find_post );
+			$is_date = (!empty($field['type']) && $field['type'] == 'datepicker') || in_array($match_field, array('post_date', 'post_modified')) ? true : false;
+			$is_date = apply_filters('geodir_post_badge_is_date', $is_date, $match_field, $field, $args, $find_post);
 
-			$match_value = isset($find_post->{$match_field}) ? esc_attr( trim( $find_post->{$match_field} ) ) : '';
+			$match_value = isset($find_post->{$match_field}) ? esc_attr(trim($find_post->{$match_field} )) : '';
 			$match_found = $match_field === '' ? true : false;
 
-			if ( ! $match_found ) {
-				if ( ( $match_field == 'post_date' || $match_field == 'post_modified' ) && ( empty( $args['condition'] ) || $args['condition'] == 'is_greater_than' || $args['condition'] == 'is_less_than' ) ) {
-					if ( strpos( $search, '+' ) === false && strpos( $search, '-' ) === false ) {
+			if (!$match_found) {
+				if (($match_field == 'post_date' || $match_field == 'post_modified') && (empty($args['condition']) || $args['condition'] == 'is_greater_than' || $args['condition'] == 'is_less_than')) {
+					if (strpos($search, '+') === false && strpos($search, '-') === false) {
 						$search = '+' . $search;
 					}
-					$the_time = $match_field == 'post_modified' ? get_the_modified_date( 'Y-m-d', $find_post ) : get_the_time( 'Y-m-d', $find_post );
-					$until_time = strtotime( $the_time . ' ' . $search . ' days' );
-					$now_time   = strtotime( date_i18n( 'Y-m-d', current_time( 'timestamp' ) ) );
-					if ( ( empty( $args['condition'] ) || $args['condition'] == 'is_less_than' ) && $until_time > $now_time ) {
+					$the_time = $match_field == 'post_modified' ? get_the_modified_date('Y-m-d', $find_post) : get_the_time('Y-m-d', $find_post);
+					$until_time = strtotime($the_time . ' ' . $search . ' days');
+					$now_time   = strtotime(date_i18n('Y-m-d', current_time('timestamp')));
+					if ((empty($args['condition']) || $args['condition'] == 'is_less_than') && $until_time > $now_time) {
 						$match_found = true;
-					} elseif ( $args['condition'] == 'is_greater_than' && $until_time < $now_time ) {
+					} elseif ($args['condition'] == 'is_greater_than' && $until_time < $now_time) {
 						$match_found = true;
 					}
 				} else {
-					switch ( $args['condition'] ) {
+					switch ($args['condition']) {
 						case 'is_equal':
-							$match_found = (bool) ( $search != '' && $match_value == $search );
+							$match_found = (bool) ($search != '' && $match_value == $search);
 							break;
 						case 'is_not_equal':
-							$match_found = (bool) ( $search != '' && $match_value != $search );
+							$match_found = (bool) ($search != '' && $match_value != $search);
 							break;
 						case 'is_greater_than':
-							$match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value > $search );
+							$match_found = (bool) ($search != '' && (is_float($search) || is_numeric($search)) && (is_float($match_value) || is_numeric($match_value)) && $match_value > $search);
 							break;
 						case 'is_less_than':
-							$match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value < $search );
+							$match_found = (bool) ($search != '' && (is_float($search) || is_numeric($search)) && (is_float($match_value) || is_numeric($match_value)) && $match_value < $search);
 							break;
 						case 'is_empty':
-							$match_found = (bool) ( $match_value === '' || $match_value === false || $match_value === '0' || is_null( $match_value ) );
+							$match_found = (bool) ($match_value === '' || $match_value === false || $match_value === '0' || is_null($match_value));
 							break;
 						case 'is_not_empty':
-							$match_found = (bool) ( $match_value !== '' && $match_value !== false && $match_value !== '0' && ! is_null( $match_value ) );
+							$match_found = (bool) ($match_value !== '' && $match_value !== false && $match_value !== '0' && !is_null($match_value));
 							break;
 						case 'is_contains':
-							$match_found = (bool) ( $search != '' && stripos( $match_value, $search ) !== false );
+							$match_found = (bool) ($search != '' && stripos($match_value, $search) !== false);
 							break;
 						case 'is_not_contains':
-							$match_found = (bool) ( $search != '' && stripos( $match_value, $search ) === false );
+							$match_found = (bool) ($search != '' && stripos($match_value, $search) === false);
 							break;
 					}
 				}
 			}
 
-			$match_found = apply_filters( 'geodir_post_badge_check_match_found', $match_found, $args, $find_post );
+			$match_found = apply_filters('geodir_post_badge_check_match_found', $match_found, $args, $find_post);
 		}
 	}
 
 	return $match_found;
 }
 
-function sd_gd_field_rule_search( $search, $post_type, $rule, $field = array(), $gd_post = array() ) {
+function sd_gd_field_rule_search($search, $post_type, $rule, $field = array(), $gd_post = array()) {
 	global $post;
 
-	if ( ! $search ) {
+	if (!$search) {
 		return $search;
 	}
 
 	$orig_search = $search;
-	$_search = strtolower( $search );
+	$_search = strtolower($search);
 
-	if ( ! empty( $rule['field'] ) && $rule['field'] == 'post_author' ) {
-		if ( $search == 'current_user' ) {
+	if (!empty($rule['field']) && $rule['field'] == 'post_author') {
+		if ($search == 'current_user') {
 			$search = is_user_logged_in() ? (int) get_current_user_id() : - 1;
-		} else if ( $search == 'current_author' ) {
-			$search = ( ! empty( $post ) && $post->post_type != 'page' && isset( $post->post_author ) ) ? absint( $post->post_author ) : - 1;
-		}
-	} else if ( $_search == 'date_today' ) {
-		$search = date( 'Y-m-d' );
-	} else if ( $_search == 'date_tomorrow' ) {
-		$search = date( 'Y-m-d', strtotime( "+1 day" ) );
-	} else if ( $_search == 'date_yesterday' ) {
-		$search = date( 'Y-m-d', strtotime( "-1 day" ) );
-	} else if ( $_search == 'time_his' ) {
-		$search = date( 'H:i:s' );
-	} else if ( $_search == 'time_hi' ) {
-		$search = date( 'H:i' );
-	} else if ( $_search == 'datetime_now' ) {
-		$search = date( 'Y-m-d H:i:s' );
-	} else if ( strpos( $_search, 'datetime_after_' ) === 0 ) {
-		$_searches = explode( 'datetime_after_', $_search, 2 );
-
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d H:i:s', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
+		} else if ($search == 'current_author') {
+			$search = (!empty($post) && $post->post_type != 'page' && isset($post->post_author)) ? absint($post->post_author) : - 1;
+		}
+	} else if ($_search == 'date_today') {
+		$search = date('Y-m-d');
+	} else if ($_search == 'date_tomorrow') {
+		$search = date('Y-m-d', strtotime("+1 day"));
+	} else if ($_search == 'date_yesterday') {
+		$search = date('Y-m-d', strtotime("-1 day"));
+	} else if ($_search == 'time_his') {
+		$search = date('H:i:s');
+	} else if ($_search == 'time_hi') {
+		$search = date('H:i');
+	} else if ($_search == 'datetime_now') {
+		$search = date('Y-m-d H:i:s');
+	} else if (strpos($_search, 'datetime_after_') === 0) {
+		$_searches = explode('datetime_after_', $_search, 2);
+
+		if (!empty($_searches[1])) {
+			$search = date('Y-m-d H:i:s', strtotime("+ " . str_replace("_", " ", $_searches[1])));
 		} else {
-			$search = date( 'Y-m-d H:i:s' );
+			$search = date('Y-m-d H:i:s');
 		}
-	} else if ( strpos( $_search, 'datetime_before_' ) === 0 ) {
-		$_searches = explode( 'datetime_before_', $_search, 2 );
+	} else if (strpos($_search, 'datetime_before_') === 0) {
+		$_searches = explode('datetime_before_', $_search, 2);
 
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d H:i:s', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
+		if (!empty($_searches[1])) {
+			$search = date('Y-m-d H:i:s', strtotime("- " . str_replace("_", " ", $_searches[1])));
 		} else {
-			$search = date( 'Y-m-d H:i:s' );
+			$search = date('Y-m-d H:i:s');
 		}
-	} else if ( strpos( $_search, 'date_after_' ) === 0 ) {
-		$_searches = explode( 'date_after_', $_search, 2 );
+	} else if (strpos($_search, 'date_after_') === 0) {
+		$_searches = explode('date_after_', $_search, 2);
 
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
+		if (!empty($_searches[1])) {
+			$search = date('Y-m-d', strtotime("+ " . str_replace("_", " ", $_searches[1])));
 		} else {
-			$search = date( 'Y-m-d' );
+			$search = date('Y-m-d');
 		}
-	} else if ( strpos( $_search, 'date_before_' ) === 0 ) {
-		$_searches = explode( 'date_before_', $_search, 2 );
+	} else if (strpos($_search, 'date_before_') === 0) {
+		$_searches = explode('date_before_', $_search, 2);
 
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
+		if (!empty($_searches[1])) {
+			$search = date('Y-m-d', strtotime("- " . str_replace("_", " ", $_searches[1])));
 		} else {
-			$search = date( 'Y-m-d' );
+			$search = date('Y-m-d');
 		}
 	}
 
-	return apply_filters( 'sd_gd_field_rule_search', $search, $post_type, $rule, $orig_search );
+	return apply_filters('sd_gd_field_rule_search', $search, $post_type, $rule, $orig_search);
 }
\ No newline at end of file

templates/frontend-footer.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 global $aui_bs5;
 ?>
@@ -17,8 +17,8 @@ 
 		<div class="modal-dialog modal-dialog-centered modal-lg" role="checkout" style="max-width: 650px;">
 			<div class="modal-content">
 				<div class="modal-body">
-					<button type="button" class=" btn-close p-2 getpaid-payment-modal-close d-sm-none" data-<?php echo $aui_bs5 ? 'bs-' : ''; ?>dismiss="modal" aria-label="<?php esc_attr__( 'Close', 'invoicing' ); ?>">
-						<?php if ( empty( $aui_bs5 ) ) : ?>
+					<button type="button" class=" btn-close p-2 getpaid-payment-modal-close d-sm-none" data-<?php echo $aui_bs5 ? 'bs-' : ''; ?>dismiss="modal" aria-label="<?php esc_attr__('Close', 'invoicing'); ?>">
+						<?php if (empty($aui_bs5)) : ?>
                             <span aria-hidden="true">×</span>
                         <?php endif; ?>
 					</button>

invoicing.php

Indentation +4 added lines, -4 removed lines

@@ -19,16 +19,16 @@ 
 
 // Define constants.
 if ( ! defined( 'WPINV_PLUGIN_FILE' ) ) {
-	define( 'WPINV_PLUGIN_FILE', __FILE__ );
+    define( 'WPINV_PLUGIN_FILE', __FILE__ );
 }
 
 if ( ! defined( 'WPINV_VERSION' ) ) {
-	define( 'WPINV_VERSION', '2.8.6' );
+    define( 'WPINV_VERSION', '2.8.6' );
 }
 
 // Include the main Invoicing class.
 if ( ! class_exists( 'WPInv_Plugin', false ) ) {
-	require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
+    require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
 }
 
 /**
@@ -43,7 +43,7 @@ 
         $GLOBALS['invoicing'] = new WPInv_Plugin();
     }
 
-	return $GLOBALS['invoicing'];
+    return $GLOBALS['invoicing'];
 }
 
 /**

Spacing +11 added lines, -11 removed lines

@@ -15,20 +15,20 @@ 
  * @package GetPaid
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Define constants.
-if ( ! defined( 'WPINV_PLUGIN_FILE' ) ) {
-	define( 'WPINV_PLUGIN_FILE', __FILE__ );
+if (!defined('WPINV_PLUGIN_FILE')) {
+	define('WPINV_PLUGIN_FILE', __FILE__);
 }
 
-if ( ! defined( 'WPINV_VERSION' ) ) {
-	define( 'WPINV_VERSION', '2.8.6' );
+if (!defined('WPINV_VERSION')) {
+	define('WPINV_VERSION', '2.8.6');
 }
 
 // Include the main Invoicing class.
-if ( ! class_exists( 'WPInv_Plugin', false ) ) {
-	require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
+if (!class_exists('WPInv_Plugin', false)) {
+	require_once plugin_dir_path(WPINV_PLUGIN_FILE) . 'includes/class-wpinv.php';
 }
 
 /**
@@ -39,7 +39,7 @@ 
  */
 function getpaid() {
 
-    if ( empty( $GLOBALS['invoicing'] ) ) {
+    if (empty($GLOBALS['invoicing'])) {
         $GLOBALS['invoicing'] = new WPInv_Plugin();
     }
 
@@ -52,9 +52,9 @@ 
  * @since  2.0.8
  */
 function getpaid_deactivation_hook() {
-    update_option( 'wpinv_flush_permalinks', 1 );
+    update_option('wpinv_flush_permalinks', 1);
 }
-register_deactivation_hook( __FILE__, 'getpaid_deactivation_hook' );
+register_deactivation_hook(__FILE__, 'getpaid_deactivation_hook');
 
 /**
  * @deprecated
@@ -64,4 +64,4 @@ 
 }
 
 // Kickstart the plugin.
-add_action( 'plugins_loaded', 'getpaid', -100 );
+add_action('plugins_loaded', 'getpaid', -100);