AyeCode / invoicing

templates/payment-forms/cart.php

Spacing +18 added lines, -18 removed lines

@@ -7,27 +7,27 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Cart table columns.
 $columns = array(
-    'name'     => __( 'Item', 'invoicing' ),
-    'price'    => __( 'Price', 'invoicing' ),
-    'quantity' => __( 'Quantity', 'invoicing' ),
-    'subtotal' => __( 'Subtotal', 'invoicing' ),
+    'name'     => __('Item', 'invoicing'),
+    'price'    => __('Price', 'invoicing'),
+    'quantity' => __('Quantity', 'invoicing'),
+    'subtotal' => __('Subtotal', 'invoicing'),
 );
 
-if ( ! empty( $form->invoice ) ) {
-    $columns = getpaid_invoice_item_columns( $form->invoice );
+if (!empty($form->invoice)) {
+    $columns = getpaid_invoice_item_columns($form->invoice);
 }
 
-if ( isset( $columns['tax_rate'] ) ) {
-    unset( $columns['tax_rate'] );
+if (isset($columns['tax_rate'])) {
+    unset($columns['tax_rate']);
 }
 
-$columns = apply_filters( 'getpaid_payment_form_cart_table_columns', $columns, $form );
+$columns = apply_filters('getpaid_payment_form_cart_table_columns', $columns, $form);
 
-do_action( 'getpaid_before_payment_form_cart', $form );
+do_action('getpaid_before_payment_form_cart', $form);
 
 ?>
     <div class="getpaid-payment-form-items-cart border form-group">
@@ -35,9 +35,9 @@ 
 
         <div class="getpaid-payment-form-items-cart-header font-weight-bold bg-light border-bottom py-2 px-3">
             <div class="form-row">
-                <?php foreach ( $columns as $key => $label ) : ?>
-                    <div class="<?php echo 'name' == $key ? 'col-12 col-sm-6' : 'col-12 col-sm' ?> getpaid-form-cart-item-<?php echo sanitize_html_class( $key ); ?>">
-                        <?php echo sanitize_text_field( $label ); ?>
+                <?php foreach ($columns as $key => $label) : ?>
+                    <div class="<?php echo 'name' == $key ? 'col-12 col-sm-6' : 'col-12 col-sm' ?> getpaid-form-cart-item-<?php echo sanitize_html_class($key); ?>">
+                        <?php echo sanitize_text_field($label); ?>
                     </div>
                 <?php endforeach; ?>
             </div>
@@ -46,16 +46,16 @@ 
         <?php
 
             // Display the item totals.
-            foreach ( $form->get_items() as $item ) {
-                wpinv_get_template( 'payment-forms/cart-item.php', compact( 'form', 'item', 'columns' ) );
+            foreach ($form->get_items() as $item) {
+                wpinv_get_template('payment-forms/cart-item.php', compact('form', 'item', 'columns'));
             }
 
             // Display the cart totals.
-            wpinv_get_template( 'payment-forms/cart-totals.php', compact( 'form' ) );
+            wpinv_get_template('payment-forms/cart-totals.php', compact('form'));
 
         ?>
     </div>
 
 <?php 
 
-do_action( 'getpaid_after_payment_form_cart', $form );
+do_action('getpaid_after_payment_form_cart', $form);

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

Spacing +381 added lines, -381 removed lines

@@ -12,14 +12,14 @@ 
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 /**
  * Only add if the class does not already exist.
  */
-if ( ! class_exists( 'AyeCode_UI_Settings' ) ) {
+if (!class_exists('AyeCode_UI_Settings')) {
 
 	/**
 	 * A Class to be able to change settings for Font Awesome.
@@ -98,23 +98,23 @@ 
 		 * @return AyeCode_UI_Settings - Main instance.
 		 */
 		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
+			if (!isset(self::$instance) && !(self::$instance instanceof AyeCode_UI_Settings)) {
 
 				self::$instance = new AyeCode_UI_Settings;
 
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+				add_action('init', array(self::$instance, 'init')); // set settings
 
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
+				if (is_admin()) {
+					add_action('admin_menu', array(self::$instance, 'menu_item'));
+					add_action('admin_init', array(self::$instance, 'register_settings'));
 
 					// Maybe show example page
-					add_action( 'template_redirect', array( self::$instance,'maybe_show_examples' ) );
+					add_action('template_redirect', array(self::$instance, 'maybe_show_examples'));
 				}
 
-				add_action( 'customize_register', array( self::$instance, 'customizer_settings' ));
+				add_action('customize_register', array(self::$instance, 'customizer_settings'));
 
-				do_action( 'ayecode_ui_settings_loaded' );
+				do_action('ayecode_ui_settings_loaded');
 			}
 
 			return self::$instance;
@@ -123,7 +123,7 @@ 
 		/**
 		 * Setup some constants.
 		 */
-		public function constants(){
+		public function constants() {
 			define('AUI_PRIMARY_COLOR_ORIGINAL', "#1e73be");
 			define('AUI_SECONDARY_COLOR_ORIGINAL', '#6c757d');
 			if (!defined('AUI_PRIMARY_COLOR')) define('AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL);
@@ -143,25 +143,25 @@ 
 			 *
 			 * We load super early in case there is a theme version that might change the colors
 			 */
-			if ( $this->settings['css'] ) {
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
+			if ($this->settings['css']) {
+				add_action('wp_enqueue_scripts', array($this, 'enqueue_style'), 1);
 			}
-			if ( $this->settings['css_backend'] && $this->load_admin_scripts() ) {
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
+			if ($this->settings['css_backend'] && $this->load_admin_scripts()) {
+				add_action('admin_enqueue_scripts', array($this, 'enqueue_style'), 1);
 			}
 
 			// maybe load JS
-			if ( $this->settings['js'] ) {
+			if ($this->settings['js']) {
 				$priority = $this->is_bs3_compat() ? 100 : 1;
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), $priority );
+				add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), $priority);
 			}
-			if ( $this->settings['js_backend'] && $this->load_admin_scripts() ) {
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 1 );
+			if ($this->settings['js_backend'] && $this->load_admin_scripts()) {
+				add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'), 1);
 			}
 
 			// Maybe set the HTML font size
-			if ( $this->settings['html_font_size'] ) {
-				add_action( 'wp_footer', array( $this, 'html_font_size' ), 10 );
+			if ($this->settings['html_font_size']) {
+				add_action('wp_footer', array($this, 'html_font_size'), 10);
 			}
 
 
@@ -172,14 +172,14 @@ 
 		 *
 		 * @return bool
 		 */
-		public function load_admin_scripts(){
+		public function load_admin_scripts() {
 			$result = true;
 
 			// check if specifically disabled
-			if(!empty($this->settings['disable_admin'])){
-				$url_parts = explode("\n",$this->settings['disable_admin']);
-				foreach($url_parts as $part){
-					if( strpos($_SERVER['REQUEST_URI'], trim($part)) !== false ){
+			if (!empty($this->settings['disable_admin'])) {
+				$url_parts = explode("\n", $this->settings['disable_admin']);
+				foreach ($url_parts as $part) {
+					if (strpos($_SERVER['REQUEST_URI'], trim($part)) !== false) {
 						return false; // return early, no point checking further
 					}
 				}
@@ -191,9 +191,9 @@ 
 		/**
 		 * Add a html font size to the footer.
 		 */
-		public function html_font_size(){
+		public function html_font_size() {
 			$this->settings = $this->get_settings();
-			echo "<style>html{font-size:".absint($this->settings['html_font_size'])."px;}</style>";
+			echo "<style>html{font-size:" . absint($this->settings['html_font_size']) . "px;}</style>";
 		}
 
 		/**
@@ -201,10 +201,10 @@ 
 		 * 
 		 * @return bool
 		 */
-		public function is_aui_screen(){
+		public function is_aui_screen() {
 			$load = false;
 			// check if we should load or not
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// Only enable on set pages
 				$aui_screens = array(
 					'page',
@@ -212,13 +212,13 @@ 
 					'settings_page_ayecode-ui-settings',
 					'appearance_page_gutenberg-widgets'
 				);
-				$screen_ids = apply_filters( 'aui_screen_ids', $aui_screens );
+				$screen_ids = apply_filters('aui_screen_ids', $aui_screens);
 
 				$screen = get_current_screen();
 
 //				echo '###'.$screen->id;
 				
-				if ( $screen && in_array( $screen->id, $screen_ids ) ) {
+				if ($screen && in_array($screen->id, $screen_ids)) {
 					$load = true;
 				}
 			}
@@ -231,25 +231,25 @@ 
 		 */
 		public function enqueue_style() {
 
-			if( is_admin() && !$this->is_aui_screen()){
+			if (is_admin() && !$this->is_aui_screen()) {
 				// don't add wp-admin scripts if not requested to
-			}else{
+			} else {
 				$css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
 
 				$rtl = is_rtl() ? '-rtl' : '';
 
-				if($this->settings[$css_setting]){
-					$compatibility = $this->settings[$css_setting]=='core' ? false : true;
-					$url = $this->settings[$css_setting]=='core' ? $this->url.'assets/css/ayecode-ui'.$rtl.'.css' : $this->url.'assets/css/ayecode-ui-compatibility'.$rtl.'.css';
-					wp_register_style( 'ayecode-ui', $url, array(), $this->latest );
-					wp_enqueue_style( 'ayecode-ui' );
+				if ($this->settings[$css_setting]) {
+					$compatibility = $this->settings[$css_setting] == 'core' ? false : true;
+					$url = $this->settings[$css_setting] == 'core' ? $this->url . 'assets/css/ayecode-ui' . $rtl . '.css' : $this->url . 'assets/css/ayecode-ui-compatibility' . $rtl . '.css';
+					wp_register_style('ayecode-ui', $url, array(), $this->latest);
+					wp_enqueue_style('ayecode-ui');
 
 					// flatpickr
-					wp_register_style( 'flatpickr', $this->url.'assets/css/flatpickr.min.css', array(), $this->latest );
+					wp_register_style('flatpickr', $this->url . 'assets/css/flatpickr.min.css', array(), $this->latest);
 
 
 					// fix some wp-admin issues
-					if(is_admin()){
+					if (is_admin()) {
 						$custom_css = "
                 body{
                     background-color: #f1f1f1;
@@ -295,11 +295,11 @@ 
 						    padding: 0;
 						}
 					";
-						wp_add_inline_style( 'ayecode-ui', $custom_css );
+						wp_add_inline_style('ayecode-ui', $custom_css);
 					}
 
 					// custom changes
-					wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
+					wp_add_inline_style('ayecode-ui', self::custom_css($compatibility));
 
 				}
 			}
@@ -559,7 +559,7 @@ 
 				function aui_init_flatpickr(){
 					if ( typeof jQuery.fn.flatpickr === "function" && !$aui_doing_init_flatpickr) {
 						$aui_doing_init_flatpickr = true;
-						<?php if ( ! empty( $flatpickr_locale ) ) { ?>try{flatpickr.localize(<?php echo $flatpickr_locale; ?>);}catch(err){console.log(err.message);}<?php } ?>
+						<?php if (!empty($flatpickr_locale)) { ?>try{flatpickr.localize(<?php echo $flatpickr_locale; ?>);}catch(err){console.log(err.message);}<?php } ?>
 						jQuery('input[data-aui-init="flatpickr"]:not(.flatpickr-input)').flatpickr();
 					}
 					$aui_doing_init_flatpickr = false;
@@ -989,10 +989,10 @@ 
 			/*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', self::minify_js($output) );
+			), '', self::minify_js($output));
 		}
 
 
@@ -1006,13 +1006,13 @@ 
 			ob_start();
 			?>
 			<script>
-				<?php if( defined( 'FUSION_BUILDER_VERSION' ) ){ ?>
+				<?php if (defined('FUSION_BUILDER_VERSION')) { ?>
 				/* With Avada builder */
 
 				<?php } ?>
 			</script>
 			<?php
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
 			), '', ob_get_clean());
@@ -1023,7 +1023,7 @@ 
 		 *
 		 * If this remains small then its best to use this than to add another JS file.
 		 */
-		public function inline_script_file_browser(){
+		public function inline_script_file_browser() {
 			ob_start();
 			?>
 			<script>
@@ -1038,10 +1038,10 @@ 
 			/*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -1049,50 +1049,50 @@ 
 		 */
 		public function enqueue_scripts() {
 
-			if( is_admin() && !$this->is_aui_screen()){
+			if (is_admin() && !$this->is_aui_screen()) {
 				// don't add wp-admin scripts if not requested to
-			}else {
+			} else {
 
 				$js_setting = current_action() == 'wp_enqueue_scripts' ? 'js' : 'js_backend';
 
 				// select2
-				wp_register_script( 'select2', $this->url . 'assets/js/select2.min.js', array( 'jquery' ), $this->select2_version );
+				wp_register_script('select2', $this->url . 'assets/js/select2.min.js', array('jquery'), $this->select2_version);
 
 				// flatpickr
-				wp_register_script( 'flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->latest );
+				wp_register_script('flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->latest);
 
 				// Bootstrap file browser
-				wp_register_script( 'aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array( 'jquery' ), $this->select2_version );
-				wp_add_inline_script( 'aui-custom-file-input', $this->inline_script_file_browser() );
+				wp_register_script('aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array('jquery'), $this->select2_version);
+				wp_add_inline_script('aui-custom-file-input', $this->inline_script_file_browser());
 
 				$load_inline = false;
 
-				if ( $this->settings[ $js_setting ] == 'core-popper' ) {
+				if ($this->settings[$js_setting] == 'core-popper') {
 					// Bootstrap bundle
 					$url = $this->url . 'assets/js/bootstrap.bundle.min.js';
-					wp_register_script( 'bootstrap-js-bundle', $url, array(
+					wp_register_script('bootstrap-js-bundle', $url, array(
 						'select2',
 						'jquery'
-					), $this->latest, $this->is_bs3_compat() );
+					), $this->latest, $this->is_bs3_compat());
 					// if in admin then add to footer for compatibility.
-					is_admin() ? wp_enqueue_script( 'bootstrap-js-bundle', '', null, null, true ) : wp_enqueue_script( 'bootstrap-js-bundle' );
+					is_admin() ? wp_enqueue_script('bootstrap-js-bundle', '', null, null, true) : wp_enqueue_script('bootstrap-js-bundle');
 					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-js-bundle', $script );
-				} elseif ( $this->settings[ $js_setting ] == 'popper' ) {
+					wp_add_inline_script('bootstrap-js-bundle', $script);
+				} elseif ($this->settings[$js_setting] == 'popper') {
 					$url = $this->url . 'assets/js/popper.min.js';
-					wp_register_script( 'bootstrap-js-popper', $url, array( 'select2', 'jquery' ), $this->latest );
-					wp_enqueue_script( 'bootstrap-js-popper' );
+					wp_register_script('bootstrap-js-popper', $url, array('select2', 'jquery'), $this->latest);
+					wp_enqueue_script('bootstrap-js-popper');
 					$load_inline = true;
 				} else {
 					$load_inline = true;
 				}
 
 				// Load needed inline scripts by faking the loading of a script if the main script is not being loaded
-				if ( $load_inline ) {
-					wp_register_script( 'bootstrap-dummy', '', array( 'select2', 'jquery' ) );
-					wp_enqueue_script( 'bootstrap-dummy' );
+				if ($load_inline) {
+					wp_register_script('bootstrap-dummy', '', array('select2', 'jquery'));
+					wp_enqueue_script('bootstrap-dummy');
 					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-dummy', $script );
+					wp_add_inline_script('bootstrap-dummy', $script);
 				}
 			}
 
@@ -1101,9 +1101,9 @@ 
 		/**
 		 * Enqueue flatpickr if called.
 		 */
-		public function enqueue_flatpickr(){
-			wp_enqueue_style( 'flatpickr' );
-			wp_enqueue_script( 'flatpickr' );
+		public function enqueue_flatpickr() {
+			wp_enqueue_style('flatpickr');
+			wp_enqueue_script('flatpickr');
 		}
 
 		/**
@@ -1115,15 +1115,15 @@ 
 
 			$url = '';
 			// check if we are inside a plugin
-			$file_dir = str_replace( "/includes","", wp_normalize_path( dirname( __FILE__ ) ) );
+			$file_dir = str_replace("/includes", "", wp_normalize_path(dirname(__FILE__)));
 
 			// add check in-case user has changed wp-content dir name.
 			$wp_content_folder_name = basename(WP_CONTENT_DIR);
-			$dir_parts = explode("/$wp_content_folder_name/",$file_dir);
-			$url_parts = explode("/$wp_content_folder_name/",plugins_url());
+			$dir_parts = explode("/$wp_content_folder_name/", $file_dir);
+			$url_parts = explode("/$wp_content_folder_name/", plugins_url());
 
-			if(!empty($url_parts[0]) && !empty($dir_parts[1])){
-				$url = trailingslashit( $url_parts[0]."/$wp_content_folder_name/".$dir_parts[1] );
+			if (!empty($url_parts[0]) && !empty($dir_parts[1])) {
+				$url = trailingslashit($url_parts[0] . "/$wp_content_folder_name/" . $dir_parts[1]);
 			}
 
 			return $url;
@@ -1133,7 +1133,7 @@ 
 		 * Register the database settings with WordPress.
 		 */
 		public function register_settings() {
-			register_setting( 'ayecode-ui-settings', 'ayecode-ui-settings' );
+			register_setting('ayecode-ui-settings', 'ayecode-ui-settings');
 		}
 
 		/**
@@ -1142,10 +1142,10 @@ 
 		 */
 		public function menu_item() {
 			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
+			call_user_func($menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
 				$this,
 				'settings_page'
-			) );
+			));
 		}
 
 		/**
@@ -1153,7 +1153,7 @@ 
 		 *
 		 * @return array
 		 */
-		public function theme_js_settings(){
+		public function theme_js_settings() {
 			return array(
 				'ayetheme' => 'popper',
 				'listimia' => 'required',
@@ -1169,17 +1169,17 @@ 
 		 */
 		public function get_settings() {
 
-			$db_settings = get_option( 'ayecode-ui-settings' );
+			$db_settings = get_option('ayecode-ui-settings');
 			$js_default = 'core-popper';
 			$js_default_backend = $js_default;
 
 			// maybe set defaults (if no settings set)
-			if(empty($db_settings)){
-				$active_theme = strtolower( get_template() ); // active parent theme.
+			if (empty($db_settings)) {
+				$active_theme = strtolower(get_template()); // active parent theme.
 				$theme_js_settings = self::theme_js_settings();
-				if(isset($theme_js_settings[$active_theme])){
+				if (isset($theme_js_settings[$active_theme])) {
 					$js_default = $theme_js_settings[$active_theme];
-					$js_default_backend = isset($theme_js_settings[$active_theme."_backend"]) ? $theme_js_settings[$active_theme."_backend"] : $js_default;
+					$js_default_backend = isset($theme_js_settings[$active_theme . "_backend"]) ? $theme_js_settings[$active_theme . "_backend"] : $js_default;
 				}
 			}
 
@@ -1192,14 +1192,14 @@ 
 				'disable_admin'     =>  '', // URL snippets to disable loading on admin
 			);
 
-			$settings = wp_parse_args( $db_settings, $defaults );
+			$settings = wp_parse_args($db_settings, $defaults);
 
 			/**
 			 * Filter the Bootstrap settings.
 			 *
 			 * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
 			 */
-			return $this->settings = apply_filters( 'ayecode-ui-settings', $settings, $db_settings, $defaults );
+			return $this->settings = apply_filters('ayecode-ui-settings', $settings, $db_settings, $defaults);
 		}
 
 
@@ -1207,90 +1207,90 @@ 
 		 * The settings page html output.
 		 */
 		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'aui' ) );
+			if (!current_user_can('manage_options')) {
+				wp_die(__('You do not have sufficient permissions to access this page.', 'aui'));
 			}
 			?>
 			<div class="wrap">
 				<h1><?php echo $this->name; ?></h1>
-				<p><?php _e("Here you can adjust settings if you are having compatibility issues.",'aui');?></p>
+				<p><?php _e("Here you can adjust settings if you are having compatibility issues.", 'aui'); ?></p>
 				<form method="post" action="options.php">
 					<?php
-					settings_fields( 'ayecode-ui-settings' );
-					do_settings_sections( 'ayecode-ui-settings' );
+					settings_fields('ayecode-ui-settings');
+					do_settings_sections('ayecode-ui-settings');
 					?>
 
-					<h2><?php _e( 'Frontend', 'aui' ); ?></h2>
+					<h2><?php _e('Frontend', 'aui'); ?></h2>
 					<table class="form-table wpbs-table-settings">
 						<tr valign="top">
 							<th scope="row"><label
-									for="wpbs-css"><?php _e( 'Load CSS', 'aui' ); ?></label></th>
+									for="wpbs-css"><?php _e('Load CSS', 'aui'); ?></label></th>
 							<td>
 								<select name="ayecode-ui-settings[css]" id="wpbs-css">
-									<option	value="compatibility" <?php selected( $this->settings['css'], 'compatibility' ); ?>><?php _e( 'Compatibility Mode (default)', 'aui' ); ?></option>
-									<option value="core" <?php selected( $this->settings['css'], 'core' ); ?>><?php _e( 'Full Mode', 'aui' ); ?></option>
-									<option	value="" <?php selected( $this->settings['css'], '' ); ?>><?php _e( 'Disabled', 'aui' ); ?></option>
+									<option	value="compatibility" <?php selected($this->settings['css'], 'compatibility'); ?>><?php _e('Compatibility Mode (default)', 'aui'); ?></option>
+									<option value="core" <?php selected($this->settings['css'], 'core'); ?>><?php _e('Full Mode', 'aui'); ?></option>
+									<option	value="" <?php selected($this->settings['css'], ''); ?>><?php _e('Disabled', 'aui'); ?></option>
 								</select>
 							</td>
 						</tr>
 
 						<tr valign="top">
 							<th scope="row"><label
-									for="wpbs-js"><?php _e( 'Load JS', 'aui' ); ?></label></th>
+									for="wpbs-js"><?php _e('Load JS', 'aui'); ?></label></th>
 							<td>
 								<select name="ayecode-ui-settings[js]" id="wpbs-js">
-									<option	value="core-popper" <?php selected( $this->settings['js'], 'core-popper' ); ?>><?php _e( 'Core + Popper (default)', 'aui' ); ?></option>
-									<option value="popper" <?php selected( $this->settings['js'], 'popper' ); ?>><?php _e( 'Popper', 'aui' ); ?></option>
-									<option value="required" <?php selected( $this->settings['js'], 'required' ); ?>><?php _e( 'Required functions only', 'aui' ); ?></option>
-									<option	value="" <?php selected( $this->settings['js'], '' ); ?>><?php _e( 'Disabled (not recommended)', 'aui' ); ?></option>
+									<option	value="core-popper" <?php selected($this->settings['js'], 'core-popper'); ?>><?php _e('Core + Popper (default)', 'aui'); ?></option>
+									<option value="popper" <?php selected($this->settings['js'], 'popper'); ?>><?php _e('Popper', 'aui'); ?></option>
+									<option value="required" <?php selected($this->settings['js'], 'required'); ?>><?php _e('Required functions only', 'aui'); ?></option>
+									<option	value="" <?php selected($this->settings['js'], ''); ?>><?php _e('Disabled (not recommended)', 'aui'); ?></option>
 								</select>
 							</td>
 						</tr>
 
 						<tr valign="top">
 							<th scope="row"><label
-									for="wpbs-font_size"><?php _e( 'HTML Font Size (px)', 'aui' ); ?></label></th>
+									for="wpbs-font_size"><?php _e('HTML Font Size (px)', 'aui'); ?></label></th>
 							<td>
-								<input type="number" name="ayecode-ui-settings[html_font_size]" id="wpbs-font_size" value="<?php echo absint( $this->settings['html_font_size']); ?>" placeholder="16" />
-								<p class="description" ><?php _e("Our font sizing is rem (responsive based) here you can set the html font size in-case your theme is setting it too low.",'aui');?></p>
+								<input type="number" name="ayecode-ui-settings[html_font_size]" id="wpbs-font_size" value="<?php echo absint($this->settings['html_font_size']); ?>" placeholder="16" />
+								<p class="description" ><?php _e("Our font sizing is rem (responsive based) here you can set the html font size in-case your theme is setting it too low.", 'aui'); ?></p>
 							</td>
 						</tr>
 
 					</table>
 
-					<h2><?php _e( 'Backend', 'aui' ); ?> (wp-admin)</h2>
+					<h2><?php _e('Backend', 'aui'); ?> (wp-admin)</h2>
 					<table class="form-table wpbs-table-settings">
 						<tr valign="top">
 							<th scope="row"><label
-									for="wpbs-css-admin"><?php _e( 'Load CSS', 'aui' ); ?></label></th>
+									for="wpbs-css-admin"><?php _e('Load CSS', 'aui'); ?></label></th>
 							<td>
 								<select name="ayecode-ui-settings[css_backend]" id="wpbs-css-admin">
-									<option	value="compatibility" <?php selected( $this->settings['css_backend'], 'compatibility' ); ?>><?php _e( 'Compatibility Mode (default)', 'aui' ); ?></option>
-									<option value="core" <?php selected( $this->settings['css_backend'], 'core' ); ?>><?php _e( 'Full Mode (will cause style issues)', 'aui' ); ?></option>
-									<option	value="" <?php selected( $this->settings['css_backend'], '' ); ?>><?php _e( 'Disabled', 'aui' ); ?></option>
+									<option	value="compatibility" <?php selected($this->settings['css_backend'], 'compatibility'); ?>><?php _e('Compatibility Mode (default)', 'aui'); ?></option>
+									<option value="core" <?php selected($this->settings['css_backend'], 'core'); ?>><?php _e('Full Mode (will cause style issues)', 'aui'); ?></option>
+									<option	value="" <?php selected($this->settings['css_backend'], ''); ?>><?php _e('Disabled', 'aui'); ?></option>
 								</select>
 							</td>
 						</tr>
 
 						<tr valign="top">
 							<th scope="row"><label
-									for="wpbs-js-admin"><?php _e( 'Load JS', 'aui' ); ?></label></th>
+									for="wpbs-js-admin"><?php _e('Load JS', 'aui'); ?></label></th>
 							<td>
 								<select name="ayecode-ui-settings[js_backend]" id="wpbs-js-admin">
-									<option	value="core-popper" <?php selected( $this->settings['js_backend'], 'core-popper' ); ?>><?php _e( 'Core + Popper (default)', 'aui' ); ?></option>
-									<option value="popper" <?php selected( $this->settings['js_backend'], 'popper' ); ?>><?php _e( 'Popper', 'aui' ); ?></option>
-									<option value="required" <?php selected( $this->settings['js_backend'], 'required' ); ?>><?php _e( 'Required functions only', 'aui' ); ?></option>
-									<option	value="" <?php selected( $this->settings['js_backend'], '' ); ?>><?php _e( 'Disabled (not recommended)', 'aui' ); ?></option>
+									<option	value="core-popper" <?php selected($this->settings['js_backend'], 'core-popper'); ?>><?php _e('Core + Popper (default)', 'aui'); ?></option>
+									<option value="popper" <?php selected($this->settings['js_backend'], 'popper'); ?>><?php _e('Popper', 'aui'); ?></option>
+									<option value="required" <?php selected($this->settings['js_backend'], 'required'); ?>><?php _e('Required functions only', 'aui'); ?></option>
+									<option	value="" <?php selected($this->settings['js_backend'], ''); ?>><?php _e('Disabled (not recommended)', 'aui'); ?></option>
 								</select>
 							</td>
 						</tr>
 
 						<tr valign="top">
 							<th scope="row"><label
-									for="wpbs-disable-admin"><?php _e( 'Disable load on URL', 'aui' ); ?></label></th>
+									for="wpbs-disable-admin"><?php _e('Disable load on URL', 'aui'); ?></label></th>
 							<td>
-								<p><?php _e( 'If you have backend conflict you can enter a partial URL argument that will disable the loading of AUI on those pages. Add each argument on a new line.', 'aui' ); ?></p>
-								<textarea name="ayecode-ui-settings[disable_admin]" rows="10" cols="50" id="wpbs-disable-admin" class="large-text code" spellcheck="false" placeholder="myplugin.php &#10;action=go"><?php echo $this->settings['disable_admin'];?></textarea>
+								<p><?php _e('If you have backend conflict you can enter a partial URL argument that will disable the loading of AUI on those pages. Add each argument on a new line.', 'aui'); ?></p>
+								<textarea name="ayecode-ui-settings[disable_admin]" rows="10" cols="50" id="wpbs-disable-admin" class="large-text code" spellcheck="false" placeholder="myplugin.php &#10;action=go"><?php echo $this->settings['disable_admin']; ?></textarea>
 
 							</td>
 						</tr>
@@ -1308,9 +1308,9 @@ 
 			<?php
 		}
 
-		public function customizer_settings($wp_customize){
+		public function customizer_settings($wp_customize) {
 			$wp_customize->add_section('aui_settings', array(
-				'title'    => __('AyeCode UI','aui'),
+				'title'    => __('AyeCode UI', 'aui'),
 				'priority' => 120,
 			));
 
@@ -1324,8 +1324,8 @@ 
 				'type'              => 'option',
 				'transport'         => 'refresh',
 			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
-				'label'    => __('Primary Color','aui'),
+			$wp_customize->add_control(new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
+				'label'    => __('Primary Color', 'aui'),
 				'section'  => 'aui_settings',
 				'settings' => 'aui_options[color_primary]',
 			)));
@@ -1337,8 +1337,8 @@ 
 				'type'              => 'option',
 				'transport'         => 'refresh',
 			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
-				'label'    => __('Secondary Color','aui'),
+			$wp_customize->add_control(new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
+				'label'    => __('Secondary Color', 'aui'),
 				'section'  => 'aui_settings',
 				'settings' => 'aui_options[color_secondary]',
 			)));
@@ -1364,12 +1364,12 @@ 
 			.collapse.show:not(.in){display: inherit;}
 			.fade.show{opacity: 1;}
 
-			<?php if( defined( 'SVQ_THEME_VERSION' ) ){ ?>
+			<?php if (defined('SVQ_THEME_VERSION')) { ?>
 			/* KLEO theme specific */
 			.kleo-main-header .navbar-collapse.collapse.show:not(.in){display: block !important;}
 			<?php } ?>
 
-			<?php if( defined( 'FUSION_BUILDER_VERSION' ) ){ ?>
+			<?php if (defined('FUSION_BUILDER_VERSION')) { ?>
 			/* With Avada builder */
 			body.modal-open .modal.in  {opacity:1;z-index: 99999}
 			body.modal-open .modal.bsui.in .modal-content  {box-shadow: none;}
@@ -1377,10 +1377,10 @@ 
 			<?php } ?>
 			</style>
 			<?php
-			return str_replace( array(
+			return str_replace(array(
 				'<style>',
 				'</style>'
-			), '', self::minify_css( ob_get_clean() ) );
+			), '', self::minify_css(ob_get_clean()));
 		}
 
 
@@ -1397,16 +1397,16 @@ 
 				<?php
 
 					// BS v3 compat
-					if( self::is_bs3_compat() ){
+					if (self::is_bs3_compat()) {
 					    echo self::bs3_compat_css();
 					}
 
-					if(!is_admin() && $primary_color != AUI_PRIMARY_COLOR_ORIGINAL){
-						echo self::css_primary($primary_color,$compatibility);
+					if (!is_admin() && $primary_color != AUI_PRIMARY_COLOR_ORIGINAL) {
+						echo self::css_primary($primary_color, $compatibility);
 					}
 
-					if(!is_admin() && $secondary_color != AUI_SECONDARY_COLOR_ORIGINAL){
-						echo self::css_secondary($settings['color_secondary'],$compatibility);
+					if (!is_admin() && $secondary_color != AUI_SECONDARY_COLOR_ORIGINAL) {
+						echo self::css_secondary($settings['color_secondary'], $compatibility);
 					}
 
 					// Set admin bar z-index lower when modal is open.
@@ -1419,10 +1419,10 @@ 
 			/*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
+			return str_replace(array(
 				'<style>',
 				'</style>'
-			), '', self::minify_css( ob_get_clean() ) );
+			), '', self::minify_css(ob_get_clean()));
 		}
 
 		/**
@@ -1430,48 +1430,48 @@ 
 		 *
 		 * @return bool
 		 */
-		public static function is_bs3_compat(){
+		public static function is_bs3_compat() {
 			return defined('AYECODE_UI_BS3_COMPAT') || defined('SVQ_THEME_VERSION') || defined('FUSION_BUILDER_VERSION');
 		}
 
-		public static function css_primary($color_code,$compatibility){;
+		public static function css_primary($color_code, $compatibility) {;
 			$color_code = sanitize_hex_color($color_code);
-			if(!$color_code){return '';}
+			if (!$color_code) {return ''; }
 			/**
 			 * c = color, b = background color, o = border-color, f = fill
 			 */
 			$selectors = array(
 				'a' => array('c'),
-				'.btn-primary' => array('b','o'),
-				'.btn-primary.disabled' => array('b','o'),
-				'.btn-primary:disabled' => array('b','o'),
-				'.btn-outline-primary' => array('c','o'),
-				'.btn-outline-primary:hover' => array('b','o'),
-				'.btn-outline-primary:not(:disabled):not(.disabled).active' => array('b','o'),
-				'.btn-outline-primary:not(:disabled):not(.disabled):active' => array('b','o'),
-				'.show>.btn-outline-primary.dropdown-toggle' => array('b','o'),
+				'.btn-primary' => array('b', 'o'),
+				'.btn-primary.disabled' => array('b', 'o'),
+				'.btn-primary:disabled' => array('b', 'o'),
+				'.btn-outline-primary' => array('c', 'o'),
+				'.btn-outline-primary:hover' => array('b', 'o'),
+				'.btn-outline-primary:not(:disabled):not(.disabled).active' => array('b', 'o'),
+				'.btn-outline-primary:not(:disabled):not(.disabled):active' => array('b', 'o'),
+				'.show>.btn-outline-primary.dropdown-toggle' => array('b', 'o'),
 				'.btn-link' => array('c'),
 				'.dropdown-item.active' => array('b'),
-				'.custom-control-input:checked~.custom-control-label::before' => array('b','o'),
-				'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before' => array('b','o'),
+				'.custom-control-input:checked~.custom-control-label::before' => array('b', 'o'),
+				'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before' => array('b', 'o'),
 //				'.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
 //				'.custom-range::-moz-range-thumb' => array('b'),
 //				'.custom-range::-ms-thumb' => array('b'),
 				'.nav-pills .nav-link.active' => array('b'),
 				'.nav-pills .show>.nav-link' => array('b'),
 				'.page-link' => array('c'),
-				'.page-item.active .page-link' => array('b','o'),
+				'.page-item.active .page-link' => array('b', 'o'),
 				'.badge-primary' => array('b'),
-				'.alert-primary' => array('b','o'),
+				'.alert-primary' => array('b', 'o'),
 				'.progress-bar' => array('b'),
-				'.list-group-item.active' => array('b','o'),
-				'.bg-primary' => array('b','f'),
+				'.list-group-item.active' => array('b', 'o'),
+				'.bg-primary' => array('b', 'f'),
 				'.btn-link.btn-primary' => array('c'),
 				'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array('b'),
 			);
 
 			$important_selectors = array(
-				'.bg-primary' => array('b','f'),
+				'.bg-primary' => array('b', 'f'),
 				'.border-primary' => array('o'),
 				'.text-primary' => array('c'),
 			);
@@ -1488,116 +1488,116 @@ 
 			$output = '';
 
 			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
+			foreach ($selectors as $selector => $types) {
+				$selector = $compatibility ? ".bsui " . $selector : $selector;
+				$types = array_combine($types, $types);
+				if (isset($types['c'])) {$color[] = $selector; }
+				if (isset($types['b'])) {$background[] = $selector; }
+				if (isset($types['o'])) {$border[] = $selector; }
+				if (isset($types['f'])) {$fill[] = $selector; }
 			}
 
 			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
+			foreach ($important_selectors as $selector => $types) {
+				$selector = $compatibility ? ".bsui " . $selector : $selector;
+				$types = array_combine($types, $types);
+				if (isset($types['c'])) {$color_i[] = $selector; }
+				if (isset($types['b'])) {$background_i[] = $selector; }
+				if (isset($types['o'])) {$border_i[] = $selector; }
+				if (isset($types['f'])) {$fill_i[] = $selector; }
 			}
 
 			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
+			if (!empty($color)) {
+				$output .= implode(",", $color) . "{color: $color_code;} ";
 			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+			if (!empty($color_i)) {
+				$output .= implode(",", $color_i) . "{color: $color_code !important;} ";
 			}
 
 			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
+			if (!empty($background)) {
+				$output .= implode(",", $background) . "{background-color: $color_code;} ";
 			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+			if (!empty($background_i)) {
+				$output .= implode(",", $background_i) . "{background-color: $color_code !important;} ";
 			}
 
 			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
+			if (!empty($border)) {
+				$output .= implode(",", $border) . "{border-color: $color_code;} ";
 			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+			if (!empty($border_i)) {
+				$output .= implode(",", $border_i) . "{border-color: $color_code !important;} ";
 			}
 
 			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
+			if (!empty($fill)) {
+				$output .= implode(",", $fill) . "{fill: $color_code;} ";
 			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+			if (!empty($fill_i)) {
+				$output .= implode(",", $fill_i) . "{fill: $color_code !important;} ";
 			}
 
 
 			$prefix = $compatibility ? ".bsui " : "";
 
 			// darken
-			$darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
+			$darker_075 = self::css_hex_lighten_darken($color_code, "-0.075");
+			$darker_10 = self::css_hex_lighten_darken($color_code, "-0.10");
+			$darker_125 = self::css_hex_lighten_darken($color_code, "-0.125");
 
 			// lighten
-			$lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
+			$lighten_25 = self::css_hex_lighten_darken($color_code, "0.25");
 
 			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
+			$op_25 = $color_code . "40"; // 25% opacity
 
 
 			// button states
-			$output .= $prefix ." .btn-primary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-			$output .= $prefix ." .btn-outline-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-primary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active, $prefix .btn-primary:not(:disabled):not(.disabled).active, .show>$prefix .btn-primary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-primary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .btn-primary:hover{background-color: " . $darker_075 . ";    border-color: " . $darker_10 . ";} ";
+			$output .= $prefix . " .btn-outline-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-primary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .btn-primary:not(:disabled):not(.disabled):active, $prefix .btn-primary:not(:disabled):not(.disabled).active, .show>$prefix .btn-primary.dropdown-toggle{background-color: " . $darker_10 . ";    border-color: " . $darker_125 . ";} ";
+			$output .= $prefix . " .btn-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-primary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
 
 
 			// dropdown's
-			$output .= $prefix ." .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
+			$output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
 
 
 			// input states
-			$output .= $prefix ." .form-control:focus{border-color: ".$lighten_25.";box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
 
 			// page link
-			$output .= $prefix ." .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
 
 			return $output;
 		}
 
-		public static function css_secondary($color_code,$compatibility){;
+		public static function css_secondary($color_code, $compatibility) {;
 			$color_code = sanitize_hex_color($color_code);
-			if(!$color_code){return '';}
+			if (!$color_code) {return ''; }
 			/**
 			 * c = color, b = background color, o = border-color, f = fill
 			 */
 			$selectors = array(
-				'.btn-secondary' => array('b','o'),
-				'.btn-secondary.disabled' => array('b','o'),
-				'.btn-secondary:disabled' => array('b','o'),
-				'.btn-outline-secondary' => array('c','o'),
-				'.btn-outline-secondary:hover' => array('b','o'),
+				'.btn-secondary' => array('b', 'o'),
+				'.btn-secondary.disabled' => array('b', 'o'),
+				'.btn-secondary:disabled' => array('b', 'o'),
+				'.btn-outline-secondary' => array('c', 'o'),
+				'.btn-outline-secondary:hover' => array('b', 'o'),
 				'.btn-outline-secondary.disabled' => array('c'),
 				'.btn-outline-secondary:disabled' => array('c'),
-				'.btn-outline-secondary:not(:disabled):not(.disabled):active' => array('b','o'),
-				'.btn-outline-secondary:not(:disabled):not(.disabled).active' => array('b','o'),
-				'.btn-outline-secondary.dropdown-toggle' => array('b','o'),
+				'.btn-outline-secondary:not(:disabled):not(.disabled):active' => array('b', 'o'),
+				'.btn-outline-secondary:not(:disabled):not(.disabled).active' => array('b', 'o'),
+				'.btn-outline-secondary.dropdown-toggle' => array('b', 'o'),
 				'.badge-secondary' => array('b'),
-				'.alert-secondary' => array('b','o'),
+				'.alert-secondary' => array('b', 'o'),
 				'.btn-link.btn-secondary' => array('c'),
 			);
 
 			$important_selectors = array(
-				'.bg-secondary' => array('b','f'),
+				'.bg-secondary' => array('b', 'f'),
 				'.border-secondary' => array('o'),
 				'.text-secondary' => array('c'),
 			);
@@ -1614,77 +1614,77 @@ 
 			$output = '';
 
 			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
+			foreach ($selectors as $selector => $types) {
+				$selector = $compatibility ? ".bsui " . $selector : $selector;
+				$types = array_combine($types, $types);
+				if (isset($types['c'])) {$color[] = $selector; }
+				if (isset($types['b'])) {$background[] = $selector; }
+				if (isset($types['o'])) {$border[] = $selector; }
+				if (isset($types['f'])) {$fill[] = $selector; }
 			}
 
 			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
+			foreach ($important_selectors as $selector => $types) {
+				$selector = $compatibility ? ".bsui " . $selector : $selector;
+				$types = array_combine($types, $types);
+				if (isset($types['c'])) {$color_i[] = $selector; }
+				if (isset($types['b'])) {$background_i[] = $selector; }
+				if (isset($types['o'])) {$border_i[] = $selector; }
+				if (isset($types['f'])) {$fill_i[] = $selector; }
 			}
 
 			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
+			if (!empty($color)) {
+				$output .= implode(",", $color) . "{color: $color_code;} ";
 			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+			if (!empty($color_i)) {
+				$output .= implode(",", $color_i) . "{color: $color_code !important;} ";
 			}
 
 			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
+			if (!empty($background)) {
+				$output .= implode(",", $background) . "{background-color: $color_code;} ";
 			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+			if (!empty($background_i)) {
+				$output .= implode(",", $background_i) . "{background-color: $color_code !important;} ";
 			}
 
 			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
+			if (!empty($border)) {
+				$output .= implode(",", $border) . "{border-color: $color_code;} ";
 			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+			if (!empty($border_i)) {
+				$output .= implode(",", $border_i) . "{border-color: $color_code !important;} ";
 			}
 
 			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
+			if (!empty($fill)) {
+				$output .= implode(",", $fill) . "{fill: $color_code;} ";
 			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+			if (!empty($fill_i)) {
+				$output .= implode(",", $fill_i) . "{fill: $color_code !important;} ";
 			}
 
 
 			$prefix = $compatibility ? ".bsui " : "";
 
 			// darken
-			$darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
+			$darker_075 = self::css_hex_lighten_darken($color_code, "-0.075");
+			$darker_10 = self::css_hex_lighten_darken($color_code, "-0.10");
+			$darker_125 = self::css_hex_lighten_darken($color_code, "-0.125");
 
 			// lighten
-			$lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
+			$lighten_25 = self::css_hex_lighten_darken($color_code, "0.25");
 
 			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
+			$op_25 = $color_code . "40"; // 25% opacity
 
 
 			// button states
-			$output .= $prefix ." .btn-secondary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-			$output .= $prefix ." .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-secondary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active, $prefix .btn-secondary:not(:disabled):not(.disabled).active, .show>$prefix .btn-secondary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-secondary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .btn-secondary:hover{background-color: " . $darker_075 . ";    border-color: " . $darker_10 . ";} ";
+			$output .= $prefix . " .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-secondary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .btn-secondary:not(:disabled):not(.disabled):active, $prefix .btn-secondary:not(:disabled):not(.disabled).active, .show>$prefix .btn-secondary.dropdown-toggle{background-color: " . $darker_10 . ";    border-color: " . $darker_125 . ";} ";
+			$output .= $prefix . " .btn-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-secondary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
 
 
 			return $output;
@@ -1720,8 +1720,8 @@ 
 		/**
 		 * Check if we should display examples.
 		 */
-		public function maybe_show_examples(){
-			if(current_user_can('manage_options') && isset($_REQUEST['preview-aui'])){
+		public function maybe_show_examples() {
+			if (current_user_can('manage_options') && isset($_REQUEST['preview-aui'])) {
 				echo "<head>";
 				wp_head();
 				echo "</head>";
@@ -1737,7 +1737,7 @@ 
 		 *
 		 * @return string
 		 */
-		public function get_examples(){
+		public function get_examples() {
 			$output = '';
 
 
@@ -1843,74 +1843,74 @@ 
 		 */
 		public static function calendar_params() {
 			$params = array(
-				'month_long_1' => __( 'January', 'aui' ),
-				'month_long_2' => __( 'February', 'aui' ),
-				'month_long_3' => __( 'March', 'aui' ),
-				'month_long_4' => __( 'April', 'aui' ),
-				'month_long_5' => __( 'May', 'aui' ),
-				'month_long_6' => __( 'June', 'aui' ),
-				'month_long_7' => __( 'July', 'aui' ),
-				'month_long_8' => __( 'August', 'aui' ),
-				'month_long_9' => __( 'September', 'aui' ),
-				'month_long_10' => __( 'October', 'aui' ),
-				'month_long_11' => __( 'November', 'aui' ),
-				'month_long_12' => __( 'December', 'aui' ),
-				'month_s_1' => _x( 'Jan', 'January abbreviation', 'aui' ),
-				'month_s_2' => _x( 'Feb', 'February abbreviation', 'aui' ),
-				'month_s_3' => _x( 'Mar', 'March abbreviation', 'aui' ),
-				'month_s_4' => _x( 'Apr', 'April abbreviation', 'aui' ),
-				'month_s_5' => _x( 'May', 'May abbreviation', 'aui' ),
-				'month_s_6' => _x( 'Jun', 'June abbreviation', 'aui' ),
-				'month_s_7' => _x( 'Jul', 'July abbreviation', 'aui' ),
-				'month_s_8' => _x( 'Aug', 'August abbreviation', 'aui' ),
-				'month_s_9' => _x( 'Sep', 'September abbreviation', 'aui' ),
-				'month_s_10' => _x( 'Oct', 'October abbreviation', 'aui' ),
-				'month_s_11' => _x( 'Nov', 'November abbreviation', 'aui' ),
-				'month_s_12' => _x( 'Dec', 'December abbreviation', 'aui' ),
-				'day_s1_1' => _x( 'S', 'Sunday initial', 'aui' ),
-				'day_s1_2' => _x( 'M', 'Monday initial', 'aui' ),
-				'day_s1_3' => _x( 'T', 'Tuesday initial', 'aui' ),
-				'day_s1_4' => _x( 'W', 'Wednesday initial', 'aui' ),
-				'day_s1_5' => _x( 'T', 'Friday initial', 'aui' ),
-				'day_s1_6' => _x( 'F', 'Thursday initial', 'aui' ),
-				'day_s1_7' => _x( 'S', 'Saturday initial', 'aui' ),
-				'day_s2_1' => __( 'Su', 'aui' ),
-				'day_s2_2' => __( 'Mo', 'aui' ),
-				'day_s2_3' => __( 'Tu', 'aui' ),
-				'day_s2_4' => __( 'We', 'aui' ),
-				'day_s2_5' => __( 'Th', 'aui' ),
-				'day_s2_6' => __( 'Fr', 'aui' ),
-				'day_s2_7' => __( 'Sa', 'aui' ),
-				'day_s3_1' => __( 'Sun', 'aui' ),
-				'day_s3_2' => __( 'Mon', 'aui' ),
-				'day_s3_3' => __( 'Tue', 'aui' ),
-				'day_s3_4' => __( 'Wed', 'aui' ),
-				'day_s3_5' => __( 'Thu', 'aui' ),
-				'day_s3_6' => __( 'Fri', 'aui' ),
-				'day_s3_7' => __( 'Sat', 'aui' ),
-				'day_s5_1' => __( 'Sunday', 'aui' ),
-				'day_s5_2' => __( 'Monday', 'aui' ),
-				'day_s5_3' => __( 'Tuesday', 'aui' ),
-				'day_s5_4' => __( 'Wednesday', 'aui' ),
-				'day_s5_5' => __( 'Thursday', 'aui' ),
-				'day_s5_6' => __( 'Friday', 'aui' ),
-				'day_s5_7' => __( 'Saturday', 'aui' ),
-				'am_lower' => __( 'am', 'aui' ),
-				'pm_lower' => __( 'pm', 'aui' ),
-				'am_upper' => __( 'AM', 'aui' ),
-				'pm_upper' => __( 'PM', 'aui' ),
-				'firstDayOfWeek' => (int) get_option( 'start_of_week' ),
+				'month_long_1' => __('January', 'aui'),
+				'month_long_2' => __('February', 'aui'),
+				'month_long_3' => __('March', 'aui'),
+				'month_long_4' => __('April', 'aui'),
+				'month_long_5' => __('May', 'aui'),
+				'month_long_6' => __('June', 'aui'),
+				'month_long_7' => __('July', 'aui'),
+				'month_long_8' => __('August', 'aui'),
+				'month_long_9' => __('September', 'aui'),
+				'month_long_10' => __('October', 'aui'),
+				'month_long_11' => __('November', 'aui'),
+				'month_long_12' => __('December', 'aui'),
+				'month_s_1' => _x('Jan', 'January abbreviation', 'aui'),
+				'month_s_2' => _x('Feb', 'February abbreviation', 'aui'),
+				'month_s_3' => _x('Mar', 'March abbreviation', 'aui'),
+				'month_s_4' => _x('Apr', 'April abbreviation', 'aui'),
+				'month_s_5' => _x('May', 'May abbreviation', 'aui'),
+				'month_s_6' => _x('Jun', 'June abbreviation', 'aui'),
+				'month_s_7' => _x('Jul', 'July abbreviation', 'aui'),
+				'month_s_8' => _x('Aug', 'August abbreviation', 'aui'),
+				'month_s_9' => _x('Sep', 'September abbreviation', 'aui'),
+				'month_s_10' => _x('Oct', 'October abbreviation', 'aui'),
+				'month_s_11' => _x('Nov', 'November abbreviation', 'aui'),
+				'month_s_12' => _x('Dec', 'December abbreviation', 'aui'),
+				'day_s1_1' => _x('S', 'Sunday initial', 'aui'),
+				'day_s1_2' => _x('M', 'Monday initial', 'aui'),
+				'day_s1_3' => _x('T', 'Tuesday initial', 'aui'),
+				'day_s1_4' => _x('W', 'Wednesday initial', 'aui'),
+				'day_s1_5' => _x('T', 'Friday initial', 'aui'),
+				'day_s1_6' => _x('F', 'Thursday initial', 'aui'),
+				'day_s1_7' => _x('S', 'Saturday initial', 'aui'),
+				'day_s2_1' => __('Su', 'aui'),
+				'day_s2_2' => __('Mo', 'aui'),
+				'day_s2_3' => __('Tu', 'aui'),
+				'day_s2_4' => __('We', 'aui'),
+				'day_s2_5' => __('Th', 'aui'),
+				'day_s2_6' => __('Fr', 'aui'),
+				'day_s2_7' => __('Sa', 'aui'),
+				'day_s3_1' => __('Sun', 'aui'),
+				'day_s3_2' => __('Mon', 'aui'),
+				'day_s3_3' => __('Tue', 'aui'),
+				'day_s3_4' => __('Wed', 'aui'),
+				'day_s3_5' => __('Thu', 'aui'),
+				'day_s3_6' => __('Fri', 'aui'),
+				'day_s3_7' => __('Sat', 'aui'),
+				'day_s5_1' => __('Sunday', 'aui'),
+				'day_s5_2' => __('Monday', 'aui'),
+				'day_s5_3' => __('Tuesday', 'aui'),
+				'day_s5_4' => __('Wednesday', 'aui'),
+				'day_s5_5' => __('Thursday', 'aui'),
+				'day_s5_6' => __('Friday', 'aui'),
+				'day_s5_7' => __('Saturday', 'aui'),
+				'am_lower' => __('am', 'aui'),
+				'pm_lower' => __('pm', 'aui'),
+				'am_upper' => __('AM', 'aui'),
+				'pm_upper' => __('PM', 'aui'),
+				'firstDayOfWeek' => (int) get_option('start_of_week'),
 				'time_24hr' => false,
-				'year' => __( 'Year', 'aui' ),
-				'hour' => __( 'Hour', 'aui' ),
-				'minute' => __( 'Minute', 'aui' ),
-				'weekAbbreviation' => __( 'Wk', 'aui' ),
-				'rangeSeparator' => __( ' to ', 'aui' ),
-				'scrollTitle' => __( 'Scroll to increment', 'aui' ),
-				'toggleTitle' => __( 'Click to toggle', 'aui' )
+				'year' => __('Year', 'aui'),
+				'hour' => __('Hour', 'aui'),
+				'minute' => __('Minute', 'aui'),
+				'weekAbbreviation' => __('Wk', 'aui'),
+				'rangeSeparator' => __(' to ', 'aui'),
+				'scrollTitle' => __('Scroll to increment', 'aui'),
+				'toggleTitle' => __('Click to toggle', 'aui')
 			);
 
-			return apply_filters( 'ayecode_ui_calendar_params', $params );
+			return apply_filters('ayecode_ui_calendar_params', $params);
 		}
 
 		/**
@@ -1923,47 +1923,47 @@ 
 		public static function flatpickr_locale() {
 			$params = self::calendar_params();
 
-			if ( is_string( $params ) ) {
-				$params = html_entity_decode( $params, ENT_QUOTES, 'UTF-8' );
+			if (is_string($params)) {
+				$params = html_entity_decode($params, ENT_QUOTES, 'UTF-8');
 			} else {
-				foreach ( (array) $params as $key => $value ) {
-					if ( ! is_scalar( $value ) ) {
+				foreach ((array) $params as $key => $value) {
+					if (!is_scalar($value)) {
 						continue;
 					}
 
-					$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+					$params[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');
 				}
 			}
 
 			$day_s3 = array();
 			$day_s5 = array();
 
-			for ( $i = 1; $i <= 7; $i ++ ) {
-				$day_s3[] = addslashes( $params[ 'day_s3_' . $i ] );
-				$day_s5[] = addslashes( $params[ 'day_s3_' . $i ] );
+			for ($i = 1; $i <= 7; $i++) {
+				$day_s3[] = addslashes($params['day_s3_' . $i]);
+				$day_s5[] = addslashes($params['day_s3_' . $i]);
 			}
 
 			$month_s = array();
 			$month_long = array();
 
-			for ( $i = 1; $i <= 12; $i ++ ) {
-				$month_s[] = addslashes( $params[ 'month_s_' . $i ] );
-				$month_long[] = addslashes( $params[ 'month_long_' . $i ] );
+			for ($i = 1; $i <= 12; $i++) {
+				$month_s[] = addslashes($params['month_s_' . $i]);
+				$month_long[] = addslashes($params['month_long_' . $i]);
 			}
 
 ob_start();
-if ( 0 ) { ?><script><?php } ?>
+if (0) { ?><script><?php } ?>
 {
 	weekdays: {
-		shorthand: ['<?php echo implode( "','", $day_s3 ); ?>'],
-		longhand: ['<?php echo implode( "','", $day_s5 ); ?>'],
+		shorthand: ['<?php echo implode("','", $day_s3); ?>'],
+		longhand: ['<?php echo implode("','", $day_s5); ?>'],
 	},
 	months: {
-		shorthand: ['<?php echo implode( "','", $month_s ); ?>'],
-		longhand: ['<?php echo implode( "','", $month_long ); ?>'],
+		shorthand: ['<?php echo implode("','", $month_s); ?>'],
+		longhand: ['<?php echo implode("','", $month_long); ?>'],
 	},
 	daysInMonth: [31,28,31,30,31,30,31,31,30,31,30,31],
-	firstDayOfWeek: <?php echo (int) $params[ 'firstDayOfWeek' ]; ?>,
+	firstDayOfWeek: <?php echo (int) $params['firstDayOfWeek']; ?>,
 	ordinal: function (nth) {
 		var s = nth % 100;
 		if (s > 3 && s < 21)
@@ -1979,21 +1979,21 @@ 
 				return "th";
 		}
 	},
-	rangeSeparator: '<?php echo addslashes( $params[ 'rangeSeparator' ] ); ?>',
-	weekAbbreviation: '<?php echo addslashes( $params[ 'weekAbbreviation' ] ); ?>',
-	scrollTitle: '<?php echo addslashes( $params[ 'scrollTitle' ] ); ?>',
-	toggleTitle: '<?php echo addslashes( $params[ 'toggleTitle' ] ); ?>',
-	amPM: ['<?php echo addslashes( $params[ 'am_upper' ] ); ?>','<?php echo addslashes( $params[ 'pm_upper' ] ); ?>'],
-	yearAriaLabel: '<?php echo addslashes( $params[ 'year' ] ); ?>',
-	hourAriaLabel: '<?php echo addslashes( $params[ 'hour' ] ); ?>',
-	minuteAriaLabel: '<?php echo addslashes( $params[ 'minute' ] ); ?>',
-	time_24hr: <?php echo ( $params[ 'time_24hr' ] ? 'true' : 'false' ) ; ?>
+	rangeSeparator: '<?php echo addslashes($params['rangeSeparator']); ?>',
+	weekAbbreviation: '<?php echo addslashes($params['weekAbbreviation']); ?>',
+	scrollTitle: '<?php echo addslashes($params['scrollTitle']); ?>',
+	toggleTitle: '<?php echo addslashes($params['toggleTitle']); ?>',
+	amPM: ['<?php echo addslashes($params['am_upper']); ?>','<?php echo addslashes($params['pm_upper']); ?>'],
+	yearAriaLabel: '<?php echo addslashes($params['year']); ?>',
+	hourAriaLabel: '<?php echo addslashes($params['hour']); ?>',
+	minuteAriaLabel: '<?php echo addslashes($params['minute']); ?>',
+	time_24hr: <?php echo ($params['time_24hr'] ? 'true' : 'false'); ?>
 }
-<?php if ( 0 ) { ?></script><?php } ?>
+<?php if (0) { ?></script><?php } ?>
 <?php
 			$locale = ob_get_clean();
 
-			return apply_filters( 'ayecode_ui_flatpickr_locale', trim( $locale ) );
+			return apply_filters('ayecode_ui_flatpickr_locale', trim($locale));
 		}
 
 		/**
@@ -2005,20 +2005,20 @@ 
 		 */
 		public static function select2_params() {
 			$params = array(
-				'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'aui' ),
-				'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'aui' ),
-				'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'aui' ),
-				'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'aui' ),
-				'i18n_input_too_short_n'    => _x( 'Please enter %item% or more characters', 'enhanced select', 'aui' ),
-				'i18n_input_too_long_1'     => _x( 'Please delete 1 character', 'enhanced select', 'aui' ),
-				'i18n_input_too_long_n'     => _x( 'Please delete %item% characters', 'enhanced select', 'aui' ),
-				'i18n_selection_too_long_1' => _x( 'You can only select 1 item', 'enhanced select', 'aui' ),
-				'i18n_selection_too_long_n' => _x( 'You can only select %item% items', 'enhanced select', 'aui' ),
-				'i18n_load_more'            => _x( 'Loading more results&hellip;', 'enhanced select', 'aui' ),
-				'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'aui' )
+				'i18n_select_state_text'    => esc_attr__('Select an option&hellip;', 'aui'),
+				'i18n_no_matches'           => _x('No matches found', 'enhanced select', 'aui'),
+				'i18n_ajax_error'           => _x('Loading failed', 'enhanced select', 'aui'),
+				'i18n_input_too_short_1'    => _x('Please enter 1 or more characters', 'enhanced select', 'aui'),
+				'i18n_input_too_short_n'    => _x('Please enter %item% or more characters', 'enhanced select', 'aui'),
+				'i18n_input_too_long_1'     => _x('Please delete 1 character', 'enhanced select', 'aui'),
+				'i18n_input_too_long_n'     => _x('Please delete %item% characters', 'enhanced select', 'aui'),
+				'i18n_selection_too_long_1' => _x('You can only select 1 item', 'enhanced select', 'aui'),
+				'i18n_selection_too_long_n' => _x('You can only select %item% items', 'enhanced select', 'aui'),
+				'i18n_load_more'            => _x('Loading more results&hellip;', 'enhanced select', 'aui'),
+				'i18n_searching'            => _x('Searching&hellip;', 'enhanced select', 'aui')
 			);
 
-			return apply_filters( 'ayecode_ui_select2_params', $params );
+			return apply_filters('ayecode_ui_select2_params', $params);
 		}
 
 		/**
@@ -2031,17 +2031,17 @@ 
 		public static function select2_locale() {
 			$params = self::select2_params();
 
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
+			foreach ((array) $params as $key => $value) {
+				if (!is_scalar($value)) {
 					continue;
 				}
 
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+				$params[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');
 			}
 
-			$locale = json_encode( $params );
+			$locale = json_encode($params);
 
-			return apply_filters( 'ayecode_ui_select2_locale', trim( $locale ) );
+			return apply_filters('ayecode_ui_select2_locale', trim($locale));
 		}
 
 		/**
@@ -2054,35 +2054,35 @@ 
 		public static function timeago_locale() {
 			$params = array(
 				'prefix_ago' => '',
-				'suffix_ago' => ' ' . _x( 'ago', 'time ago', 'aui' ),
-				'prefix_after' => _x( 'after', 'time ago', 'aui' ) . ' ',
+				'suffix_ago' => ' ' . _x('ago', 'time ago', 'aui'),
+				'prefix_after' => _x('after', 'time ago', 'aui') . ' ',
 				'suffix_after' => '',
-				'seconds' => _x( 'less than a minute', 'time ago', 'aui' ),
-				'minute' => _x( 'about a minute', 'time ago', 'aui' ),
-				'minutes' => _x( '%d minutes', 'time ago', 'aui' ),
-				'hour' => _x( 'about an hour', 'time ago', 'aui' ),
-				'hours' => _x( 'about %d hours', 'time ago', 'aui' ),
-				'day' => _x( 'a day', 'time ago', 'aui' ),
-				'days' => _x( '%d days', 'time ago', 'aui' ),
-				'month' => _x( 'about a month', 'time ago', 'aui' ),
-				'months' => _x( '%d months', 'time ago', 'aui' ),
-				'year' => _x( 'about a year', 'time ago', 'aui' ),
-				'years' => _x( '%d years', 'time ago', 'aui' ),
+				'seconds' => _x('less than a minute', 'time ago', 'aui'),
+				'minute' => _x('about a minute', 'time ago', 'aui'),
+				'minutes' => _x('%d minutes', 'time ago', 'aui'),
+				'hour' => _x('about an hour', 'time ago', 'aui'),
+				'hours' => _x('about %d hours', 'time ago', 'aui'),
+				'day' => _x('a day', 'time ago', 'aui'),
+				'days' => _x('%d days', 'time ago', 'aui'),
+				'month' => _x('about a month', 'time ago', 'aui'),
+				'months' => _x('%d months', 'time ago', 'aui'),
+				'year' => _x('about a year', 'time ago', 'aui'),
+				'years' => _x('%d years', 'time ago', 'aui'),
 			);
 
-			$params = apply_filters( 'ayecode_ui_timeago_params', $params );
+			$params = apply_filters('ayecode_ui_timeago_params', $params);
 
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
+			foreach ((array) $params as $key => $value) {
+				if (!is_scalar($value)) {
 					continue;
 				}
 
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+				$params[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');
 			}
 
-			$locale = json_encode( $params );
+			$locale = json_encode($params);
 
-			return apply_filters( 'ayecode_ui_timeago_locale', trim( $locale ) );
+			return apply_filters('ayecode_ui_timeago_locale', trim($locale));
 		}
 
 		/**
@@ -2093,7 +2093,7 @@ 
 		 * @return mixed
 		 */
 		public static function minify_js($input) {
-			if(trim($input) === "") return $input;
+			if (trim($input) === "") return $input;
 			return preg_replace(
 				array(
 					// Remove comment(s)
@@ -2125,7 +2125,7 @@ 
 		 * @return mixed
 		 */
 		public static function minify_css($input) {
-			if(trim($input) === "") return $input;
+			if (trim($input) === "") return $input;
 			return preg_replace(
 				array(
 					// Remove comment(s)

Braces +14 added lines, -6 removed lines

@@ -126,8 +126,12 @@ 
 		public function constants(){
 			define('AUI_PRIMARY_COLOR_ORIGINAL', "#1e73be");
 			define('AUI_SECONDARY_COLOR_ORIGINAL', '#6c757d');
-			if (!defined('AUI_PRIMARY_COLOR')) define('AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL);
-			if (!defined('AUI_SECONDARY_COLOR')) define('AUI_SECONDARY_COLOR', AUI_SECONDARY_COLOR_ORIGINAL);
+			if (!defined('AUI_PRIMARY_COLOR')) {
+			    define('AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL);
+			}
+			if (!defined('AUI_SECONDARY_COLOR')) {
+			    define('AUI_SECONDARY_COLOR', AUI_SECONDARY_COLOR_ORIGINAL);
+			}
 		}
 
 		/**
@@ -233,7 +237,7 @@ 
 
 			if( is_admin() && !$this->is_aui_screen()){
 				// don't add wp-admin scripts if not requested to
-			}else{
+			} else{
 				$css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
 
 				$rtl = is_rtl() ? '-rtl' : '';
@@ -1051,7 +1055,7 @@ 
 
 			if( is_admin() && !$this->is_aui_screen()){
 				// don't add wp-admin scripts if not requested to
-			}else {
+			} else {
 
 				$js_setting = current_action() == 'wp_enqueue_scripts' ? 'js' : 'js_backend';
 
@@ -2093,7 +2097,9 @@ 
 		 * @return mixed
 		 */
 		public static function minify_js($input) {
-			if(trim($input) === "") return $input;
+			if(trim($input) === "") {
+			    return $input;
+			}
 			return preg_replace(
 				array(
 					// Remove comment(s)
@@ -2125,7 +2131,9 @@ 
 		 * @return mixed
 		 */
 		public static function minify_css($input) {
-			if(trim($input) === "") return $input;
+			if(trim($input) === "") {
+			    return $input;
+			}
 			return preg_replace(
 				array(
 					// Remove comment(s)

Indentation +1223 added lines, -1223 removed lines

@@ -13,7 +13,7 @@ 
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,236 +21,236 @@ 
  */
 if ( ! class_exists( 'AyeCode_UI_Settings' ) ) {
 
-	/**
-	 * A Class to be able to change settings for Font Awesome.
-	 *
-	 * Class AyeCode_UI_Settings
-	 * @ver 1.0.0
-	 * @todo decide how to implement textdomain
-	 */
-	class AyeCode_UI_Settings {
-
-		/**
-		 * Class version version.
-		 *
-		 * @var string
-		 */
-		public $version = '0.1.49';
-
-		/**
-		 * Class textdomain.
-		 *
-		 * @var string
-		 */
-		public $textdomain = 'aui';
-
-		/**
-		 * Latest version of Bootstrap at time of publish published.
-		 *
-		 * @var string
-		 */
-		public $latest = "4.5.3";
-
-		/**
-		 * Current version of select2 being used.
-		 *
-		 * @var string
-		 */
-		public $select2_version = "4.0.11";
-
-		/**
-		 * The title.
-		 *
-		 * @var string
-		 */
-		public $name = 'AyeCode UI';
-
-		/**
-		 * The relative url to the assets.
-		 *
-		 * @var string
-		 */
-		public $url = '';
-
-		/**
-		 * Holds the settings values.
-		 *
-		 * @var array
-		 */
-		private $settings;
-
-		/**
-		 * AyeCode_UI_Settings instance.
-		 *
-		 * @access private
-		 * @since  1.0.0
-		 * @var    AyeCode_UI_Settings There can be only one!
-		 */
-		private static $instance = null;
-
-		/**
-		 * Main AyeCode_UI_Settings Instance.
-		 *
-		 * Ensures only one instance of AyeCode_UI_Settings is loaded or can be loaded.
-		 *
-		 * @since 1.0.0
-		 * @static
-		 * @return AyeCode_UI_Settings - Main instance.
-		 */
-		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
-
-				self::$instance = new AyeCode_UI_Settings;
-
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
-
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
-
-					// Maybe show example page
-					add_action( 'template_redirect', array( self::$instance,'maybe_show_examples' ) );
-				}
-
-				add_action( 'customize_register', array( self::$instance, 'customizer_settings' ));
-
-				do_action( 'ayecode_ui_settings_loaded' );
-			}
-
-			return self::$instance;
-		}
-
-		/**
-		 * Setup some constants.
-		 */
-		public function constants(){
-			define('AUI_PRIMARY_COLOR_ORIGINAL', "#1e73be");
-			define('AUI_SECONDARY_COLOR_ORIGINAL', '#6c757d');
-			if (!defined('AUI_PRIMARY_COLOR')) define('AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL);
-			if (!defined('AUI_SECONDARY_COLOR')) define('AUI_SECONDARY_COLOR', AUI_SECONDARY_COLOR_ORIGINAL);
-		}
-
-		/**
-		 * Initiate the settings and add the required action hooks.
-		 */
-		public function init() {
-			$this->constants();
-			$this->settings = $this->get_settings();
-			$this->url = $this->get_url();
-
-			/**
-			 * Maybe load CSS
-			 *
-			 * We load super early in case there is a theme version that might change the colors
-			 */
-			if ( $this->settings['css'] ) {
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
-			}
-			if ( $this->settings['css_backend'] && $this->load_admin_scripts() ) {
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
-			}
-
-			// maybe load JS
-			if ( $this->settings['js'] ) {
-				$priority = $this->is_bs3_compat() ? 100 : 1;
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), $priority );
-			}
-			if ( $this->settings['js_backend'] && $this->load_admin_scripts() ) {
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 1 );
-			}
-
-			// Maybe set the HTML font size
-			if ( $this->settings['html_font_size'] ) {
-				add_action( 'wp_footer', array( $this, 'html_font_size' ), 10 );
-			}
-
-
-		}
-
-		/**
-		 * Check if we should load the admin scripts or not.
-		 *
-		 * @return bool
-		 */
-		public function load_admin_scripts(){
-			$result = true;
-
-			// check if specifically disabled
-			if(!empty($this->settings['disable_admin'])){
-				$url_parts = explode("\n",$this->settings['disable_admin']);
-				foreach($url_parts as $part){
-					if( strpos($_SERVER['REQUEST_URI'], trim($part)) !== false ){
-						return false; // return early, no point checking further
-					}
-				}
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Add a html font size to the footer.
-		 */
-		public function html_font_size(){
-			$this->settings = $this->get_settings();
-			echo "<style>html{font-size:".absint($this->settings['html_font_size'])."px;}</style>";
-		}
+    /**
+     * A Class to be able to change settings for Font Awesome.
+     *
+     * Class AyeCode_UI_Settings
+     * @ver 1.0.0
+     * @todo decide how to implement textdomain
+     */
+    class AyeCode_UI_Settings {
+
+        /**
+         * Class version version.
+         *
+         * @var string
+         */
+        public $version = '0.1.49';
+
+        /**
+         * Class textdomain.
+         *
+         * @var string
+         */
+        public $textdomain = 'aui';
+
+        /**
+         * Latest version of Bootstrap at time of publish published.
+         *
+         * @var string
+         */
+        public $latest = "4.5.3";
+
+        /**
+         * Current version of select2 being used.
+         *
+         * @var string
+         */
+        public $select2_version = "4.0.11";
+
+        /**
+         * The title.
+         *
+         * @var string
+         */
+        public $name = 'AyeCode UI';
+
+        /**
+         * The relative url to the assets.
+         *
+         * @var string
+         */
+        public $url = '';
+
+        /**
+         * Holds the settings values.
+         *
+         * @var array
+         */
+        private $settings;
+
+        /**
+         * AyeCode_UI_Settings instance.
+         *
+         * @access private
+         * @since  1.0.0
+         * @var    AyeCode_UI_Settings There can be only one!
+         */
+        private static $instance = null;
+
+        /**
+         * Main AyeCode_UI_Settings Instance.
+         *
+         * Ensures only one instance of AyeCode_UI_Settings is loaded or can be loaded.
+         *
+         * @since 1.0.0
+         * @static
+         * @return AyeCode_UI_Settings - Main instance.
+         */
+        public static function instance() {
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
+
+                self::$instance = new AyeCode_UI_Settings;
+
+                add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+
+                if ( is_admin() ) {
+                    add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
+                    add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
+
+                    // Maybe show example page
+                    add_action( 'template_redirect', array( self::$instance,'maybe_show_examples' ) );
+                }
 
-		/**
-		 * Check if the current admin screen should load scripts.
-		 * 
-		 * @return bool
-		 */
-		public function is_aui_screen(){
-			$load = false;
-			// check if we should load or not
-			if ( is_admin() ) {
-				// Only enable on set pages
-				$aui_screens = array(
-					'page',
-					'post',
-					'settings_page_ayecode-ui-settings',
-					'appearance_page_gutenberg-widgets'
-				);
-				$screen_ids = apply_filters( 'aui_screen_ids', $aui_screens );
-
-				$screen = get_current_screen();
+                add_action( 'customize_register', array( self::$instance, 'customizer_settings' ));
+
+                do_action( 'ayecode_ui_settings_loaded' );
+            }
+
+            return self::$instance;
+        }
+
+        /**
+         * Setup some constants.
+         */
+        public function constants(){
+            define('AUI_PRIMARY_COLOR_ORIGINAL', "#1e73be");
+            define('AUI_SECONDARY_COLOR_ORIGINAL', '#6c757d');
+            if (!defined('AUI_PRIMARY_COLOR')) define('AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL);
+            if (!defined('AUI_SECONDARY_COLOR')) define('AUI_SECONDARY_COLOR', AUI_SECONDARY_COLOR_ORIGINAL);
+        }
+
+        /**
+         * Initiate the settings and add the required action hooks.
+         */
+        public function init() {
+            $this->constants();
+            $this->settings = $this->get_settings();
+            $this->url = $this->get_url();
+
+            /**
+             * Maybe load CSS
+             *
+             * We load super early in case there is a theme version that might change the colors
+             */
+            if ( $this->settings['css'] ) {
+                add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
+            }
+            if ( $this->settings['css_backend'] && $this->load_admin_scripts() ) {
+                add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
+            }
+
+            // maybe load JS
+            if ( $this->settings['js'] ) {
+                $priority = $this->is_bs3_compat() ? 100 : 1;
+                add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), $priority );
+            }
+            if ( $this->settings['js_backend'] && $this->load_admin_scripts() ) {
+                add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 1 );
+            }
+
+            // Maybe set the HTML font size
+            if ( $this->settings['html_font_size'] ) {
+                add_action( 'wp_footer', array( $this, 'html_font_size' ), 10 );
+            }
+
+
+        }
+
+        /**
+         * Check if we should load the admin scripts or not.
+         *
+         * @return bool
+         */
+        public function load_admin_scripts(){
+            $result = true;
+
+            // check if specifically disabled
+            if(!empty($this->settings['disable_admin'])){
+                $url_parts = explode("\n",$this->settings['disable_admin']);
+                foreach($url_parts as $part){
+                    if( strpos($_SERVER['REQUEST_URI'], trim($part)) !== false ){
+                        return false; // return early, no point checking further
+                    }
+                }
+            }
+
+            return $result;
+        }
+
+        /**
+         * Add a html font size to the footer.
+         */
+        public function html_font_size(){
+            $this->settings = $this->get_settings();
+            echo "<style>html{font-size:".absint($this->settings['html_font_size'])."px;}</style>";
+        }
+
+        /**
+         * Check if the current admin screen should load scripts.
+         * 
+         * @return bool
+         */
+        public function is_aui_screen(){
+            $load = false;
+            // check if we should load or not
+            if ( is_admin() ) {
+                // Only enable on set pages
+                $aui_screens = array(
+                    'page',
+                    'post',
+                    'settings_page_ayecode-ui-settings',
+                    'appearance_page_gutenberg-widgets'
+                );
+                $screen_ids = apply_filters( 'aui_screen_ids', $aui_screens );
+
+                $screen = get_current_screen();
 
 //				echo '###'.$screen->id;
 				
-				if ( $screen && in_array( $screen->id, $screen_ids ) ) {
-					$load = true;
-				}
-			}
+                if ( $screen && in_array( $screen->id, $screen_ids ) ) {
+                    $load = true;
+                }
+            }
 
-			return $load;
-		}
+            return $load;
+        }
 
-		/**
-		 * Adds the styles.
-		 */
-		public function enqueue_style() {
+        /**
+         * Adds the styles.
+         */
+        public function enqueue_style() {
 
-			if( is_admin() && !$this->is_aui_screen()){
-				// don't add wp-admin scripts if not requested to
-			}else{
-				$css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
+            if( is_admin() && !$this->is_aui_screen()){
+                // don't add wp-admin scripts if not requested to
+            }else{
+                $css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
 
-				$rtl = is_rtl() ? '-rtl' : '';
+                $rtl = is_rtl() ? '-rtl' : '';
 
-				if($this->settings[$css_setting]){
-					$compatibility = $this->settings[$css_setting]=='core' ? false : true;
-					$url = $this->settings[$css_setting]=='core' ? $this->url.'assets/css/ayecode-ui'.$rtl.'.css' : $this->url.'assets/css/ayecode-ui-compatibility'.$rtl.'.css';
-					wp_register_style( 'ayecode-ui', $url, array(), $this->latest );
-					wp_enqueue_style( 'ayecode-ui' );
+                if($this->settings[$css_setting]){
+                    $compatibility = $this->settings[$css_setting]=='core' ? false : true;
+                    $url = $this->settings[$css_setting]=='core' ? $this->url.'assets/css/ayecode-ui'.$rtl.'.css' : $this->url.'assets/css/ayecode-ui-compatibility'.$rtl.'.css';
+                    wp_register_style( 'ayecode-ui', $url, array(), $this->latest );
+                    wp_enqueue_style( 'ayecode-ui' );
 
-					// flatpickr
-					wp_register_style( 'flatpickr', $this->url.'assets/css/flatpickr.min.css', array(), $this->latest );
+                    // flatpickr
+                    wp_register_style( 'flatpickr', $this->url.'assets/css/flatpickr.min.css', array(), $this->latest );
 
 
-					// fix some wp-admin issues
-					if(is_admin()){
-						$custom_css = "
+                    // fix some wp-admin issues
+                    if(is_admin()){
+                        $custom_css = "
                 body{
                     background-color: #f1f1f1;
                     font-family: -apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;
@@ -292,35 +292,35 @@ 
 				}
                 ";
 
-						// @todo, remove once fixed :: fix for this bug https://github.com/WordPress/gutenberg/issues/14377
-						$custom_css .= "
+                        // @todo, remove once fixed :: fix for this bug https://github.com/WordPress/gutenberg/issues/14377
+                        $custom_css .= "
 						.edit-post-sidebar input[type=color].components-text-control__input{
 						    padding: 0;
 						}
 					";
-						wp_add_inline_style( 'ayecode-ui', $custom_css );
-					}
+                        wp_add_inline_style( 'ayecode-ui', $custom_css );
+                    }
 
-					// custom changes
-					wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
+                    // custom changes
+                    wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
 
-				}
-			}
+                }
+            }
 
 
-		}
+        }
+
+        /**
+         * Get inline script used if bootstrap enqueued
+         *
+         * If this remains small then its best to use this than to add another JS file.
+         */
+        public function inline_script() {
+            // Flatpickr calendar locale
+            $flatpickr_locale = self::flatpickr_locale();
 
-		/**
-		 * Get inline script used if bootstrap enqueued
-		 *
-		 * If this remains small then its best to use this than to add another JS file.
-		 */
-		public function inline_script() {
-			// Flatpickr calendar locale
-			$flatpickr_locale = self::flatpickr_locale();
-
-			ob_start();
-			?>
+            ob_start();
+            ?>
 			<script>
 				/**
 				 * An AUI bootstrap adaptation of GreedyNav.js ( by Luke Jackson ).
@@ -985,29 +985,29 @@ 
 
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
 
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', self::minify_js($output) );
-		}
-
-
-		/**
-		 * JS to help with conflict issues with other plugins and themes using bootstrap v3.
-		 *
-		 * @TODO we may need this when other conflicts arrise.
-		 * @return mixed
-		 */
-		public static function bs3_compat_js() {
-			ob_start();
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', self::minify_js($output) );
+        }
+
+
+        /**
+         * JS to help with conflict issues with other plugins and themes using bootstrap v3.
+         *
+         * @TODO we may need this when other conflicts arrise.
+         * @return mixed
+         */
+        public static function bs3_compat_js() {
+            ob_start();
+            ?>
 			<script>
 				<?php if( defined( 'FUSION_BUILDER_VERSION' ) ){ ?>
 				/* With Avada builder */
@@ -1015,20 +1015,20 @@ 
 				<?php } ?>
 			</script>
 			<?php
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', ob_get_clean());
-		}
-
-		/**
-		 * Get inline script used if bootstrap file browser enqueued.
-		 *
-		 * If this remains small then its best to use this than to add another JS file.
-		 */
-		public function inline_script_file_browser(){
-			ob_start();
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', ob_get_clean());
+        }
+
+        /**
+         * Get inline script used if bootstrap file browser enqueued.
+         *
+         * If this remains small then its best to use this than to add another JS file.
+         */
+        public function inline_script_file_browser(){
+            ob_start();
+            ?>
 			<script>
 				// run on doc ready
 				jQuery(document).ready(function () {
@@ -1036,192 +1036,192 @@ 
 				});
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
-
-		/**
-		 * Adds the Font Awesome JS.
-		 */
-		public function enqueue_scripts() {
-
-			if( is_admin() && !$this->is_aui_screen()){
-				// don't add wp-admin scripts if not requested to
-			}else {
-
-				$js_setting = current_action() == 'wp_enqueue_scripts' ? 'js' : 'js_backend';
-
-				// select2
-				wp_register_script( 'select2', $this->url . 'assets/js/select2.min.js', array( 'jquery' ), $this->select2_version );
-
-				// flatpickr
-				wp_register_script( 'flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->latest );
-
-				// Bootstrap file browser
-				wp_register_script( 'aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array( 'jquery' ), $this->select2_version );
-				wp_add_inline_script( 'aui-custom-file-input', $this->inline_script_file_browser() );
-
-				$load_inline = false;
-
-				if ( $this->settings[ $js_setting ] == 'core-popper' ) {
-					// Bootstrap bundle
-					$url = $this->url . 'assets/js/bootstrap.bundle.min.js';
-					wp_register_script( 'bootstrap-js-bundle', $url, array(
-						'select2',
-						'jquery'
-					), $this->latest, $this->is_bs3_compat() );
-					// if in admin then add to footer for compatibility.
-					is_admin() ? wp_enqueue_script( 'bootstrap-js-bundle', '', null, null, true ) : wp_enqueue_script( 'bootstrap-js-bundle' );
-					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-js-bundle', $script );
-				} elseif ( $this->settings[ $js_setting ] == 'popper' ) {
-					$url = $this->url . 'assets/js/popper.min.js';
-					wp_register_script( 'bootstrap-js-popper', $url, array( 'select2', 'jquery' ), $this->latest );
-					wp_enqueue_script( 'bootstrap-js-popper' );
-					$load_inline = true;
-				} else {
-					$load_inline = true;
-				}
-
-				// Load needed inline scripts by faking the loading of a script if the main script is not being loaded
-				if ( $load_inline ) {
-					wp_register_script( 'bootstrap-dummy', '', array( 'select2', 'jquery' ) );
-					wp_enqueue_script( 'bootstrap-dummy' );
-					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-dummy', $script );
-				}
-			}
-
-		}
-
-		/**
-		 * Enqueue flatpickr if called.
-		 */
-		public function enqueue_flatpickr(){
-			wp_enqueue_style( 'flatpickr' );
-			wp_enqueue_script( 'flatpickr' );
-		}
-
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url() {
-
-			$url = '';
-			// check if we are inside a plugin
-			$file_dir = str_replace( "/includes","", wp_normalize_path( dirname( __FILE__ ) ) );
-
-			// add check in-case user has changed wp-content dir name.
-			$wp_content_folder_name = basename(WP_CONTENT_DIR);
-			$dir_parts = explode("/$wp_content_folder_name/",$file_dir);
-			$url_parts = explode("/$wp_content_folder_name/",plugins_url());
-
-			if(!empty($url_parts[0]) && !empty($dir_parts[1])){
-				$url = trailingslashit( $url_parts[0]."/$wp_content_folder_name/".$dir_parts[1] );
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Register the database settings with WordPress.
-		 */
-		public function register_settings() {
-			register_setting( 'ayecode-ui-settings', 'ayecode-ui-settings' );
-		}
-
-		/**
-		 * Add the WordPress settings menu item.
-		 * @since 1.0.10 Calling function name direct will fail theme check so we don't.
-		 */
-		public function menu_item() {
-			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
-				$this,
-				'settings_page'
-			) );
-		}
-
-		/**
-		 * Get a list of themes and their default JS settings.
-		 *
-		 * @return array
-		 */
-		public function theme_js_settings(){
-			return array(
-				'ayetheme' => 'popper',
-				'listimia' => 'required',
-				'listimia_backend' => 'core-popper',
-				//'avada'    => 'required', // removed as we now add compatibility
-			);
-		}
-
-		/**
-		 * Get the current Font Awesome output settings.
-		 *
-		 * @return array The array of settings.
-		 */
-		public function get_settings() {
-
-			$db_settings = get_option( 'ayecode-ui-settings' );
-			$js_default = 'core-popper';
-			$js_default_backend = $js_default;
-
-			// maybe set defaults (if no settings set)
-			if(empty($db_settings)){
-				$active_theme = strtolower( get_template() ); // active parent theme.
-				$theme_js_settings = self::theme_js_settings();
-				if(isset($theme_js_settings[$active_theme])){
-					$js_default = $theme_js_settings[$active_theme];
-					$js_default_backend = isset($theme_js_settings[$active_theme."_backend"]) ? $theme_js_settings[$active_theme."_backend"] : $js_default;
-				}
-			}
-
-			$defaults = array(
-				'css'       => 'compatibility', // core, compatibility
-				'js'        => $js_default, // js to load, core-popper, popper
-				'html_font_size'        => '16', // js to load, core-popper, popper
-				'css_backend'       => 'compatibility', // core, compatibility
-				'js_backend'        => $js_default_backend, // js to load, core-popper, popper
-				'disable_admin'     =>  '', // URL snippets to disable loading on admin
-			);
-
-			$settings = wp_parse_args( $db_settings, $defaults );
-
-			/**
-			 * Filter the Bootstrap settings.
-			 *
-			 * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
-			 */
-			return $this->settings = apply_filters( 'ayecode-ui-settings', $settings, $db_settings, $defaults );
-		}
-
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
+
+        /**
+         * Adds the Font Awesome JS.
+         */
+        public function enqueue_scripts() {
+
+            if( is_admin() && !$this->is_aui_screen()){
+                // don't add wp-admin scripts if not requested to
+            }else {
+
+                $js_setting = current_action() == 'wp_enqueue_scripts' ? 'js' : 'js_backend';
+
+                // select2
+                wp_register_script( 'select2', $this->url . 'assets/js/select2.min.js', array( 'jquery' ), $this->select2_version );
+
+                // flatpickr
+                wp_register_script( 'flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->latest );
+
+                // Bootstrap file browser
+                wp_register_script( 'aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array( 'jquery' ), $this->select2_version );
+                wp_add_inline_script( 'aui-custom-file-input', $this->inline_script_file_browser() );
+
+                $load_inline = false;
+
+                if ( $this->settings[ $js_setting ] == 'core-popper' ) {
+                    // Bootstrap bundle
+                    $url = $this->url . 'assets/js/bootstrap.bundle.min.js';
+                    wp_register_script( 'bootstrap-js-bundle', $url, array(
+                        'select2',
+                        'jquery'
+                    ), $this->latest, $this->is_bs3_compat() );
+                    // if in admin then add to footer for compatibility.
+                    is_admin() ? wp_enqueue_script( 'bootstrap-js-bundle', '', null, null, true ) : wp_enqueue_script( 'bootstrap-js-bundle' );
+                    $script = $this->inline_script();
+                    wp_add_inline_script( 'bootstrap-js-bundle', $script );
+                } elseif ( $this->settings[ $js_setting ] == 'popper' ) {
+                    $url = $this->url . 'assets/js/popper.min.js';
+                    wp_register_script( 'bootstrap-js-popper', $url, array( 'select2', 'jquery' ), $this->latest );
+                    wp_enqueue_script( 'bootstrap-js-popper' );
+                    $load_inline = true;
+                } else {
+                    $load_inline = true;
+                }
 
-		/**
-		 * The settings page html output.
-		 */
-		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'aui' ) );
-			}
-			?>
+                // Load needed inline scripts by faking the loading of a script if the main script is not being loaded
+                if ( $load_inline ) {
+                    wp_register_script( 'bootstrap-dummy', '', array( 'select2', 'jquery' ) );
+                    wp_enqueue_script( 'bootstrap-dummy' );
+                    $script = $this->inline_script();
+                    wp_add_inline_script( 'bootstrap-dummy', $script );
+                }
+            }
+
+        }
+
+        /**
+         * Enqueue flatpickr if called.
+         */
+        public function enqueue_flatpickr(){
+            wp_enqueue_style( 'flatpickr' );
+            wp_enqueue_script( 'flatpickr' );
+        }
+
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url() {
+
+            $url = '';
+            // check if we are inside a plugin
+            $file_dir = str_replace( "/includes","", wp_normalize_path( dirname( __FILE__ ) ) );
+
+            // add check in-case user has changed wp-content dir name.
+            $wp_content_folder_name = basename(WP_CONTENT_DIR);
+            $dir_parts = explode("/$wp_content_folder_name/",$file_dir);
+            $url_parts = explode("/$wp_content_folder_name/",plugins_url());
+
+            if(!empty($url_parts[0]) && !empty($dir_parts[1])){
+                $url = trailingslashit( $url_parts[0]."/$wp_content_folder_name/".$dir_parts[1] );
+            }
+
+            return $url;
+        }
+
+        /**
+         * Register the database settings with WordPress.
+         */
+        public function register_settings() {
+            register_setting( 'ayecode-ui-settings', 'ayecode-ui-settings' );
+        }
+
+        /**
+         * Add the WordPress settings menu item.
+         * @since 1.0.10 Calling function name direct will fail theme check so we don't.
+         */
+        public function menu_item() {
+            $menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
+            call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
+                $this,
+                'settings_page'
+            ) );
+        }
+
+        /**
+         * Get a list of themes and their default JS settings.
+         *
+         * @return array
+         */
+        public function theme_js_settings(){
+            return array(
+                'ayetheme' => 'popper',
+                'listimia' => 'required',
+                'listimia_backend' => 'core-popper',
+                //'avada'    => 'required', // removed as we now add compatibility
+            );
+        }
+
+        /**
+         * Get the current Font Awesome output settings.
+         *
+         * @return array The array of settings.
+         */
+        public function get_settings() {
+
+            $db_settings = get_option( 'ayecode-ui-settings' );
+            $js_default = 'core-popper';
+            $js_default_backend = $js_default;
+
+            // maybe set defaults (if no settings set)
+            if(empty($db_settings)){
+                $active_theme = strtolower( get_template() ); // active parent theme.
+                $theme_js_settings = self::theme_js_settings();
+                if(isset($theme_js_settings[$active_theme])){
+                    $js_default = $theme_js_settings[$active_theme];
+                    $js_default_backend = isset($theme_js_settings[$active_theme."_backend"]) ? $theme_js_settings[$active_theme."_backend"] : $js_default;
+                }
+            }
+
+            $defaults = array(
+                'css'       => 'compatibility', // core, compatibility
+                'js'        => $js_default, // js to load, core-popper, popper
+                'html_font_size'        => '16', // js to load, core-popper, popper
+                'css_backend'       => 'compatibility', // core, compatibility
+                'js_backend'        => $js_default_backend, // js to load, core-popper, popper
+                'disable_admin'     =>  '', // URL snippets to disable loading on admin
+            );
+
+            $settings = wp_parse_args( $db_settings, $defaults );
+
+            /**
+             * Filter the Bootstrap settings.
+             *
+             * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
+             */
+            return $this->settings = apply_filters( 'ayecode-ui-settings', $settings, $db_settings, $defaults );
+        }
+
+
+        /**
+         * The settings page html output.
+         */
+        public function settings_page() {
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die( __( 'You do not have sufficient permissions to access this page.', 'aui' ) );
+            }
+            ?>
 			<div class="wrap">
 				<h1><?php echo $this->name; ?></h1>
 				<p><?php _e("Here you can adjust settings if you are having compatibility issues.",'aui');?></p>
 				<form method="post" action="options.php">
 					<?php
-					settings_fields( 'ayecode-ui-settings' );
-					do_settings_sections( 'ayecode-ui-settings' );
-					?>
+                    settings_fields( 'ayecode-ui-settings' );
+                    do_settings_sections( 'ayecode-ui-settings' );
+                    ?>
 
 					<h2><?php _e( 'Frontend', 'aui' ); ?></h2>
 					<table class="form-table wpbs-table-settings">
@@ -1301,60 +1301,60 @@ 
 					</table>
 
 					<?php
-					submit_button();
-					?>
+                    submit_button();
+                    ?>
 				</form>
 
 				<div id="wpbs-version"><?php echo $this->version; ?></div>
 			</div>
 
 			<?php
-		}
-
-		public function customizer_settings($wp_customize){
-			$wp_customize->add_section('aui_settings', array(
-				'title'    => __('AyeCode UI','aui'),
-				'priority' => 120,
-			));
-
-			//  =============================
-			//  = Color Picker              =
-			//  =============================
-			$wp_customize->add_setting('aui_options[color_primary]', array(
-				'default'           => AUI_PRIMARY_COLOR,
-				'sanitize_callback' => 'sanitize_hex_color',
-				'capability'        => 'edit_theme_options',
-				'type'              => 'option',
-				'transport'         => 'refresh',
-			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
-				'label'    => __('Primary Color','aui'),
-				'section'  => 'aui_settings',
-				'settings' => 'aui_options[color_primary]',
-			)));
-
-			$wp_customize->add_setting('aui_options[color_secondary]', array(
-				'default'           => '#6c757d',
-				'sanitize_callback' => 'sanitize_hex_color',
-				'capability'        => 'edit_theme_options',
-				'type'              => 'option',
-				'transport'         => 'refresh',
-			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
-				'label'    => __('Secondary Color','aui'),
-				'section'  => 'aui_settings',
-				'settings' => 'aui_options[color_secondary]',
-			)));
-		}
-
-		/**
-		 * CSS to help with conflict issues with other plugins and themes using bootstrap v3.
-		 *
-		 * @return mixed
-		 */
-		public static function bs3_compat_css() {
-			ob_start();
-			?>
+        }
+
+        public function customizer_settings($wp_customize){
+            $wp_customize->add_section('aui_settings', array(
+                'title'    => __('AyeCode UI','aui'),
+                'priority' => 120,
+            ));
+
+            //  =============================
+            //  = Color Picker              =
+            //  =============================
+            $wp_customize->add_setting('aui_options[color_primary]', array(
+                'default'           => AUI_PRIMARY_COLOR,
+                'sanitize_callback' => 'sanitize_hex_color',
+                'capability'        => 'edit_theme_options',
+                'type'              => 'option',
+                'transport'         => 'refresh',
+            ));
+            $wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
+                'label'    => __('Primary Color','aui'),
+                'section'  => 'aui_settings',
+                'settings' => 'aui_options[color_primary]',
+            )));
+
+            $wp_customize->add_setting('aui_options[color_secondary]', array(
+                'default'           => '#6c757d',
+                'sanitize_callback' => 'sanitize_hex_color',
+                'capability'        => 'edit_theme_options',
+                'type'              => 'option',
+                'transport'         => 'refresh',
+            ));
+            $wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
+                'label'    => __('Secondary Color','aui'),
+                'section'  => 'aui_settings',
+                'settings' => 'aui_options[color_secondary]',
+            )));
+        }
+
+        /**
+         * CSS to help with conflict issues with other plugins and themes using bootstrap v3.
+         *
+         * @return mixed
+         */
+        public static function bs3_compat_css() {
+            ob_start();
+            ?>
 			<style>
 			/* Bootstrap 3 compatibility */
 			body.modal-open .modal-backdrop.show:not(.in) {opacity:0.5;}
@@ -1380,579 +1380,579 @@ 
 			<?php } ?>
 			</style>
 			<?php
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', self::minify_css( ob_get_clean() ) );
-		}
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', self::minify_css( ob_get_clean() ) );
+        }
 
 
-		public static function custom_css($compatibility = true) {
-			$settings = get_option('aui_options');
+        public static function custom_css($compatibility = true) {
+            $settings = get_option('aui_options');
 
-			ob_start();
+            ob_start();
 
-			$primary_color = !empty($settings['color_primary']) ? $settings['color_primary'] : AUI_PRIMARY_COLOR;
-			$secondary_color = !empty($settings['color_secondary']) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR;
-				//AUI_PRIMARY_COLOR_ORIGINAL
-			?>
+            $primary_color = !empty($settings['color_primary']) ? $settings['color_primary'] : AUI_PRIMARY_COLOR;
+            $secondary_color = !empty($settings['color_secondary']) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR;
+                //AUI_PRIMARY_COLOR_ORIGINAL
+            ?>
 			<style>
 				<?php
 
-					// BS v3 compat
-					if( self::is_bs3_compat() ){
-					    echo self::bs3_compat_css();
-					}
+                    // BS v3 compat
+                    if( self::is_bs3_compat() ){
+                        echo self::bs3_compat_css();
+                    }
 
-					if(!is_admin() && $primary_color != AUI_PRIMARY_COLOR_ORIGINAL){
-						echo self::css_primary($primary_color,$compatibility);
-					}
+                    if(!is_admin() && $primary_color != AUI_PRIMARY_COLOR_ORIGINAL){
+                        echo self::css_primary($primary_color,$compatibility);
+                    }
 
-					if(!is_admin() && $secondary_color != AUI_SECONDARY_COLOR_ORIGINAL){
-						echo self::css_secondary($settings['color_secondary'],$compatibility);
-					}
+                    if(!is_admin() && $secondary_color != AUI_SECONDARY_COLOR_ORIGINAL){
+                        echo self::css_secondary($settings['color_secondary'],$compatibility);
+                    }
 
-					// Set admin bar z-index lower when modal is open.
-					echo ' body.modal-open #wpadminbar{z-index:999}';
+                    // Set admin bar z-index lower when modal is open.
+                    echo ' body.modal-open #wpadminbar{z-index:999}';
                 ?>
 			</style>
 			<?php
 
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', self::minify_css( ob_get_clean() ) );
-		}
-
-		/**
-		 * Check if we should add booststrap 3 compatibility changes.
-		 *
-		 * @return bool
-		 */
-		public static function is_bs3_compat(){
-			return defined('AYECODE_UI_BS3_COMPAT') || defined('SVQ_THEME_VERSION') || defined('FUSION_BUILDER_VERSION');
-		}
-
-		public static function css_primary($color_code,$compatibility){;
-			$color_code = sanitize_hex_color($color_code);
-			if(!$color_code){return '';}
-			/**
-			 * c = color, b = background color, o = border-color, f = fill
-			 */
-			$selectors = array(
-				'a' => array('c'),
-				'.btn-primary' => array('b','o'),
-				'.btn-primary.disabled' => array('b','o'),
-				'.btn-primary:disabled' => array('b','o'),
-				'.btn-outline-primary' => array('c','o'),
-				'.btn-outline-primary:hover' => array('b','o'),
-				'.btn-outline-primary:not(:disabled):not(.disabled).active' => array('b','o'),
-				'.btn-outline-primary:not(:disabled):not(.disabled):active' => array('b','o'),
-				'.show>.btn-outline-primary.dropdown-toggle' => array('b','o'),
-				'.btn-link' => array('c'),
-				'.dropdown-item.active' => array('b'),
-				'.custom-control-input:checked~.custom-control-label::before' => array('b','o'),
-				'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before' => array('b','o'),
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', self::minify_css( ob_get_clean() ) );
+        }
+
+        /**
+         * Check if we should add booststrap 3 compatibility changes.
+         *
+         * @return bool
+         */
+        public static function is_bs3_compat(){
+            return defined('AYECODE_UI_BS3_COMPAT') || defined('SVQ_THEME_VERSION') || defined('FUSION_BUILDER_VERSION');
+        }
+
+        public static function css_primary($color_code,$compatibility){;
+            $color_code = sanitize_hex_color($color_code);
+            if(!$color_code){return '';}
+            /**
+             * c = color, b = background color, o = border-color, f = fill
+             */
+            $selectors = array(
+                'a' => array('c'),
+                '.btn-primary' => array('b','o'),
+                '.btn-primary.disabled' => array('b','o'),
+                '.btn-primary:disabled' => array('b','o'),
+                '.btn-outline-primary' => array('c','o'),
+                '.btn-outline-primary:hover' => array('b','o'),
+                '.btn-outline-primary:not(:disabled):not(.disabled).active' => array('b','o'),
+                '.btn-outline-primary:not(:disabled):not(.disabled):active' => array('b','o'),
+                '.show>.btn-outline-primary.dropdown-toggle' => array('b','o'),
+                '.btn-link' => array('c'),
+                '.dropdown-item.active' => array('b'),
+                '.custom-control-input:checked~.custom-control-label::before' => array('b','o'),
+                '.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before' => array('b','o'),
 //				'.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
 //				'.custom-range::-moz-range-thumb' => array('b'),
 //				'.custom-range::-ms-thumb' => array('b'),
-				'.nav-pills .nav-link.active' => array('b'),
-				'.nav-pills .show>.nav-link' => array('b'),
-				'.page-link' => array('c'),
-				'.page-item.active .page-link' => array('b','o'),
-				'.badge-primary' => array('b'),
-				'.alert-primary' => array('b','o'),
-				'.progress-bar' => array('b'),
-				'.list-group-item.active' => array('b','o'),
-				'.bg-primary' => array('b','f'),
-				'.btn-link.btn-primary' => array('c'),
-				'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array('b'),
-			);
-
-			$important_selectors = array(
-				'.bg-primary' => array('b','f'),
-				'.border-primary' => array('o'),
-				'.text-primary' => array('c'),
-			);
-
-			$color = array();
-			$color_i = array();
-			$background = array();
-			$background_i = array();
-			$border = array();
-			$border_i = array();
-			$fill = array();
-			$fill_i = array();
-
-			$output = '';
-
-			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
-			}
-
-			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
-			}
-
-			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
-			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-			}
-
-			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
-			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
-			}
-
-			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
-			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-			}
-
-			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
-			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-			}
-
-
-			$prefix = $compatibility ? ".bsui " : "";
-
-			// darken
-			$darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
-
-			// lighten
-			$lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
-
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
-
-
-			// button states
-			$output .= $prefix ." .btn-primary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-			$output .= $prefix ." .btn-outline-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-primary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active, $prefix .btn-primary:not(:disabled):not(.disabled).active, .show>$prefix .btn-primary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-primary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-
-			// dropdown's
-			$output .= $prefix ." .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
-
-
-			// input states
-			$output .= $prefix ." .form-control:focus{border-color: ".$lighten_25.";box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-			// page link
-			$output .= $prefix ." .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-			return $output;
-		}
-
-		public static function css_secondary($color_code,$compatibility){;
-			$color_code = sanitize_hex_color($color_code);
-			if(!$color_code){return '';}
-			/**
-			 * c = color, b = background color, o = border-color, f = fill
-			 */
-			$selectors = array(
-				'.btn-secondary' => array('b','o'),
-				'.btn-secondary.disabled' => array('b','o'),
-				'.btn-secondary:disabled' => array('b','o'),
-				'.btn-outline-secondary' => array('c','o'),
-				'.btn-outline-secondary:hover' => array('b','o'),
-				'.btn-outline-secondary.disabled' => array('c'),
-				'.btn-outline-secondary:disabled' => array('c'),
-				'.btn-outline-secondary:not(:disabled):not(.disabled):active' => array('b','o'),
-				'.btn-outline-secondary:not(:disabled):not(.disabled).active' => array('b','o'),
-				'.btn-outline-secondary.dropdown-toggle' => array('b','o'),
-				'.badge-secondary' => array('b'),
-				'.alert-secondary' => array('b','o'),
-				'.btn-link.btn-secondary' => array('c'),
-			);
-
-			$important_selectors = array(
-				'.bg-secondary' => array('b','f'),
-				'.border-secondary' => array('o'),
-				'.text-secondary' => array('c'),
-			);
-
-			$color = array();
-			$color_i = array();
-			$background = array();
-			$background_i = array();
-			$border = array();
-			$border_i = array();
-			$fill = array();
-			$fill_i = array();
-
-			$output = '';
-
-			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
-			}
-
-			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
-			}
-
-			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
-			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-			}
-
-			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
-			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
-			}
-
-			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
-			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-			}
-
-			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
-			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-			}
-
-
-			$prefix = $compatibility ? ".bsui " : "";
-
-			// darken
-			$darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
-
-			// lighten
-			$lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
-
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
-
-
-			// button states
-			$output .= $prefix ." .btn-secondary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-			$output .= $prefix ." .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-secondary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active, $prefix .btn-secondary:not(:disabled):not(.disabled).active, .show>$prefix .btn-secondary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-secondary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-
-			return $output;
-		}
-
-		/**
-		 * Increases or decreases the brightness of a color by a percentage of the current brightness.
-		 *
-		 * @param   string  $hexCode        Supported formats: `#FFF`, `#FFFFFF`, `FFF`, `FFFFFF`
-		 * @param   float   $adjustPercent  A number between -1 and 1. E.g. 0.3 = 30% lighter; -0.4 = 40% darker.
-		 *
-		 * @return  string
-		 */
-		public static function css_hex_lighten_darken($hexCode, $adjustPercent) {
-			$hexCode = ltrim($hexCode, '#');
-
-			if (strlen($hexCode) == 3) {
-				$hexCode = $hexCode[0] . $hexCode[0] . $hexCode[1] . $hexCode[1] . $hexCode[2] . $hexCode[2];
-			}
-
-			$hexCode = array_map('hexdec', str_split($hexCode, 2));
-
-			foreach ($hexCode as & $color) {
-				$adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
-				$adjustAmount = ceil($adjustableLimit * $adjustPercent);
-
-				$color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
-			}
-
-			return '#' . implode($hexCode);
-		}
-
-		/**
-		 * Check if we should display examples.
-		 */
-		public function maybe_show_examples(){
-			if(current_user_can('manage_options') && isset($_REQUEST['preview-aui'])){
-				echo "<head>";
-				wp_head();
-				echo "</head>";
-				echo "<body>";
-				echo $this->get_examples();
-				echo "</body>";
-				exit;
-			}
-		}
-
-		/**
-		 * Get developer examples.
-		 *
-		 * @return string
-		 */
-		public function get_examples(){
-			$output = '';
-
-
-			// open form
-			$output .= "<form class='p-5 m-5 border rounded'>";
-
-			// input example
-			$output .= aui()->input(array(
-				'type'  =>  'text',
-				'id'    =>  'text-example',
-				'name'    =>  'text-example',
-				'placeholder'   => 'text placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label'
-			));
-
-			// input example
-			$output .= aui()->input(array(
-				'type'  =>  'url',
-				'id'    =>  'text-example2',
-				'name'    =>  'text-example',
-				'placeholder'   => 'url placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label'
-			));
-
-			// checkbox example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'checkbox-example',
-				'name'    =>  'checkbox-example',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Checkbox example',
-				'value' =>  '1',
-				'checked'   => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Checkbox checked'
-			));
-
-			// checkbox example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'checkbox-example2',
-				'name'    =>  'checkbox-example2',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Checkbox example',
-				'value' =>  '1',
-				'checked'   => false,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Checkbox un-checked'
-			));
-
-			// switch example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'switch-example',
-				'name'    =>  'switch-example',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Switch example',
-				'value' =>  '1',
-				'checked'   => true,
-				'switch'    => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Switch on'
-			));
-
-			// switch example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'switch-example2',
-				'name'    =>  'switch-example2',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Switch example',
-				'value' =>  '1',
-				'checked'   => false,
-				'switch'    => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Switch off'
-			));
-
-			// close form
-			$output .= "</form>";
-
-			return $output;
-		}
-
-		/**
-		 * Calendar params.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return array Calendar params.
-		 */
-		public static function calendar_params() {
-			$params = array(
-				'month_long_1' => __( 'January', 'aui' ),
-				'month_long_2' => __( 'February', 'aui' ),
-				'month_long_3' => __( 'March', 'aui' ),
-				'month_long_4' => __( 'April', 'aui' ),
-				'month_long_5' => __( 'May', 'aui' ),
-				'month_long_6' => __( 'June', 'aui' ),
-				'month_long_7' => __( 'July', 'aui' ),
-				'month_long_8' => __( 'August', 'aui' ),
-				'month_long_9' => __( 'September', 'aui' ),
-				'month_long_10' => __( 'October', 'aui' ),
-				'month_long_11' => __( 'November', 'aui' ),
-				'month_long_12' => __( 'December', 'aui' ),
-				'month_s_1' => _x( 'Jan', 'January abbreviation', 'aui' ),
-				'month_s_2' => _x( 'Feb', 'February abbreviation', 'aui' ),
-				'month_s_3' => _x( 'Mar', 'March abbreviation', 'aui' ),
-				'month_s_4' => _x( 'Apr', 'April abbreviation', 'aui' ),
-				'month_s_5' => _x( 'May', 'May abbreviation', 'aui' ),
-				'month_s_6' => _x( 'Jun', 'June abbreviation', 'aui' ),
-				'month_s_7' => _x( 'Jul', 'July abbreviation', 'aui' ),
-				'month_s_8' => _x( 'Aug', 'August abbreviation', 'aui' ),
-				'month_s_9' => _x( 'Sep', 'September abbreviation', 'aui' ),
-				'month_s_10' => _x( 'Oct', 'October abbreviation', 'aui' ),
-				'month_s_11' => _x( 'Nov', 'November abbreviation', 'aui' ),
-				'month_s_12' => _x( 'Dec', 'December abbreviation', 'aui' ),
-				'day_s1_1' => _x( 'S', 'Sunday initial', 'aui' ),
-				'day_s1_2' => _x( 'M', 'Monday initial', 'aui' ),
-				'day_s1_3' => _x( 'T', 'Tuesday initial', 'aui' ),
-				'day_s1_4' => _x( 'W', 'Wednesday initial', 'aui' ),
-				'day_s1_5' => _x( 'T', 'Friday initial', 'aui' ),
-				'day_s1_6' => _x( 'F', 'Thursday initial', 'aui' ),
-				'day_s1_7' => _x( 'S', 'Saturday initial', 'aui' ),
-				'day_s2_1' => __( 'Su', 'aui' ),
-				'day_s2_2' => __( 'Mo', 'aui' ),
-				'day_s2_3' => __( 'Tu', 'aui' ),
-				'day_s2_4' => __( 'We', 'aui' ),
-				'day_s2_5' => __( 'Th', 'aui' ),
-				'day_s2_6' => __( 'Fr', 'aui' ),
-				'day_s2_7' => __( 'Sa', 'aui' ),
-				'day_s3_1' => __( 'Sun', 'aui' ),
-				'day_s3_2' => __( 'Mon', 'aui' ),
-				'day_s3_3' => __( 'Tue', 'aui' ),
-				'day_s3_4' => __( 'Wed', 'aui' ),
-				'day_s3_5' => __( 'Thu', 'aui' ),
-				'day_s3_6' => __( 'Fri', 'aui' ),
-				'day_s3_7' => __( 'Sat', 'aui' ),
-				'day_s5_1' => __( 'Sunday', 'aui' ),
-				'day_s5_2' => __( 'Monday', 'aui' ),
-				'day_s5_3' => __( 'Tuesday', 'aui' ),
-				'day_s5_4' => __( 'Wednesday', 'aui' ),
-				'day_s5_5' => __( 'Thursday', 'aui' ),
-				'day_s5_6' => __( 'Friday', 'aui' ),
-				'day_s5_7' => __( 'Saturday', 'aui' ),
-				'am_lower' => __( 'am', 'aui' ),
-				'pm_lower' => __( 'pm', 'aui' ),
-				'am_upper' => __( 'AM', 'aui' ),
-				'pm_upper' => __( 'PM', 'aui' ),
-				'firstDayOfWeek' => (int) get_option( 'start_of_week' ),
-				'time_24hr' => false,
-				'year' => __( 'Year', 'aui' ),
-				'hour' => __( 'Hour', 'aui' ),
-				'minute' => __( 'Minute', 'aui' ),
-				'weekAbbreviation' => __( 'Wk', 'aui' ),
-				'rangeSeparator' => __( ' to ', 'aui' ),
-				'scrollTitle' => __( 'Scroll to increment', 'aui' ),
-				'toggleTitle' => __( 'Click to toggle', 'aui' )
-			);
-
-			return apply_filters( 'ayecode_ui_calendar_params', $params );
-		}
-
-		/**
-		 * Flatpickr calendar localize.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return string Calendar locale.
-		 */
-		public static function flatpickr_locale() {
-			$params = self::calendar_params();
-
-			if ( is_string( $params ) ) {
-				$params = html_entity_decode( $params, ENT_QUOTES, 'UTF-8' );
-			} else {
-				foreach ( (array) $params as $key => $value ) {
-					if ( ! is_scalar( $value ) ) {
-						continue;
-					}
-
-					$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-				}
-			}
+                '.nav-pills .nav-link.active' => array('b'),
+                '.nav-pills .show>.nav-link' => array('b'),
+                '.page-link' => array('c'),
+                '.page-item.active .page-link' => array('b','o'),
+                '.badge-primary' => array('b'),
+                '.alert-primary' => array('b','o'),
+                '.progress-bar' => array('b'),
+                '.list-group-item.active' => array('b','o'),
+                '.bg-primary' => array('b','f'),
+                '.btn-link.btn-primary' => array('c'),
+                '.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array('b'),
+            );
+
+            $important_selectors = array(
+                '.bg-primary' => array('b','f'),
+                '.border-primary' => array('o'),
+                '.text-primary' => array('c'),
+            );
+
+            $color = array();
+            $color_i = array();
+            $background = array();
+            $background_i = array();
+            $border = array();
+            $border_i = array();
+            $fill = array();
+            $fill_i = array();
+
+            $output = '';
+
+            // build rules into each type
+            foreach($selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color[] = $selector;}
+                if(isset($types['b'])){$background[] = $selector;}
+                if(isset($types['o'])){$border[] = $selector;}
+                if(isset($types['f'])){$fill[] = $selector;}
+            }
+
+            // build rules into each type
+            foreach($important_selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color_i[] = $selector;}
+                if(isset($types['b'])){$background_i[] = $selector;}
+                if(isset($types['o'])){$border_i[] = $selector;}
+                if(isset($types['f'])){$fill_i[] = $selector;}
+            }
+
+            // add any color rules
+            if(!empty($color)){
+                $output .= implode(",",$color) . "{color: $color_code;} ";
+            }
+            if(!empty($color_i)){
+                $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+            }
+
+            // add any background color rules
+            if(!empty($background)){
+                $output .= implode(",",$background) . "{background-color: $color_code;} ";
+            }
+            if(!empty($background_i)){
+                $output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+            }
+
+            // add any border color rules
+            if(!empty($border)){
+                $output .= implode(",",$border) . "{border-color: $color_code;} ";
+            }
+            if(!empty($border_i)){
+                $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+            }
+
+            // add any fill color rules
+            if(!empty($fill)){
+                $output .= implode(",",$fill) . "{fill: $color_code;} ";
+            }
+            if(!empty($fill_i)){
+                $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+            }
+
+
+            $prefix = $compatibility ? ".bsui " : "";
+
+            // darken
+            $darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
+            $darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
+            $darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
+
+            // lighten
+            $lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
+
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
+
+
+            // button states
+            $output .= $prefix ." .btn-primary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+            $output .= $prefix ." .btn-outline-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-primary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active, $prefix .btn-primary:not(:disabled):not(.disabled).active, .show>$prefix .btn-primary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+            $output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-primary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+
+            // dropdown's
+            $output .= $prefix ." .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
+
+
+            // input states
+            $output .= $prefix ." .form-control:focus{border-color: ".$lighten_25.";box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+            // page link
+            $output .= $prefix ." .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+            return $output;
+        }
+
+        public static function css_secondary($color_code,$compatibility){;
+            $color_code = sanitize_hex_color($color_code);
+            if(!$color_code){return '';}
+            /**
+             * c = color, b = background color, o = border-color, f = fill
+             */
+            $selectors = array(
+                '.btn-secondary' => array('b','o'),
+                '.btn-secondary.disabled' => array('b','o'),
+                '.btn-secondary:disabled' => array('b','o'),
+                '.btn-outline-secondary' => array('c','o'),
+                '.btn-outline-secondary:hover' => array('b','o'),
+                '.btn-outline-secondary.disabled' => array('c'),
+                '.btn-outline-secondary:disabled' => array('c'),
+                '.btn-outline-secondary:not(:disabled):not(.disabled):active' => array('b','o'),
+                '.btn-outline-secondary:not(:disabled):not(.disabled).active' => array('b','o'),
+                '.btn-outline-secondary.dropdown-toggle' => array('b','o'),
+                '.badge-secondary' => array('b'),
+                '.alert-secondary' => array('b','o'),
+                '.btn-link.btn-secondary' => array('c'),
+            );
+
+            $important_selectors = array(
+                '.bg-secondary' => array('b','f'),
+                '.border-secondary' => array('o'),
+                '.text-secondary' => array('c'),
+            );
+
+            $color = array();
+            $color_i = array();
+            $background = array();
+            $background_i = array();
+            $border = array();
+            $border_i = array();
+            $fill = array();
+            $fill_i = array();
+
+            $output = '';
+
+            // build rules into each type
+            foreach($selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color[] = $selector;}
+                if(isset($types['b'])){$background[] = $selector;}
+                if(isset($types['o'])){$border[] = $selector;}
+                if(isset($types['f'])){$fill[] = $selector;}
+            }
+
+            // build rules into each type
+            foreach($important_selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color_i[] = $selector;}
+                if(isset($types['b'])){$background_i[] = $selector;}
+                if(isset($types['o'])){$border_i[] = $selector;}
+                if(isset($types['f'])){$fill_i[] = $selector;}
+            }
+
+            // add any color rules
+            if(!empty($color)){
+                $output .= implode(",",$color) . "{color: $color_code;} ";
+            }
+            if(!empty($color_i)){
+                $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+            }
+
+            // add any background color rules
+            if(!empty($background)){
+                $output .= implode(",",$background) . "{background-color: $color_code;} ";
+            }
+            if(!empty($background_i)){
+                $output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+            }
+
+            // add any border color rules
+            if(!empty($border)){
+                $output .= implode(",",$border) . "{border-color: $color_code;} ";
+            }
+            if(!empty($border_i)){
+                $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+            }
+
+            // add any fill color rules
+            if(!empty($fill)){
+                $output .= implode(",",$fill) . "{fill: $color_code;} ";
+            }
+            if(!empty($fill_i)){
+                $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+            }
+
+
+            $prefix = $compatibility ? ".bsui " : "";
+
+            // darken
+            $darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
+            $darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
+            $darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
+
+            // lighten
+            $lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
+
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
+
+
+            // button states
+            $output .= $prefix ." .btn-secondary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+            $output .= $prefix ." .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-secondary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active, $prefix .btn-secondary:not(:disabled):not(.disabled).active, .show>$prefix .btn-secondary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+            $output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-secondary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+
+            return $output;
+        }
+
+        /**
+         * Increases or decreases the brightness of a color by a percentage of the current brightness.
+         *
+         * @param   string  $hexCode        Supported formats: `#FFF`, `#FFFFFF`, `FFF`, `FFFFFF`
+         * @param   float   $adjustPercent  A number between -1 and 1. E.g. 0.3 = 30% lighter; -0.4 = 40% darker.
+         *
+         * @return  string
+         */
+        public static function css_hex_lighten_darken($hexCode, $adjustPercent) {
+            $hexCode = ltrim($hexCode, '#');
+
+            if (strlen($hexCode) == 3) {
+                $hexCode = $hexCode[0] . $hexCode[0] . $hexCode[1] . $hexCode[1] . $hexCode[2] . $hexCode[2];
+            }
+
+            $hexCode = array_map('hexdec', str_split($hexCode, 2));
+
+            foreach ($hexCode as & $color) {
+                $adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
+                $adjustAmount = ceil($adjustableLimit * $adjustPercent);
+
+                $color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
+            }
+
+            return '#' . implode($hexCode);
+        }
+
+        /**
+         * Check if we should display examples.
+         */
+        public function maybe_show_examples(){
+            if(current_user_can('manage_options') && isset($_REQUEST['preview-aui'])){
+                echo "<head>";
+                wp_head();
+                echo "</head>";
+                echo "<body>";
+                echo $this->get_examples();
+                echo "</body>";
+                exit;
+            }
+        }
+
+        /**
+         * Get developer examples.
+         *
+         * @return string
+         */
+        public function get_examples(){
+            $output = '';
+
+
+            // open form
+            $output .= "<form class='p-5 m-5 border rounded'>";
+
+            // input example
+            $output .= aui()->input(array(
+                'type'  =>  'text',
+                'id'    =>  'text-example',
+                'name'    =>  'text-example',
+                'placeholder'   => 'text placeholder',
+                'title'   => 'Text input example',
+                'value' =>  '',
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Text input example label'
+            ));
+
+            // input example
+            $output .= aui()->input(array(
+                'type'  =>  'url',
+                'id'    =>  'text-example2',
+                'name'    =>  'text-example',
+                'placeholder'   => 'url placeholder',
+                'title'   => 'Text input example',
+                'value' =>  '',
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Text input example label'
+            ));
+
+            // checkbox example
+            $output .= aui()->input(array(
+                'type'  =>  'checkbox',
+                'id'    =>  'checkbox-example',
+                'name'    =>  'checkbox-example',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Checkbox example',
+                'value' =>  '1',
+                'checked'   => true,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Checkbox checked'
+            ));
+
+            // checkbox example
+            $output .= aui()->input(array(
+                'type'  =>  'checkbox',
+                'id'    =>  'checkbox-example2',
+                'name'    =>  'checkbox-example2',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Checkbox example',
+                'value' =>  '1',
+                'checked'   => false,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Checkbox un-checked'
+            ));
+
+            // switch example
+            $output .= aui()->input(array(
+                'type'  =>  'checkbox',
+                'id'    =>  'switch-example',
+                'name'    =>  'switch-example',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Switch example',
+                'value' =>  '1',
+                'checked'   => true,
+                'switch'    => true,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Switch on'
+            ));
+
+            // switch example
+            $output .= aui()->input(array(
+                'type'  =>  'checkbox',
+                'id'    =>  'switch-example2',
+                'name'    =>  'switch-example2',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Switch example',
+                'value' =>  '1',
+                'checked'   => false,
+                'switch'    => true,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Switch off'
+            ));
+
+            // close form
+            $output .= "</form>";
+
+            return $output;
+        }
+
+        /**
+         * Calendar params.
+         *
+         * @since 0.1.44
+         *
+         * @return array Calendar params.
+         */
+        public static function calendar_params() {
+            $params = array(
+                'month_long_1' => __( 'January', 'aui' ),
+                'month_long_2' => __( 'February', 'aui' ),
+                'month_long_3' => __( 'March', 'aui' ),
+                'month_long_4' => __( 'April', 'aui' ),
+                'month_long_5' => __( 'May', 'aui' ),
+                'month_long_6' => __( 'June', 'aui' ),
+                'month_long_7' => __( 'July', 'aui' ),
+                'month_long_8' => __( 'August', 'aui' ),
+                'month_long_9' => __( 'September', 'aui' ),
+                'month_long_10' => __( 'October', 'aui' ),
+                'month_long_11' => __( 'November', 'aui' ),
+                'month_long_12' => __( 'December', 'aui' ),
+                'month_s_1' => _x( 'Jan', 'January abbreviation', 'aui' ),
+                'month_s_2' => _x( 'Feb', 'February abbreviation', 'aui' ),
+                'month_s_3' => _x( 'Mar', 'March abbreviation', 'aui' ),
+                'month_s_4' => _x( 'Apr', 'April abbreviation', 'aui' ),
+                'month_s_5' => _x( 'May', 'May abbreviation', 'aui' ),
+                'month_s_6' => _x( 'Jun', 'June abbreviation', 'aui' ),
+                'month_s_7' => _x( 'Jul', 'July abbreviation', 'aui' ),
+                'month_s_8' => _x( 'Aug', 'August abbreviation', 'aui' ),
+                'month_s_9' => _x( 'Sep', 'September abbreviation', 'aui' ),
+                'month_s_10' => _x( 'Oct', 'October abbreviation', 'aui' ),
+                'month_s_11' => _x( 'Nov', 'November abbreviation', 'aui' ),
+                'month_s_12' => _x( 'Dec', 'December abbreviation', 'aui' ),
+                'day_s1_1' => _x( 'S', 'Sunday initial', 'aui' ),
+                'day_s1_2' => _x( 'M', 'Monday initial', 'aui' ),
+                'day_s1_3' => _x( 'T', 'Tuesday initial', 'aui' ),
+                'day_s1_4' => _x( 'W', 'Wednesday initial', 'aui' ),
+                'day_s1_5' => _x( 'T', 'Friday initial', 'aui' ),
+                'day_s1_6' => _x( 'F', 'Thursday initial', 'aui' ),
+                'day_s1_7' => _x( 'S', 'Saturday initial', 'aui' ),
+                'day_s2_1' => __( 'Su', 'aui' ),
+                'day_s2_2' => __( 'Mo', 'aui' ),
+                'day_s2_3' => __( 'Tu', 'aui' ),
+                'day_s2_4' => __( 'We', 'aui' ),
+                'day_s2_5' => __( 'Th', 'aui' ),
+                'day_s2_6' => __( 'Fr', 'aui' ),
+                'day_s2_7' => __( 'Sa', 'aui' ),
+                'day_s3_1' => __( 'Sun', 'aui' ),
+                'day_s3_2' => __( 'Mon', 'aui' ),
+                'day_s3_3' => __( 'Tue', 'aui' ),
+                'day_s3_4' => __( 'Wed', 'aui' ),
+                'day_s3_5' => __( 'Thu', 'aui' ),
+                'day_s3_6' => __( 'Fri', 'aui' ),
+                'day_s3_7' => __( 'Sat', 'aui' ),
+                'day_s5_1' => __( 'Sunday', 'aui' ),
+                'day_s5_2' => __( 'Monday', 'aui' ),
+                'day_s5_3' => __( 'Tuesday', 'aui' ),
+                'day_s5_4' => __( 'Wednesday', 'aui' ),
+                'day_s5_5' => __( 'Thursday', 'aui' ),
+                'day_s5_6' => __( 'Friday', 'aui' ),
+                'day_s5_7' => __( 'Saturday', 'aui' ),
+                'am_lower' => __( 'am', 'aui' ),
+                'pm_lower' => __( 'pm', 'aui' ),
+                'am_upper' => __( 'AM', 'aui' ),
+                'pm_upper' => __( 'PM', 'aui' ),
+                'firstDayOfWeek' => (int) get_option( 'start_of_week' ),
+                'time_24hr' => false,
+                'year' => __( 'Year', 'aui' ),
+                'hour' => __( 'Hour', 'aui' ),
+                'minute' => __( 'Minute', 'aui' ),
+                'weekAbbreviation' => __( 'Wk', 'aui' ),
+                'rangeSeparator' => __( ' to ', 'aui' ),
+                'scrollTitle' => __( 'Scroll to increment', 'aui' ),
+                'toggleTitle' => __( 'Click to toggle', 'aui' )
+            );
+
+            return apply_filters( 'ayecode_ui_calendar_params', $params );
+        }
+
+        /**
+         * Flatpickr calendar localize.
+         *
+         * @since 0.1.44
+         *
+         * @return string Calendar locale.
+         */
+        public static function flatpickr_locale() {
+            $params = self::calendar_params();
+
+            if ( is_string( $params ) ) {
+                $params = html_entity_decode( $params, ENT_QUOTES, 'UTF-8' );
+            } else {
+                foreach ( (array) $params as $key => $value ) {
+                    if ( ! is_scalar( $value ) ) {
+                        continue;
+                    }
+
+                    $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+                }
+            }
 
-			$day_s3 = array();
-			$day_s5 = array();
+            $day_s3 = array();
+            $day_s5 = array();
 
-			for ( $i = 1; $i <= 7; $i ++ ) {
-				$day_s3[] = addslashes( $params[ 'day_s3_' . $i ] );
-				$day_s5[] = addslashes( $params[ 'day_s3_' . $i ] );
-			}
+            for ( $i = 1; $i <= 7; $i ++ ) {
+                $day_s3[] = addslashes( $params[ 'day_s3_' . $i ] );
+                $day_s5[] = addslashes( $params[ 'day_s3_' . $i ] );
+            }
 
-			$month_s = array();
-			$month_long = array();
+            $month_s = array();
+            $month_long = array();
 
-			for ( $i = 1; $i <= 12; $i ++ ) {
-				$month_s[] = addslashes( $params[ 'month_s_' . $i ] );
-				$month_long[] = addslashes( $params[ 'month_long_' . $i ] );
-			}
+            for ( $i = 1; $i <= 12; $i ++ ) {
+                $month_s[] = addslashes( $params[ 'month_s_' . $i ] );
+                $month_long[] = addslashes( $params[ 'month_long_' . $i ] );
+            }
 
 ob_start();
 if ( 0 ) { ?><script><?php } ?>
@@ -1994,184 +1994,184 @@ 
 }
 <?php if ( 0 ) { ?></script><?php } ?>
 <?php
-			$locale = ob_get_clean();
-
-			return apply_filters( 'ayecode_ui_flatpickr_locale', trim( $locale ) );
-		}
-
-		/**
-		 * Select2 JS params.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return array Select2 JS params.
-		 */
-		public static function select2_params() {
-			$params = array(
-				'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'aui' ),
-				'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'aui' ),
-				'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'aui' ),
-				'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'aui' ),
-				'i18n_input_too_short_n'    => _x( 'Please enter %item% or more characters', 'enhanced select', 'aui' ),
-				'i18n_input_too_long_1'     => _x( 'Please delete 1 character', 'enhanced select', 'aui' ),
-				'i18n_input_too_long_n'     => _x( 'Please delete %item% characters', 'enhanced select', 'aui' ),
-				'i18n_selection_too_long_1' => _x( 'You can only select 1 item', 'enhanced select', 'aui' ),
-				'i18n_selection_too_long_n' => _x( 'You can only select %item% items', 'enhanced select', 'aui' ),
-				'i18n_load_more'            => _x( 'Loading more results&hellip;', 'enhanced select', 'aui' ),
-				'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'aui' )
-			);
-
-			return apply_filters( 'ayecode_ui_select2_params', $params );
-		}
-
-		/**
-		 * Select2 JS localize.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return string Select2 JS locale.
-		 */
-		public static function select2_locale() {
-			$params = self::select2_params();
-
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
-					continue;
-				}
-
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-			}
-
-			$locale = json_encode( $params );
-
-			return apply_filters( 'ayecode_ui_select2_locale', trim( $locale ) );
-		}
-
-		/**
-		 * Time ago JS localize.
-		 *
-		 * @since 0.1.47
-		 *
-		 * @return string Time ago JS locale.
-		 */
-		public static function timeago_locale() {
-			$params = array(
-				'prefix_ago' => '',
-				'suffix_ago' => ' ' . _x( 'ago', 'time ago', 'aui' ),
-				'prefix_after' => _x( 'after', 'time ago', 'aui' ) . ' ',
-				'suffix_after' => '',
-				'seconds' => _x( 'less than a minute', 'time ago', 'aui' ),
-				'minute' => _x( 'about a minute', 'time ago', 'aui' ),
-				'minutes' => _x( '%d minutes', 'time ago', 'aui' ),
-				'hour' => _x( 'about an hour', 'time ago', 'aui' ),
-				'hours' => _x( 'about %d hours', 'time ago', 'aui' ),
-				'day' => _x( 'a day', 'time ago', 'aui' ),
-				'days' => _x( '%d days', 'time ago', 'aui' ),
-				'month' => _x( 'about a month', 'time ago', 'aui' ),
-				'months' => _x( '%d months', 'time ago', 'aui' ),
-				'year' => _x( 'about a year', 'time ago', 'aui' ),
-				'years' => _x( '%d years', 'time ago', 'aui' ),
-			);
-
-			$params = apply_filters( 'ayecode_ui_timeago_params', $params );
-
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
-					continue;
-				}
-
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-			}
-
-			$locale = json_encode( $params );
-
-			return apply_filters( 'ayecode_ui_timeago_locale', trim( $locale ) );
-		}
-
-		/**
-		 * JavaScript Minifier
-		 *
-		 * @param $input
-		 *
-		 * @return mixed
-		 */
-		public static function minify_js($input) {
-			if(trim($input) === "") return $input;
-			return preg_replace(
-				array(
-					// Remove comment(s)
-					'#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',
-					// Remove white-space(s) outside the string and regex
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/)|\/(?!\/)[^\n\r]*?\/(?=[\s.,;]|[gimuy]|$))|\s*([!%&*\(\)\-=+\[\]\{\}|;:,.<>?\/])\s*#s',
-					// Remove the last semicolon
-					'#;+\}#',
-					// Minify object attribute(s) except JSON attribute(s). From `{'foo':'bar'}` to `{foo:'bar'}`
-					'#([\{,])([\'])(\d+|[a-z_][a-z0-9_]*)\2(?=\:)#i',
-					// --ibid. From `foo['bar']` to `foo.bar`
-					'#([a-z0-9_\)\]])\[([\'"])([a-z_][a-z0-9_]*)\2\]#i'
-				),
-				array(
-					'$1',
-					'$1$2',
-					'}',
-					'$1$3',
-					'$1.$3'
-				),
-				$input);
-		}
+            $locale = ob_get_clean();
+
+            return apply_filters( 'ayecode_ui_flatpickr_locale', trim( $locale ) );
+        }
+
+        /**
+         * Select2 JS params.
+         *
+         * @since 0.1.44
+         *
+         * @return array Select2 JS params.
+         */
+        public static function select2_params() {
+            $params = array(
+                'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'aui' ),
+                'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'aui' ),
+                'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'aui' ),
+                'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'aui' ),
+                'i18n_input_too_short_n'    => _x( 'Please enter %item% or more characters', 'enhanced select', 'aui' ),
+                'i18n_input_too_long_1'     => _x( 'Please delete 1 character', 'enhanced select', 'aui' ),
+                'i18n_input_too_long_n'     => _x( 'Please delete %item% characters', 'enhanced select', 'aui' ),
+                'i18n_selection_too_long_1' => _x( 'You can only select 1 item', 'enhanced select', 'aui' ),
+                'i18n_selection_too_long_n' => _x( 'You can only select %item% items', 'enhanced select', 'aui' ),
+                'i18n_load_more'            => _x( 'Loading more results&hellip;', 'enhanced select', 'aui' ),
+                'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'aui' )
+            );
+
+            return apply_filters( 'ayecode_ui_select2_params', $params );
+        }
+
+        /**
+         * Select2 JS localize.
+         *
+         * @since 0.1.44
+         *
+         * @return string Select2 JS locale.
+         */
+        public static function select2_locale() {
+            $params = self::select2_params();
+
+            foreach ( (array) $params as $key => $value ) {
+                if ( ! is_scalar( $value ) ) {
+                    continue;
+                }
 
-		/**
-		 * Minify CSS
-		 *
-		 * @param $input
-		 *
-		 * @return mixed
-		 */
-		public static function minify_css($input) {
-			if(trim($input) === "") return $input;
-			return preg_replace(
-				array(
-					// Remove comment(s)
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')|\/\*(?!\!)(?>.*?\*\/)|^\s*|\s*$#s',
-					// Remove unused white-space(s)
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/))|\s*+;\s*+(})\s*+|\s*+([*$~^|]?+=|[{};,>~]|\s(?![0-9\.])|!important\b)\s*+|([[(:])\s++|\s++([])])|\s++(:)\s*+(?!(?>[^{}"\']++|"(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')*+{)|^\s++|\s++\z|(\s)\s+#si',
-					// Replace `0(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)` with `0`
-					'#(?<=[\s:])(0)(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)#si',
-					// Replace `:0 0 0 0` with `:0`
-					'#:(0\s+0|0\s+0\s+0\s+0)(?=[;\}]|\!important)#i',
-					// Replace `background-position:0` with `background-position:0 0`
-					'#(background-position):0(?=[;\}])#si',
-					// Replace `0.6` with `.6`, but only when preceded by `:`, `,`, `-` or a white-space
-					'#(?<=[\s:,\-])0+\.(\d+)#s',
-					// Minify string value
-					'#(\/\*(?>.*?\*\/))|(?<!content\:)([\'"])([a-z_][a-z0-9\-_]*?)\2(?=[\s\{\}\];,])#si',
-					'#(\/\*(?>.*?\*\/))|(\burl\()([\'"])([^\s]+?)\3(\))#si',
-					// Minify HEX color code
-					'#(?<=[\s:,\-]\#)([a-f0-6]+)\1([a-f0-6]+)\2([a-f0-6]+)\3#i',
-					// Replace `(border|outline):none` with `(border|outline):0`
-					'#(?<=[\{;])(border|outline):none(?=[;\}\!])#',
-					// Remove empty selector(s)
-					'#(\/\*(?>.*?\*\/))|(^|[\{\}])(?:[^\s\{\}]+)\{\}#s'
-				),
-				array(
-					'$1',
-					'$1$2$3$4$5$6$7',
-					'$1',
-					':0',
-					'$1:0 0',
-					'.$1',
-					'$1$3',
-					'$1$2$4$5',
-					'$1$2$3',
-					'$1:0',
-					'$1$2'
-				),
-				$input);
-		}
-	}
+                $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+            }
+
+            $locale = json_encode( $params );
+
+            return apply_filters( 'ayecode_ui_select2_locale', trim( $locale ) );
+        }
+
+        /**
+         * Time ago JS localize.
+         *
+         * @since 0.1.47
+         *
+         * @return string Time ago JS locale.
+         */
+        public static function timeago_locale() {
+            $params = array(
+                'prefix_ago' => '',
+                'suffix_ago' => ' ' . _x( 'ago', 'time ago', 'aui' ),
+                'prefix_after' => _x( 'after', 'time ago', 'aui' ) . ' ',
+                'suffix_after' => '',
+                'seconds' => _x( 'less than a minute', 'time ago', 'aui' ),
+                'minute' => _x( 'about a minute', 'time ago', 'aui' ),
+                'minutes' => _x( '%d minutes', 'time ago', 'aui' ),
+                'hour' => _x( 'about an hour', 'time ago', 'aui' ),
+                'hours' => _x( 'about %d hours', 'time ago', 'aui' ),
+                'day' => _x( 'a day', 'time ago', 'aui' ),
+                'days' => _x( '%d days', 'time ago', 'aui' ),
+                'month' => _x( 'about a month', 'time ago', 'aui' ),
+                'months' => _x( '%d months', 'time ago', 'aui' ),
+                'year' => _x( 'about a year', 'time ago', 'aui' ),
+                'years' => _x( '%d years', 'time ago', 'aui' ),
+            );
+
+            $params = apply_filters( 'ayecode_ui_timeago_params', $params );
+
+            foreach ( (array) $params as $key => $value ) {
+                if ( ! is_scalar( $value ) ) {
+                    continue;
+                }
 
-	/**
-	 * Run the class if found.
-	 */
-	AyeCode_UI_Settings::instance();
+                $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+            }
+
+            $locale = json_encode( $params );
+
+            return apply_filters( 'ayecode_ui_timeago_locale', trim( $locale ) );
+        }
+
+        /**
+         * JavaScript Minifier
+         *
+         * @param $input
+         *
+         * @return mixed
+         */
+        public static function minify_js($input) {
+            if(trim($input) === "") return $input;
+            return preg_replace(
+                array(
+                    // Remove comment(s)
+                    '#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',
+                    // Remove white-space(s) outside the string and regex
+                    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/)|\/(?!\/)[^\n\r]*?\/(?=[\s.,;]|[gimuy]|$))|\s*([!%&*\(\)\-=+\[\]\{\}|;:,.<>?\/])\s*#s',
+                    // Remove the last semicolon
+                    '#;+\}#',
+                    // Minify object attribute(s) except JSON attribute(s). From `{'foo':'bar'}` to `{foo:'bar'}`
+                    '#([\{,])([\'])(\d+|[a-z_][a-z0-9_]*)\2(?=\:)#i',
+                    // --ibid. From `foo['bar']` to `foo.bar`
+                    '#([a-z0-9_\)\]])\[([\'"])([a-z_][a-z0-9_]*)\2\]#i'
+                ),
+                array(
+                    '$1',
+                    '$1$2',
+                    '}',
+                    '$1$3',
+                    '$1.$3'
+                ),
+                $input);
+        }
+
+        /**
+         * Minify CSS
+         *
+         * @param $input
+         *
+         * @return mixed
+         */
+        public static function minify_css($input) {
+            if(trim($input) === "") return $input;
+            return preg_replace(
+                array(
+                    // Remove comment(s)
+                    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')|\/\*(?!\!)(?>.*?\*\/)|^\s*|\s*$#s',
+                    // Remove unused white-space(s)
+                    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/))|\s*+;\s*+(})\s*+|\s*+([*$~^|]?+=|[{};,>~]|\s(?![0-9\.])|!important\b)\s*+|([[(:])\s++|\s++([])])|\s++(:)\s*+(?!(?>[^{}"\']++|"(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')*+{)|^\s++|\s++\z|(\s)\s+#si',
+                    // Replace `0(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)` with `0`
+                    '#(?<=[\s:])(0)(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)#si',
+                    // Replace `:0 0 0 0` with `:0`
+                    '#:(0\s+0|0\s+0\s+0\s+0)(?=[;\}]|\!important)#i',
+                    // Replace `background-position:0` with `background-position:0 0`
+                    '#(background-position):0(?=[;\}])#si',
+                    // Replace `0.6` with `.6`, but only when preceded by `:`, `,`, `-` or a white-space
+                    '#(?<=[\s:,\-])0+\.(\d+)#s',
+                    // Minify string value
+                    '#(\/\*(?>.*?\*\/))|(?<!content\:)([\'"])([a-z_][a-z0-9\-_]*?)\2(?=[\s\{\}\];,])#si',
+                    '#(\/\*(?>.*?\*\/))|(\burl\()([\'"])([^\s]+?)\3(\))#si',
+                    // Minify HEX color code
+                    '#(?<=[\s:,\-]\#)([a-f0-6]+)\1([a-f0-6]+)\2([a-f0-6]+)\3#i',
+                    // Replace `(border|outline):none` with `(border|outline):0`
+                    '#(?<=[\{;])(border|outline):none(?=[;\}\!])#',
+                    // Remove empty selector(s)
+                    '#(\/\*(?>.*?\*\/))|(^|[\{\}])(?:[^\s\{\}]+)\{\}#s'
+                ),
+                array(
+                    '$1',
+                    '$1$2$3$4$5$6$7',
+                    '$1',
+                    ':0',
+                    '$1:0 0',
+                    '.$1',
+                    '$1$3',
+                    '$1$2$4$5',
+                    '$1$2$3',
+                    '$1:0',
+                    '$1$2'
+                ),
+                $input);
+        }
+    }
+
+    /**
+     * Run the class if found.
+     */
+    AyeCode_UI_Settings::instance();
 }
\ No newline at end of file

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

Indentation +134 added lines, -134 removed lines

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

Spacing +41 added lines, -41 removed lines

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

includes/admin/subscriptions.php

Indentation +429 added lines, -429 removed lines

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

Spacing +196 added lines, -196 removed lines

@@ -3,7 +3,7 @@ 
  * Contains functions that display the subscriptions admin page.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Render the Subscriptions page
@@ -17,22 +17,22 @@ 
 	?>
 
 	<div class="wrap">
-		<h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
+		<h1><?php echo esc_html(get_admin_page_title()); ?></h1>
 		<div class="bsui">
 
 			<?php
 
 				// Verify user permissions.
-				if ( ! wpinv_current_user_can_manage_invoicing() ) {
+				if (!wpinv_current_user_can_manage_invoicing()) {
 
 					echo aui()->alert(
 						array(
 							'type'    => 'danger',
-							'content' => __( 'You are not permitted to view this page.', 'invoicing' ),
+							'content' => __('You are not permitted to view this page.', 'invoicing'),
 						)
 					);
 
-				} else if ( ! empty( $_GET['id'] ) && is_numeric( $_GET['id'] ) ) {
+				} else if (!empty($_GET['id']) && is_numeric($_GET['id'])) {
 
 					// Display a single subscription.
 					wpinv_recurring_subscription_details();
@@ -81,13 +81,13 @@ 
 function wpinv_recurring_subscription_details() {
 
 	// Fetch the subscription.
-	$sub = new WPInv_Subscription( (int) $_GET['id'] );
-	if ( ! $sub->exists() ) {
+	$sub = new WPInv_Subscription((int) $_GET['id']);
+	if (!$sub->exists()) {
 
 		echo aui()->alert(
 			array(
 				'type'    => 'danger',
-				'content' => __( 'Subscription not found.', 'invoicing' ),
+				'content' => __('Subscription not found.', 'invoicing'),
 			)
 		);
 
@@ -95,45 +95,45 @@ 
 	}
 
 	// Use metaboxes to display the subscription details.
-	add_meta_box( 'getpaid_admin_subscription_details_metabox', __( 'Subscription Details', 'invoicing' ), 'getpaid_admin_subscription_details_metabox', get_current_screen(), 'normal', 'high' );
-	add_meta_box( 'getpaid_admin_subscription_update_metabox', __( 'Change Status', 'invoicing' ), 'getpaid_admin_subscription_update_metabox', get_current_screen(), 'side' );
+	add_meta_box('getpaid_admin_subscription_details_metabox', __('Subscription Details', 'invoicing'), 'getpaid_admin_subscription_details_metabox', get_current_screen(), 'normal', 'high');
+	add_meta_box('getpaid_admin_subscription_update_metabox', __('Change Status', 'invoicing'), 'getpaid_admin_subscription_update_metabox', get_current_screen(), 'side');
 
 	$subscription_id     = $sub->get_id();
-	$subscription_groups = getpaid_get_invoice_subscription_groups( $sub->get_parent_invoice_id() );
-	$subscription_group  = wp_list_filter( $subscription_groups, compact( 'subscription_id' ) );
+	$subscription_groups = getpaid_get_invoice_subscription_groups($sub->get_parent_invoice_id());
+	$subscription_group  = wp_list_filter($subscription_groups, compact('subscription_id'));
 
-	if ( 1 < count( $subscription_groups ) ) {
-		add_meta_box( 'getpaid_admin_subscription_related_subscriptions_metabox', __( 'Related Subscriptions', 'invoicing' ), 'getpaid_admin_subscription_related_subscriptions_metabox', get_current_screen(), 'advanced' );
+	if (1 < count($subscription_groups)) {
+		add_meta_box('getpaid_admin_subscription_related_subscriptions_metabox', __('Related Subscriptions', 'invoicing'), 'getpaid_admin_subscription_related_subscriptions_metabox', get_current_screen(), 'advanced');
 	}
 
-	if ( ! empty( $subscription_group ) ) {
-		add_meta_box( 'getpaid_admin_subscription_item_details_metabox', __( 'Subscription Items', 'invoicing' ), 'getpaid_admin_subscription_item_details_metabox', get_current_screen(), 'normal', 'low' );
+	if (!empty($subscription_group)) {
+		add_meta_box('getpaid_admin_subscription_item_details_metabox', __('Subscription Items', 'invoicing'), 'getpaid_admin_subscription_item_details_metabox', get_current_screen(), 'normal', 'low');
 	}
 
-	add_meta_box( 'getpaid_admin_subscription_invoice_details_metabox', __( 'Related Invoices', 'invoicing' ), 'getpaid_admin_subscription_invoice_details_metabox', get_current_screen(), 'advanced' );
+	add_meta_box('getpaid_admin_subscription_invoice_details_metabox', __('Related Invoices', 'invoicing'), 'getpaid_admin_subscription_invoice_details_metabox', get_current_screen(), 'advanced');
 
-	do_action( 'getpaid_admin_single_subscription_register_metabox', $sub );
+	do_action('getpaid_admin_single_subscription_register_metabox', $sub);
 
 	?>
 
-		<form method="post" action="<?php echo admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $sub->get_id() ) ); ?>">
+		<form method="post" action="<?php echo admin_url('admin.php?page=wpinv-subscriptions&id=' . absint($sub->get_id())); ?>">
 
-			<?php wp_nonce_field( 'getpaid-nonce', 'getpaid-nonce' ); ?>
-			<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
-			<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+			<?php wp_nonce_field('getpaid-nonce', 'getpaid-nonce'); ?>
+			<?php wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false); ?>
+			<?php wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false); ?>
 			<input type="hidden" name="getpaid-admin-action" value="update_single_subscription" />
-			<input type="hidden" name="subscription_id" value="<?php echo (int) $sub->get_id() ;?>" />
+			<input type="hidden" name="subscription_id" value="<?php echo (int) $sub->get_id(); ?>" />
 
 			<div id="poststuff">
 				<div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
 
 					<div id="postbox-container-1" class="postbox-container">
-						<?php do_meta_boxes( get_current_screen(), 'side', $sub ); ?>
+						<?php do_meta_boxes(get_current_screen(), 'side', $sub); ?>
 					</div>
 
 					<div id="postbox-container-2" class="postbox-container">
-						<?php do_meta_boxes( get_current_screen(), 'normal', $sub ); ?>
-						<?php do_meta_boxes( get_current_screen(), 'advanced', $sub ); ?>
+						<?php do_meta_boxes(get_current_screen(), 'normal', $sub); ?>
+						<?php do_meta_boxes(get_current_screen(), 'advanced', $sub); ?>
 					</div>
 
 				</div>
@@ -152,44 +152,44 @@ 
  *
  * @param WPInv_Subscription $sub
  */
-function getpaid_admin_subscription_details_metabox( $sub ) {
+function getpaid_admin_subscription_details_metabox($sub) {
 
 	// Subscription items.
-	$subscription_group = getpaid_get_invoice_subscription_group( $sub->get_parent_invoice_id(), $sub->get_id() );
-	$items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
+	$subscription_group = getpaid_get_invoice_subscription_group($sub->get_parent_invoice_id(), $sub->get_id());
+	$items_count        = empty($subscription_group) ? 1 : count($subscription_group['items']);
 
 	// Prepare subscription detail columns.
 	$fields = apply_filters(
 		'getpaid_subscription_admin_page_fields',
 		array(
-			'subscription'   => __( 'Subscription', 'invoicing' ),
-			'customer'       => __( 'Customer', 'invoicing' ),
-			'amount'         => __( 'Amount', 'invoicing' ),
-			'start_date'     => __( 'Start Date', 'invoicing' ),
-			'renews_on'      => __( 'Next Payment', 'invoicing' ),
-			'renewals'       => __( 'Payments', 'invoicing' ),
-			'item'           => _n( 'Item', 'Items', $items_count,  'invoicing' ),
-			'gateway'        => __( 'Payment Method', 'invoicing' ),
-			'profile_id'     => __( 'Profile ID', 'invoicing' ),
-			'status'         => __( 'Status', 'invoicing' ),
+			'subscription'   => __('Subscription', 'invoicing'),
+			'customer'       => __('Customer', 'invoicing'),
+			'amount'         => __('Amount', 'invoicing'),
+			'start_date'     => __('Start Date', 'invoicing'),
+			'renews_on'      => __('Next Payment', 'invoicing'),
+			'renewals'       => __('Payments', 'invoicing'),
+			'item'           => _n('Item', 'Items', $items_count, 'invoicing'),
+			'gateway'        => __('Payment Method', 'invoicing'),
+			'profile_id'     => __('Profile ID', 'invoicing'),
+			'status'         => __('Status', 'invoicing'),
 		)
 	);
 
-	if ( ! $sub->is_active() ) {
+	if (!$sub->is_active()) {
 
-		if ( isset( $fields['renews_on'] ) ) {
-			unset( $fields['renews_on'] );
+		if (isset($fields['renews_on'])) {
+			unset($fields['renews_on']);
 		}
 
-		if ( isset( $fields['gateway'] ) ) {
-			unset( $fields['gateway'] );
+		if (isset($fields['gateway'])) {
+			unset($fields['gateway']);
 		}
 
 	}
 
 	$profile_id = $sub->get_profile_id();
-	if ( empty( $profile_id ) && isset( $fields['profile_id'] ) ) {
-		unset( $fields['profile_id'] );
+	if (empty($profile_id) && isset($fields['profile_id'])) {
+		unset($fields['profile_id']);
 	}
 
 	?>
@@ -197,16 +197,16 @@ 
 		<table class="table table-borderless" style="font-size: 14px;">
 			<tbody>
 
-				<?php foreach ( $fields as $key => $label ) : ?>
+				<?php foreach ($fields as $key => $label) : ?>
 
-					<tr class="getpaid-subscription-meta-<?php echo sanitize_html_class( $key ); ?>">
+					<tr class="getpaid-subscription-meta-<?php echo sanitize_html_class($key); ?>">
 
 						<th class="w-25" style="font-weight: 500;">
-							<?php echo sanitize_text_field( $label ); ?>
+							<?php echo sanitize_text_field($label); ?>
 						</th>
 
 						<td class="w-75 text-muted">
-							<?php do_action( 'getpaid_subscription_admin_display_' . sanitize_text_field( $key ), $sub, $subscription_group ); ?>
+							<?php do_action('getpaid_subscription_admin_display_' . sanitize_text_field($key), $sub, $subscription_group); ?>
 						</td>
 
 					</tr>
@@ -224,129 +224,129 @@ 
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_customer( $subscription ) {
+function getpaid_admin_subscription_metabox_display_customer($subscription) {
 
-	$username = __( '(Missing User)', 'invoicing' );
+	$username = __('(Missing User)', 'invoicing');
 
-	$user = get_userdata( $subscription->get_customer_id() );
-	if ( $user ) {
+	$user = get_userdata($subscription->get_customer_id());
+	if ($user) {
 
 		$username = sprintf(
 			'<a href="user-edit.php?user_id=%s">%s</a>',
-			absint( $user->ID ),
-			! empty( $user->display_name ) ? sanitize_text_field( $user->display_name ) : sanitize_email( $user->user_email )
+			absint($user->ID),
+			!empty($user->display_name) ? sanitize_text_field($user->display_name) : sanitize_email($user->user_email)
 		);
 
 	}
 
 	echo  $username;
 }
-add_action( 'getpaid_subscription_admin_display_customer', 'getpaid_admin_subscription_metabox_display_customer' );
+add_action('getpaid_subscription_admin_display_customer', 'getpaid_admin_subscription_metabox_display_customer');
 
 /**
  * Displays the subscription amount.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_amount( $subscription ) {
-	$amount    = sanitize_text_field( getpaid_get_formatted_subscription_amount( $subscription ) );
+function getpaid_admin_subscription_metabox_display_amount($subscription) {
+	$amount = sanitize_text_field(getpaid_get_formatted_subscription_amount($subscription));
 	echo "<span>$amount</span>";
 }
-add_action( 'getpaid_subscription_admin_display_amount', 'getpaid_admin_subscription_metabox_display_amount' );
+add_action('getpaid_subscription_admin_display_amount', 'getpaid_admin_subscription_metabox_display_amount');
 
 /**
  * Displays the subscription id.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_id( $subscription ) {
-	echo  '#' . absint( $subscription->get_id() );
+function getpaid_admin_subscription_metabox_display_id($subscription) {
+	echo  '#' . absint($subscription->get_id());
 }
-add_action( 'getpaid_subscription_admin_display_subscription', 'getpaid_admin_subscription_metabox_display_id' );
+add_action('getpaid_subscription_admin_display_subscription', 'getpaid_admin_subscription_metabox_display_id');
 
 /**
  * Displays the subscription renewal date.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_start_date( $subscription ) {
-	echo getpaid_format_date_value( $subscription->get_date_created() );
+function getpaid_admin_subscription_metabox_display_start_date($subscription) {
+	echo getpaid_format_date_value($subscription->get_date_created());
 }
-add_action( 'getpaid_subscription_admin_display_start_date', 'getpaid_admin_subscription_metabox_display_start_date' );
+add_action('getpaid_subscription_admin_display_start_date', 'getpaid_admin_subscription_metabox_display_start_date');
 
 /**
  * Displays the subscription renewal date.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_renews_on( $subscription ) {
-	echo getpaid_format_date_value( $subscription->get_expiration() );
+function getpaid_admin_subscription_metabox_display_renews_on($subscription) {
+	echo getpaid_format_date_value($subscription->get_expiration());
 }
-add_action( 'getpaid_subscription_admin_display_renews_on', 'getpaid_admin_subscription_metabox_display_renews_on' );
+add_action('getpaid_subscription_admin_display_renews_on', 'getpaid_admin_subscription_metabox_display_renews_on');
 
 /**
  * Displays the subscription renewal count.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_renewals( $subscription ) {
+function getpaid_admin_subscription_metabox_display_renewals($subscription) {
 	$max_bills = $subscription->get_bill_times();
-	echo $subscription->get_times_billed() . ' / ' . ( empty( $max_bills ) ? "&infin;" : $max_bills );
+	echo $subscription->get_times_billed() . ' / ' . (empty($max_bills) ? "&infin;" : $max_bills);
 }
-add_action( 'getpaid_subscription_admin_display_renewals', 'getpaid_admin_subscription_metabox_display_renewals' );
+add_action('getpaid_subscription_admin_display_renewals', 'getpaid_admin_subscription_metabox_display_renewals');
 /**
  * Displays the subscription item.
  *
  * @param WPInv_Subscription $subscription
  * @param false|array $subscription_group
  */
-function getpaid_admin_subscription_metabox_display_item( $subscription, $subscription_group = false ) {
+function getpaid_admin_subscription_metabox_display_item($subscription, $subscription_group = false) {
 
-	if ( empty( $subscription_group ) ) {
-		echo WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() );
+	if (empty($subscription_group)) {
+		echo WPInv_Subscriptions_List_Table::generate_item_markup($subscription->get_product_id());
 		return;
 	}
 
-	$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-	echo implode( ' | ', $markup );
+	$markup = array_map(array('WPInv_Subscriptions_List_Table', 'generate_item_markup'), array_keys($subscription_group['items']));
+	echo implode(' | ', $markup);
 
 }
-add_action( 'getpaid_subscription_admin_display_item', 'getpaid_admin_subscription_metabox_display_item', 10, 2 );
+add_action('getpaid_subscription_admin_display_item', 'getpaid_admin_subscription_metabox_display_item', 10, 2);
 
 /**
  * Displays the subscription gateway.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_gateway( $subscription ) {
+function getpaid_admin_subscription_metabox_display_gateway($subscription) {
 
 	$gateway = $subscription->get_gateway();
 
-	if ( ! empty( $gateway ) ) {
-		echo sanitize_text_field( wpinv_get_gateway_admin_label( $gateway ) );
+	if (!empty($gateway)) {
+		echo sanitize_text_field(wpinv_get_gateway_admin_label($gateway));
 	} else {
 		echo "&mdash;";
 	}
 
 }
-add_action( 'getpaid_subscription_admin_display_gateway', 'getpaid_admin_subscription_metabox_display_gateway' );
+add_action('getpaid_subscription_admin_display_gateway', 'getpaid_admin_subscription_metabox_display_gateway');
 
 /**
  * Displays the subscription status.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_status( $subscription ) {
+function getpaid_admin_subscription_metabox_display_status($subscription) {
 	echo $subscription->get_status_label_html();
 }
-add_action( 'getpaid_subscription_admin_display_status', 'getpaid_admin_subscription_metabox_display_status' );
+add_action('getpaid_subscription_admin_display_status', 'getpaid_admin_subscription_metabox_display_status');
 
 /**
  * Displays the subscription profile id.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_metabox_display_profile_id( $subscription ) {
+function getpaid_admin_subscription_metabox_display_profile_id($subscription) {
 
 	$profile_id = $subscription->get_profile_id();
 
@@ -355,32 +355,32 @@ 
 			'type'        => 'text',
 			'id'          => 'wpinv_subscription_profile_id',
 			'name'        => 'wpinv_subscription_profile_id',
-			'label'       => __( 'Profile Id', 'invoicing' ),
+			'label'       => __('Profile Id', 'invoicing'),
 			'label_type'  => 'hidden',
-			'placeholder' => __( 'Profile Id', 'invoicing' ),
-			'value'       => sanitize_text_field( $profile_id ),
+			'placeholder' => __('Profile Id', 'invoicing'),
+			'value'       => sanitize_text_field($profile_id),
 			'input_group_right' => '',
 			'no_wrap'     => true,
 		)
 	);
 
-	echo str_ireplace( 'form-control', 'regular-text', $input );
+	echo str_ireplace('form-control', 'regular-text', $input);
 
-	$url = apply_filters( 'getpaid_remote_subscription_profile_url', '', $subscription );
-	if ( ! empty( $url ) ) {
-		$url = esc_url_raw( $url );
-		echo '&nbsp;<a href="' . $url . '" title="' . __( 'View in Gateway', 'invoicing' ) . '" target="_blank"><i class="fas fa-external-link-alt fa-xs fa-fw align-top"></i></a>';
+	$url = apply_filters('getpaid_remote_subscription_profile_url', '', $subscription);
+	if (!empty($url)) {
+		$url = esc_url_raw($url);
+		echo '&nbsp;<a href="' . $url . '" title="' . __('View in Gateway', 'invoicing') . '" target="_blank"><i class="fas fa-external-link-alt fa-xs fa-fw align-top"></i></a>';
 	}
 
 }
-add_action( 'getpaid_subscription_admin_display_profile_id', 'getpaid_admin_subscription_metabox_display_profile_id' );
+add_action('getpaid_subscription_admin_display_profile_id', 'getpaid_admin_subscription_metabox_display_profile_id');
 
 /**
  * Displays the subscriptions update metabox.
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_update_metabox( $subscription ) {
+function getpaid_admin_subscription_update_metabox($subscription) {
 
 	?>
 	<div class="mt-3">
@@ -393,10 +393,10 @@ 
 					'id'               => 'subscription_status_update_select',
 					'required'         => true,
 					'no_wrap'          => false,
-					'label'            => __( 'Subscription Status', 'invoicing' ),
-					'help_text'        => __( 'Updating the status will trigger related actions and hooks', 'invoicing' ),
+					'label'            => __('Subscription Status', 'invoicing'),
+					'help_text'        => __('Updating the status will trigger related actions and hooks', 'invoicing'),
 					'select2'          => true,
-					'value'            => $subscription->get_status( 'edit' ),
+					'value'            => $subscription->get_status('edit'),
 				)
 			);
 		?>
@@ -404,13 +404,13 @@ 
 		<div class="mt-2 px-3 py-2 bg-light border-top" style="margin: -12px;">
 
 		<?php
-			submit_button( __( 'Update', 'invoicing' ), 'primary', 'submit', false );
+			submit_button(__('Update', 'invoicing'), 'primary', 'submit', false);
 
-			$url    = esc_url( wp_nonce_url( add_query_arg( 'getpaid-admin-action', 'subscription_manual_renew' ), 'getpaid-nonce', 'getpaid-nonce' ) );
-			$anchor = __( 'Renew Subscription', 'invoicing' );
-			$title  = esc_attr__( 'Are you sure you want to extend the subscription and generate a new invoice that will be automatically marked as paid?', 'invoicing' );
+			$url    = esc_url(wp_nonce_url(add_query_arg('getpaid-admin-action', 'subscription_manual_renew'), 'getpaid-nonce', 'getpaid-nonce'));
+			$anchor = __('Renew Subscription', 'invoicing');
+			$title  = esc_attr__('Are you sure you want to extend the subscription and generate a new invoice that will be automatically marked as paid?', 'invoicing');
 
-			if ( $subscription->is_active() ) {
+			if ($subscription->is_active()) {
 				echo "<a href='$url' class='float-right text-muted' onclick='return confirm(\"$title\")'>$anchor</a>";
 			}
 
@@ -423,31 +423,31 @@ 
  * @param WPInv_Subscription $subscription
  * @param bool $strict Whether or not to skip invoices of sibling subscriptions
  */
-function getpaid_admin_subscription_invoice_details_metabox( $subscription, $strict = true ) {
+function getpaid_admin_subscription_invoice_details_metabox($subscription, $strict = true) {
 
 	$columns = apply_filters(
 		'getpaid_subscription_related_invoices_columns',
 		array(
-			'invoice'      => __( 'Invoice', 'invoicing' ),
-			'relationship' => __( 'Relationship', 'invoicing' ),
-			'date'         => __( 'Date', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
-			'total'        => __( 'Total', 'invoicing' ),
+			'invoice'      => __('Invoice', 'invoicing'),
+			'relationship' => __('Relationship', 'invoicing'),
+			'date'         => __('Date', 'invoicing'),
+			'status'       => __('Status', 'invoicing'),
+			'total'        => __('Total', 'invoicing'),
 		),
 		$subscription
 	);
 
 	// Prepare the invoices.
-	$payments = $subscription->get_child_payments( ! is_admin() );
+	$payments = $subscription->get_child_payments(!is_admin());
 	$parent   = $subscription->get_parent_invoice();
 
-	if ( $parent->exists() ) {
-		$payments = array_merge( array( $parent ), $payments );
+	if ($parent->exists()) {
+		$payments = array_merge(array($parent), $payments);
 	}
 
 	$table_class = 'w-100 bg-white';
 
-	if ( ! is_admin() ) {
+	if (!is_admin()) {
 		$table_class = 'table table-bordered';
 	}
 
@@ -459,9 +459,9 @@ 
 				<thead>
 					<tr>
 						<?php
-							foreach ( $columns as $key => $label ) {
-								$key   = esc_attr( $key );
-								$label = sanitize_text_field( $label );
+							foreach ($columns as $key => $label) {
+								$key   = esc_attr($key);
+								$label = sanitize_text_field($label);
 								$class = 'text-left';
 
 								echo "<th class='subscription-invoice-field-$key bg-light p-2 $class color-dark font-weight-bold'>$label</th>";
@@ -472,57 +472,57 @@ 
 
 				<tbody>
 
-					<?php if ( empty( $payments ) ) : ?>
+					<?php if (empty($payments)) : ?>
 						<tr>
 							<td colspan="<?php echo count($columns); ?>" class="p-2 text-left text-muted">
-								<?php _e( 'This subscription has no invoices.', 'invoicing' ); ?>
+								<?php _e('This subscription has no invoices.', 'invoicing'); ?>
 							</td>
 						</tr>
 					<?php endif; ?>
 
 					<?php
 
-						foreach( $payments as $payment ) :
+						foreach ($payments as $payment) :
 
 							// Ensure that we have an invoice.
-							$payment = new WPInv_Invoice( $payment );
+							$payment = new WPInv_Invoice($payment);
 
 							// Abort if the invoice is invalid...
-							if ( ! $payment->exists() ) {
+							if (!$payment->exists()) {
 								continue;
 							}
 
 							// ... or belongs to a different subscription.
-							if ( $strict && $payment->is_renewal() && $payment->get_subscription_id() && $payment->get_subscription_id() != $subscription->get_id() ) {
+							if ($strict && $payment->is_renewal() && $payment->get_subscription_id() && $payment->get_subscription_id() != $subscription->get_id()) {
 								continue;
 							}
 
 							echo '<tr>';
 
-								foreach ( array_keys( $columns ) as $key ) {
+								foreach (array_keys($columns) as $key) {
 
 									$class = 'text-left';
 
 									echo "<td class='p-2 $class'>";
 
-										switch( $key ) {
+										switch ($key) {
 
 											case 'total':
-												echo '<strong>' . wpinv_price( $payment->get_total(), $payment->get_currency() ) . '</strong>';
+												echo '<strong>' . wpinv_price($payment->get_total(), $payment->get_currency()) . '</strong>';
 												break;
 
 											case 'relationship':
-												echo $payment->is_renewal() ? __( 'Renewal Invoice', 'invoicing' ) : __( 'Initial Invoice', 'invoicing' );
+												echo $payment->is_renewal() ? __('Renewal Invoice', 'invoicing') : __('Initial Invoice', 'invoicing');
 												break;
 
 											case 'date':
-												echo getpaid_format_date_value( $payment->get_date_created() );
+												echo getpaid_format_date_value($payment->get_date_created());
 												break;
 
 											case 'status':
 
 												$status = $payment->get_status_nicename();
-												if ( is_admin() ) {
+												if (is_admin()) {
 													$status = $payment->get_status_label_html();
 												}
 
@@ -530,13 +530,13 @@ 
 												break;
 
 											case 'invoice':
-												$link    = esc_url( get_edit_post_link( $payment->get_id() ) );
+												$link = esc_url(get_edit_post_link($payment->get_id()));
 
-												if ( ! is_admin() ) {
-													$link = esc_url( $payment->get_view_url() );
+												if (!is_admin()) {
+													$link = esc_url($payment->get_view_url());
 												}
 
-												$invoice = sanitize_text_field( $payment->get_number() );
+												$invoice = sanitize_text_field($payment->get_number());
 												echo "<a href='$link'>$invoice</a>";
 												break;
 										}
@@ -564,12 +564,12 @@ 
  *
  * @param WPInv_Subscription $subscription
  */
-function getpaid_admin_subscription_item_details_metabox( $subscription ) {
+function getpaid_admin_subscription_item_details_metabox($subscription) {
 
 	// Fetch the subscription group.
-	$subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_payment_id(), $subscription->get_id() );
+	$subscription_group = getpaid_get_invoice_subscription_group($subscription->get_parent_payment_id(), $subscription->get_id());
 
-	if ( empty( $subscription_group ) || empty( $subscription_group['items'] ) ) {
+	if (empty($subscription_group) || empty($subscription_group['items'])) {
 		return;
 	}
 
@@ -577,12 +577,12 @@ 
 	$columns = apply_filters(
 		'getpaid_subscription_item_details_columns',
 		array(
-			'item_name'    => __( 'Item', 'invoicing' ),
-			'price'        => __( 'Price', 'invoicing' ),
-			'tax'          => __( 'Tax', 'invoicing' ),
-			'discount'     => __( 'Discount', 'invoicing' ),
+			'item_name'    => __('Item', 'invoicing'),
+			'price'        => __('Price', 'invoicing'),
+			'tax'          => __('Tax', 'invoicing'),
+			'discount'     => __('Discount', 'invoicing'),
 			//'initial'      => __( 'Initial Amount', 'invoicing' ),
-			'recurring'    => __( 'Subtotal', 'invoicing' ),
+			'recurring'    => __('Subtotal', 'invoicing'),
 		),
 		$subscription
 	);
@@ -591,13 +591,13 @@ 
 
 	$invoice = $subscription->get_parent_invoice();
 
-	if ( ( ! wpinv_use_taxes() || ! $invoice->is_taxable() ) && isset( $columns['tax'] ) ) {
-		unset( $columns['tax'] );
+	if ((!wpinv_use_taxes() || !$invoice->is_taxable()) && isset($columns['tax'])) {
+		unset($columns['tax']);
 	}
 
 	$table_class = 'w-100 bg-white';
 
-	if ( ! is_admin() ) {
+	if (!is_admin()) {
 		$table_class = 'table table-bordered';
 	}
 
@@ -610,9 +610,9 @@ 
 					<tr>
 						<?php
 
-							foreach ( $columns as $key => $label ) {
-								$key   = esc_attr( $key );
-								$label = sanitize_text_field( $label );
+							foreach ($columns as $key => $label) {
+								$key   = esc_attr($key);
+								$label = sanitize_text_field($label);
 								$class = 'text-left';
 
 								echo "<th class='subscription-item-field-$key bg-light p-2 $class color-dark font-weight-bold'>$label</th>";
@@ -625,48 +625,48 @@ 
 
 					<?php
 
-						foreach( $subscription_group['items'] as $subscription_group_item ) :
+						foreach ($subscription_group['items'] as $subscription_group_item) :
 
 							echo '<tr>';
 
-								foreach ( array_keys( $columns ) as $key ) {
+								foreach (array_keys($columns) as $key) {
 
 									$class = 'text-left';
 
 									echo "<td class='p-2 $class'>";
 
-										switch( $key ) {
+										switch ($key) {
 
 											case 'item_name':
-												$item_name = get_the_title( $subscription_group_item['item_id'] );
-												$item_name = empty( $item_name ) ? $subscription_group_item['item_name'] : $item_name;
+												$item_name = get_the_title($subscription_group_item['item_id']);
+												$item_name = empty($item_name) ? $subscription_group_item['item_name'] : $item_name;
 
-												if ( $invoice->get_template() == 'amount' || 1 == (float) $subscription_group_item['quantity'] ) {
-													echo sanitize_text_field( $item_name );
+												if ($invoice->get_template() == 'amount' || 1 == (float) $subscription_group_item['quantity']) {
+													echo sanitize_text_field($item_name);
 												} else {
-													printf( '%1$s x %2$d', sanitize_text_field( $item_name ), (float) $subscription_group_item['quantity'] );
+													printf('%1$s x %2$d', sanitize_text_field($item_name), (float) $subscription_group_item['quantity']);
 												}
 
 												break;
 
 											case 'price':
-												echo wpinv_price( $subscription_group_item['item_price'], $invoice->get_currency() );
+												echo wpinv_price($subscription_group_item['item_price'], $invoice->get_currency());
 												break;
 
 											case 'tax':
-												echo wpinv_price( $subscription_group_item['tax'], $invoice->get_currency() );
+												echo wpinv_price($subscription_group_item['tax'], $invoice->get_currency());
 												break;
 
 											case 'discount':
-												echo wpinv_price( $subscription_group_item['discount'], $invoice->get_currency() );
+												echo wpinv_price($subscription_group_item['discount'], $invoice->get_currency());
 												break;
 
 											case 'initial':
-												echo wpinv_price( $subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency() );
+												echo wpinv_price($subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency());
 												break;
 
 											case 'recurring':
-												echo '<strong>' . wpinv_price( $subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency() ) . '</strong>';
+												echo '<strong>' . wpinv_price($subscription_group_item['price'] * $subscription_group_item['quantity'], $invoice->get_currency()) . '</strong>';
 												break;
 
 										}
@@ -679,24 +679,24 @@ 
 
 						endforeach;
 
-						foreach( $subscription_group['fees'] as $subscription_group_fee ) :
+						foreach ($subscription_group['fees'] as $subscription_group_fee) :
 
 							echo '<tr>';
 
-								foreach ( array_keys( $columns ) as $key ) {
+								foreach (array_keys($columns) as $key) {
 
 									$class = 'text-left';
 
 									echo "<td class='p-2 $class'>";
 
-										switch( $key ) {
+										switch ($key) {
 
 											case 'item_name':
-												echo sanitize_text_field( $subscription_group_fee['name'] );
+												echo sanitize_text_field($subscription_group_fee['name']);
 												break;
 
 											case 'price':
-												echo wpinv_price( $subscription_group_fee['initial_fee'], $invoice->get_currency() );
+												echo wpinv_price($subscription_group_fee['initial_fee'], $invoice->get_currency());
 												break;
 
 											case 'tax':
@@ -708,11 +708,11 @@ 
 												break;
 
 											case 'initial':
-												echo wpinv_price( $subscription_group_fee['initial_fee'], $invoice->get_currency() );
+												echo wpinv_price($subscription_group_fee['initial_fee'], $invoice->get_currency());
 												break;
 
 											case 'recurring':
-												echo '<strong>' . wpinv_price( $subscription_group_fee['recurring_fee'], $invoice->get_currency() ) . '</strong>';
+												echo '<strong>' . wpinv_price($subscription_group_fee['recurring_fee'], $invoice->get_currency()) . '</strong>';
 												break;
 
 										}
@@ -741,12 +741,12 @@ 
  * @param WPInv_Subscription $subscription
  * @param bool $skip_current
  */
-function getpaid_admin_subscription_related_subscriptions_metabox( $subscription, $skip_current = true ) {
+function getpaid_admin_subscription_related_subscriptions_metabox($subscription, $skip_current = true) {
 
 	// Fetch the subscription groups.
-	$subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_payment_id() );
+	$subscription_groups = getpaid_get_invoice_subscription_groups($subscription->get_parent_payment_id());
 
-	if ( empty( $subscription_groups ) ) {
+	if (empty($subscription_groups)) {
 		return;
 	}
 
@@ -754,23 +754,23 @@ 
 	$columns = apply_filters(
 		'getpaid_subscription_related_subscriptions_columns',
 		array(
-			'subscription'      => __( 'Subscription', 'invoicing' ),
-			'start_date'        => __( 'Start Date', 'invoicing' ),
-			'renewal_date'      => __( 'Next Payment', 'invoicing' ),
-			'renewals'          => __( 'Payments', 'invoicing' ),
-			'item'              => __( 'Items', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
+			'subscription'      => __('Subscription', 'invoicing'),
+			'start_date'        => __('Start Date', 'invoicing'),
+			'renewal_date'      => __('Next Payment', 'invoicing'),
+			'renewals'          => __('Payments', 'invoicing'),
+			'item'              => __('Items', 'invoicing'),
+			'status'            => __('Status', 'invoicing'),
 		),
 		$subscription
 	);
 
-	if ( $subscription->get_status() == 'pending' ) {
-		unset( $columns['start_date'], $columns['renewal_date'] );
+	if ($subscription->get_status() == 'pending') {
+		unset($columns['start_date'], $columns['renewal_date']);
 	}
 
 	$table_class = 'w-100 bg-white';
 
-	if ( ! is_admin() ) {
+	if (!is_admin()) {
 		$table_class = 'table table-bordered';
 	}
 
@@ -783,9 +783,9 @@ 
 					<tr>
 						<?php
 
-							foreach ( $columns as $key => $label ) {
-								$key   = esc_attr( $key );
-								$label = sanitize_text_field( $label );
+							foreach ($columns as $key => $label) {
+								$key   = esc_attr($key);
+								$label = sanitize_text_field($label);
 								$class = 'text-left';
 
 								echo "<th class='related-subscription-field-$key bg-light p-2 $class color-dark font-weight-bold'>$label</th>";
@@ -798,62 +798,62 @@ 
 
 					<?php
 
-						foreach( $subscription_groups as $subscription_group ) :
+						foreach ($subscription_groups as $subscription_group) :
 
 							// Do not list current subscription.
-							if ( $skip_current && (int) $subscription_group['subscription_id'] === $subscription->get_id() ) {
+							if ($skip_current && (int) $subscription_group['subscription_id'] === $subscription->get_id()) {
 								continue;
 							}
 
 							// Ensure the subscription exists.
-							$_suscription = new WPInv_Subscription( $subscription_group['subscription_id'] );
+							$_suscription = new WPInv_Subscription($subscription_group['subscription_id']);
 
-							if ( ! $_suscription->exists() ) {
+							if (!$_suscription->exists()) {
 								continue;
 							}
 
 							echo '<tr>';
 
-								foreach ( array_keys( $columns ) as $key ) {
+								foreach (array_keys($columns) as $key) {
 
 									$class = 'text-left';
 
 									echo "<td class='p-2 $class'>";
 
-										switch( $key ) {
+										switch ($key) {
 
 											case 'status':
 												echo $_suscription->get_status_label_html();
 												break;
 
 											case 'item':
-												$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-												echo implode( ' | ', $markup );
+												$markup = array_map(array('WPInv_Subscriptions_List_Table', 'generate_item_markup'), array_keys($subscription_group['items']));
+												echo implode(' | ', $markup);
 												break;
 
 											case 'renewals':
 												$max_bills = $_suscription->get_bill_times();
-												echo $_suscription->get_times_billed() . ' / ' . ( empty( $max_bills ) ? "&infin;" : $max_bills );
+												echo $_suscription->get_times_billed() . ' / ' . (empty($max_bills) ? "&infin;" : $max_bills);
 												break;
 
 											case 'renewal_date':
-												echo $_suscription->is_active() ? getpaid_format_date_value( $_suscription->get_expiration() ) : "&mdash;";
+												echo $_suscription->is_active() ? getpaid_format_date_value($_suscription->get_expiration()) : "&mdash;";
 												break;
 
 											case 'start_date':
-												echo 'pending' == $_suscription->get_status() ? "&mdash;" : getpaid_format_date_value( $_suscription->get_date_created() );
+												echo 'pending' == $_suscription->get_status() ? "&mdash;" : getpaid_format_date_value($_suscription->get_date_created());
 												break;
 
 											case 'subscription':
-												$url = is_admin() ? admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $_suscription->get_id() ) ) : $_suscription->get_view_url();
+												$url = is_admin() ? admin_url('admin.php?page=wpinv-subscriptions&id=' . absint($_suscription->get_id())) : $_suscription->get_view_url();
 												printf(
 													'%1$s#%2$s%3$s',
-													'<a href="' . esc_url( $url ) . '">',
-													'<strong>' . intval( $_suscription->get_id() ) . '</strong>',
+													'<a href="' . esc_url($url) . '">',
+													'<strong>' . intval($_suscription->get_id()) . '</strong>',
 													'</a>'
 												);
 
-												echo WPInv_Subscriptions_List_Table::column_amount( $_suscription );
+												echo WPInv_Subscriptions_List_Table::column_amount($_suscription);
 												break;
 
 										}

includes/subscription-functions.php

Indentation +307 added lines, -307 removed lines

@@ -50,7 +50,7 @@ 
  */
 function getpaid_get_invoice_subscription_group( $invoice_id, $subscription_id ) {
     $subscription_groups = getpaid_get_invoice_subscription_groups( $invoice_id );
-	$matching_group      = wp_list_filter( $subscription_groups, compact( 'subscription_id' ) );
+    $matching_group      = wp_list_filter( $subscription_groups, compact( 'subscription_id' ) );
     return reset( $matching_group );
 }
 
@@ -63,11 +63,11 @@ 
  */
 function getpaid_get_subscription( $subscription ) {
 
-	if ( ! is_a( $subscription, 'WPInv_Subscription' ) ) {
-		$subscription = new WPInv_Subscription( $subscription );
-	}
+    if ( ! is_a( $subscription, 'WPInv_Subscription' ) ) {
+        $subscription = new WPInv_Subscription( $subscription );
+    }
 
-	return $subscription->exists() ? $subscription : false;
+    return $subscription->exists() ? $subscription : false;
 }
 
 /**
@@ -81,28 +81,28 @@ 
  */
 function getpaid_get_subscriptions( $args = array(), $return = 'results' ) {
 
-	// Do not retrieve all fields if we just want the count.
-	if ( 'count' == $return ) {
-		$args['fields'] = 'id';
-		$args['number'] = 1;
-	}
+    // Do not retrieve all fields if we just want the count.
+    if ( 'count' == $return ) {
+        $args['fields'] = 'id';
+        $args['number'] = 1;
+    }
 
-	// Do not count all matches if we just want the results.
-	if ( 'results' == $return ) {
-		$args['count_total'] = false;
-	}
+    // Do not count all matches if we just want the results.
+    if ( 'results' == $return ) {
+        $args['count_total'] = false;
+    }
 
-	$query = new GetPaid_Subscriptions_Query( $args );
+    $query = new GetPaid_Subscriptions_Query( $args );
 
-	if ( 'results' == $return ) {
-		return $query->get_results();
-	}
+    if ( 'results' == $return ) {
+        return $query->get_results();
+    }
 
-	if ( 'count' == $return ) {
-		return $query->get_total();
-	}
+    if ( 'count' == $return ) {
+        return $query->get_total();
+    }
 
-	return $query;
+    return $query;
 }
 
 /**
@@ -112,18 +112,18 @@ 
  */
 function getpaid_get_subscription_statuses() {
 
-	return apply_filters(
-		'getpaid_get_subscription_statuses',
-		array(
-			'pending'    => __( 'Pending', 'invoicing' ),
-			'trialling'  => __( 'Trialing', 'invoicing' ),
-			'active'     => __( 'Active', 'invoicing' ),
-			'failing'    => __( 'Failing', 'invoicing' ),
-			'expired'    => __( 'Expired', 'invoicing' ),
-			'completed'  => __( 'Complete', 'invoicing' ),
-			'cancelled'  => __( 'Cancelled', 'invoicing' ),
-		)
-	);
+    return apply_filters(
+        'getpaid_get_subscription_statuses',
+        array(
+            'pending'    => __( 'Pending', 'invoicing' ),
+            'trialling'  => __( 'Trialing', 'invoicing' ),
+            'active'     => __( 'Active', 'invoicing' ),
+            'failing'    => __( 'Failing', 'invoicing' ),
+            'expired'    => __( 'Expired', 'invoicing' ),
+            'completed'  => __( 'Complete', 'invoicing' ),
+            'cancelled'  => __( 'Cancelled', 'invoicing' ),
+        )
+    );
 
 }
 
@@ -133,8 +133,8 @@ 
  * @return string
  */
 function getpaid_get_subscription_status_label( $status ) {
-	$statuses = getpaid_get_subscription_statuses();
-	return isset( $statuses[ $status ] ) ? $statuses[ $status ] : ucfirst( sanitize_text_field( $status ) );
+    $statuses = getpaid_get_subscription_statuses();
+    return isset( $statuses[ $status ] ) ? $statuses[ $status ] : ucfirst( sanitize_text_field( $status ) );
 }
 
 /**
@@ -144,18 +144,18 @@ 
  */
 function getpaid_get_subscription_status_classes() {
 
-	return apply_filters(
-		'getpaid_get_subscription_status_classes',
-		array(
-			'pending'    => 'badge-dark',
-			'trialling'  => 'badge-info',
-			'active'     => 'badge-success',
-			'failing'    => 'badge-warning',
-			'expired'    => 'badge-danger',
-			'completed'  => 'badge-primary',
-			'cancelled'  => 'badge-secondary',
-		)
-	);
+    return apply_filters(
+        'getpaid_get_subscription_status_classes',
+        array(
+            'pending'    => 'badge-dark',
+            'trialling'  => 'badge-info',
+            'active'     => 'badge-success',
+            'failing'    => 'badge-warning',
+            'expired'    => 'badge-danger',
+            'completed'  => 'badge-primary',
+            'cancelled'  => 'badge-secondary',
+        )
+    );
 
 }
 
@@ -166,15 +166,15 @@ 
  */
 function getpaid_get_subscription_status_counts( $args = array() ) {
 
-	$statuses = array_keys( getpaid_get_subscription_statuses() );
-	$counts   = array();
+    $statuses = array_keys( getpaid_get_subscription_statuses() );
+    $counts   = array();
 
-	foreach ( $statuses as $status ) {
-		$_args             = wp_parse_args( "status=$status", $args );
-		$counts[ $status ] = getpaid_get_subscriptions( $_args, 'count' );
-	}
+    foreach ( $statuses as $status ) {
+        $_args             = wp_parse_args( "status=$status", $args );
+        $counts[ $status ] = getpaid_get_subscriptions( $_args, 'count' );
+    }
 
-	return $counts;
+    return $counts;
 
 }
 
@@ -185,32 +185,32 @@ 
  */
 function getpaid_get_subscription_periods() {
 
-	return apply_filters(
-		'getpaid_get_subscription_periods',
-		array(
+    return apply_filters(
+        'getpaid_get_subscription_periods',
+        array(
 
-			'day'   => array(
-				'singular' => __( '%s day', 'invoicing' ),
-				'plural'   => __( '%d days', 'invoicing' ),
-			),
+            'day'   => array(
+                'singular' => __( '%s day', 'invoicing' ),
+                'plural'   => __( '%d days', 'invoicing' ),
+            ),
 
-			'week'   => array(
-				'singular' => __( '%s week', 'invoicing' ),
-				'plural'   => __( '%d weeks', 'invoicing' ),
-			),
+            'week'   => array(
+                'singular' => __( '%s week', 'invoicing' ),
+                'plural'   => __( '%d weeks', 'invoicing' ),
+            ),
 
-			'month'   => array(
-				'singular' => __( '%s month', 'invoicing' ),
-				'plural'   => __( '%d months', 'invoicing' ),
-			),
+            'month'   => array(
+                'singular' => __( '%s month', 'invoicing' ),
+                'plural'   => __( '%d months', 'invoicing' ),
+            ),
 
-			'year'   => array(
-				'singular' => __( '%s year', 'invoicing' ),
-				'plural'   => __( '%d years', 'invoicing' ),
-			),
+            'year'   => array(
+                'singular' => __( '%s year', 'invoicing' ),
+                'plural'   => __( '%d years', 'invoicing' ),
+            ),
 
-		)
-	);
+        )
+    );
 
 }
 
@@ -221,7 +221,7 @@ 
  * @return int
  */
 function getpaid_get_subscription_trial_period_interval( $trial_period ) {
-	return (int) preg_replace( '/[^0-9]/', '', $trial_period );
+    return (int) preg_replace( '/[^0-9]/', '', $trial_period );
 }
 
 /**
@@ -231,7 +231,7 @@ 
  * @return string
  */
 function getpaid_get_subscription_trial_period_period( $trial_period ) {
-	return preg_replace( '/[^a-z]/', '', strtolower( $trial_period ) );
+    return preg_replace( '/[^a-z]/', '', strtolower( $trial_period ) );
 }
 
 /**
@@ -242,8 +242,8 @@ 
  * @return string
  */
 function getpaid_get_subscription_period_label( $period, $interval = 1, $singular_prefix = '1' ) {
-	$label = (int) $interval > 1 ? getpaid_get_plural_subscription_period_label(  $period, $interval ) : getpaid_get_singular_subscription_period_label( $period, $singular_prefix );
-	return strtolower( sanitize_text_field( $label ) );
+    $label = (int) $interval > 1 ? getpaid_get_plural_subscription_period_label(  $period, $interval ) : getpaid_get_singular_subscription_period_label( $period, $singular_prefix );
+    return strtolower( sanitize_text_field( $label ) );
 }
 
 /**
@@ -254,22 +254,22 @@ 
  */
 function getpaid_get_singular_subscription_period_label( $period, $singular_prefix = '1' ) {
 
-	$periods = getpaid_get_subscription_periods();
-	$period  = strtolower( $period );
+    $periods = getpaid_get_subscription_periods();
+    $period  = strtolower( $period );
 
-	if ( isset( $periods[ $period ] ) ) {
-		return sprintf( $periods[ $period ]['singular'], $singular_prefix );
-	}
+    if ( isset( $periods[ $period ] ) ) {
+        return sprintf( $periods[ $period ]['singular'], $singular_prefix );
+    }
 
-	// Backwards compatibility.
-	foreach ( $periods as $key => $data ) {
-		if ( strpos( $key, $period ) === 0 ) {
-			return sprintf( $data['singular'], $singular_prefix );
-		}
-	}
+    // Backwards compatibility.
+    foreach ( $periods as $key => $data ) {
+        if ( strpos( $key, $period ) === 0 ) {
+            return sprintf( $data['singular'], $singular_prefix );
+        }
+    }
 
-	// Invalid string.
-	return '';
+    // Invalid string.
+    return '';
 }
 
 /**
@@ -281,22 +281,22 @@ 
  */
 function getpaid_get_plural_subscription_period_label( $period, $interval ) {
 
-	$periods = getpaid_get_subscription_periods();
-	$period  = strtolower( $period );
+    $periods = getpaid_get_subscription_periods();
+    $period  = strtolower( $period );
 
-	if ( isset( $periods[ $period ] ) ) {
-		return sprintf( $periods[ $period ]['plural'], $interval );
-	}
+    if ( isset( $periods[ $period ] ) ) {
+        return sprintf( $periods[ $period ]['plural'], $interval );
+    }
 
-	// Backwards compatibility.
-	foreach ( $periods as $key => $data ) {
-		if ( strpos( $key, $period ) === 0 ) {
-			return sprintf( $data['plural'], $interval );
-		}
-	}
+    // Backwards compatibility.
+    foreach ( $periods as $key => $data ) {
+        if ( strpos( $key, $period ) === 0 ) {
+            return sprintf( $data['plural'], $interval );
+        }
+    }
 
-	// Invalid string.
-	return '';
+    // Invalid string.
+    return '';
 }
 
 /**
@@ -307,101 +307,101 @@ 
  */
 function getpaid_get_formatted_subscription_amount( $subscription ) {
 
-	$initial    = wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() );
-	$recurring  = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-	$period     = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-	$bill_times = $subscription->get_bill_times();
+    $initial    = wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() );
+    $recurring  = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
+    $period     = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
+    $bill_times = $subscription->get_bill_times();
 
-	if ( ! empty( $bill_times ) ) {
-		$bill_times = $subscription->get_frequency() * $bill_times;
-		$bill_times = getpaid_get_subscription_period_label( $subscription->get_period(), $bill_times );
-	}
+    if ( ! empty( $bill_times ) ) {
+        $bill_times = $subscription->get_frequency() * $bill_times;
+        $bill_times = getpaid_get_subscription_period_label( $subscription->get_period(), $bill_times );
+    }
 
-	// Trial periods.
-	if ( $subscription->has_trial_period() ) {
+    // Trial periods.
+    if ( $subscription->has_trial_period() ) {
 
-		$trial_period   = getpaid_get_subscription_trial_period_period( $subscription->get_trial_period() );
-		$trial_interval = getpaid_get_subscription_trial_period_interval( $subscription->get_trial_period() );
+        $trial_period   = getpaid_get_subscription_trial_period_period( $subscription->get_trial_period() );
+        $trial_interval = getpaid_get_subscription_trial_period_interval( $subscription->get_trial_period() );
 
-		if ( empty( $bill_times ) ) {
+        if ( empty( $bill_times ) ) {
 
-			return sprintf(
+            return sprintf(
 
-				// translators: $1: is the initial amount, $2: is the trial period, $3: is the recurring amount, $4: is the recurring period
-				_x( '%1$s trial for %2$s then %3$s / %4$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year)', 'invoicing' ),
-				$initial,
-				getpaid_get_subscription_period_label( $trial_period, $trial_interval ),
-				$recurring,
-				$period
+                // translators: $1: is the initial amount, $2: is the trial period, $3: is the recurring amount, $4: is the recurring period
+                _x( '%1$s trial for %2$s then %3$s / %4$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year)', 'invoicing' ),
+                $initial,
+                getpaid_get_subscription_period_label( $trial_period, $trial_interval ),
+                $recurring,
+                $period
 	
-			);
+            );
 
-		}
+        }
 
-		return sprintf(
+        return sprintf(
 
-			// translators: $1: is the initial amount, $2: is the trial period, $3: is the recurring amount, $4: is the recurring period, $5: is the bill times
-			_x( '%1$s trial for %2$s then %3$s / %4$s for %5$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year for 4 years)', 'invoicing' ),
-			$initial,
-			getpaid_get_subscription_period_label( $trial_period, $trial_interval ),
-			$recurring,
-			$period,
-			$bill_times
-		);
+            // translators: $1: is the initial amount, $2: is the trial period, $3: is the recurring amount, $4: is the recurring period, $5: is the bill times
+            _x( '%1$s trial for %2$s then %3$s / %4$s for %5$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year for 4 years)', 'invoicing' ),
+            $initial,
+            getpaid_get_subscription_period_label( $trial_period, $trial_interval ),
+            $recurring,
+            $period,
+            $bill_times
+        );
 
-	}
+    }
 
-	if ( $initial != $recurring ) {
+    if ( $initial != $recurring ) {
 
-		if ( empty( $bill_times ) ) {
+        if ( empty( $bill_times ) ) {
 
-			return sprintf(
+            return sprintf(
 
-				// translators: $1: is the initial amount, $2: is the recurring amount, $3: is the recurring period
-				_x( 'Initial payment of %1$s which renews at %2$s / %3$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year)', 'invoicing' ),
-				$initial,
-				$recurring,
-				$period
+                // translators: $1: is the initial amount, $2: is the recurring amount, $3: is the recurring period
+                _x( 'Initial payment of %1$s which renews at %2$s / %3$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year)', 'invoicing' ),
+                $initial,
+                $recurring,
+                $period
 	
-			);
+            );
 
-		}
+        }
 
-		return sprintf(
+        return sprintf(
 
-			// translators: $1: is the initial amount, $2: is the recurring amount, $3: is the recurring period, $4: is the bill times
-			_x( 'Initial payment of %1$s which renews at %2$s / %3$s for %4$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year for 5 years)', 'invoicing' ),
-			$initial,
-			$recurring,
-			$period,
-			$bill_times
+            // translators: $1: is the initial amount, $2: is the recurring amount, $3: is the recurring period, $4: is the bill times
+            _x( 'Initial payment of %1$s which renews at %2$s / %3$s for %4$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year for 5 years)', 'invoicing' ),
+            $initial,
+            $recurring,
+            $period,
+            $bill_times
 
-		);
+        );
 
-	}
+    }
 
-	if ( empty( $bill_times ) ) {
+    if ( empty( $bill_times ) ) {
 
-		return sprintf(
+        return sprintf(
 
-			// translators: $1: is the recurring amount, $2: is the recurring period
-			_x( '%1$s / %2$s', 'Subscription amount. (e.g.: $120 / year)', 'invoicing' ),
-			$initial,
-			$period
+            // translators: $1: is the recurring amount, $2: is the recurring period
+            _x( '%1$s / %2$s', 'Subscription amount. (e.g.: $120 / year)', 'invoicing' ),
+            $initial,
+            $period
 	
-		);
+        );
 
-	}
+    }
 
-	return sprintf(
+    return sprintf(
 
-		// translators: $1: is the bill times, $2: is the recurring amount, $3: is the recurring period
-		_x( '%2$s / %3$s for %1$s', 'Subscription amount. (e.g.: $120 / year for 5 years)', 'invoicing' ),
-		$bill_times,
-		$initial,
-		$period
+        // translators: $1: is the bill times, $2: is the recurring amount, $3: is the recurring period
+        _x( '%2$s / %3$s for %1$s', 'Subscription amount. (e.g.: $120 / year for 5 years)', 'invoicing' ),
+        $bill_times,
+        $initial,
+        $period
 
-	);
+    );
 
 }
 
@@ -412,7 +412,7 @@ 
  * @return WPInv_Subscription|false
  */
 function getpaid_get_invoice_subscription( $invoice ) {
-	return getpaid_subscriptions()->get_invoice_subscription( $invoice );
+    return getpaid_subscriptions()->get_invoice_subscription( $invoice );
 }
 
 /**
@@ -421,10 +421,10 @@ 
  * @param WPInv_Invoice $invoice
  */
 function getpaid_activate_invoice_subscription( $invoice ) {
-	$subscription = getpaid_get_invoice_subscription( $invoice );
-	if ( is_a( $subscription, 'WPInv_Subscription' ) ) {
-		$subscription->activate();
-	}
+    $subscription = getpaid_get_invoice_subscription( $invoice );
+    if ( is_a( $subscription, 'WPInv_Subscription' ) ) {
+        $subscription->activate();
+    }
 }
 
 /**
@@ -433,7 +433,7 @@ 
  * @return WPInv_Subscriptions
  */
 function getpaid_subscriptions() {
-	return getpaid()->get( 'subscriptions' );
+    return getpaid()->get( 'subscriptions' );
 }
 
 /**
@@ -452,15 +452,15 @@ 
         return false;
     }
 
-	// Fetch the invoice subscription.
-	$subscription = getpaid_get_subscriptions(
-		array(
-			'invoice_in' => $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id(),
-			'number'     => 1,
-		)
-	);
+    // Fetch the invoice subscription.
+    $subscription = getpaid_get_subscriptions(
+        array(
+            'invoice_in' => $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id(),
+            'number'     => 1,
+        )
+    );
 
-	return empty( $subscription ) ? false : $subscription[0];
+    return empty( $subscription ) ? false : $subscription[0];
 
 }
 
@@ -477,48 +477,48 @@ 
  */
 function getpaid_get_recurring_item_key( $cart_item ) {
 
-	$cart_key     = 'renews_';
-	$interval     = $cart_item->get_recurring_interval();
-	$period       = $cart_item->get_recurring_period( true );
-	$length       = $cart_item->get_recurring_limit() * $interval;
-	$trial_period = $cart_item->get_trial_period( true );
-	$trial_length = $cart_item->get_trial_interval();
-
-	// First start with the billing interval and period
-	switch ( $interval ) {
-		case 1 :
-			if ( 'day' == $period ) {
-				$cart_key .= 'daily';
-			} else {
-				$cart_key .= sprintf( '%sly', $period );
-			}
-			break;
-		case 2 :
-			$cart_key .= sprintf( 'every_2nd_%s', $period );
-			break;
-		case 3 :
-			$cart_key .= sprintf( 'every_3rd_%s', $period );
-		break;
-		default:
-			$cart_key .= sprintf( 'every_%dth_%s', $interval, $period );
-			break;
-	}
-
-	// Maybe add the optional maximum billing periods...
-	if ( $length > 0 ) {
-		$cart_key .= '_for_';
-		$cart_key .= sprintf( '%d_%s', $length, $period );
-		if ( $length > 1 ) {
-			$cart_key .= 's';
-		}
-	}
-
-	// And an optional free trial.
-	if ( $cart_item->has_free_trial() ) {
-		$cart_key .= sprintf( '_after_a_%d_%s_trial', $trial_length, $trial_period );
-	}
-
-	return apply_filters( 'getpaid_get_recurring_item_key', $cart_key, $cart_item );
+    $cart_key     = 'renews_';
+    $interval     = $cart_item->get_recurring_interval();
+    $period       = $cart_item->get_recurring_period( true );
+    $length       = $cart_item->get_recurring_limit() * $interval;
+    $trial_period = $cart_item->get_trial_period( true );
+    $trial_length = $cart_item->get_trial_interval();
+
+    // First start with the billing interval and period
+    switch ( $interval ) {
+        case 1 :
+            if ( 'day' == $period ) {
+                $cart_key .= 'daily';
+            } else {
+                $cart_key .= sprintf( '%sly', $period );
+            }
+            break;
+        case 2 :
+            $cart_key .= sprintf( 'every_2nd_%s', $period );
+            break;
+        case 3 :
+            $cart_key .= sprintf( 'every_3rd_%s', $period );
+        break;
+        default:
+            $cart_key .= sprintf( 'every_%dth_%s', $interval, $period );
+            break;
+    }
+
+    // Maybe add the optional maximum billing periods...
+    if ( $length > 0 ) {
+        $cart_key .= '_for_';
+        $cart_key .= sprintf( '%d_%s', $length, $period );
+        if ( $length > 1 ) {
+            $cart_key .= 's';
+        }
+    }
+
+    // And an optional free trial.
+    if ( $cart_item->has_free_trial() ) {
+        $cart_key .= sprintf( '_after_a_%d_%s_trial', $trial_length, $trial_period );
+    }
+
+    return apply_filters( 'getpaid_get_recurring_item_key', $cart_key, $cart_item );
 }
 
 /**
@@ -529,17 +529,17 @@ 
  */
 function getpaid_get_subscription_groups( $invoice ) {
 
-	// Generate subscription groups.
-	$subscription_groups = array();
-	foreach ( $invoice->get_items() as $item ) {
+    // Generate subscription groups.
+    $subscription_groups = array();
+    foreach ( $invoice->get_items() as $item ) {
 
-		if ( $item->is_recurring() ) {
-			$subscription_groups[ getpaid_get_recurring_item_key( $item ) ][] = $item;
-		}
+        if ( $item->is_recurring() ) {
+            $subscription_groups[ getpaid_get_recurring_item_key( $item ) ][] = $item;
+        }
 
-	}
+    }
 
-	return $subscription_groups;
+    return $subscription_groups;
 }
 
 /**
@@ -553,57 +553,57 @@ 
  */
 function getpaid_calculate_subscription_totals( $invoice ) {
 
-	// Generate subscription groups.
-	$subscription_groups = getpaid_get_subscription_groups( $invoice );
+    // Generate subscription groups.
+    $subscription_groups = getpaid_get_subscription_groups( $invoice );
 
-	// Now let's calculate the totals for each group of subscriptions
-	$subscription_totals = array();
+    // Now let's calculate the totals for each group of subscriptions
+    $subscription_totals = array();
 
-	foreach ( $subscription_groups as $subscription_key => $items ) {
+    foreach ( $subscription_groups as $subscription_key => $items ) {
 
-		if ( empty( $subscription_totals[ $subscription_key ] ) ) {
+        if ( empty( $subscription_totals[ $subscription_key ] ) ) {
 
-			$subscription_totals[ $subscription_key ] = array(
-				'initial_total'   => 0,
-				'recurring_total' => 0,
-				'items'           => array(),
-				'trialling'       => false,
-			);
+            $subscription_totals[ $subscription_key ] = array(
+                'initial_total'   => 0,
+                'recurring_total' => 0,
+                'items'           => array(),
+                'trialling'       => false,
+            );
 
-		}
+        }
 
-		/**
-		 * Get the totals of the group.
-		 * @var GetPaid_Form_Item $item
-		 */
-		foreach ( $items as $item ) {
+        /**
+         * Get the totals of the group.
+         * @var GetPaid_Form_Item $item
+         */
+        foreach ( $items as $item ) {
 
-			$subscription_totals[ $subscription_key ]['items'][$item->get_id()]  = $item->prepare_data_for_saving();
-			$subscription_totals[ $subscription_key ]['item_id']                 = $item->get_id();
-			$subscription_totals[ $subscription_key ]['period']                  = $item->get_recurring_period( true );
-			$subscription_totals[ $subscription_key ]['interval']                = $item->get_recurring_interval();
-			$subscription_totals[ $subscription_key ]['initial_total']          += $item->get_sub_total() + $item->item_tax - $item->item_discount;
-			$subscription_totals[ $subscription_key ]['recurring_total']        += $item->get_recurring_sub_total() + $item->item_tax - $item->recurring_item_discount;
-			$subscription_totals[ $subscription_key ]['recurring_limit']         = $item->get_recurring_limit();
+            $subscription_totals[ $subscription_key ]['items'][$item->get_id()]  = $item->prepare_data_for_saving();
+            $subscription_totals[ $subscription_key ]['item_id']                 = $item->get_id();
+            $subscription_totals[ $subscription_key ]['period']                  = $item->get_recurring_period( true );
+            $subscription_totals[ $subscription_key ]['interval']                = $item->get_recurring_interval();
+            $subscription_totals[ $subscription_key ]['initial_total']          += $item->get_sub_total() + $item->item_tax - $item->item_discount;
+            $subscription_totals[ $subscription_key ]['recurring_total']        += $item->get_recurring_sub_total() + $item->item_tax - $item->recurring_item_discount;
+            $subscription_totals[ $subscription_key ]['recurring_limit']         = $item->get_recurring_limit();
 
-			// Calculate the next renewal date.
-			$period       = $item->get_recurring_period( true );
-			$interval     = $item->get_recurring_interval();
+            // Calculate the next renewal date.
+            $period       = $item->get_recurring_period( true );
+            $interval     = $item->get_recurring_interval();
 
-			// If the subscription item has a trial period...
-			if ( $item->has_free_trial() ) {
-				$period   = $item->get_trial_period( true );
-				$interval = $item->get_trial_interval();
-				$subscription_totals[ $subscription_key ]['trialling'] = $interval . ' ' . $period;
-			}
+            // If the subscription item has a trial period...
+            if ( $item->has_free_trial() ) {
+                $period   = $item->get_trial_period( true );
+                $interval = $item->get_trial_interval();
+                $subscription_totals[ $subscription_key ]['trialling'] = $interval . ' ' . $period;
+            }
 
-			$subscription_totals[ $subscription_key ]['renews_on'] = date( 'Y-m-d H:i:s', strtotime( "+$interval $period", current_time( 'timestamp' ) ) );
+            $subscription_totals[ $subscription_key ]['renews_on'] = date( 'Y-m-d H:i:s', strtotime( "+$interval $period", current_time( 'timestamp' ) ) );
 
-		}
+        }
 
-	}
+    }
 
-	return apply_filters( 'getpaid_calculate_subscription_totals', $subscription_totals, $invoice );
+    return apply_filters( 'getpaid_calculate_subscription_totals', $subscription_totals, $invoice );
 }
 
 /**
@@ -614,17 +614,17 @@ 
  */
 function getpaid_should_group_subscriptions( $invoice ) {
 
-	$recurring_items = 0;
+    $recurring_items = 0;
 
-	foreach ( $invoice->get_items() as $item ) {
+    foreach ( $invoice->get_items() as $item ) {
 
-		if ( $item->is_recurring() ) {
-			$recurring_items ++;
-		}
+        if ( $item->is_recurring() ) {
+            $recurring_items ++;
+        }
 
-	}
+    }
 
-	return apply_filters( 'getpaid_should_group_subscriptions', $recurring_items > 1, $invoice );
+    return apply_filters( 'getpaid_should_group_subscriptions', $recurring_items > 1, $invoice );
 }
 
 /**
@@ -635,40 +635,40 @@ 
  * @return int
  */
 function getpaid_count_subscription_invoices( $parent_invoice_id, $subscription_id = false ) {
-	global $wpdb;
+    global $wpdb;
 
-	$parent_invoice_id = (int) $parent_invoice_id;
+    $parent_invoice_id = (int) $parent_invoice_id;
 
-	if ( false === $subscription_id || ! (bool) get_post_meta( $parent_invoice_id, '_wpinv_subscription_id', true ) ) {
+    if ( false === $subscription_id || ! (bool) get_post_meta( $parent_invoice_id, '_wpinv_subscription_id', true ) ) {
 
-		return (int) $wpdb->get_var(
-			$wpdb->prepare(
-				"SELECT COUNT(ID) FROM $wpdb->posts WHERE ( post_parent=%d OR ID=%d ) AND post_status IN ( 'publish', 'wpi-processing', 'wpi-renewal' )",
-				$parent_invoice_id,
-				$parent_invoice_id
-			)
-		);
+        return (int) $wpdb->get_var(
+            $wpdb->prepare(
+                "SELECT COUNT(ID) FROM $wpdb->posts WHERE ( post_parent=%d OR ID=%d ) AND post_status IN ( 'publish', 'wpi-processing', 'wpi-renewal' )",
+                $parent_invoice_id,
+                $parent_invoice_id
+            )
+        );
 
-	}
+    }
 	
-	$invoice_ids = $wpdb->get_col(
-		$wpdb->prepare(
-			"SELECT ID FROM $wpdb->posts WHERE ( post_parent=%d OR ID=%d ) AND post_status IN ( 'publish', 'wpi-processing', 'wpi-renewal' )",
-			$parent_invoice_id,
-			$parent_invoice_id
-		)
-	);
+    $invoice_ids = $wpdb->get_col(
+        $wpdb->prepare(
+            "SELECT ID FROM $wpdb->posts WHERE ( post_parent=%d OR ID=%d ) AND post_status IN ( 'publish', 'wpi-processing', 'wpi-renewal' )",
+            $parent_invoice_id,
+            $parent_invoice_id
+        )
+    );
 
-	$count = 0;
+    $count = 0;
 
-	foreach ( wp_parse_id_list( $invoice_ids ) as $invoice_id ) {
+    foreach ( wp_parse_id_list( $invoice_ids ) as $invoice_id ) {
 
-		if ( $invoice_id == $parent_invoice_id || $subscription_id == (int) get_post_meta( $invoice_id, '_wpinv_subscription_id', true ) ) {
-			$count ++;
-			continue;
-		}
+        if ( $invoice_id == $parent_invoice_id || $subscription_id == (int) get_post_meta( $invoice_id, '_wpinv_subscription_id', true ) ) {
+            $count ++;
+            continue;
+        }
 
-	}
+    }
 
-	return $count;
+    return $count;
 }

Spacing +143 added lines, -143 removed lines

@@ -13,18 +13,18 @@ 
  * @return      WPInv_Subscription[]|WPInv_Subscription|false
  * @since       2.3.0
  */
-function getpaid_get_invoice_subscriptions( $invoice ) {
+function getpaid_get_invoice_subscriptions($invoice) {
 
     // Retrieve subscription groups.
-    $subscription_ids = wp_list_pluck( getpaid_get_invoice_subscription_groups( $invoice->get_id() ), 'subscription_id' );
+    $subscription_ids = wp_list_pluck(getpaid_get_invoice_subscription_groups($invoice->get_id()), 'subscription_id');
 
     // No subscription groups, normal subscription.
-    if ( empty( $subscription_ids ) ) {
-        return getpaid_subscriptions()->get_invoice_subscription( $invoice );
+    if (empty($subscription_ids)) {
+        return getpaid_subscriptions()->get_invoice_subscription($invoice);
     }
 
     // Subscription groups.
-    return array_filter( array_map( 'getpaid_get_subscription', $subscription_ids ) );
+    return array_filter(array_map('getpaid_get_subscription', $subscription_ids));
 
 }
 
@@ -35,9 +35,9 @@ 
  * @return      array
  * @since       2.3.0
  */
-function getpaid_get_invoice_subscription_groups( $invoice_id ) {
-    $subscription_groups = get_post_meta( $invoice_id, 'getpaid_subscription_groups', true );
-    return empty( $subscription_groups ) ? array() : $subscription_groups;
+function getpaid_get_invoice_subscription_groups($invoice_id) {
+    $subscription_groups = get_post_meta($invoice_id, 'getpaid_subscription_groups', true);
+    return empty($subscription_groups) ? array() : $subscription_groups;
 }
 
 /**
@@ -48,10 +48,10 @@ 
  * @return      array|false
  * @since       2.3.0
  */
-function getpaid_get_invoice_subscription_group( $invoice_id, $subscription_id ) {
-    $subscription_groups = getpaid_get_invoice_subscription_groups( $invoice_id );
-	$matching_group      = wp_list_filter( $subscription_groups, compact( 'subscription_id' ) );
-    return reset( $matching_group );
+function getpaid_get_invoice_subscription_group($invoice_id, $subscription_id) {
+    $subscription_groups = getpaid_get_invoice_subscription_groups($invoice_id);
+	$matching_group = wp_list_filter($subscription_groups, compact('subscription_id'));
+    return reset($matching_group);
 }
 
 /**
@@ -61,10 +61,10 @@ 
  * @since       2.3.0
  * @return WPInv_Subscription|false
  */
-function getpaid_get_subscription( $subscription ) {
+function getpaid_get_subscription($subscription) {
 
-	if ( ! is_a( $subscription, 'WPInv_Subscription' ) ) {
-		$subscription = new WPInv_Subscription( $subscription );
+	if (!is_a($subscription, 'WPInv_Subscription')) {
+		$subscription = new WPInv_Subscription($subscription);
 	}
 
 	return $subscription->exists() ? $subscription : false;
@@ -79,26 +79,26 @@ 
  *
  * @return int|array|WPInv_Subscription[]|GetPaid_Subscriptions_Query
  */
-function getpaid_get_subscriptions( $args = array(), $return = 'results' ) {
+function getpaid_get_subscriptions($args = array(), $return = 'results') {
 
 	// Do not retrieve all fields if we just want the count.
-	if ( 'count' == $return ) {
+	if ('count' == $return) {
 		$args['fields'] = 'id';
 		$args['number'] = 1;
 	}
 
 	// Do not count all matches if we just want the results.
-	if ( 'results' == $return ) {
+	if ('results' == $return) {
 		$args['count_total'] = false;
 	}
 
-	$query = new GetPaid_Subscriptions_Query( $args );
+	$query = new GetPaid_Subscriptions_Query($args);
 
-	if ( 'results' == $return ) {
+	if ('results' == $return) {
 		return $query->get_results();
 	}
 
-	if ( 'count' == $return ) {
+	if ('count' == $return) {
 		return $query->get_total();
 	}
 
@@ -115,13 +115,13 @@ 
 	return apply_filters(
 		'getpaid_get_subscription_statuses',
 		array(
-			'pending'    => __( 'Pending', 'invoicing' ),
-			'trialling'  => __( 'Trialing', 'invoicing' ),
-			'active'     => __( 'Active', 'invoicing' ),
-			'failing'    => __( 'Failing', 'invoicing' ),
-			'expired'    => __( 'Expired', 'invoicing' ),
-			'completed'  => __( 'Complete', 'invoicing' ),
-			'cancelled'  => __( 'Cancelled', 'invoicing' ),
+			'pending'    => __('Pending', 'invoicing'),
+			'trialling'  => __('Trialing', 'invoicing'),
+			'active'     => __('Active', 'invoicing'),
+			'failing'    => __('Failing', 'invoicing'),
+			'expired'    => __('Expired', 'invoicing'),
+			'completed'  => __('Complete', 'invoicing'),
+			'cancelled'  => __('Cancelled', 'invoicing'),
 		)
 	);
 
@@ -132,9 +132,9 @@ 
  *
  * @return string
  */
-function getpaid_get_subscription_status_label( $status ) {
+function getpaid_get_subscription_status_label($status) {
 	$statuses = getpaid_get_subscription_statuses();
-	return isset( $statuses[ $status ] ) ? $statuses[ $status ] : ucfirst( sanitize_text_field( $status ) );
+	return isset($statuses[$status]) ? $statuses[$status] : ucfirst(sanitize_text_field($status));
 }
 
 /**
@@ -164,14 +164,14 @@ 
  *
  * @return array
  */
-function getpaid_get_subscription_status_counts( $args = array() ) {
+function getpaid_get_subscription_status_counts($args = array()) {
 
-	$statuses = array_keys( getpaid_get_subscription_statuses() );
+	$statuses = array_keys(getpaid_get_subscription_statuses());
 	$counts   = array();
 
-	foreach ( $statuses as $status ) {
-		$_args             = wp_parse_args( "status=$status", $args );
-		$counts[ $status ] = getpaid_get_subscriptions( $_args, 'count' );
+	foreach ($statuses as $status) {
+		$_args             = wp_parse_args("status=$status", $args);
+		$counts[$status] = getpaid_get_subscriptions($_args, 'count');
 	}
 
 	return $counts;
@@ -190,23 +190,23 @@ 
 		array(
 
 			'day'   => array(
-				'singular' => __( '%s day', 'invoicing' ),
-				'plural'   => __( '%d days', 'invoicing' ),
+				'singular' => __('%s day', 'invoicing'),
+				'plural'   => __('%d days', 'invoicing'),
 			),
 
 			'week'   => array(
-				'singular' => __( '%s week', 'invoicing' ),
-				'plural'   => __( '%d weeks', 'invoicing' ),
+				'singular' => __('%s week', 'invoicing'),
+				'plural'   => __('%d weeks', 'invoicing'),
 			),
 
 			'month'   => array(
-				'singular' => __( '%s month', 'invoicing' ),
-				'plural'   => __( '%d months', 'invoicing' ),
+				'singular' => __('%s month', 'invoicing'),
+				'plural'   => __('%d months', 'invoicing'),
 			),
 
 			'year'   => array(
-				'singular' => __( '%s year', 'invoicing' ),
-				'plural'   => __( '%d years', 'invoicing' ),
+				'singular' => __('%s year', 'invoicing'),
+				'plural'   => __('%d years', 'invoicing'),
 			),
 
 		)
@@ -220,8 +220,8 @@ 
  * @param string $trial_period
  * @return int
  */
-function getpaid_get_subscription_trial_period_interval( $trial_period ) {
-	return (int) preg_replace( '/[^0-9]/', '', $trial_period );
+function getpaid_get_subscription_trial_period_interval($trial_period) {
+	return (int) preg_replace('/[^0-9]/', '', $trial_period);
 }
 
 /**
@@ -230,8 +230,8 @@ 
  * @param string $trial_period
  * @return string
  */
-function getpaid_get_subscription_trial_period_period( $trial_period ) {
-	return preg_replace( '/[^a-z]/', '', strtolower( $trial_period ) );
+function getpaid_get_subscription_trial_period_period($trial_period) {
+	return preg_replace('/[^a-z]/', '', strtolower($trial_period));
 }
 
 /**
@@ -241,9 +241,9 @@ 
  * @param int $interval
  * @return string
  */
-function getpaid_get_subscription_period_label( $period, $interval = 1, $singular_prefix = '1' ) {
-	$label = (int) $interval > 1 ? getpaid_get_plural_subscription_period_label(  $period, $interval ) : getpaid_get_singular_subscription_period_label( $period, $singular_prefix );
-	return strtolower( sanitize_text_field( $label ) );
+function getpaid_get_subscription_period_label($period, $interval = 1, $singular_prefix = '1') {
+	$label = (int) $interval > 1 ? getpaid_get_plural_subscription_period_label($period, $interval) : getpaid_get_singular_subscription_period_label($period, $singular_prefix);
+	return strtolower(sanitize_text_field($label));
 }
 
 /**
@@ -252,19 +252,19 @@ 
  * @param string $period
  * @return string
  */
-function getpaid_get_singular_subscription_period_label( $period, $singular_prefix = '1' ) {
+function getpaid_get_singular_subscription_period_label($period, $singular_prefix = '1') {
 
 	$periods = getpaid_get_subscription_periods();
-	$period  = strtolower( $period );
+	$period  = strtolower($period);
 
-	if ( isset( $periods[ $period ] ) ) {
-		return sprintf( $periods[ $period ]['singular'], $singular_prefix );
+	if (isset($periods[$period])) {
+		return sprintf($periods[$period]['singular'], $singular_prefix);
 	}
 
 	// Backwards compatibility.
-	foreach ( $periods as $key => $data ) {
-		if ( strpos( $key, $period ) === 0 ) {
-			return sprintf( $data['singular'], $singular_prefix );
+	foreach ($periods as $key => $data) {
+		if (strpos($key, $period) === 0) {
+			return sprintf($data['singular'], $singular_prefix);
 		}
 	}
 
@@ -279,19 +279,19 @@ 
  * @param int $interval
  * @return string
  */
-function getpaid_get_plural_subscription_period_label( $period, $interval ) {
+function getpaid_get_plural_subscription_period_label($period, $interval) {
 
 	$periods = getpaid_get_subscription_periods();
-	$period  = strtolower( $period );
+	$period  = strtolower($period);
 
-	if ( isset( $periods[ $period ] ) ) {
-		return sprintf( $periods[ $period ]['plural'], $interval );
+	if (isset($periods[$period])) {
+		return sprintf($periods[$period]['plural'], $interval);
 	}
 
 	// Backwards compatibility.
-	foreach ( $periods as $key => $data ) {
-		if ( strpos( $key, $period ) === 0 ) {
-			return sprintf( $data['plural'], $interval );
+	foreach ($periods as $key => $data) {
+		if (strpos($key, $period) === 0) {
+			return sprintf($data['plural'], $interval);
 		}
 	}
 
@@ -305,32 +305,32 @@ 
  * @param WPInv_Subscription $subscription
  * @return string
  */
-function getpaid_get_formatted_subscription_amount( $subscription ) {
+function getpaid_get_formatted_subscription_amount($subscription) {
 
-	$initial    = wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() );
-	$recurring  = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-	$period     = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
+	$initial    = wpinv_price($subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency());
+	$recurring  = wpinv_price($subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency());
+	$period     = getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), '');
 	$bill_times = $subscription->get_bill_times();
 
-	if ( ! empty( $bill_times ) ) {
+	if (!empty($bill_times)) {
 		$bill_times = $subscription->get_frequency() * $bill_times;
-		$bill_times = getpaid_get_subscription_period_label( $subscription->get_period(), $bill_times );
+		$bill_times = getpaid_get_subscription_period_label($subscription->get_period(), $bill_times);
 	}
 
 	// Trial periods.
-	if ( $subscription->has_trial_period() ) {
+	if ($subscription->has_trial_period()) {
 
-		$trial_period   = getpaid_get_subscription_trial_period_period( $subscription->get_trial_period() );
-		$trial_interval = getpaid_get_subscription_trial_period_interval( $subscription->get_trial_period() );
+		$trial_period   = getpaid_get_subscription_trial_period_period($subscription->get_trial_period());
+		$trial_interval = getpaid_get_subscription_trial_period_interval($subscription->get_trial_period());
 
-		if ( empty( $bill_times ) ) {
+		if (empty($bill_times)) {
 
 			return sprintf(
 
 				// translators: $1: is the initial amount, $2: is the trial period, $3: is the recurring amount, $4: is the recurring period
-				_x( '%1$s trial for %2$s then %3$s / %4$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year)', 'invoicing' ),
+				_x('%1$s trial for %2$s then %3$s / %4$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year)', 'invoicing'),
 				$initial,
-				getpaid_get_subscription_period_label( $trial_period, $trial_interval ),
+				getpaid_get_subscription_period_label($trial_period, $trial_interval),
 				$recurring,
 				$period
 	
@@ -341,9 +341,9 @@ 
 		return sprintf(
 
 			// translators: $1: is the initial amount, $2: is the trial period, $3: is the recurring amount, $4: is the recurring period, $5: is the bill times
-			_x( '%1$s trial for %2$s then %3$s / %4$s for %5$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year for 4 years)', 'invoicing' ),
+			_x('%1$s trial for %2$s then %3$s / %4$s for %5$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year for 4 years)', 'invoicing'),
 			$initial,
-			getpaid_get_subscription_period_label( $trial_period, $trial_interval ),
+			getpaid_get_subscription_period_label($trial_period, $trial_interval),
 			$recurring,
 			$period,
 			$bill_times
@@ -351,14 +351,14 @@ 
 
 	}
 
-	if ( $initial != $recurring ) {
+	if ($initial != $recurring) {
 
-		if ( empty( $bill_times ) ) {
+		if (empty($bill_times)) {
 
 			return sprintf(
 
 				// translators: $1: is the initial amount, $2: is the recurring amount, $3: is the recurring period
-				_x( 'Initial payment of %1$s which renews at %2$s / %3$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year)', 'invoicing' ),
+				_x('Initial payment of %1$s which renews at %2$s / %3$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year)', 'invoicing'),
 				$initial,
 				$recurring,
 				$period
@@ -370,7 +370,7 @@ 
 		return sprintf(
 
 			// translators: $1: is the initial amount, $2: is the recurring amount, $3: is the recurring period, $4: is the bill times
-			_x( 'Initial payment of %1$s which renews at %2$s / %3$s for %4$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year for 5 years)', 'invoicing' ),
+			_x('Initial payment of %1$s which renews at %2$s / %3$s for %4$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year for 5 years)', 'invoicing'),
 			$initial,
 			$recurring,
 			$period,
@@ -380,12 +380,12 @@ 
 
 	}
 
-	if ( empty( $bill_times ) ) {
+	if (empty($bill_times)) {
 
 		return sprintf(
 
 			// translators: $1: is the recurring amount, $2: is the recurring period
-			_x( '%1$s / %2$s', 'Subscription amount. (e.g.: $120 / year)', 'invoicing' ),
+			_x('%1$s / %2$s', 'Subscription amount. (e.g.: $120 / year)', 'invoicing'),
 			$initial,
 			$period
 	
@@ -396,7 +396,7 @@ 
 	return sprintf(
 
 		// translators: $1: is the bill times, $2: is the recurring amount, $3: is the recurring period
-		_x( '%2$s / %3$s for %1$s', 'Subscription amount. (e.g.: $120 / year for 5 years)', 'invoicing' ),
+		_x('%2$s / %3$s for %1$s', 'Subscription amount. (e.g.: $120 / year for 5 years)', 'invoicing'),
 		$bill_times,
 		$initial,
 		$period
@@ -411,8 +411,8 @@ 
  * @param WPInv_Invoice $invoice
  * @return WPInv_Subscription|false
  */
-function getpaid_get_invoice_subscription( $invoice ) {
-	return getpaid_subscriptions()->get_invoice_subscription( $invoice );
+function getpaid_get_invoice_subscription($invoice) {
+	return getpaid_subscriptions()->get_invoice_subscription($invoice);
 }
 
 /**
@@ -420,9 +420,9 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_activate_invoice_subscription( $invoice ) {
-	$subscription = getpaid_get_invoice_subscription( $invoice );
-	if ( is_a( $subscription, 'WPInv_Subscription' ) ) {
+function getpaid_activate_invoice_subscription($invoice) {
+	$subscription = getpaid_get_invoice_subscription($invoice);
+	if (is_a($subscription, 'WPInv_Subscription')) {
 		$subscription->activate();
 	}
 }
@@ -433,7 +433,7 @@ 
  * @return WPInv_Subscriptions
  */
 function getpaid_subscriptions() {
-	return getpaid()->get( 'subscriptions' );
+	return getpaid()->get('subscriptions');
 }
 
 /**
@@ -442,13 +442,13 @@ 
  * @since 2.3.0
  * @return WPInv_Subscription|bool
  */
-function wpinv_get_invoice_subscription( $invoice ) {
+function wpinv_get_invoice_subscription($invoice) {
 
     // Retrieve the invoice.
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Ensure it is a recurring invoice.
-    if ( ! $invoice->is_recurring() ) {
+    if (!$invoice->is_recurring()) {
         return false;
     }
 
@@ -460,7 +460,7 @@ 
 		)
 	);
 
-	return empty( $subscription ) ? false : $subscription[0];
+	return empty($subscription) ? false : $subscription[0];
 
 }
 
@@ -475,50 +475,50 @@ 
  * @param GetPaid_Form_Item|WPInv_Item $cart_item
  * @return string
  */
-function getpaid_get_recurring_item_key( $cart_item ) {
+function getpaid_get_recurring_item_key($cart_item) {
 
 	$cart_key     = 'renews_';
 	$interval     = $cart_item->get_recurring_interval();
-	$period       = $cart_item->get_recurring_period( true );
+	$period       = $cart_item->get_recurring_period(true);
 	$length       = $cart_item->get_recurring_limit() * $interval;
-	$trial_period = $cart_item->get_trial_period( true );
+	$trial_period = $cart_item->get_trial_period(true);
 	$trial_length = $cart_item->get_trial_interval();
 
 	// First start with the billing interval and period
-	switch ( $interval ) {
+	switch ($interval) {
 		case 1 :
-			if ( 'day' == $period ) {
+			if ('day' == $period) {
 				$cart_key .= 'daily';
 			} else {
-				$cart_key .= sprintf( '%sly', $period );
+				$cart_key .= sprintf('%sly', $period);
 			}
 			break;
 		case 2 :
-			$cart_key .= sprintf( 'every_2nd_%s', $period );
+			$cart_key .= sprintf('every_2nd_%s', $period);
 			break;
 		case 3 :
-			$cart_key .= sprintf( 'every_3rd_%s', $period );
+			$cart_key .= sprintf('every_3rd_%s', $period);
 		break;
 		default:
-			$cart_key .= sprintf( 'every_%dth_%s', $interval, $period );
+			$cart_key .= sprintf('every_%dth_%s', $interval, $period);
 			break;
 	}
 
 	// Maybe add the optional maximum billing periods...
-	if ( $length > 0 ) {
+	if ($length > 0) {
 		$cart_key .= '_for_';
-		$cart_key .= sprintf( '%d_%s', $length, $period );
-		if ( $length > 1 ) {
+		$cart_key .= sprintf('%d_%s', $length, $period);
+		if ($length > 1) {
 			$cart_key .= 's';
 		}
 	}
 
 	// And an optional free trial.
-	if ( $cart_item->has_free_trial() ) {
-		$cart_key .= sprintf( '_after_a_%d_%s_trial', $trial_length, $trial_period );
+	if ($cart_item->has_free_trial()) {
+		$cart_key .= sprintf('_after_a_%d_%s_trial', $trial_length, $trial_period);
 	}
 
-	return apply_filters( 'getpaid_get_recurring_item_key', $cart_key, $cart_item );
+	return apply_filters('getpaid_get_recurring_item_key', $cart_key, $cart_item);
 }
 
 /**
@@ -527,14 +527,14 @@ 
  * @param WPInv_Invoice|GetPaid_Payment_Form_Submission|GetPaid_Payment_Form $invoice
  * @return array
  */
-function getpaid_get_subscription_groups( $invoice ) {
+function getpaid_get_subscription_groups($invoice) {
 
 	// Generate subscription groups.
 	$subscription_groups = array();
-	foreach ( $invoice->get_items() as $item ) {
+	foreach ($invoice->get_items() as $item) {
 
-		if ( $item->is_recurring() ) {
-			$subscription_groups[ getpaid_get_recurring_item_key( $item ) ][] = $item;
+		if ($item->is_recurring()) {
+			$subscription_groups[getpaid_get_recurring_item_key($item)][] = $item;
 		}
 
 	}
@@ -551,19 +551,19 @@ 
  * @param WPInv_Invoice|GetPaid_Payment_Form_Submission|GetPaid_Payment_Form $invoice
  * @return array
  */
-function getpaid_calculate_subscription_totals( $invoice ) {
+function getpaid_calculate_subscription_totals($invoice) {
 
 	// Generate subscription groups.
-	$subscription_groups = getpaid_get_subscription_groups( $invoice );
+	$subscription_groups = getpaid_get_subscription_groups($invoice);
 
 	// Now let's calculate the totals for each group of subscriptions
 	$subscription_totals = array();
 
-	foreach ( $subscription_groups as $subscription_key => $items ) {
+	foreach ($subscription_groups as $subscription_key => $items) {
 
-		if ( empty( $subscription_totals[ $subscription_key ] ) ) {
+		if (empty($subscription_totals[$subscription_key])) {
 
-			$subscription_totals[ $subscription_key ] = array(
+			$subscription_totals[$subscription_key] = array(
 				'initial_total'   => 0,
 				'recurring_total' => 0,
 				'items'           => array(),
@@ -576,34 +576,34 @@ 
 		 * Get the totals of the group.
 		 * @var GetPaid_Form_Item $item
 		 */
-		foreach ( $items as $item ) {
+		foreach ($items as $item) {
 
-			$subscription_totals[ $subscription_key ]['items'][$item->get_id()]  = $item->prepare_data_for_saving();
-			$subscription_totals[ $subscription_key ]['item_id']                 = $item->get_id();
-			$subscription_totals[ $subscription_key ]['period']                  = $item->get_recurring_period( true );
-			$subscription_totals[ $subscription_key ]['interval']                = $item->get_recurring_interval();
-			$subscription_totals[ $subscription_key ]['initial_total']          += $item->get_sub_total() + $item->item_tax - $item->item_discount;
-			$subscription_totals[ $subscription_key ]['recurring_total']        += $item->get_recurring_sub_total() + $item->item_tax - $item->recurring_item_discount;
-			$subscription_totals[ $subscription_key ]['recurring_limit']         = $item->get_recurring_limit();
+			$subscription_totals[$subscription_key]['items'][$item->get_id()]  = $item->prepare_data_for_saving();
+			$subscription_totals[$subscription_key]['item_id']                 = $item->get_id();
+			$subscription_totals[$subscription_key]['period']                  = $item->get_recurring_period(true);
+			$subscription_totals[$subscription_key]['interval']                = $item->get_recurring_interval();
+			$subscription_totals[$subscription_key]['initial_total']          += $item->get_sub_total() + $item->item_tax - $item->item_discount;
+			$subscription_totals[$subscription_key]['recurring_total']        += $item->get_recurring_sub_total() + $item->item_tax - $item->recurring_item_discount;
+			$subscription_totals[$subscription_key]['recurring_limit']         = $item->get_recurring_limit();
 
 			// Calculate the next renewal date.
-			$period       = $item->get_recurring_period( true );
+			$period       = $item->get_recurring_period(true);
 			$interval     = $item->get_recurring_interval();
 
 			// If the subscription item has a trial period...
-			if ( $item->has_free_trial() ) {
-				$period   = $item->get_trial_period( true );
+			if ($item->has_free_trial()) {
+				$period   = $item->get_trial_period(true);
 				$interval = $item->get_trial_interval();
-				$subscription_totals[ $subscription_key ]['trialling'] = $interval . ' ' . $period;
+				$subscription_totals[$subscription_key]['trialling'] = $interval . ' ' . $period;
 			}
 
-			$subscription_totals[ $subscription_key ]['renews_on'] = date( 'Y-m-d H:i:s', strtotime( "+$interval $period", current_time( 'timestamp' ) ) );
+			$subscription_totals[$subscription_key]['renews_on'] = date('Y-m-d H:i:s', strtotime("+$interval $period", current_time('timestamp')));
 
 		}
 
 	}
 
-	return apply_filters( 'getpaid_calculate_subscription_totals', $subscription_totals, $invoice );
+	return apply_filters('getpaid_calculate_subscription_totals', $subscription_totals, $invoice);
 }
 
 /**
@@ -612,19 +612,19 @@ 
  * @param WPInv_Invoice|GetPaid_Payment_Form_Submission|GetPaid_Payment_Form $invoice
  * @return array
  */
-function getpaid_should_group_subscriptions( $invoice ) {
+function getpaid_should_group_subscriptions($invoice) {
 
 	$recurring_items = 0;
 
-	foreach ( $invoice->get_items() as $item ) {
+	foreach ($invoice->get_items() as $item) {
 
-		if ( $item->is_recurring() ) {
-			$recurring_items ++;
+		if ($item->is_recurring()) {
+			$recurring_items++;
 		}
 
 	}
 
-	return apply_filters( 'getpaid_should_group_subscriptions', $recurring_items > 1, $invoice );
+	return apply_filters('getpaid_should_group_subscriptions', $recurring_items > 1, $invoice);
 }
 
 /**
@@ -634,12 +634,12 @@ 
  * @param int|false $subscription_id
  * @return int
  */
-function getpaid_count_subscription_invoices( $parent_invoice_id, $subscription_id = false ) {
+function getpaid_count_subscription_invoices($parent_invoice_id, $subscription_id = false) {
 	global $wpdb;
 
 	$parent_invoice_id = (int) $parent_invoice_id;
 
-	if ( false === $subscription_id || ! (bool) get_post_meta( $parent_invoice_id, '_wpinv_subscription_id', true ) ) {
+	if (false === $subscription_id || !(bool) get_post_meta($parent_invoice_id, '_wpinv_subscription_id', true)) {
 
 		return (int) $wpdb->get_var(
 			$wpdb->prepare(
@@ -661,10 +661,10 @@ 
 
 	$count = 0;
 
-	foreach ( wp_parse_id_list( $invoice_ids ) as $invoice_id ) {
+	foreach (wp_parse_id_list($invoice_ids) as $invoice_id) {
 
-		if ( $invoice_id == $parent_invoice_id || $subscription_id == (int) get_post_meta( $invoice_id, '_wpinv_subscription_id', true ) ) {
-			$count ++;
+		if ($invoice_id == $parent_invoice_id || $subscription_id == (int) get_post_meta($invoice_id, '_wpinv_subscription_id', true)) {
+			$count++;
 			continue;
 		}
 

includes/payments/class-getpaid-payment-form-submission-taxes.php

Indentation +211 added lines, -211 removed lines

@@ -12,230 +12,230 @@
  */
 class GetPaid_Payment_Form_Submission_Taxes {
 
-	/**
-	 * Submission taxes.
-	 * @var array
-	 */
-	public $taxes = array();
-
-	/**
-	 * Whether or not we should skip the taxes.
-	 * @var bool
-	 */
-	protected $skip_taxes = false;
+    /**
+     * Submission taxes.
+     * @var array
+     */
+    public $taxes = array();
+
+    /**
+     * Whether or not we should skip the taxes.
+     * @var bool
+     */
+    protected $skip_taxes = false;
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		// Validate VAT number.
-		$this->validate_vat( $submission );
-
-		if ( $this->skip_taxes ) {
-			return;
-		}
-
-		foreach ( $submission->get_items() as $item ) {
-			$this->process_item_tax( $item, $submission );
-		}
-
-		// Process any existing invoice taxes.
-		if ( $submission->has_invoice() ) {
-			$this->taxes = array_replace( $submission->get_invoice()->get_taxes(), $this->taxes );
-		}
-
-	}
-
-	/**
-	 * Maybe process tax.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Form_Item $item
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function process_item_tax( $item, $submission ) {
-
-		$rates    = getpaid_get_item_tax_rates( $item, $submission->country, $submission->state );
-		$rates    = getpaid_filter_item_tax_rates( $item, $rates );
-		$taxes    = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, false ), $rates );
-		$r_taxes  = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
-
-		foreach ( $taxes as $name => $amount ) {
-			$recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
-			$tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
-
-			$item->item_tax += wpinv_sanitize_amount( $tax['initial_tax'] );
-
-			if ( ! isset( $this->taxes[ $name ] ) ) {
-				$this->taxes[ $name ] = $tax;
-				continue;
-			}
-
-			$this->taxes[ $name ]['initial_tax']   += $tax['initial_tax'];
-			$this->taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
-
-		}
-
-	}
-
-	/**
-	 * Checks if the submission has a digital item.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_digital_item( $submission ) {
-
-		foreach ( $submission->get_items() as $item ) {
-
-			if ( 'digital' == $item->get_vat_rule() ) {
-				return true;
-			}
-
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks if this is an eu store.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public static function is_eu_store() {
-		return self::is_eu_country( wpinv_get_default_country() );
-	}
-
-	/**
-	 * Checks if this is an eu country.
-	 *
-	 * @param string $country
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public static function is_eu_country( $country ) {
-		return getpaid_is_eu_state( $country );
-	}
-
-	/**
-	 * Checks if this is an eu purchase.
-	 *
-	 * @param string $customer_country
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public static function is_eu_transaction( $customer_country ) {
-		return self::is_eu_country( $customer_country ) && self::is_eu_store();
-	}
-
-	/**
-	 * Retrieves the vat number.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_vat_number( $submission ) {
-
-		// Retrieve from the posted number.
-		$vat_number = $submission->get_field( 'wpinv_vat_number', 'billing' );
-		if ( ! is_null( $vat_number ) ) {
-			return wpinv_clean( $vat_number );
-		}
-
-		return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
-	}
-
-	/**
-	 * Retrieves the company.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_company( $submission ) {
-
-		// Retrieve from the posted data.
-		$company = $submission->get_field( 'wpinv_company', 'billing' );
-		if ( ! empty( $company ) ) {
-			return wpinv_clean( $company );
-		}
-
-		// Retrieve from the invoice.
-		return $submission->has_invoice() ? $submission->get_invoice()->get_company() : '';
-	}
-
-	/**
-	 * Checks if we require a VAT number.
-	 *
-	 * @param bool $ip_in_eu Whether the customer IP is from the EU
-	 * @param bool $country_in_eu Whether the customer country is from the EU
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function requires_vat( $ip_in_eu, $country_in_eu ) {
-
-		$prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
-		$prevent_b2c = ! empty( $prevent_b2c );
-		$is_eu       = $ip_in_eu || $country_in_eu;
-
-		return $prevent_b2c && $is_eu;
-	}
-
-	/**
-	 * Validate VAT data.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 */
-	public function validate_vat( $submission ) {
-
-		$in_eu = $this->is_eu_transaction( $submission->country );
-
-		// Abort if we are not validating vat numbers.
-		if ( ! $in_eu ) {
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        // Validate VAT number.
+        $this->validate_vat( $submission );
+
+        if ( $this->skip_taxes ) {
             return;
-		}
+        }
+
+        foreach ( $submission->get_items() as $item ) {
+            $this->process_item_tax( $item, $submission );
+        }
+
+        // Process any existing invoice taxes.
+        if ( $submission->has_invoice() ) {
+            $this->taxes = array_replace( $submission->get_invoice()->get_taxes(), $this->taxes );
+        }
+
+    }
+
+    /**
+     * Maybe process tax.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Form_Item $item
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function process_item_tax( $item, $submission ) {
+
+        $rates    = getpaid_get_item_tax_rates( $item, $submission->country, $submission->state );
+        $rates    = getpaid_filter_item_tax_rates( $item, $rates );
+        $taxes    = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, false ), $rates );
+        $r_taxes  = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
+
+        foreach ( $taxes as $name => $amount ) {
+            $recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
+            $tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
+
+            $item->item_tax += wpinv_sanitize_amount( $tax['initial_tax'] );
+
+            if ( ! isset( $this->taxes[ $name ] ) ) {
+                $this->taxes[ $name ] = $tax;
+                continue;
+            }
+
+            $this->taxes[ $name ]['initial_tax']   += $tax['initial_tax'];
+            $this->taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
+
+        }
+
+    }
+
+    /**
+     * Checks if the submission has a digital item.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_digital_item( $submission ) {
+
+        foreach ( $submission->get_items() as $item ) {
+
+            if ( 'digital' == $item->get_vat_rule() ) {
+                return true;
+            }
+
+        }
 
-		// Prepare variables.
-		$vat_number  = $this->get_vat_number( $submission );
-		$ip_country  = getpaid_get_ip_country();
+        return false;
+    }
+
+    /**
+     * Checks if this is an eu store.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public static function is_eu_store() {
+        return self::is_eu_country( wpinv_get_default_country() );
+    }
+
+    /**
+     * Checks if this is an eu country.
+     *
+     * @param string $country
+     * @since 1.0.19
+     * @return bool
+     */
+    public static function is_eu_country( $country ) {
+        return getpaid_is_eu_state( $country );
+    }
+
+    /**
+     * Checks if this is an eu purchase.
+     *
+     * @param string $customer_country
+     * @since 1.0.19
+     * @return bool
+     */
+    public static function is_eu_transaction( $customer_country ) {
+        return self::is_eu_country( $customer_country ) && self::is_eu_store();
+    }
+
+    /**
+     * Retrieves the vat number.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_vat_number( $submission ) {
+
+        // Retrieve from the posted number.
+        $vat_number = $submission->get_field( 'wpinv_vat_number', 'billing' );
+        if ( ! is_null( $vat_number ) ) {
+            return wpinv_clean( $vat_number );
+        }
+
+        return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
+    }
+
+    /**
+     * Retrieves the company.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_company( $submission ) {
+
+        // Retrieve from the posted data.
+        $company = $submission->get_field( 'wpinv_company', 'billing' );
+        if ( ! empty( $company ) ) {
+            return wpinv_clean( $company );
+        }
+
+        // Retrieve from the invoice.
+        return $submission->has_invoice() ? $submission->get_invoice()->get_company() : '';
+    }
+
+    /**
+     * Checks if we require a VAT number.
+     *
+     * @param bool $ip_in_eu Whether the customer IP is from the EU
+     * @param bool $country_in_eu Whether the customer country is from the EU
+     * @since 1.0.19
+     * @return string
+     */
+    public function requires_vat( $ip_in_eu, $country_in_eu ) {
+
+        $prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
+        $prevent_b2c = ! empty( $prevent_b2c );
+        $is_eu       = $ip_in_eu || $country_in_eu;
+
+        return $prevent_b2c && $is_eu;
+    }
+
+    /**
+     * Validate VAT data.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     */
+    public function validate_vat( $submission ) {
+
+        $in_eu = $this->is_eu_transaction( $submission->country );
+
+        // Abort if we are not validating vat numbers.
+        if ( ! $in_eu ) {
+            return;
+        }
+
+        // Prepare variables.
+        $vat_number  = $this->get_vat_number( $submission );
+        $ip_country  = getpaid_get_ip_country();
         $is_eu       = $this->is_eu_country( $submission->country );
         $is_ip_eu    = $this->is_eu_country( $ip_country );
 
-		// Maybe abort early for initial fetches.
-		if ( $submission->is_initial_fetch() && empty( $vat_number ) ) {
-			return;
-		}
+        // Maybe abort early for initial fetches.
+        if ( $submission->is_initial_fetch() && empty( $vat_number ) ) {
+            return;
+        }
 
-		// If we're preventing business to consumer purchases,
-		if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
+        // If we're preventing business to consumer purchases,
+        if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
 
-			// Ensure that a vat number has been specified.
-			throw new Exception(
-				__( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' )
-			);
+            // Ensure that a vat number has been specified.
+            throw new Exception(
+                __( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' )
+            );
 
-		}
+        }
 
-		if ( empty( $vat_number ) ) {
-			return;
-		}
+        if ( empty( $vat_number ) ) {
+            return;
+        }
 
-		if ( wpinv_should_validate_vat_number() && ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
-			throw new Exception( __( 'Your VAT number is invalid', 'invoicing' ) );
-		}
+        if ( wpinv_should_validate_vat_number() && ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
+            throw new Exception( __( 'Your VAT number is invalid', 'invoicing' ) );
+        }
 
-		if (  wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
-			return;
-		}
+        if (  wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
+            return;
+        }
 
-		$this->skip_taxes = true;
-	}
+        $this->skip_taxes = true;
+    }
 
 }

Spacing +53 added lines, -53 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission taxes class
@@ -29,22 +29,22 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		// Validate VAT number.
-		$this->validate_vat( $submission );
+		$this->validate_vat($submission);
 
-		if ( $this->skip_taxes ) {
+		if ($this->skip_taxes) {
 			return;
 		}
 
-		foreach ( $submission->get_items() as $item ) {
-			$this->process_item_tax( $item, $submission );
+		foreach ($submission->get_items() as $item) {
+			$this->process_item_tax($item, $submission);
 		}
 
 		// Process any existing invoice taxes.
-		if ( $submission->has_invoice() ) {
-			$this->taxes = array_replace( $submission->get_invoice()->get_taxes(), $this->taxes );
+		if ($submission->has_invoice()) {
+			$this->taxes = array_replace($submission->get_invoice()->get_taxes(), $this->taxes);
 		}
 
 	}
@@ -56,26 +56,26 @@ 
 	 * @param GetPaid_Form_Item $item
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function process_item_tax( $item, $submission ) {
+	public function process_item_tax($item, $submission) {
 
-		$rates    = getpaid_get_item_tax_rates( $item, $submission->country, $submission->state );
-		$rates    = getpaid_filter_item_tax_rates( $item, $rates );
-		$taxes    = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, false ), $rates );
-		$r_taxes  = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
+		$rates    = getpaid_get_item_tax_rates($item, $submission->country, $submission->state);
+		$rates    = getpaid_filter_item_tax_rates($item, $rates);
+		$taxes    = getpaid_calculate_item_taxes(getpaid_get_taxable_amount($item, false), $rates);
+		$r_taxes  = getpaid_calculate_item_taxes(getpaid_get_taxable_amount($item, true), $rates);
 
-		foreach ( $taxes as $name => $amount ) {
-			$recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
-			$tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
+		foreach ($taxes as $name => $amount) {
+			$recurring = isset($r_taxes[$name]) ? $r_taxes[$name] : 0;
+			$tax       = getpaid_prepare_item_tax($item, $name, $amount, $recurring);
 
-			$item->item_tax += wpinv_sanitize_amount( $tax['initial_tax'] );
+			$item->item_tax += wpinv_sanitize_amount($tax['initial_tax']);
 
-			if ( ! isset( $this->taxes[ $name ] ) ) {
-				$this->taxes[ $name ] = $tax;
+			if (!isset($this->taxes[$name])) {
+				$this->taxes[$name] = $tax;
 				continue;
 			}
 
-			$this->taxes[ $name ]['initial_tax']   += $tax['initial_tax'];
-			$this->taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
+			$this->taxes[$name]['initial_tax']   += $tax['initial_tax'];
+			$this->taxes[$name]['recurring_tax'] += $tax['recurring_tax'];
 
 		}
 
@@ -88,11 +88,11 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public function has_digital_item( $submission ) {
+	public function has_digital_item($submission) {
 
-		foreach ( $submission->get_items() as $item ) {
+		foreach ($submission->get_items() as $item) {
 
-			if ( 'digital' == $item->get_vat_rule() ) {
+			if ('digital' == $item->get_vat_rule()) {
 				return true;
 			}
 
@@ -108,7 +108,7 @@ 
 	 * @return bool
 	 */
 	public static function is_eu_store() {
-		return self::is_eu_country( wpinv_get_default_country() );
+		return self::is_eu_country(wpinv_get_default_country());
 	}
 
 	/**
@@ -118,8 +118,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public static function is_eu_country( $country ) {
-		return getpaid_is_eu_state( $country );
+	public static function is_eu_country($country) {
+		return getpaid_is_eu_state($country);
 	}
 
 	/**
@@ -129,8 +129,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public static function is_eu_transaction( $customer_country ) {
-		return self::is_eu_country( $customer_country ) && self::is_eu_store();
+	public static function is_eu_transaction($customer_country) {
+		return self::is_eu_country($customer_country) && self::is_eu_store();
 	}
 
 	/**
@@ -140,12 +140,12 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function get_vat_number( $submission ) {
+	public function get_vat_number($submission) {
 
 		// Retrieve from the posted number.
-		$vat_number = $submission->get_field( 'wpinv_vat_number', 'billing' );
-		if ( ! is_null( $vat_number ) ) {
-			return wpinv_clean( $vat_number );
+		$vat_number = $submission->get_field('wpinv_vat_number', 'billing');
+		if (!is_null($vat_number)) {
+			return wpinv_clean($vat_number);
 		}
 
 		return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
@@ -158,12 +158,12 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function get_company( $submission ) {
+	public function get_company($submission) {
 
 		// Retrieve from the posted data.
-		$company = $submission->get_field( 'wpinv_company', 'billing' );
-		if ( ! empty( $company ) ) {
-			return wpinv_clean( $company );
+		$company = $submission->get_field('wpinv_company', 'billing');
+		if (!empty($company)) {
+			return wpinv_clean($company);
 		}
 
 		// Retrieve from the invoice.
@@ -178,10 +178,10 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function requires_vat( $ip_in_eu, $country_in_eu ) {
+	public function requires_vat($ip_in_eu, $country_in_eu) {
 
-		$prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
-		$prevent_b2c = ! empty( $prevent_b2c );
+		$prevent_b2c = wpinv_get_option('vat_prevent_b2c_purchase');
+		$prevent_b2c = !empty($prevent_b2c);
 		$is_eu       = $ip_in_eu || $country_in_eu;
 
 		return $prevent_b2c && $is_eu;
@@ -193,45 +193,45 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 * @since 1.0.19
 	 */
-	public function validate_vat( $submission ) {
+	public function validate_vat($submission) {
 
-		$in_eu = $this->is_eu_transaction( $submission->country );
+		$in_eu = $this->is_eu_transaction($submission->country);
 
 		// Abort if we are not validating vat numbers.
-		if ( ! $in_eu ) {
+		if (!$in_eu) {
             return;
 		}
 
 		// Prepare variables.
-		$vat_number  = $this->get_vat_number( $submission );
+		$vat_number  = $this->get_vat_number($submission);
 		$ip_country  = getpaid_get_ip_country();
-        $is_eu       = $this->is_eu_country( $submission->country );
-        $is_ip_eu    = $this->is_eu_country( $ip_country );
+        $is_eu       = $this->is_eu_country($submission->country);
+        $is_ip_eu    = $this->is_eu_country($ip_country);
 
 		// Maybe abort early for initial fetches.
-		if ( $submission->is_initial_fetch() && empty( $vat_number ) ) {
+		if ($submission->is_initial_fetch() && empty($vat_number)) {
 			return;
 		}
 
 		// If we're preventing business to consumer purchases,
-		if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
+		if ($this->requires_vat($is_ip_eu, $is_eu) && empty($vat_number)) {
 
 			// Ensure that a vat number has been specified.
 			throw new Exception(
-				__( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' )
+				__('Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing')
 			);
 
 		}
 
-		if ( empty( $vat_number ) ) {
+		if (empty($vat_number)) {
 			return;
 		}
 
-		if ( wpinv_should_validate_vat_number() && ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
-			throw new Exception( __( 'Your VAT number is invalid', 'invoicing' ) );
+		if (wpinv_should_validate_vat_number() && !wpinv_validate_vat_number($vat_number, $submission->country)) {
+			throw new Exception(__('Your VAT number is invalid', 'invoicing'));
 		}
 
-		if (  wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
+		if (wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option('vat_same_country_rule', 'vat_too')) {
 			return;
 		}
 

includes/wpinv-payment-functions.php

Indentation +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
         do_action( 'getpaid_checkout_invoice_exception', $invoice );
     }
 
-	// Do we have any errors?
+    // Do we have any errors?
     if ( wpinv_get_errors() ) {
         $response['data'] = getpaid_get_errors_html( true, false );
     } else {

Spacing +94 added lines, -94 removed lines

@@ -1,155 +1,155 @@ 
 <?php
-function wpinv_is_subscription_payment( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_is_subscription_payment($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
         
-    if ( $invoice->is_renewal() ) {
+    if ($invoice->is_renewal()) {
         return true;
     }
 
     return false;
 }
 
-function wpinv_payment_link_transaction_id( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_payment_link_transaction_id($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
 
-    return apply_filters( 'wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice );
+    return apply_filters('wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice);
 }
 
-function wpinv_subscription_initial_payment_desc( $amount, $period, $interval, $trial_period = '', $trial_interval = 0 ) {
-    $interval   = (int)$interval > 0 ? (int)$interval : 1;
+function wpinv_subscription_initial_payment_desc($amount, $period, $interval, $trial_period = '', $trial_interval = 0) {
+    $interval   = (int) $interval > 0 ? (int) $interval : 1;
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
-        $amount = __( 'Free', 'invoicing' );
+    if ($trial_interval > 0 && !empty($trial_period)) {
+        $amount = __('Free', 'invoicing');
         $interval = $trial_interval;
         $period = $trial_period;
     }
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :
-            $description = wp_sprintf( _n( '%s for the first day.', '%s for the first %d days.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first day.', '%s for the first %d days.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'W' :
         case 'week' :
-            $description = wp_sprintf( _n( '%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'M' :
         case 'month' :
-            $description = wp_sprintf( _n( '%s for the first month.', '%s for the first %d months.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first month.', '%s for the first %d months.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'Y' :
         case 'year' :
-            $description = wp_sprintf( _n( '%s for the first year.', '%s for the first %d years.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first year.', '%s for the first %d years.', $interval, 'invoicing'), $amount, $interval);
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval  );
+    return apply_filters('wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_recurring_payment_desc( $amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0 ) {
-    $interval   = (int)$interval > 0 ? (int)$interval : 1;
-    $bill_times = (int)$bill_times > 0 ? (int)$bill_times : 0;
+function wpinv_subscription_recurring_payment_desc($amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0) {
+    $interval   = (int) $interval > 0 ? (int) $interval : 1;
+    $bill_times = (int) $bill_times > 0 ? (int) $bill_times : 0;
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d days, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d days, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d days.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d days.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'W' :
         case 'week' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d weeks, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d weeks, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d weeks.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d weeks.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each week.', '%s for each %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each week.', '%s for each %d weeks.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'M' :
         case 'month' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d months, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d months, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d months.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d months.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each month.', '%s for each %d months.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each month.', '%s for each %d months.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'Y' :
         case 'year' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d years, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d years, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d years.', 'invoicing'), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d years.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each year.', '%s for each %d years.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each year.', '%s for each %d years.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    return apply_filters('wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_payment_desc( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_subscription_payment_desc($invoice) {
+    if (empty($invoice)) {
         return NULL;
     }
 
     $description = '';
-    if ( $invoice->is_parent() && $item = $invoice->get_recurring( true ) ) {
-        if ( $item->has_free_trial() ) {
+    if ($invoice->is_parent() && $item = $invoice->get_recurring(true)) {
+        if ($item->has_free_trial()) {
             $trial_period = $item->get_trial_period();
             $trial_interval = $item->get_trial_interval();
         } else {
@@ -157,40 +157,40 @@ 
             $trial_interval = 0;
         }
         
-        $description = wpinv_get_billing_cycle( $invoice->get_total(), $invoice->get_recurring_details( 'total' ), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency() );
+        $description = wpinv_get_billing_cycle($invoice->get_total(), $invoice->get_recurring_details('total'), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency());
     }
     
-    return apply_filters( 'wpinv_subscription_payment_desc', $description, $invoice );
+    return apply_filters('wpinv_subscription_payment_desc', $description, $invoice);
 }
 
-function wpinv_get_billing_cycle( $initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '' ) {
-    $initial_total      = wpinv_round_amount( $initial );
-    $recurring_total    = wpinv_round_amount( $recurring );
+function wpinv_get_billing_cycle($initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '') {
+    $initial_total      = wpinv_round_amount($initial);
+    $recurring_total    = wpinv_round_amount($recurring);
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
+    if ($trial_interval > 0 && !empty($trial_period)) {
         // Free trial
     } else {
-        if ( $bill_times == 1 ) {
+        if ($bill_times == 1) {
             $recurring_total = $initial_total;
-        } else if ( $bill_times > 1 && $initial_total != $recurring_total ) {
+        } else if ($bill_times > 1 && $initial_total != $recurring_total) {
             $bill_times--;
         }
     }
     
-    $initial_amount     = wpinv_price( $initial_total, $currency );
-    $recurring_amount   = wpinv_price( $recurring_total, $currency );
+    $initial_amount     = wpinv_price($initial_total, $currency);
+    $recurring_amount   = wpinv_price($recurring_total, $currency);
     
-    $recurring          = wpinv_subscription_recurring_payment_desc( $recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    $recurring          = wpinv_subscription_recurring_payment_desc($recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
         
-    if ( $initial_total != $recurring_total ) {
-        $initial        = wpinv_subscription_initial_payment_desc( $initial_amount, $period, $interval, $trial_period, $trial_interval );
+    if ($initial_total != $recurring_total) {
+        $initial        = wpinv_subscription_initial_payment_desc($initial_amount, $period, $interval, $trial_period, $trial_interval);
         
-        $description    = wp_sprintf( __( '%s Then %s', 'invoicing' ), $initial, $recurring );
+        $description    = wp_sprintf(__('%s Then %s', 'invoicing'), $initial, $recurring);
     } else {
         $description    = $recurring;
     }
     
-    return apply_filters( 'wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency );
+    return apply_filters('wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency);
 }
 
 /**
@@ -200,27 +200,27 @@ 
  * @param string $card_number Card number.
  * @return string
  */
-function getpaid_get_card_name( $card_number ) {
+function getpaid_get_card_name($card_number) {
 
     // Known regexes.
     $regexes = array(
-        '/^4/'                     => __( 'Visa', 'invoicing' ),
-        '/^5[1-5]/'                => __( 'Mastercard', 'invoicing' ),
-        '/^3[47]/'                 => __( 'Amex', 'invoicing' ),
-        '/^3(?:0[0-5]|[68])/'      => __( 'Diners Club', 'invoicing' ),
-        '/^6(?:011|5)/'            => __( 'Discover', 'invoicing' ),
-        '/^(?:2131|1800|35\d{3})/' => __( 'JCB', 'invoicing' ),
+        '/^4/'                     => __('Visa', 'invoicing'),
+        '/^5[1-5]/'                => __('Mastercard', 'invoicing'),
+        '/^3[47]/'                 => __('Amex', 'invoicing'),
+        '/^3(?:0[0-5]|[68])/'      => __('Diners Club', 'invoicing'),
+        '/^6(?:011|5)/'            => __('Discover', 'invoicing'),
+        '/^(?:2131|1800|35\d{3})/' => __('JCB', 'invoicing'),
     );
 
     // Confirm if one matches.
-    foreach ( $regexes as $regex => $card ) {
-        if ( preg_match ( $regex, $card_number ) >= 1 ) {
+    foreach ($regexes as $regex => $card) {
+        if (preg_match($regex, $card_number) >= 1) {
             return $card;
         }
     }
 
     // None matched.
-    return __( 'Card', 'invoicing' );
+    return __('Card', 'invoicing');
 
 }
 
@@ -229,23 +229,23 @@ 
  * 
  * @param WPInv_Invoice|int|null $invoice
  */
-function wpinv_send_back_to_checkout( $invoice = null ) {
-    $response = array( 'success' => false );
-    $invoice  = wpinv_get_invoice( $invoice );
+function wpinv_send_back_to_checkout($invoice = null) {
+    $response = array('success' => false);
+    $invoice  = wpinv_get_invoice($invoice);
 
     // Was an invoice created?
-    if ( ! empty( $invoice ) ) {
-        $invoice             = is_scalar( $invoice ) ? new WPInv_Invoice( $invoice ) : $invoice;
+    if (!empty($invoice)) {
+        $invoice             = is_scalar($invoice) ? new WPInv_Invoice($invoice) : $invoice;
         $response['invoice'] = $invoice->get_id();
-        do_action( 'getpaid_checkout_invoice_exception', $invoice );
+        do_action('getpaid_checkout_invoice_exception', $invoice);
     }
 
 	// Do we have any errors?
-    if ( wpinv_get_errors() ) {
-        $response['data'] = getpaid_get_errors_html( true, false );
+    if (wpinv_get_errors()) {
+        $response['data'] = getpaid_get_errors_html(true, false);
     } else {
-        $response['data'] = __( 'An error occured while processing your payment. Please try again.', 'invoicing' );
+        $response['data'] = __('An error occured while processing your payment. Please try again.', 'invoicing');
     }
 
-    wp_send_json( $response );
+    wp_send_json($response);
 }

includes/payments/class-getpaid-checkout.php

Indentation +256 added lines, -256 removed lines

@@ -12,180 +12,180 @@ 
  */
 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'] ) ) {
-			wpinv_set_error( 'invalid_gateway', __( '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'] ) ) {
+            wpinv_set_error( 'invalid_gateway', __( 'The selected payment gateway is not active', 'invoicing' ) );
+        }
 
-		// Clear any existing errors.
-		wpinv_clear_errors();
+        // Clear any existing errors.
+        wpinv_clear_errors();
 
-		// Allow themes and plugins to hook to errors
-		do_action( 'getpaid_checkout_error_checks', $submission );
+        // Allow themes and plugins to hook to errors
+        do_action( 'getpaid_checkout_error_checks', $submission );
 
-		// Do we have any errors?
+        // Do we have any errors?
         if ( wpinv_get_errors() ) {
             wp_send_json_error( getpaid_get_errors_html() );
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Retrieves submission items.
-	 *
-	 * @return GetPaid_Form_Item[]
-	 */
-	protected function get_submission_items() {
+    /**
+     * Retrieves submission items.
+     *
+     * @return GetPaid_Form_Item[]
+     */
+    protected function get_submission_items() {
 
-		$items = $this->payment_form_submission->get_items();
+        $items = $this->payment_form_submission->get_items();
 
         // Ensure that we have items.
         if ( empty( $items ) && ! $this->payment_form_submission->has_fees() ) {
             wp_send_json_error( __( 'Please provide at least one item or amount.', 'invoicing' ) );
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Retrieves submission invoice.
-	 *
-	 * @return WPInv_Invoice
-	 */
-	protected function get_submission_invoice() {
-		$submission = $this->payment_form_submission;
-
-		if ( ! $submission->has_invoice() ) {
-			$invoice = new WPInv_Invoice();
-			$invoice->set_created_via( 'payment_form' );
-			return $invoice;
         }
 
-		$invoice = $submission->get_invoice();
+        return $items;
+    }
 
-		// Make sure that it is neither paid or refunded.
-		if ( $invoice->is_paid() || $invoice->is_refunded() ) {
-			wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
-		}
+    /**
+     * Retrieves submission invoice.
+     *
+     * @return WPInv_Invoice
+     */
+    protected function get_submission_invoice() {
+        $submission = $this->payment_form_submission;
 
-		return $invoice;
-	}
+        if ( ! $submission->has_invoice() ) {
+            $invoice = new WPInv_Invoice();
+            $invoice->set_created_via( 'payment_form' );
+            return $invoice;
+        }
 
-	/**
-	 * Processes the submission invoice.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	protected function process_submission_invoice( $invoice, $items ) {
+        $invoice = $submission->get_invoice();
 
-		$submission = $this->payment_form_submission;
-		$data       = $submission->get_data();
+        // Make sure that it is neither paid or refunded.
+        if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+            wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
+        }
 
-		// Set-up the invoice details.
-		$invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
-		$invoice->set_user_id( $this->get_submission_customer() );
-		$invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
+        return $invoice;
+    }
+
+    /**
+     * Processes the submission invoice.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    protected function process_submission_invoice( $invoice, $items ) {
+
+        $submission = $this->payment_form_submission;
+        $data       = $submission->get_data();
+
+        // Set-up the invoice details.
+        $invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
+        $invoice->set_user_id( $this->get_submission_customer() );
+        $invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
         $invoice->set_items( $items );
         $invoice->set_fees( $submission->get_fees() );
         $invoice->set_taxes( $submission->get_taxes() );
-		$invoice->set_discounts( $submission->get_discounts() );
-		$invoice->set_gateway( $data['wpi-gateway'] );
+        $invoice->set_discounts( $submission->get_discounts() );
+        $invoice->set_gateway( $data['wpi-gateway'] );
 
-		$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 ) ) {
@@ -195,11 +195,11 @@ 
         if ( empty( $user ) ) {
             $user = wpinv_create_user( $submission->get_billing_email() );
 
-			// (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 ) ) ) {
-				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 ) ) ) {
+                wp_send_new_user_notifications( $user, 'user' );
+            }
 
         }
 
@@ -209,31 +209,31 @@ 
 
         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();
 
         // 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'] ) || $field['type'] == 'address' ) {
                 continue;
             }
@@ -251,176 +251,176 @@ 
                     $label = $field['label'];
                 }
 
-				$prepared[ wpinv_clean( $label ) ] = wp_kses_post( $data[ $field['id'] ] );
+                $prepared[ wpinv_clean( $label ) ] = wp_kses_post( $data[ $field['id'] ] );
 
             }
 
-		}
+        }
 
-		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 );
         if ( ! empty( $prepared_payment_form_data ) ) {
             update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data );
-		}
+        }
 
-		// Save payment form data.
+        // Save payment form data.
         if ( ! empty( $shipping ) ) {
             update_post_meta( $invoice->get_id(), 'shipping_address', $shipping );
-		}
+        }
 
-		// Backwards compatibility.
+        // Backwards compatibility.
         add_filter( 'wp_redirect', array( $this, 'send_redirect_response' ) );
 
-		$this->process_payment( $invoice );
+        $this->process_payment( $invoice );
 
         // If we are here, there was an error.
-		wpinv_send_back_to_checkout( $invoice );
+        wpinv_send_back_to_checkout( $invoice );
 
-	}
+    }
 
-	/**
-	 * Processes the actual payment.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	protected function process_payment( $invoice ) {
+    /**
+     * Processes the actual payment.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    protected function process_payment( $invoice ) {
 
-		// Clear any checkout errors.
-		wpinv_clear_errors();
+        // Clear any checkout errors.
+        wpinv_clear_errors();
 
-		// No need to send free invoices to the gateway.
-		if ( $invoice->is_free() ) {
-			$this->process_free_payment( $invoice );
-		}
+        // No need to send free invoices to the gateway.
+        if ( $invoice->is_free() ) {
+            $this->process_free_payment( $invoice );
+        }
 
-		$submission = $this->payment_form_submission;
+        $submission = $this->payment_form_submission;
 
-		// Fires before sending to the gateway.
-		do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
+        // Fires before sending to the gateway.
+        do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
 
-		// Allow the sumission data to be modified before it is sent to the gateway.
-		$submission_data    = $submission->get_data();
-		$submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
-		$submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
+        // Allow the sumission data to be modified before it is sent to the gateway.
+        $submission_data    = $submission->get_data();
+        $submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
+        $submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
 
-		// Validate the currency.
-		if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
-			wpinv_set_error( 'invalid_currency', __( 'The chosen payment gateway does not support this currency', 'invoicing' ) );
-		}
+        // Validate the currency.
+        if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
+            wpinv_set_error( 'invalid_currency', __( 'The chosen payment gateway does not support this currency', 'invoicing' ) );
+        }
 
-		// Check to see if we have any errors.
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
-		}
+        // Check to see if we have any errors.
+        if ( wpinv_get_errors() ) {
+            wpinv_send_back_to_checkout( $invoice );
+        }
 
-		// Send info to the gateway for payment processing
-		do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
+        // Send info to the gateway for payment processing
+        do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
 
-		// Backwards compatibility.
-		wpinv_send_to_gateway( $submission_gateway, $invoice );
+        // Backwards compatibility.
+        wpinv_send_to_gateway( $submission_gateway, $invoice );
 
-	}
+    }
 
-	/**
-	 * Marks the invoice as paid in case the checkout is free.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	protected function process_free_payment( $invoice ) {
+    /**
+     * Marks the invoice as paid in case the checkout is free.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    protected function process_free_payment( $invoice ) {
 
-		$invoice->set_gateway( 'none' );
-		$invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
-		$invoice->mark_paid();
-		wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        $invoice->set_gateway( 'none' );
+        $invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
+        $invoice->mark_paid();
+        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
 
-	}
+    }
 
-	/**
+    /**
      * Sends a redrect response to payment details.
      *
      */

Spacing +108 added lines, -108 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'] ) ) {
-			wpinv_set_error( 'invalid_gateway', __( 'The selected payment gateway is not active', 'invoicing' ) );
+		if ($submission->should_collect_payment_details() && !wpinv_is_gateway_active($data['wpi-gateway'])) {
+			wpinv_set_error('invalid_gateway', __('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,29 +146,29 @@ 
 	 * @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;
 		$data       = $submission->get_data();
 
 		// Set-up the invoice details.
-		$invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
-		$invoice->set_user_id( $this->get_submission_customer() );
-		$invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
-        $invoice->set_items( $items );
-        $invoice->set_fees( $submission->get_fees() );
-        $invoice->set_taxes( $submission->get_taxes() );
-		$invoice->set_discounts( $submission->get_discounts() );
-		$invoice->set_gateway( $data['wpi-gateway'] );
-
-		$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() );
+		$invoice->set_email(sanitize_email($submission->get_billing_email()));
+		$invoice->set_user_id($this->get_submission_customer());
+		$invoice->set_payment_form(absint($submission->get_payment_form()->get_id()));
+        $invoice->set_items($items);
+        $invoice->set_fees($submission->get_fees());
+        $invoice->set_taxes($submission->get_taxes());
+		$invoice->set_discounts($submission->get_discounts());
+		$invoice->set_gateway($data['wpi-gateway']);
+
+		$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());
 		}
 
-		getpaid_maybe_add_default_address( $invoice );
+		getpaid_maybe_add_default_address($invoice);
 		return $invoice;
 	}
 
@@ -181,33 +181,33 @@ 
 		$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 ) ) {
-            $user = wpinv_create_user( $submission->get_billing_email() );
+        if (empty($user)) {
+            $user = wpinv_create_user($submission->get_billing_email());
 
 			// (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 ) ) ) {
-				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))) {
+				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;
 		}
 
@@ -228,30 +228,30 @@ 
         $prepared = array();
 
         // 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'] ) || $field['type'] == 'address' ) {
+            if (!empty($field['premade']) || $field['type'] == 'address') {
                 continue;
             }
 
             // 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']])) {
                 $label = $field['id'];
 
-                if ( isset( $field['label'] ) ) {
+                if (isset($field['label'])) {
                     $label = $field['label'];
                 }
 
-				$prepared[ wpinv_clean( $label ) ] = wp_kses_post( $data[ $field['id'] ] );
+				$prepared[wpinv_clean($label)] = wp_kses_post($data[$field['id']]);
 
             }
 
@@ -268,30 +268,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);
 
 	}
 
@@ -301,12 +301,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);
 
 	}
 
@@ -316,15 +316,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');
 
 	}
 
@@ -335,31 +335,31 @@ 
 	 * @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 );
-        if ( ! empty( $prepared_payment_form_data ) ) {
-            update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data );
+		$prepared_payment_form_data = apply_filters('getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice);
+        if (!empty($prepared_payment_form_data)) {
+            update_post_meta($invoice->get_id(), 'payment_form_data', $prepared_payment_form_data);
 		}
 
 		// Save payment form data.
-        if ( ! empty( $shipping ) ) {
-            update_post_meta( $invoice->get_id(), 'shipping_address', $shipping );
+        if (!empty($shipping)) {
+            update_post_meta($invoice->get_id(), 'shipping_address', $shipping);
 		}
 
 		// Backwards compatibility.
-        add_filter( 'wp_redirect', array( $this, 'send_redirect_response' ) );
+        add_filter('wp_redirect', array($this, 'send_redirect_response'));
 
-		$this->process_payment( $invoice );
+		$this->process_payment($invoice);
 
         // If we are here, there was an error.
-		wpinv_send_back_to_checkout( $invoice );
+		wpinv_send_back_to_checkout($invoice);
 
 	}
 
@@ -368,41 +368,41 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	protected function process_payment( $invoice ) {
+	protected function process_payment($invoice) {
 
 		// Clear any checkout errors.
 		wpinv_clear_errors();
 
 		// No need to send free invoices to the gateway.
-		if ( $invoice->is_free() ) {
-			$this->process_free_payment( $invoice );
+		if ($invoice->is_free()) {
+			$this->process_free_payment($invoice);
 		}
 
 		$submission = $this->payment_form_submission;
 
 		// Fires before sending to the gateway.
-		do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
+		do_action('getpaid_checkout_before_gateway', $invoice, $submission);
 
 		// Allow the sumission data to be modified before it is sent to the gateway.
 		$submission_data    = $submission->get_data();
-		$submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
-		$submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
+		$submission_gateway = apply_filters('getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice);
+		$submission_data    = apply_filters('getpaid_gateway_submission_data', $submission_data, $submission, $invoice);
 
 		// Validate the currency.
-		if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
-			wpinv_set_error( 'invalid_currency', __( 'The chosen payment gateway does not support this currency', 'invoicing' ) );
+		if (!apply_filters("getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency())) {
+			wpinv_set_error('invalid_currency', __('The chosen payment gateway does not support this currency', 'invoicing'));
 		}
 
 		// Check to see if we have any errors.
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
+		if (wpinv_get_errors()) {
+			wpinv_send_back_to_checkout($invoice);
 		}
 
 		// Send info to the gateway for payment processing
-		do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
+		do_action("getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission);
 
 		// Backwards compatibility.
-		wpinv_send_to_gateway( $submission_gateway, $invoice );
+		wpinv_send_to_gateway($submission_gateway, $invoice);
 
 	}
 
@@ -411,12 +411,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()));
 
 	}
 
@@ -424,9 +424,9 @@ 
      * Sends a redrect response to payment details.
      *
      */
-    public function send_redirect_response( $url ) {
-        $url = urlencode( $url );
-        wp_send_json_success( $url );
+    public function send_redirect_response($url) {
+        $url = urlencode($url);
+        wp_send_json_success($url);
     }
 
 }

includes/admin/class-wpinv-admin-menus.php

Indentation +6 added lines, -6 removed lines

@@ -24,14 +24,14 @@
     }
 
     /**
-	 * Highlights sub menus.
-	 */
-	public function set_admin_menu_class() {
-		global $current_screen, $parent_file, $submenu_file;
+     * Highlights sub menus.
+     */
+    public function set_admin_menu_class() {
+        global $current_screen, $parent_file, $submenu_file;
 
         if ( ! empty( $current_screen->id ) && in_array( $current_screen->id , array( 'wpi_discount', 'wpi_payment_form', 'wpi_invoice' ) ) ) {
-			$parent_file = 'wpinv';
-			$submenu_file = 'edit.php?post_type=' . $current_screen->id;
+            $parent_file = 'wpinv';
+            $submenu_file = 'edit.php?post_type=' . $current_screen->id;
         }
 
     }

Spacing +83 added lines, -83 removed lines

@@ -3,7 +3,7 @@ 
  * Setup menus in WP admin.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WC_Admin_Menus Class.
@@ -13,14 +13,14 @@ 
      * Hook in tabs.
      */
     public function __construct() {
-        add_action( 'admin_head', array( $this, 'set_admin_menu_class' ) );
-        add_action( 'admin_menu', array( $this, 'admin_menu' ), 10 );
-        add_action( 'admin_menu', array( $this, 'add_customers_menu' ), 18 );
-        add_action( 'admin_menu', array( $this, 'add_subscriptions_menu' ), 40 );
-        add_action( 'admin_menu', array( $this, 'add_addons_menu' ), 100 );
-        add_action( 'admin_menu', array( $this, 'add_settings_menu' ), 60 );
-        add_action( 'admin_menu', array( $this, 'remove_admin_submenus' ), 10 );
-        add_action( 'admin_head-nav-menus.php', array( $this, 'add_nav_menu_meta_boxes' ) );
+        add_action('admin_head', array($this, 'set_admin_menu_class'));
+        add_action('admin_menu', array($this, 'admin_menu'), 10);
+        add_action('admin_menu', array($this, 'add_customers_menu'), 18);
+        add_action('admin_menu', array($this, 'add_subscriptions_menu'), 40);
+        add_action('admin_menu', array($this, 'add_addons_menu'), 100);
+        add_action('admin_menu', array($this, 'add_settings_menu'), 60);
+        add_action('admin_menu', array($this, 'remove_admin_submenus'), 10);
+        add_action('admin_head-nav-menus.php', array($this, 'add_nav_menu_meta_boxes'));
     }
 
     /**
@@ -29,7 +29,7 @@ 
 	public function set_admin_menu_class() {
 		global $current_screen, $parent_file, $submenu_file;
 
-        if ( ! empty( $current_screen->id ) && in_array( $current_screen->id , array( 'wpi_discount', 'wpi_payment_form', 'wpi_invoice' ) ) ) {
+        if (!empty($current_screen->id) && in_array($current_screen->id, array('wpi_discount', 'wpi_payment_form', 'wpi_invoice'))) {
 			$parent_file = 'wpinv';
 			$submenu_file = 'edit.php?post_type=' . $current_screen->id;
         }
@@ -38,14 +38,14 @@ 
 
     public function admin_menu() {
 
-        $capability = apply_filters( 'invoicing_capability', wpinv_get_capability() );
+        $capability = apply_filters('invoicing_capability', wpinv_get_capability());
         add_menu_page(
-            __( 'GetPaid', 'invoicing' ),
-            __( 'GetPaid', 'invoicing' ),
+            __('GetPaid', 'invoicing'),
+            __('GetPaid', 'invoicing'),
             $capability,
             'wpinv',
             null,
-            'data:image/svg+xml;base64,' . base64_encode( file_get_contents( WPINV_PLUGIN_DIR . 'assets/images/GetPaid.svg' ) ),
+            'data:image/svg+xml;base64,' . base64_encode(file_get_contents(WPINV_PLUGIN_DIR . 'assets/images/GetPaid.svg')),
             '54.123460'
         );
 
@@ -57,11 +57,11 @@ 
     public function add_customers_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Customers', 'invoicing' ),
-            __( 'Customers', 'invoicing' ),
+            __('Customers', 'invoicing'),
+            __('Customers', 'invoicing'),
             wpinv_get_capability(),
             'wpinv-customers',
-            array( $this, 'customers_page' )
+            array($this, 'customers_page')
         );
     }
 
@@ -71,8 +71,8 @@ 
     public function add_subscriptions_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Subscriptions', 'invoicing' ),
-            __( 'Subscriptions', 'invoicing' ),
+            __('Subscriptions', 'invoicing'),
+            __('Subscriptions', 'invoicing'),
             wpinv_get_capability(),
             'wpinv-subscriptions',
             'wpinv_subscriptions_page'
@@ -83,7 +83,7 @@ 
      * Displays the customers page.
      */
     public function customers_page() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-customers-table.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-customers-table.php');
         ?>
         <div class="wrap wpi-customers-wrap">
             <style>
@@ -91,12 +91,12 @@ 
                     width: 30%;
                 }
             </style>
-            <h1><?php echo esc_html( __( 'Customers', 'invoicing' ) ); ?></h1>
+            <h1><?php echo esc_html(__('Customers', 'invoicing')); ?></h1>
             <form method="post">
             <?php
                 $table = new WPInv_Customers_Table();
                 $table->prepare_items();
-                $table->search_box( __( 'Search Customers', 'invoicing' ), 'search-customers' );
+                $table->search_box(__('Search Customers', 'invoicing'), 'search-customers');
                 $table->display();
             ?>
             </form>
@@ -110,16 +110,16 @@ 
     public function add_settings_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Invoice Settings', 'invoicing' ),
-            __( 'Settings', 'invoicing' ),
-            apply_filters( 'invoicing_capability', wpinv_get_capability() ),
+            __('Invoice Settings', 'invoicing'),
+            __('Settings', 'invoicing'),
+            apply_filters('invoicing_capability', wpinv_get_capability()),
             'wpinv-settings',
-            array( $this, 'options_page' )
+            array($this, 'options_page')
         );
     }
 
-    public function add_addons_menu(){
-        if ( !apply_filters( 'wpi_show_addons_page', true ) ) {
+    public function add_addons_menu() {
+        if (!apply_filters('wpi_show_addons_page', true)) {
             return;
         }
 
@@ -129,80 +129,80 @@ 
             __('Extensions', 'invoicing'),
             'manage_options',
             'wpi-addons',
-            array( $this, 'addons_page' )
+            array($this, 'addons_page')
         );
     }
 
-    public function addons_page(){
+    public function addons_page() {
         $addon_obj = new WPInv_Admin_Addons();
         $addon_obj->output();
     }
 
     function options_page() {
-        $page       = isset( $_GET['page'] )                ? strtolower( $_GET['page'] )               : false;
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
 
-        if ( $page !== 'wpinv-settings' ) {
+        if ($page !== 'wpinv-settings') {
             return;
         }
 
         $settings_tabs = wpinv_get_settings_tabs();
         $settings_tabs = empty($settings_tabs) ? array() : $settings_tabs;
-        $active_tab    = isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $settings_tabs ) ? sanitize_text_field( $_GET['tab'] ) : 'general';
-        $sections      = wpinv_get_settings_tab_sections( $active_tab );
+        $active_tab    = isset($_GET['tab']) && array_key_exists($_GET['tab'], $settings_tabs) ? sanitize_text_field($_GET['tab']) : 'general';
+        $sections      = wpinv_get_settings_tab_sections($active_tab);
         $key           = 'main';
 
-        if ( is_array( $sections ) ) {
-            $key = key( $sections );
+        if (is_array($sections)) {
+            $key = key($sections);
         }
 
         add_thickbox();
 
-        $registered_sections = wpinv_get_settings_tab_sections( $active_tab );
-        $section             = isset( $_GET['section'] ) && ! empty( $registered_sections ) && array_key_exists( $_GET['section'], $registered_sections ) ? $_GET['section'] : $key;
+        $registered_sections = wpinv_get_settings_tab_sections($active_tab);
+        $section             = isset($_GET['section']) && !empty($registered_sections) && array_key_exists($_GET['section'], $registered_sections) ? $_GET['section'] : $key;
         ob_start();
         ?>
         <div class="wrap">
             <h1 class="nav-tab-wrapper">
                 <?php
-                foreach( wpinv_get_settings_tabs() as $tab_id => $tab_name ) {
-                    $tab_url = add_query_arg( array(
+                foreach (wpinv_get_settings_tabs() as $tab_id => $tab_name) {
+                    $tab_url = add_query_arg(array(
                         'settings-updated' => false,
                         'tab' => $tab_id,
-                    ) );
+                    ));
 
                     // Remove the section from the tabs so we always end up at the main section
-                    $tab_url = remove_query_arg( 'section', $tab_url );
-                    $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                    $tab_url = remove_query_arg('section', $tab_url);
+                    $tab_url = remove_query_arg('wpi_sub', $tab_url);
 
                     $active = $active_tab == $tab_id ? ' nav-tab-active' : '';
 
-                    echo '<a href="' . esc_url( $tab_url ) . '" title="' . esc_attr( $tab_name ) . '" class="nav-tab' . $active . '">';
-                    echo esc_html( $tab_name );
+                    echo '<a href="' . esc_url($tab_url) . '" title="' . esc_attr($tab_name) . '" class="nav-tab' . $active . '">';
+                    echo esc_html($tab_name);
                     echo '</a>';
                 }
                 ?>
             </h1>
             <?php
-            $number_of_sections = count( $sections );
+            $number_of_sections = count($sections);
             $number = 0;
-            if ( $number_of_sections > 1 ) {
+            if ($number_of_sections > 1) {
                 echo '<div><ul class="subsubsub">';
-                foreach( $sections as $section_id => $section_name ) {
+                foreach ($sections as $section_id => $section_name) {
                     echo '<li>';
                     $number++;
-                    $tab_url = add_query_arg( array(
+                    $tab_url = add_query_arg(array(
                         'settings-updated' => false,
                         'tab' => $active_tab,
                         'section' => $section_id
-                    ) );
-                    $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                    ));
+                    $tab_url = remove_query_arg('wpi_sub', $tab_url);
                     $class = '';
-                    if ( $section == $section_id ) {
+                    if ($section == $section_id) {
                         $class = 'current';
                     }
-                    echo '<a class="' . $class . '" href="' . esc_url( $tab_url ) . '">' . $section_name . '</a>';
+                    echo '<a class="' . $class . '" href="' . esc_url($tab_url) . '">' . $section_name . '</a>';
 
-                    if ( $number != $number_of_sections ) {
+                    if ($number != $number_of_sections) {
                         echo ' | ';
                     }
                     echo '</li>';
@@ -214,20 +214,20 @@ 
                 <form method="post" action="options.php">
                     <table class="form-table">
                         <?php
-                        settings_fields( 'wpinv_settings' );
+                        settings_fields('wpinv_settings');
 
-                        if ( 'main' === $section ) {
-                            do_action( 'wpinv_settings_tab_top', $active_tab );
+                        if ('main' === $section) {
+                            do_action('wpinv_settings_tab_top', $active_tab);
                         }
 
-                        do_action( 'wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_settings_sections( 'wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_action( 'wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_action( 'getpaid_settings_tab_bottom', $active_tab, $section );
+                        do_action('wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_settings_sections('wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_action('wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_action('getpaid_settings_tab_bottom', $active_tab, $section);
 
                         // For backwards compatibility
-                        if ( 'main' === $section ) {
-                            do_action( 'wpinv_settings_tab_bottom', $active_tab );
+                        if ('main' === $section) {
+                            do_action('wpinv_settings_tab_bottom', $active_tab);
                         }
                         ?>
                     </table>
@@ -241,7 +241,7 @@ 
     }
 
     public function remove_admin_submenus() {
-        remove_submenu_page( 'edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice' );
+        remove_submenu_page('edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice');
     }
 
     /**
@@ -251,8 +251,8 @@ 
 
         add_meta_box(
             'wpinv_endpoints_nav_link',
-            __( 'GetPaid endpoints', 'invoicing' ),
-            array( $this, 'nav_menu_links' ),
+            __('GetPaid endpoints', 'invoicing'),
+            array($this, 'nav_menu_links'),
             'nav-menus',
             'side',
             'low'
@@ -267,12 +267,12 @@ 
         $endpoints = $this->get_menu_items();
         ?>
         <div id="invoicing-endpoints" class="posttypediv">
-            <?php if ( ! empty( $endpoints['pages'] ) ) : ?>
+            <?php if (!empty($endpoints['pages'])) : ?>
                 <div id="tabs-panel-invoicing-endpoints" class="tabs-panel tabs-panel-active">
                     <ul id="invoicing-endpoints-checklist" class="categorychecklist form-no-clear">
                         <?php
-                            $walker = new Walker_Nav_Menu_Checklist( array() );
-                            echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $endpoints['pages'] ), 0, (object) array( 'walker' => $walker ) );
+                            $walker = new Walker_Nav_Menu_Checklist(array());
+                            echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $endpoints['pages']), 0, (object) array('walker' => $walker));
                         ?>
                     </ul>
                 </div>
@@ -281,11 +281,11 @@ 
             <p class="button-controls wp-clearfix" data-items-type="invoicing-endpoints">
                 <span class="list-controls hide-if-no-js">
                     <input type="checkbox" id="invoicing-endpoints-tab" class="select-all">
-                    <label for="invoicing-endpoints-tab"><?php _e( 'Select all', 'invoicing' ); ?></label>
+                    <label for="invoicing-endpoints-tab"><?php _e('Select all', 'invoicing'); ?></label>
                 </span>
 
                 <span class="add-to-menu">
-                    <input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to menu', 'invoicing' ); ?>" name="add-invoicing-endpoints-item" id="submit-invoicing-endpoints">
+                    <input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to menu', 'invoicing'); ?>" name="add-invoicing-endpoints-item" id="submit-invoicing-endpoints">
                     <span class="spinner"></span>
                 </span>
             </p>
@@ -298,35 +298,35 @@ 
      *
      * @return array.
      */
-    public function get_menu_items(){
+    public function get_menu_items() {
         $items = array();
 
         $pages = array(
             array(
-                'id'    => wpinv_get_option( 'invoice_history_page' ),
-                'label' => __( 'My Invoices', 'invoicing' ),
+                'id'    => wpinv_get_option('invoice_history_page'),
+                'label' => __('My Invoices', 'invoicing'),
             ),
             array(
-                'id'    => wpinv_get_option( 'invoice_subscription_page' ),
-                'label' => __( 'My Subscriptions', 'invoicing' ),
+                'id'    => wpinv_get_option('invoice_subscription_page'),
+                'label' => __('My Subscriptions', 'invoicing'),
             )
         );
 
-        foreach ( apply_filters( 'getpaid_menu_pages', $pages ) as $page ) {
+        foreach (apply_filters('getpaid_menu_pages', $pages) as $page) {
 
-            if ( (int) $page['id'] > 0 ) {
+            if ((int) $page['id'] > 0) {
 
                 $item                   = new stdClass();
                 $item->object_id        = (int) $page['id'];
                 $item->db_id            = 0;
-                $item->object           =  'page';
+                $item->object           = 'page';
                 $item->menu_item_parent = 0;
                 $item->type             = 'post_type';
-                $item->title            = sanitize_text_field( $page['label'] );
-                $item->url              = get_permalink( (int) $page['id'] );
+                $item->title            = sanitize_text_field($page['label']);
+                $item->url              = get_permalink((int) $page['id']);
                 $item->target           = '';
                 $item->attr_title       = '';
-                $item->classes          = array( 'wpinv-menu-item' );
+                $item->classes          = array('wpinv-menu-item');
                 $item->xfn              = '';
 
                 $items['pages'][]       = $item;
@@ -335,7 +335,7 @@ 
 
         }
 
-        return apply_filters( 'wpinv_menu_items', $items );
+        return apply_filters('wpinv_menu_items', $items);
     }
 
 }