AyeCode / invoicing

templates/emails/invoice-details.php

Spacing +13 added lines, -13 removed lines

@@ -8,45 +8,45 @@ 
  * @var WPInv_Invoice $invoice
  * @var array $columns
  */
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$meta_data = getpaid_get_invoice_meta( $invoice );
+$meta_data = getpaid_get_invoice_meta($invoice);
 
-if ( isset( $meta_data['status'] ) ) {
+if (isset($meta_data['status'])) {
     $meta_data['status']['value'] = $invoice->get_status_nicename();
 }
 
-do_action( 'wpinv_email_before_invoice_details', $invoice, $sent_to_admin );
+do_action('wpinv_email_before_invoice_details', $invoice, $sent_to_admin);
 
 ?>
 
 <div id="wpinv-email-details">
 
     <h3 class="invoice-details-title">
-        <?php echo sprintf( esc_html__( '%s Details', 'invoicing' ), esc_html( ucfirst( $invoice->get_invoice_quote_type() ) ) ); ?>
+        <?php echo sprintf(esc_html__('%s Details', 'invoicing'), esc_html(ucfirst($invoice->get_invoice_quote_type()))); ?>
     </h3>
 
     <table class="table table-bordered table-sm">
 
-        <?php foreach ( $meta_data as $key => $data ) : ?>
+        <?php foreach ($meta_data as $key => $data) : ?>
 
-            <?php if ( ! empty( $data['value'] ) ) : ?>
+            <?php if (!empty($data['value'])) : ?>
 
-                <?php do_action( "getpaid_before_email_details_$key", $invoice, $data ); ?>
+                <?php do_action("getpaid_before_email_details_$key", $invoice, $data); ?>
 
-                <tr class="getpaid-email-details-<?php echo esc_attr( $key ); ?>">
+                <tr class="getpaid-email-details-<?php echo esc_attr($key); ?>">
 
                     <td class="getpaid-lable-td">
-                        <?php echo esc_html( $data['label'] ); ?>
+                        <?php echo esc_html($data['label']); ?>
                     </td>
 
                     <td class="getpaid-value-td">
-                        <span class="getpaid-invoice-meta-<?php echo esc_attr( $key ); ?>-value"><?php echo wp_kses_post( $data['value'] ); ?></span>
+                        <span class="getpaid-invoice-meta-<?php echo esc_attr($key); ?>-value"><?php echo wp_kses_post($data['value']); ?></span>
                     </td>
 
                 </tr>
 
-                <?php do_action( "getpaid_after_email_details_$key", $invoice, $data ); ?>
+                <?php do_action("getpaid_after_email_details_$key", $invoice, $data); ?>
 
             <?php endif; ?>
 
@@ -56,4 +56,4 @@ 
 
 </div>
 
-<?php do_action( 'wpinv_email_after_invoice_details', $invoice, $sent_to_admin ); ?>
+<?php do_action('wpinv_email_after_invoice_details', $invoice, $sent_to_admin); ?>

templates/invoice/line-item.php

Indentation +62 added lines, -62 removed lines

@@ -26,90 +26,90 @@
 
 				<?php
 
-					// Fires before printing a line item column.
-					do_action( "getpaid_invoice_line_item_before_$column", $item, $invoice );
+                    // Fires before printing a line item column.
+                    do_action( "getpaid_invoice_line_item_before_$column", $item, $invoice );
 
-					// Item name.
-					if ( 'name' === $column ) {
+                    // Item name.
+                    if ( 'name' === $column ) {
 
-						$has_featured_image = has_post_thumbnail( $item->get_id() );
+                        $has_featured_image = has_post_thumbnail( $item->get_id() );
 
-						if ( $has_featured_image ) {
-							echo '<div class="d-flex align-items-center getpaid-form-item-has-featured-image">';
-							echo '<div class="getpaid-form-item-image-container mr-2">';
-							echo get_the_post_thumbnail( $item->get_id(), 'thumbnail', array( 'class' => 'getpaid-form-item-image mb-0' ) );
-							echo '</div>';
-							echo '<div class="getpaid-form-item-name-container">';
-						}
+                        if ( $has_featured_image ) {
+                            echo '<div class="d-flex align-items-center getpaid-form-item-has-featured-image">';
+                            echo '<div class="getpaid-form-item-image-container mr-2">';
+                            echo get_the_post_thumbnail( $item->get_id(), 'thumbnail', array( 'class' => 'getpaid-form-item-image mb-0' ) );
+                            echo '</div>';
+                            echo '<div class="getpaid-form-item-name-container">';
+                        }
 
-						// Display the name.
-						echo '<div class="mb-1">' . esc_html( $item->get_name() ) . '</div>';
+                        // Display the name.
+                        echo '<div class="mb-1">' . esc_html( $item->get_name() ) . '</div>';
 
-						// And an optional description.
-						$description = $item->get_description();
+                        // And an optional description.
+                        $description = $item->get_description();
 
-						if ( ! empty( $description ) ) {
-							echo "<small class='form-text text-muted pr-2 m-0'>" . wp_kses_post( $description ) . '</small>';
-						}
+                        if ( ! empty( $description ) ) {
+                            echo "<small class='form-text text-muted pr-2 m-0'>" . wp_kses_post( $description ) . '</small>';
+                        }
 
-						// Fires before printing the line item actions.
-						do_action( 'getpaid_before_invoice_line_item_actions', $item, $invoice );
+                        // Fires before printing the line item actions.
+                        do_action( 'getpaid_before_invoice_line_item_actions', $item, $invoice );
 
-						$actions = apply_filters( 'getpaid-invoice-page-line-item-actions', array(), $item, $invoice );
+                        $actions = apply_filters( 'getpaid-invoice-page-line-item-actions', array(), $item, $invoice );
 
-						if ( ! empty( $actions ) ) {
+                        if ( ! empty( $actions ) ) {
 
-							$sanitized  = array();
-							foreach ( $actions as $key => $item_action ) {
-								$key         = sanitize_html_class( $key );
-								$item_action = wp_kses_post( $item_action );
-								$sanitized[] = "<span class='$key'>$item_action</span>";
-							}
+                            $sanitized  = array();
+                            foreach ( $actions as $key => $item_action ) {
+                                $key         = sanitize_html_class( $key );
+                                $item_action = wp_kses_post( $item_action );
+                                $sanitized[] = "<span class='$key'>$item_action</span>";
+                            }
 
-							echo "<small class='form-text getpaid-line-item-actions'>";
-							echo wp_kses_post( implode( ' | ', $sanitized ) );
-							echo '</small>';
+                            echo "<small class='form-text getpaid-line-item-actions'>";
+                            echo wp_kses_post( implode( ' | ', $sanitized ) );
+                            echo '</small>';
 
-						}
+                        }
 
-						if ( $has_featured_image ) {
-							echo '</div>';
-							echo '</div>';
-						}
-					}
+                        if ( $has_featured_image ) {
+                            echo '</div>';
+                            echo '</div>';
+                        }
+                    }
 
-					// Item price.
-					if ( 'price' === $column ) {
+                    // Item price.
+                    if ( 'price' === $column ) {
 
-					// Display the item price (or recurring price if this is a renewal invoice)
-					$price = $invoice->is_renewal() ? $item->get_price() : $item->get_initial_price();
-					wpinv_the_price( $price, $invoice->get_currency() );
+                    // Display the item price (or recurring price if this is a renewal invoice)
+                    $price = $invoice->is_renewal() ? $item->get_price() : $item->get_initial_price();
+                    wpinv_the_price( $price, $invoice->get_currency() );
 
-					}
+                    }
 
-					// Tax rate.
-					if ( 'tax_rate' === $column ) {
-					echo floatval( round( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
-					}
+                    // Tax rate.
+                    if ( 'tax_rate' === $column ) {
+                    echo floatval( round( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
+                    }
 
-					// Item quantity.
-					if ( 'quantity' === $column ) {
-					echo (float) $item->get_quantity();
-					}
+                    // Item quantity.
+                    if ( 'quantity' === $column ) {
+                    echo (float) $item->get_quantity();
+                    }
 
-					// Item sub total.
-					if ( 'subtotal' === $column ) {
-					$subtotal = $invoice->is_renewal() ? $item->get_recurring_sub_total() : $item->get_sub_total();
-					wpinv_the_price( $subtotal, $invoice->get_currency() );
-					}
+                    // Item sub total.
+                    if ( 'subtotal' === $column ) {
+                    $subtotal = $invoice->is_renewal() ? $item->get_recurring_sub_total() : $item->get_sub_total();
+                    wpinv_the_price( $subtotal, $invoice->get_currency() );
+                    }
 
-					// Fires when printing a line item column.
-					do_action( "getpaid_invoice_line_item_$column", $item, $invoice );
+                    // Fires when printing a line item column.
+                    do_action( "getpaid_invoice_line_item_$column", $item, $invoice );
 
-					// Fires after printing a line item column.
-					do_action( "getpaid_invoice_line_item_after_$column", $item, $invoice );
+                    // Fires after printing a line item column.
+                    do_action( "getpaid_invoice_line_item_after_$column", $item, $invoice );
 
-				?>
+                ?>
 
 			</div>
 

Spacing +31 added lines, -31 removed lines

@@ -10,104 +10,104 @@
  * @var array $columns
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-do_action( 'getpaid_before_invoice_line_item', $invoice, $item );
+do_action('getpaid_before_invoice_line_item', $invoice, $item);
 
 ?>
 
-<div class='getpaid-invoice-item item-<?php echo (int) $item->get_id(); ?> item-type-<?php echo esc_attr( $item->get_type() ); ?> border-bottom'>
+<div class='getpaid-invoice-item item-<?php echo (int) $item->get_id(); ?> item-type-<?php echo esc_attr($item->get_type()); ?> border-bottom'>
 
 	<div class="form-row row align-items-center">
 
-		<?php foreach ( array_keys( $columns ) as $column ) : ?>
+		<?php foreach (array_keys($columns) as $column) : ?>
 
-			<div class="<?php echo 'name' === $column ? 'col-12 col-sm-6' : 'col-12 col-sm'; ?> getpaid-invoice-item-<?php echo esc_attr( $column ); ?>">
+			<div class="<?php echo 'name' === $column ? 'col-12 col-sm-6' : 'col-12 col-sm'; ?> getpaid-invoice-item-<?php echo esc_attr($column); ?>">
 
 				<?php
 
 					// Fires before printing a line item column.
-					do_action( "getpaid_invoice_line_item_before_$column", $item, $invoice );
+					do_action("getpaid_invoice_line_item_before_$column", $item, $invoice);
 
 					// Item name.
-					if ( 'name' === $column ) {
+					if ('name' === $column) {
 
-						$has_featured_image = has_post_thumbnail( $item->get_id() );
+						$has_featured_image = has_post_thumbnail($item->get_id());
 
-						if ( $has_featured_image ) {
+						if ($has_featured_image) {
 							echo '<div class="d-flex align-items-center getpaid-form-item-has-featured-image">';
 							echo '<div class="getpaid-form-item-image-container mr-2">';
-							echo get_the_post_thumbnail( $item->get_id(), 'thumbnail', array( 'class' => 'getpaid-form-item-image mb-0' ) );
+							echo get_the_post_thumbnail($item->get_id(), 'thumbnail', array('class' => 'getpaid-form-item-image mb-0'));
 							echo '</div>';
 							echo '<div class="getpaid-form-item-name-container">';
 						}
 
 						// Display the name.
-						echo '<div class="mb-1">' . esc_html( $item->get_name() ) . '</div>';
+						echo '<div class="mb-1">' . esc_html($item->get_name()) . '</div>';
 
 						// And an optional description.
 						$description = $item->get_description();
 
-						if ( ! empty( $description ) ) {
-							echo "<small class='form-text text-muted pr-2 m-0'>" . wp_kses_post( $description ) . '</small>';
+						if (!empty($description)) {
+							echo "<small class='form-text text-muted pr-2 m-0'>" . wp_kses_post($description) . '</small>';
 						}
 
 						// Fires before printing the line item actions.
-						do_action( 'getpaid_before_invoice_line_item_actions', $item, $invoice );
+						do_action('getpaid_before_invoice_line_item_actions', $item, $invoice);
 
-						$actions = apply_filters( 'getpaid-invoice-page-line-item-actions', array(), $item, $invoice );
+						$actions = apply_filters('getpaid-invoice-page-line-item-actions', array(), $item, $invoice);
 
-						if ( ! empty( $actions ) ) {
+						if (!empty($actions)) {
 
-							$sanitized  = array();
-							foreach ( $actions as $key => $item_action ) {
-								$key         = sanitize_html_class( $key );
-								$item_action = wp_kses_post( $item_action );
+							$sanitized = array();
+							foreach ($actions as $key => $item_action) {
+								$key         = sanitize_html_class($key);
+								$item_action = wp_kses_post($item_action);
 								$sanitized[] = "<span class='$key'>$item_action</span>";
 							}
 
 							echo "<small class='form-text getpaid-line-item-actions'>";
-							echo wp_kses_post( implode( ' | ', $sanitized ) );
+							echo wp_kses_post(implode(' | ', $sanitized));
 							echo '</small>';
 
 						}
 
-						if ( $has_featured_image ) {
+						if ($has_featured_image) {
 							echo '</div>';
 							echo '</div>';
 						}
 					}
 
 					// Item price.
-					if ( 'price' === $column ) {
+					if ('price' === $column) {
 
 					// Display the item price (or recurring price if this is a renewal invoice)
 					$price = $invoice->is_renewal() ? $item->get_price() : $item->get_initial_price();
-					wpinv_the_price( $price, $invoice->get_currency() );
+					wpinv_the_price($price, $invoice->get_currency());
 
 					}
 
 					// Tax rate.
-					if ( 'tax_rate' === $column ) {
-					echo floatval( round( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
+					if ('tax_rate' === $column) {
+					echo floatval(round(getpaid_get_invoice_tax_rate($invoice, $item), 2)) . '%';
 					}
 
 					// Item quantity.
-					if ( 'quantity' === $column ) {
+					if ('quantity' === $column) {
 					echo (float) $item->get_quantity();
 					}
 
 					// Item sub total.
-					if ( 'subtotal' === $column ) {
+					if ('subtotal' === $column) {
 					$subtotal = $invoice->is_renewal() ? $item->get_recurring_sub_total() : $item->get_sub_total();
-					wpinv_the_price( $subtotal, $invoice->get_currency() );
+					wpinv_the_price($subtotal, $invoice->get_currency());
 					}
 
 					// Fires when printing a line item column.
-					do_action( "getpaid_invoice_line_item_$column", $item, $invoice );
+					do_action("getpaid_invoice_line_item_$column", $item, $invoice);
 
 					// Fires after printing a line item column.
-					do_action( "getpaid_invoice_line_item_after_$column", $item, $invoice );
+					do_action("getpaid_invoice_line_item_after_$column", $item, $invoice);
 
 				?>
 

includes/class-getpaid-tax.php

Indentation +192 added lines, -192 removed lines

@@ -13,199 +13,199 @@
  */
 class GetPaid_Tax {
 
-	/**
-	 * Calculates tax for a line item.
-	 *
-	 * @param  float   $price              The price to calc tax on.
-	 * @param  array   $rates              The rates to apply.
-	 * @param  boolean $price_includes_tax Whether the passed price has taxes included.
-	 * @return array                       Array of tax name => tax amount.
-	 */
-	public static function calc_tax( $price, $rates, $price_includes_tax = false ) {
-
-		if ( $price_includes_tax ) {
-			$taxes = self::calc_inclusive_tax( $price, $rates );
-		} else {
-			$taxes = self::calc_exclusive_tax( $price, $rates );
-		}
-
-		return apply_filters( 'getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax );
-
-	}
-
-	/**
-	 * Calc tax from inclusive price.
-	 *
-	 * @param  float $price Price to calculate tax for.
-	 * @param  array $rates Array of tax rates.
-	 * @return array
-	 */
-	public static function calc_inclusive_tax( $price, $rates ) {
-		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
-
-		// Add tax rates.
-		$tax_rate  = 1 + ( array_sum( $tax_rates ) / 100 );
-
-		foreach ( $tax_rates as $name => $rate ) {
-			$the_rate       = ( $rate / 100 ) / $tax_rate;
-			$net_price      = $price - ( $the_rate * $price );
-			$tax_amount     = apply_filters( 'getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price );
-			$taxes[ $name ] = $tax_amount;
-		}
-
-		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
-
-		return $taxes;
-	}
-
-	/**
-	 * Calc tax from exclusive price.
-	 *
-	 * @param  float $price Price to calculate tax for.
-	 * @param  array $rates Array of tax rates.
-	 * @return array
-	 */
-	public static function calc_exclusive_tax( $price, $rates ) {
-		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
-
-		foreach ( $tax_rates as $name => $rate ) {
-
-			$tax_amount     = $price * ( $rate / 100 );
-			$taxes[ $name ] = apply_filters( 'getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price );
-
-		}
-
-		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
-
-		return $taxes;
-	}
-
-	/**
-	 * Get's an array of all tax rates.
-	 *
-	 * @return array
-	 */
-	public static function get_all_tax_rates() {
-
-		$rates = get_option( 'wpinv_tax_rates', array() );
-
-		return apply_filters(
-			'getpaid_get_all_tax_rates',
-			array_filter( wpinv_parse_list( $rates ) )
-		);
-
-	}
-
-	/**
-	 * Get's an array of default tax rates.
-	 *
-	 * @return array
-	 */
-	public static function get_default_tax_rates() {
-
-		return apply_filters(
-			'getpaid_get_default_tax_rates',
-			array(
-				array(
-					'country' => wpinv_get_default_country(),
-					'state'   => wpinv_get_default_state(),
-					'global'  => true,
-					'rate'    => wpinv_get_default_tax_rate(),
-					'name'    => __( 'Base Tax', 'invoicing' ),
-				),
-			)
-		);
-
-	}
-
-	/**
-	 * Get's an array of all tax rules.
-	 *
-	 * @return array
-	 */
-	public static function get_all_tax_rules() {
-
-		$rules = get_option(
-			'wpinv_tax_rules',
-			array(
-				array(
-					'key'               => 'physical',
-					'label'             => __( 'Physical Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
-				),
-				array(
-					'key'               => 'digital',
-					'label'             => __( 'Digital Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
-				),
-        	)
-		);
-
-		return apply_filters(
-			'getpaid_tax_rules',
-			array_filter( array_values( wpinv_parse_list( $rules ) ) )
-		);
-
-	}
-
-	/**
-	 * Get's an array of tax rates for a given address.
-	 *
-	 * @param string $country
-	 * @param string $state
-	 * @return array
-	 */
-	public static function get_address_tax_rates( $country, $state ) {
-
-		$all_tax_rates  = self::get_all_tax_rates();
-		$matching_rates = array_merge(
-			wp_list_filter( $all_tax_rates, array( 'country' => $country ) ),
-			wp_list_filter( $all_tax_rates, array( 'country' => '' ) )
-		);
-
-		foreach ( $matching_rates as $i => $rate ) {
-
-			$states = array_filter( wpinv_clean( explode( ',', strtolower( $rate['state'] ) ) ) );
-			if ( empty( $rate['global'] ) && ! in_array( strtolower( $state ), $states ) ) {
-				unset( $matching_rates[ $i ] );
-			}
+    /**
+     * Calculates tax for a line item.
+     *
+     * @param  float   $price              The price to calc tax on.
+     * @param  array   $rates              The rates to apply.
+     * @param  boolean $price_includes_tax Whether the passed price has taxes included.
+     * @return array                       Array of tax name => tax amount.
+     */
+    public static function calc_tax( $price, $rates, $price_includes_tax = false ) {
+
+        if ( $price_includes_tax ) {
+            $taxes = self::calc_inclusive_tax( $price, $rates );
+        } else {
+            $taxes = self::calc_exclusive_tax( $price, $rates );
+        }
+
+        return apply_filters( 'getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax );
+
+    }
+
+    /**
+     * Calc tax from inclusive price.
+     *
+     * @param  float $price Price to calculate tax for.
+     * @param  array $rates Array of tax rates.
+     * @return array
+     */
+    public static function calc_inclusive_tax( $price, $rates ) {
+        $taxes     = array();
+        $tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+
+        // Add tax rates.
+        $tax_rate  = 1 + ( array_sum( $tax_rates ) / 100 );
+
+        foreach ( $tax_rates as $name => $rate ) {
+            $the_rate       = ( $rate / 100 ) / $tax_rate;
+            $net_price      = $price - ( $the_rate * $price );
+            $tax_amount     = apply_filters( 'getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price );
+            $taxes[ $name ] = $tax_amount;
+        }
+
+        // Round all taxes to precision (4DP) before passing them back.
+        $taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+
+        return $taxes;
+    }
+
+    /**
+     * Calc tax from exclusive price.
+     *
+     * @param  float $price Price to calculate tax for.
+     * @param  array $rates Array of tax rates.
+     * @return array
+     */
+    public static function calc_exclusive_tax( $price, $rates ) {
+        $taxes     = array();
+        $tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+
+        foreach ( $tax_rates as $name => $rate ) {
+
+            $tax_amount     = $price * ( $rate / 100 );
+            $taxes[ $name ] = apply_filters( 'getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price );
+
+        }
+
+        // Round all taxes to precision (4DP) before passing them back.
+        $taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+
+        return $taxes;
+    }
+
+    /**
+     * Get's an array of all tax rates.
+     *
+     * @return array
+     */
+    public static function get_all_tax_rates() {
+
+        $rates = get_option( 'wpinv_tax_rates', array() );
+
+        return apply_filters(
+            'getpaid_get_all_tax_rates',
+            array_filter( wpinv_parse_list( $rates ) )
+        );
+
+    }
+
+    /**
+     * Get's an array of default tax rates.
+     *
+     * @return array
+     */
+    public static function get_default_tax_rates() {
+
+        return apply_filters(
+            'getpaid_get_default_tax_rates',
+            array(
+                array(
+                    'country' => wpinv_get_default_country(),
+                    'state'   => wpinv_get_default_state(),
+                    'global'  => true,
+                    'rate'    => wpinv_get_default_tax_rate(),
+                    'name'    => __( 'Base Tax', 'invoicing' ),
+                ),
+            )
+        );
+
+    }
+
+    /**
+     * Get's an array of all tax rules.
+     *
+     * @return array
+     */
+    public static function get_all_tax_rules() {
+
+        $rules = get_option(
+            'wpinv_tax_rules',
+            array(
+                array(
+                    'key'               => 'physical',
+                    'label'             => __( 'Physical Item', 'invoicing' ),
+                    'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
+                    'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+                ),
+                array(
+                    'key'               => 'digital',
+                    'label'             => __( 'Digital Item', 'invoicing' ),
+                    'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
+                    'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+                ),
+            )
+        );
+
+        return apply_filters(
+            'getpaid_tax_rules',
+            array_filter( array_values( wpinv_parse_list( $rules ) ) )
+        );
+
+    }
+
+    /**
+     * Get's an array of tax rates for a given address.
+     *
+     * @param string $country
+     * @param string $state
+     * @return array
+     */
+    public static function get_address_tax_rates( $country, $state ) {
+
+        $all_tax_rates  = self::get_all_tax_rates();
+        $matching_rates = array_merge(
+            wp_list_filter( $all_tax_rates, array( 'country' => $country ) ),
+            wp_list_filter( $all_tax_rates, array( 'country' => '' ) )
+        );
+
+        foreach ( $matching_rates as $i => $rate ) {
+
+            $states = array_filter( wpinv_clean( explode( ',', strtolower( $rate['state'] ) ) ) );
+            if ( empty( $rate['global'] ) && ! in_array( strtolower( $state ), $states ) ) {
+                unset( $matching_rates[ $i ] );
+            }
 }
 
-		return apply_filters( 'getpaid_get_address_tax_rates', $matching_rates, $country, $state );
-
-	}
-
-	/**
-	 * Sums a set of taxes to form a single total. Result is rounded to precision.
-	 *
-	 * @param  array $taxes Array of taxes.
-	 * @return float
-	 */
-	public static function get_tax_total( $taxes ) {
-		return self::round( array_sum( $taxes ) );
-	}
-
-	/**
-	 * Round to precision.
-	 *
-	 * Filter example: to return rounding to .5 cents you'd use:
-	 *
-	 * function euro_5cent_rounding( $in ) {
-	 *      return round( $in / 5, 2 ) * 5;
-	 * }
-	 * add_filter( 'getpaid_tax_round', 'euro_5cent_rounding' );
-	 *
-	 * @param float|int $in Value to round.
-	 * @return float
-	 */
-	public static function round( $in ) {
-		return apply_filters( 'getpaid_tax_round', round( $in, 4 ), $in );
-	}
+        return apply_filters( 'getpaid_get_address_tax_rates', $matching_rates, $country, $state );
+
+    }
+
+    /**
+     * Sums a set of taxes to form a single total. Result is rounded to precision.
+     *
+     * @param  array $taxes Array of taxes.
+     * @return float
+     */
+    public static function get_tax_total( $taxes ) {
+        return self::round( array_sum( $taxes ) );
+    }
+
+    /**
+     * Round to precision.
+     *
+     * Filter example: to return rounding to .5 cents you'd use:
+     *
+     * function euro_5cent_rounding( $in ) {
+     *      return round( $in / 5, 2 ) * 5;
+     * }
+     * add_filter( 'getpaid_tax_round', 'euro_5cent_rounding' );
+     *
+     * @param float|int $in Value to round.
+     * @return float
+     */
+    public static function round( $in ) {
+        return apply_filters( 'getpaid_tax_round', round( $in, 4 ), $in );
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Class GetPaid_Tax
@@ -21,15 +21,15 @@ 
 	 * @param  boolean $price_includes_tax Whether the passed price has taxes included.
 	 * @return array                       Array of tax name => tax amount.
 	 */
-	public static function calc_tax( $price, $rates, $price_includes_tax = false ) {
+	public static function calc_tax($price, $rates, $price_includes_tax = false) {
 
-		if ( $price_includes_tax ) {
-			$taxes = self::calc_inclusive_tax( $price, $rates );
+		if ($price_includes_tax) {
+			$taxes = self::calc_inclusive_tax($price, $rates);
 		} else {
-			$taxes = self::calc_exclusive_tax( $price, $rates );
+			$taxes = self::calc_exclusive_tax($price, $rates);
 		}
 
-		return apply_filters( 'getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax );
+		return apply_filters('getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax);
 
 	}
 
@@ -40,22 +40,22 @@ 
 	 * @param  array $rates Array of tax rates.
 	 * @return array
 	 */
-	public static function calc_inclusive_tax( $price, $rates ) {
+	public static function calc_inclusive_tax($price, $rates) {
 		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+		$tax_rates = wp_list_pluck($rates, 'rate', 'name');
 
 		// Add tax rates.
-		$tax_rate  = 1 + ( array_sum( $tax_rates ) / 100 );
+		$tax_rate  = 1 + (array_sum($tax_rates) / 100);
 
-		foreach ( $tax_rates as $name => $rate ) {
-			$the_rate       = ( $rate / 100 ) / $tax_rate;
-			$net_price      = $price - ( $the_rate * $price );
-			$tax_amount     = apply_filters( 'getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price );
-			$taxes[ $name ] = $tax_amount;
+		foreach ($tax_rates as $name => $rate) {
+			$the_rate       = ($rate / 100) / $tax_rate;
+			$net_price      = $price - ($the_rate * $price);
+			$tax_amount     = apply_filters('getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price);
+			$taxes[$name] = $tax_amount;
 		}
 
 		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+		$taxes = array_map(array(__CLASS__, 'round'), $taxes);
 
 		return $taxes;
 	}
@@ -67,19 +67,19 @@ 
 	 * @param  array $rates Array of tax rates.
 	 * @return array
 	 */
-	public static function calc_exclusive_tax( $price, $rates ) {
+	public static function calc_exclusive_tax($price, $rates) {
 		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+		$tax_rates = wp_list_pluck($rates, 'rate', 'name');
 
-		foreach ( $tax_rates as $name => $rate ) {
+		foreach ($tax_rates as $name => $rate) {
 
-			$tax_amount     = $price * ( $rate / 100 );
-			$taxes[ $name ] = apply_filters( 'getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price );
+			$tax_amount     = $price * ($rate / 100);
+			$taxes[$name] = apply_filters('getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price);
 
 		}
 
 		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+		$taxes = array_map(array(__CLASS__, 'round'), $taxes);
 
 		return $taxes;
 	}
@@ -91,11 +91,11 @@ 
 	 */
 	public static function get_all_tax_rates() {
 
-		$rates = get_option( 'wpinv_tax_rates', array() );
+		$rates = get_option('wpinv_tax_rates', array());
 
 		return apply_filters(
 			'getpaid_get_all_tax_rates',
-			array_filter( wpinv_parse_list( $rates ) )
+			array_filter(wpinv_parse_list($rates))
 		);
 
 	}
@@ -115,7 +115,7 @@ 
 					'state'   => wpinv_get_default_state(),
 					'global'  => true,
 					'rate'    => wpinv_get_default_tax_rate(),
-					'name'    => __( 'Base Tax', 'invoicing' ),
+					'name'    => __('Base Tax', 'invoicing'),
 				),
 			)
 		);
@@ -134,22 +134,22 @@ 
 			array(
 				array(
 					'key'               => 'physical',
-					'label'             => __( 'Physical Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+					'label'             => __('Physical Item', 'invoicing'),
+					'tax_base'          => wpinv_get_option('tax_base', 'billing'),
+					'same_country_rule' => wpinv_get_option('vat_same_country_rule', 'vat_too'),
 				),
 				array(
 					'key'               => 'digital',
-					'label'             => __( 'Digital Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+					'label'             => __('Digital Item', 'invoicing'),
+					'tax_base'          => wpinv_get_option('tax_base', 'billing'),
+					'same_country_rule' => wpinv_get_option('vat_same_country_rule', 'vat_too'),
 				),
         	)
 		);
 
 		return apply_filters(
 			'getpaid_tax_rules',
-			array_filter( array_values( wpinv_parse_list( $rules ) ) )
+			array_filter(array_values(wpinv_parse_list($rules)))
 		);
 
 	}
@@ -161,23 +161,23 @@ 
 	 * @param string $state
 	 * @return array
 	 */
-	public static function get_address_tax_rates( $country, $state ) {
+	public static function get_address_tax_rates($country, $state) {
 
 		$all_tax_rates  = self::get_all_tax_rates();
 		$matching_rates = array_merge(
-			wp_list_filter( $all_tax_rates, array( 'country' => $country ) ),
-			wp_list_filter( $all_tax_rates, array( 'country' => '' ) )
+			wp_list_filter($all_tax_rates, array('country' => $country)),
+			wp_list_filter($all_tax_rates, array('country' => ''))
 		);
 
-		foreach ( $matching_rates as $i => $rate ) {
+		foreach ($matching_rates as $i => $rate) {
 
-			$states = array_filter( wpinv_clean( explode( ',', strtolower( $rate['state'] ) ) ) );
-			if ( empty( $rate['global'] ) && ! in_array( strtolower( $state ), $states ) ) {
-				unset( $matching_rates[ $i ] );
+			$states = array_filter(wpinv_clean(explode(',', strtolower($rate['state']))));
+			if (empty($rate['global']) && !in_array(strtolower($state), $states)) {
+				unset($matching_rates[$i]);
 			}
 }
 
-		return apply_filters( 'getpaid_get_address_tax_rates', $matching_rates, $country, $state );
+		return apply_filters('getpaid_get_address_tax_rates', $matching_rates, $country, $state);
 
 	}
 
@@ -187,8 +187,8 @@ 
 	 * @param  array $taxes Array of taxes.
 	 * @return float
 	 */
-	public static function get_tax_total( $taxes ) {
-		return self::round( array_sum( $taxes ) );
+	public static function get_tax_total($taxes) {
+		return self::round(array_sum($taxes));
 	}
 
 	/**
@@ -204,8 +204,8 @@ 
 	 * @param float|int $in Value to round.
 	 * @return float
 	 */
-	public static function round( $in ) {
-		return apply_filters( 'getpaid_tax_round', round( $in, 4 ), $in );
+	public static function round($in) {
+		return apply_filters('getpaid_tax_round', round($in, 4), $in);
 	}
 
 }

includes/admin/views/html-tax-rules-edit.php

Indentation +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
 
 $dummy_rule = array(
     'key'               => 'TAX_RULE_KEY',
-	'label'             => __( 'New Tax Rule', 'invoicing' ),
-	'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
+    'label'             => __( 'New Tax Rule', 'invoicing' ),
+    'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
     'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
 );
 

Spacing +16 added lines, -16 removed lines

@@ -4,40 +4,40 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $dummy_rule = array(
     'key'               => 'TAX_RULE_KEY',
-	'label'             => __( 'New Tax Rule', 'invoicing' ),
-	'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-    'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+	'label'             => __('New Tax Rule', 'invoicing'),
+	'tax_base'          => wpinv_get_option('tax_base', 'billing'),
+    'same_country_rule' => wpinv_get_option('vat_same_country_rule', 'vat_too'),
 );
 
-wp_nonce_field( 'wpinv_tax_rules', 'wpinv_tax_rules_nonce' );
+wp_nonce_field('wpinv_tax_rules', 'wpinv_tax_rules_nonce');
 
 ?>
 <div class="table-responsive">
     <table id="wpinv-tax-rules" class="widefat fixed table">
-        <caption><?php echo esc_html_e( 'You can use this section to create or edit your tax rules', 'invoicing' ); ?></caption>
+        <caption><?php echo esc_html_e('You can use this section to create or edit your tax rules', 'invoicing'); ?></caption>
 
         <thead>
             <tr class="table-light">
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Unique Key', 'invoicing' ); ?>
+                    <?php esc_html_e('Unique Key', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Label', 'invoicing' ); ?>
+                    <?php esc_html_e('Label', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Calculate tax based on', 'invoicing' ); ?>
+                    <?php esc_html_e('Calculate tax based on', 'invoicing'); ?>
                 </th>
 
                 <!-- <th scope="col" class="border-bottom border-top">
-                    <?php esc_html_e( 'Same country rule', 'invoicing' ); ?>
-                    <?php getpaid_get_help_tip( __( 'What should happen if a customer is from the same country as your business?.', 'invoicing' ), 'position-static', true ); ?>
+                    <?php esc_html_e('Same country rule', 'invoicing'); ?>
+                    <?php getpaid_get_help_tip(__('What should happen if a customer is from the same country as your business?.', 'invoicing'), 'position-static', true); ?>
                 </th> -->
 
                 <th scope="col" class="border-bottom border-top" style="width:32px">&nbsp;</th>
@@ -46,8 +46,8 @@ 
         </thead>
 
         <tbody>
-            <?php foreach ( GetPaid_Tax::get_all_tax_rules() as $tax_rule ) : ?>
-                <?php include plugin_dir_path( __FILE__ ) . 'html-tax-rule-edit.php'; ?>
+            <?php foreach (GetPaid_Tax::get_all_tax_rules() as $tax_rule) : ?>
+                <?php include plugin_dir_path(__FILE__) . 'html-tax-rule-edit.php'; ?>
             <?php endforeach; ?>
         </tbody>
 
@@ -55,8 +55,8 @@ 
             <tr class="table-light">
                 <td colspan="4" class="border-top">
 
-                    <button type="button" class="button button-secondary wpinv_add_tax_rule" aria-label="<?php esc_attr_e( 'Add Tax Rule', 'invoicing' ); ?>">
-                        <span><?php esc_html_e( 'Add Tax Rule', 'invoicing' ); ?></span>
+                    <button type="button" class="button button-secondary wpinv_add_tax_rule" aria-label="<?php esc_attr_e('Add Tax Rule', 'invoicing'); ?>">
+                        <span><?php esc_html_e('Add Tax Rule', 'invoicing'); ?></span>
                     </button>
 
                 </td>
@@ -67,6 +67,6 @@ 
 
 <script type="text/html" id="tmpl-wpinv-tax-rule-row">
     <?php $tax_rule = $dummy_rule; ?>
-    <?php include plugin_dir_path( __FILE__ ) . 'html-tax-rule-edit.php'; ?>
+    <?php include plugin_dir_path(__FILE__) . 'html-tax-rule-edit.php'; ?>
 </script>
 

includes/admin/views/wizard-gateways.php

Spacing +18 added lines, -18 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -12,24 +12,24 @@ 
 
     <form method="post" class="text-center card-body">
         <div class="gp-wizard-payments">
-            <h2 class="gd-settings-title h3 "><?php esc_html_e( 'Gateway Setup', 'invoicing' ); ?></h2>
-            <p><?php esc_html_e( 'Below are a few gateways that can be setup in a few seconds.', 'invoicing' ); ?>
+            <h2 class="gd-settings-title h3 "><?php esc_html_e('Gateway Setup', 'invoicing'); ?></h2>
+            <p><?php esc_html_e('Below are a few gateways that can be setup in a few seconds.', 'invoicing'); ?>
                 <br>
-                <?php esc_html_e( 'We have 20+ Gateways that can be setup later.', 'invoicing' ); ?>
+                <?php esc_html_e('We have 20+ Gateways that can be setup later.', 'invoicing'); ?>
             </p>
 
             <ul class="list-group">
 
 				<li class="list-group-item d-flex justify-content-between align-items-center">
-				    <span class="mr-auto"><img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/stripe-verified.svg' ); ?>" class="ml-n2" alt="Stripe"></span>
-				    <?php if ( false === wpinv_get_option( 'stripe_live_connect_account_id' ) ) : ?>
+				    <span class="mr-auto"><img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/stripe-verified.svg'); ?>" class="ml-n2" alt="Stripe"></span>
+				    <?php if (false === wpinv_get_option('stripe_live_connect_account_id')) : ?>
                         <a href="<?php
-                        echo esc_url( wp_nonce_url(
+                        echo esc_url(wp_nonce_url(
                             add_query_arg(
                                 array(
                                     'getpaid-admin-action' => 'connect_gateway',
                                     'plugin'               => 'stripe',
-                                    'redirect'             => urlencode( add_query_arg( 'step', 'payments' ) ),
+                                    'redirect'             => urlencode(add_query_arg('step', 'payments')),
                                 ),
                                 admin_url()
                             ),
@@ -37,31 +37,31 @@ 
                             'getpaid-nonce'
                         ));
                         ?>"
-                        class="btn btn-sm btn-outline-primary"><?php esc_html_e( 'Connect', 'invoicing' ); ?></a>
+                        class="btn btn-sm btn-outline-primary"><?php esc_html_e('Connect', 'invoicing'); ?></a>
                     <?php else : ?>
-                        <span class="btn btn-sm btn-success"><?php esc_html_e( 'Connected', 'invoicing' ); ?></span>
+                        <span class="btn btn-sm btn-success"><?php esc_html_e('Connected', 'invoicing'); ?></span>
                     <?php endif; ?>
 				</li>
 
 				<li class="list-group-item">
                     <div class="d-flex justify-content-between align-items-center">
                         <span class="mr-auto">
-                            <img src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/pp-logo-150px.webp' ); ?>" class="" alt="PayPal" height="25">
+                            <img src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/pp-logo-150px.webp'); ?>" class="" alt="PayPal" height="25">
                         </span>
                         <a
                             href="#"
                             onclick="jQuery('.getpaid-setup-paypal-input').toggleClass('d-none'); return false;"
-                            class="getpaid-setup-paypal btn btn-sm btn-outline-primary"><?php esc_html_e( 'Set-up', 'invoicing' ); ?></a>
+                            class="getpaid-setup-paypal btn btn-sm btn-outline-primary"><?php esc_html_e('Set-up', 'invoicing'); ?></a>
                     </div>
                     <div class="mt-4 getpaid-setup-paypal-input d-none">
-                        <input type="text" placeholder="<?php esc_attr_e( 'PayPal Email', 'invoicing' ); ?>" name="paypal-email" class="form-control" value="<?php echo esc_attr( wpinv_get_option( 'paypal_email' ) ); ?>">
+                        <input type="text" placeholder="<?php esc_attr_e('PayPal Email', 'invoicing'); ?>" name="paypal-email" class="form-control" value="<?php echo esc_attr(wpinv_get_option('paypal_email')); ?>">
                     </div>
                 </li>
 
 				<li class="list-group-item d-flex justify-content-between align-items-center">
-				    <span class="mr-auto"><?php esc_html_e( 'Test Gateway', 'invoicing' ); ?></span>
+				    <span class="mr-auto"><?php esc_html_e('Test Gateway', 'invoicing'); ?></span>
 					<div class="custom-control custom-switch">
-						<input type="checkbox" name="enable-manual-gateway" class="custom-control-input" id="enable-manual-gateway" <?php checked( wpinv_is_gateway_active( 'manual' ) ); ?>>
+						<input type="checkbox" name="enable-manual-gateway" class="custom-control-input" id="enable-manual-gateway" <?php checked(wpinv_is_gateway_active('manual')); ?>>
 						<label class="custom-control-label" for="enable-manual-gateway"></label>
 					</div>
 				</li>
@@ -70,10 +70,10 @@ 
         </div>
 
         <p class="gp-setup-actions step text-center mt-4">
-			<input type="submit" class="btn btn-primary" value="<?php esc_attr_e( 'Continue', 'invoicing' ); ?>" />
+			<input type="submit" class="btn btn-primary" value="<?php esc_attr_e('Continue', 'invoicing'); ?>" />
 		</p>
         
-        <?php getpaid_hidden_field( 'save_step', 1 ); ?>
-        <?php wp_nonce_field( 'getpaid-setup-wizard', 'getpaid-setup-wizard' ); ?>
+        <?php getpaid_hidden_field('save_step', 1); ?>
+        <?php wp_nonce_field('getpaid-setup-wizard', 'getpaid-setup-wizard'); ?>
     </form>
 </div>

Braces +5 added lines, -2 removed lines

@@ -38,8 +38,11 @@
                         ));
                         ?>"
                         class="btn btn-sm btn-outline-primary"><?php esc_html_e( 'Connect', 'invoicing' ); ?></a>
-                    <?php else : ?>
-                        <span class="btn btn-sm btn-success"><?php esc_html_e( 'Connected', 'invoicing' ); ?></span>
+                    <?php else {
+    : ?>
+                        <span class="btn btn-sm btn-success"><?php esc_html_e( 'Connected', 'invoicing' );
+}
+?></span>
                     <?php endif; ?>
 				</li>
 

includes/user-functions.php

Indentation +73 added lines, -73 removed lines

@@ -34,11 +34,11 @@ 
  */
 function wpinv_get_capability( $capalibilty = 'manage_invoicing' ) {
 
-	if ( current_user_can( 'manage_options' ) ) {
-		return 'manage_options';
-	};
+    if ( current_user_can( 'manage_options' ) ) {
+        return 'manage_options';
+    };
 
-	return $capalibilty;
+    return $capalibilty;
 }
 
 /**
@@ -62,10 +62,10 @@ 
     // Prepare user values.
     $prefix = preg_replace( '/\s+/', '', $prefix );
     $prefix = empty( $prefix ) ? $email : $prefix;
-	$args   = array(
-		'user_login' => wpinv_generate_user_name( $prefix ),
-		'user_pass'  => wp_generate_password(),
-		'user_email' => $email,
+    $args   = array(
+        'user_login' => wpinv_generate_user_name( $prefix ),
+        'user_pass'  => wp_generate_password(),
+        'user_email' => $email,
         'role'       => 'subscriber',
     );
 
@@ -82,16 +82,16 @@ 
 function wpinv_generate_user_name( $prefix = '' ) {
 
     // If prefix is an email, retrieve the part before the email.
-	$prefix = strtok( $prefix, '@' );
+    $prefix = strtok( $prefix, '@' );
     $prefix = trim( $prefix, '.' );
 
-	// Sanitize the username.
-	$prefix = sanitize_user( $prefix, true );
+    // Sanitize the username.
+    $prefix = sanitize_user( $prefix, true );
 
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
-	if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
-		$prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
-	}
+    $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+    if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
+        $prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
+    }
 
     $username = $prefix;
     $postfix  = 2;
@@ -220,43 +220,43 @@ 
 
                     foreach ( getpaid_user_address_fields() as $key => $label ) {
 
-					// Display the country.
-					if ( 'country' == $key ) {
-
-						aui()->select(
-							array(
-								'options'     => wpinv_get_country_list(),
-								'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
-								'id'          => 'wpinv-' . sanitize_html_class( $key ),
-								'value'       => sanitize_text_field( getpaid_get_user_address_field( get_current_user_id(), $key ) ),
-								'placeholder' => $label,
-								'label'       => wp_kses_post( $label ),
-								'label_type'  => 'vertical',
-								'class'       => 'getpaid-address-field',
+                    // Display the country.
+                    if ( 'country' == $key ) {
+
+                        aui()->select(
+                            array(
+                                'options'     => wpinv_get_country_list(),
+                                'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
+                                'id'          => 'wpinv-' . sanitize_html_class( $key ),
+                                'value'       => sanitize_text_field( getpaid_get_user_address_field( get_current_user_id(), $key ) ),
+                                'placeholder' => $label,
+                                'label'       => wp_kses_post( $label ),
+                                'label_type'  => 'vertical',
+                                'class'       => 'getpaid-address-field',
                             ),
                             true
-						);
-
-					}
-
-					// Display the state.
-					elseif ( 'state' == $key ) {
-
-						getpaid_get_states_select_markup(
-							getpaid_get_user_address_field( get_current_user_id(), 'country' ),
-							getpaid_get_user_address_field( get_current_user_id(), 'state' ),
-							$label,
-							$label,
-							'',
-							false,
-							'',
-							'getpaid_address[' . esc_attr( $key ) . ']',
+                        );
+
+                    }
+
+                    // Display the state.
+                    elseif ( 'state' == $key ) {
+
+                        getpaid_get_states_select_markup(
+                            getpaid_get_user_address_field( get_current_user_id(), 'country' ),
+                            getpaid_get_user_address_field( get_current_user_id(), 'state' ),
+                            $label,
+                            $label,
+                            '',
+                            false,
+                            '',
+                            'getpaid_address[' . esc_attr( $key ) . ']',
                             true
-						);
+                        );
 
                         } else {
 
-						aui()->input(
+                        aui()->input(
                             array(
                                 'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
                                 'id'          => 'wpinv-' . sanitize_html_class( $key ),
@@ -268,7 +268,7 @@ 
                                 'class'       => 'getpaid-address-field',
                             ),
                             true
-						);
+                        );
 
                         }
                     }
@@ -407,7 +407,7 @@ 
 function getpaid_allowed_html() {
     $allowed_html = wp_kses_allowed_html( 'post' );
 
-	// form fields
+    // form fields
     $allowed_html['form'] = array(
         'action'         => true,
         'accept'         => true,
@@ -419,12 +419,12 @@ 
     );
 
     // - input
-	$allowed_html['input'] = array(
-		'class'        => array(),
-		'id'           => array(),
-		'name'         => array(),
-		'value'        => array(),
-		'type'         => array(),
+    $allowed_html['input'] = array(
+        'class'        => array(),
+        'id'           => array(),
+        'name'         => array(),
+        'value'        => array(),
+        'type'         => array(),
         'placeholder'  => array(),
         'autocomplete' => array(),
         'autofocus'    => array(),
@@ -438,33 +438,33 @@ 
         'max'          => array(),
         'step'         => array(),
         'size'         => array(),
-	);
+    );
 
     // - input
-	$allowed_html['textarea'] = array(
-		'class' => array(),
-		'id'    => array(),
-		'name'  => array(),
-		'value' => array(),
-	);
-
-	// select
-	$allowed_html['select'] = array(
-		'class'        => array(),
-		'id'           => array(),
-		'name'         => array(),
+    $allowed_html['textarea'] = array(
+        'class' => array(),
+        'id'    => array(),
+        'name'  => array(),
+        'value' => array(),
+    );
+
+    // select
+    $allowed_html['select'] = array(
+        'class'        => array(),
+        'id'           => array(),
+        'name'         => array(),
         'autocomplete' => array(),
         'multiple'     => array(),
-	);
+    );
 
-	// select options
-	$allowed_html['option'] = array(
-		'selected' => array(),
+    // select options
+    $allowed_html['option'] = array(
+        'selected' => array(),
         'disabled' => array(),
         'value'    => array(),
-	);
+    );
 
-	return $allowed_html;
+    return $allowed_html;
 
 }
 

Spacing +117 added lines, -117 removed lines

@@ -6,7 +6,7 @@ 
  * @package GetPaid
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  *  Generates a users select dropdown.
@@ -16,13 +16,13 @@ 
  * @param array $args
  * @see wp_dropdown_users
  */
-function wpinv_dropdown_users( $args = '' ) {
+function wpinv_dropdown_users($args = '') {
 
-    if ( is_array( $args ) && ! empty( $args['show'] ) && 'display_name_with_email' == $args['show'] ) {
+    if (is_array($args) && !empty($args['show']) && 'display_name_with_email' == $args['show']) {
         $args['show'] = 'display_name_with_login';
     }
 
-    return wp_dropdown_users( $args );
+    return wp_dropdown_users($args);
 }
 
 /**
@@ -32,9 +32,9 @@ 
  * @return string capability to check against
  * @param string $capalibilty Optional. The alternative capability to check against.
  */
-function wpinv_get_capability( $capalibilty = 'manage_invoicing' ) {
+function wpinv_get_capability($capalibilty = 'manage_invoicing') {
 
-	if ( current_user_can( 'manage_options' ) ) {
+	if (current_user_can('manage_options')) {
 		return 'manage_options';
 	};
 
@@ -48,7 +48,7 @@ 
  * @return bool
  */
 function wpinv_current_user_can_manage_invoicing() {
-    return current_user_can( wpinv_get_capability() );
+    return current_user_can(wpinv_get_capability());
 }
 
 /**
@@ -57,19 +57,19 @@ 
  * @since 1.0.19
  * @return int|WP_Error
  */
-function wpinv_create_user( $email, $prefix = '' ) {
+function wpinv_create_user($email, $prefix = '') {
 
     // Prepare user values.
-    $prefix = preg_replace( '/\s+/', '', $prefix );
-    $prefix = empty( $prefix ) ? $email : $prefix;
-	$args   = array(
-		'user_login' => wpinv_generate_user_name( $prefix ),
+    $prefix = preg_replace('/\s+/', '', $prefix);
+    $prefix = empty($prefix) ? $email : $prefix;
+	$args = array(
+		'user_login' => wpinv_generate_user_name($prefix),
 		'user_pass'  => wp_generate_password(),
 		'user_email' => $email,
         'role'       => 'subscriber',
     );
 
-    return wp_insert_user( $args );
+    return wp_insert_user($args);
 
 }
 
@@ -79,26 +79,26 @@ 
  * @since 1.0.19
  * @return bool|WP_User
  */
-function wpinv_generate_user_name( $prefix = '' ) {
+function wpinv_generate_user_name($prefix = '') {
 
     // If prefix is an email, retrieve the part before the email.
-	$prefix = strtok( $prefix, '@' );
-    $prefix = trim( $prefix, '.' );
+	$prefix = strtok($prefix, '@');
+    $prefix = trim($prefix, '.');
 
 	// Sanitize the username.
-	$prefix = sanitize_user( $prefix, true );
+	$prefix = sanitize_user($prefix, true);
 
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
-	if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
-		$prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
+	$illegal_logins = (array) apply_filters('illegal_user_logins', array());
+	if (empty($prefix) || in_array(strtolower($prefix), array_map('strtolower', $illegal_logins), true)) {
+		$prefix = 'gtp_' . zeroise(wp_rand(0, 9999), 4);
 	}
 
     $username = $prefix;
     $postfix  = 2;
 
-    while ( username_exists( $username ) ) {
+    while (username_exists($username)) {
         $username = "{$prefix}{$postfix}";
-        $postfix ++;
+        $postfix++;
     }
 
     return $username;
@@ -115,31 +115,31 @@ 
     $tabs = array(
 
         'gp-invoices'      => array(
-            'label'   => __( 'Invoices', 'invoicing' ), // Name of the tab.
+            'label'   => __('Invoices', 'invoicing'), // Name of the tab.
             'content' => '[wpinv_history]', // Content of the tab. Or specify "callback" to provide a callback instead.
             'icon'    => 'fas fa-file-invoice', // Shown on some profile plugins.
         ),
 
         'gp-subscriptions' => array(
-            'label'   => __( 'Subscriptions', 'invoicing' ),
+            'label'   => __('Subscriptions', 'invoicing'),
             'content' => '[wpinv_subscriptions]',
             'icon'    => 'fas fa-redo',
         ),
 
         'gp-edit-address'  => array(
-            'label'    => __( 'Billing Address', 'invoicing' ),
+            'label'    => __('Billing Address', 'invoicing'),
             'callback' => 'getpaid_display_address_edit_tab',
             'icon'     => 'fas fa-credit-card',
         ),
 
     );
 
-    $tabs = apply_filters( 'getpaid_user_content_tabs', $tabs );
+    $tabs = apply_filters('getpaid_user_content_tabs', $tabs);
 
     // Make sure address editing is last on the list.
-    if ( isset( $tabs['gp-edit-address'] ) ) {
+    if (isset($tabs['gp-edit-address'])) {
         $address = $tabs['gp-edit-address'];
-        unset( $tabs['gp-edit-address'] );
+        unset($tabs['gp-edit-address']);
         $tabs['gp-edit-address'] = $address;
     }
 
@@ -153,19 +153,19 @@ 
  * @param array $tab
  * @return array
  */
-function getpaid_prepare_user_content_tab( $tab ) {
+function getpaid_prepare_user_content_tab($tab) {
 
-    if ( ! empty( $tab['callback'] ) ) {
-        return call_user_func( $tab['callback'] );
+    if (!empty($tab['callback'])) {
+        return call_user_func($tab['callback']);
     }
 
-    if ( ! empty( $tab['content'] ) ) {
-        return convert_smilies( capital_P_dangit( wp_filter_content_tags( do_shortcode( shortcode_unautop( wpautop( wptexturize( do_blocks( $tab['content'] ) ) ) ) ) ) ) );
+    if (!empty($tab['content'])) {
+        return convert_smilies(capital_P_dangit(wp_filter_content_tags(do_shortcode(shortcode_unautop(wpautop(wptexturize(do_blocks($tab['content']))))))));
     }
 
     $notice = aui()->alert(
         array(
-            'content' => __( 'This tab has no content or content callback.', 'invoicing' ),
+            'content' => __('This tab has no content or content callback.', 'invoicing'),
             'type'    => 'error',
         )
     );
@@ -181,14 +181,14 @@ 
  * @param string $default
  * @return array
  */
-function getpaid_get_tab_url( $tab, $default ) {
+function getpaid_get_tab_url($tab, $default) {
     global $getpaid_tab_url;
 
-    if ( empty( $getpaid_tab_url ) ) {
+    if (empty($getpaid_tab_url)) {
         return $default;
     }
 
-    return sprintf( $getpaid_tab_url, $tab );
+    return sprintf($getpaid_tab_url, $tab);
 
 }
 
@@ -200,11 +200,11 @@ 
  */
 function getpaid_display_address_edit_tab() {
 
-    if ( 0 === get_current_user_id() ) {
+    if (0 === get_current_user_id()) {
         return '<div class="bsui">' . aui()->alert(
             array(
                 'type'        => 'error',
-                'content'     => __( 'Your must be logged in to view this section', 'invoicing' ),
+                'content'     => __('Your must be logged in to view this section', 'invoicing'),
                 'dismissible' => false,
             )
         ) . '</div>';
@@ -218,19 +218,19 @@ 
 
                 <?php
 
-                    foreach ( getpaid_user_address_fields() as $key => $label ) {
+                    foreach (getpaid_user_address_fields() as $key => $label) {
 
 					// Display the country.
-					if ( 'country' == $key ) {
+					if ('country' == $key) {
 
 						aui()->select(
 							array(
 								'options'     => wpinv_get_country_list(),
-								'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
-								'id'          => 'wpinv-' . sanitize_html_class( $key ),
-								'value'       => sanitize_text_field( getpaid_get_user_address_field( get_current_user_id(), $key ) ),
+								'name'        => 'getpaid_address[' . esc_attr($key) . ']',
+								'id'          => 'wpinv-' . sanitize_html_class($key),
+								'value'       => sanitize_text_field(getpaid_get_user_address_field(get_current_user_id(), $key)),
 								'placeholder' => $label,
-								'label'       => wp_kses_post( $label ),
+								'label'       => wp_kses_post($label),
 								'label_type'  => 'vertical',
 								'class'       => 'getpaid-address-field',
                             ),
@@ -240,17 +240,17 @@ 
 					}
 
 					// Display the state.
-					elseif ( 'state' == $key ) {
+					elseif ('state' == $key) {
 
 						getpaid_get_states_select_markup(
-							getpaid_get_user_address_field( get_current_user_id(), 'country' ),
-							getpaid_get_user_address_field( get_current_user_id(), 'state' ),
+							getpaid_get_user_address_field(get_current_user_id(), 'country'),
+							getpaid_get_user_address_field(get_current_user_id(), 'state'),
 							$label,
 							$label,
 							'',
 							false,
 							'',
-							'getpaid_address[' . esc_attr( $key ) . ']',
+							'getpaid_address[' . esc_attr($key) . ']',
                             true
 						);
 
@@ -258,13 +258,13 @@ 
 
 						aui()->input(
                             array(
-                                'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
-                                'id'          => 'wpinv-' . sanitize_html_class( $key ),
+                                'name'        => 'getpaid_address[' . esc_attr($key) . ']',
+                                'id'          => 'wpinv-' . sanitize_html_class($key),
                                 'placeholder' => $label,
-                                'label'       => wp_kses_post( $label ),
+                                'label'       => wp_kses_post($label),
                                 'label_type'  => 'vertical',
                                 'type'        => 'text',
-                                'value'       => sanitize_text_field( getpaid_get_user_address_field( get_current_user_id(), $key ) ),
+                                'value'       => sanitize_text_field(getpaid_get_user_address_field(get_current_user_id(), $key)),
                                 'class'       => 'getpaid-address-field',
                             ),
                             true
@@ -278,32 +278,32 @@ 
                             'name'        => 'getpaid_address[email_cc]',
                             'id'          => 'wpinv-email_cc',
                             'placeholder' => 'email1@example.com, email2@example.com',
-                            'label'       => __( 'Other email addresses', 'invoicing' ),
+                            'label'       => __('Other email addresses', 'invoicing'),
                             'label_type'  => 'vertical',
                             'type'        => 'text',
-                            'value'       => sanitize_text_field( get_user_meta( get_current_user_id(), '_wpinv_email_cc', true ) ),
+                            'value'       => sanitize_text_field(get_user_meta(get_current_user_id(), '_wpinv_email_cc', true)),
                             'class'       => 'getpaid-address-field',
-                            'help_text'   => __( 'Optionally provide other email addresses where we should send payment notifications', 'invoicing' ),
+                            'help_text'   => __('Optionally provide other email addresses where we should send payment notifications', 'invoicing'),
                         ),
                         true
                     );
 
-                    do_action( 'getpaid_display_address_edit_tab' );
+                    do_action('getpaid_display_address_edit_tab');
 
                     aui()->input(
                         array(
                             'name'      => 'getpaid_profile_edit_submit_button',
                             'id'        => 'getpaid_profile_edit_submit_button',
-                            'value'     => __( 'Save Address', 'invoicing' ),
-                            'help_text' => __( 'New invoices will use this address as the billing address.', 'invoicing' ),
+                            'value'     => __('Save Address', 'invoicing'),
+                            'help_text' => __('New invoices will use this address as the billing address.', 'invoicing'),
                             'type'      => 'submit',
                             'class'     => 'btn btn-primary btn-block submit-button',
                         ),
                         true
                     );
 
-                    wp_nonce_field( 'getpaid-nonce', 'getpaid-nonce' );
-                    getpaid_hidden_field( 'getpaid-action', 'edit_billing_details' );
+                    wp_nonce_field('getpaid-nonce', 'getpaid-nonce');
+                    getpaid_hidden_field('getpaid-action', 'edit_billing_details');
                 ?>
 
             </form>
@@ -313,7 +313,7 @@ 
 
     return ob_get_clean();
 }
-add_shortcode( 'getpaid_edit_address', 'getpaid_display_address_edit_tab' );
+add_shortcode('getpaid_edit_address', 'getpaid_display_address_edit_tab');
 
 /**
  * Saves the billing address edit tab.
@@ -321,30 +321,30 @@ 
  * @since 2.1.4
  * @param array $data
  */
-function getpaid_save_address_edit_tab( $data ) {
+function getpaid_save_address_edit_tab($data) {
 
-    if ( empty( $data['getpaid_address'] ) || ! is_array( $data['getpaid_address'] ) ) {
+    if (empty($data['getpaid_address']) || !is_array($data['getpaid_address'])) {
         return;
     }
 
     $data    = $data['getpaid_address'];
     $user_id = get_current_user_id();
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-        if ( isset( $data[ $field ] ) ) {
-            $value = sanitize_text_field( $data[ $field ] );
-            update_user_meta( $user_id, '_wpinv_' . $field, $value );
+        if (isset($data[$field])) {
+            $value = sanitize_text_field($data[$field]);
+            update_user_meta($user_id, '_wpinv_' . $field, $value);
         }
     }
 
-    if ( isset( $data['email_cc'] ) ) {
-        update_user_meta( $user_id, '_wpinv_email_cc', sanitize_text_field( $data['email_cc'] ) );
+    if (isset($data['email_cc'])) {
+        update_user_meta($user_id, '_wpinv_email_cc', sanitize_text_field($data['email_cc']));
     }
 
-    wpinv_set_error( 'address_updated' );
+    wpinv_set_error('address_updated');
 }
-add_action( 'getpaid_authenticated_action_edit_billing_details', 'getpaid_save_address_edit_tab' );
+add_action('getpaid_authenticated_action_edit_billing_details', 'getpaid_save_address_edit_tab');
 
 
 /*
@@ -362,27 +362,27 @@ 
  * @param  array $tabs
  * @return array
  */
-function getpaid_filter_userswp_account_tabs( $tabs ) {
+function getpaid_filter_userswp_account_tabs($tabs) {
 
     // Abort if the integration is inactive.
-    if ( ! getpaid_is_userswp_integration_active() ) {
+    if (!getpaid_is_userswp_integration_active()) {
         return $tabs;
     }
 
-    $new_tabs   = array();
+    $new_tabs = array();
 
-    foreach ( getpaid_get_user_content_tabs() as $slug => $tab ) {
+    foreach (getpaid_get_user_content_tabs() as $slug => $tab) {
 
-        $new_tabs[ $slug ] = array(
+        $new_tabs[$slug] = array(
             'title' => $tab['label'],
             'icon'  => $tab['icon'],
         );
 
     }
 
-    return array_merge( $tabs, $new_tabs );
+    return array_merge($tabs, $new_tabs);
 }
-add_filter( 'uwp_account_available_tabs', 'getpaid_filter_userswp_account_tabs' );
+add_filter('uwp_account_available_tabs', 'getpaid_filter_userswp_account_tabs');
 
 /**
  * Display our UsersWP account tabs.
@@ -391,21 +391,21 @@ 
  * @param  array $tabs
  * @return array
  */
-function getpaid_display_userswp_account_tabs( $tab ) {
+function getpaid_display_userswp_account_tabs($tab) {
     global $getpaid_tab_url;
 
     $our_tabs = getpaid_get_user_content_tabs();
 
-    if ( getpaid_is_userswp_integration_active() && isset( $our_tabs[ $tab ] ) ) {
-        $getpaid_tab_url = add_query_arg( 'type', '%s', uwp_get_account_page_url() );
-        echo wp_kses( getpaid_prepare_user_content_tab( $our_tabs[ $tab ] ), getpaid_allowed_html() );
+    if (getpaid_is_userswp_integration_active() && isset($our_tabs[$tab])) {
+        $getpaid_tab_url = add_query_arg('type', '%s', uwp_get_account_page_url());
+        echo wp_kses(getpaid_prepare_user_content_tab($our_tabs[$tab]), getpaid_allowed_html());
     }
 
 }
-add_action( 'uwp_account_form_display', 'getpaid_display_userswp_account_tabs' );
+add_action('uwp_account_form_display', 'getpaid_display_userswp_account_tabs');
 
 function getpaid_allowed_html() {
-    $allowed_html = wp_kses_allowed_html( 'post' );
+    $allowed_html = wp_kses_allowed_html('post');
 
 	// form fields
     $allowed_html['form'] = array(
@@ -476,17 +476,17 @@ 
  * @param  string $tab   Current tab.
  * @return string Title.
  */
-function getpaid_filter_userswp_account_title( $title, $tab ) {
+function getpaid_filter_userswp_account_title($title, $tab) {
 
-    $our_tabs   = getpaid_get_user_content_tabs();
+    $our_tabs = getpaid_get_user_content_tabs();
 
-    if ( getpaid_is_userswp_integration_active() && isset( $our_tabs[ $tab ] ) ) {
-        return $our_tabs[ $tab ]['label'];
+    if (getpaid_is_userswp_integration_active() && isset($our_tabs[$tab])) {
+        return $our_tabs[$tab]['label'];
     }
 
     return $title;
 }
-add_filter( 'uwp_account_page_title', 'getpaid_filter_userswp_account_title', 10, 2 );
+add_filter('uwp_account_page_title', 'getpaid_filter_userswp_account_title', 10, 2);
 
 /**
  * Registers the UsersWP integration settings.
@@ -495,26 +495,26 @@ 
  * @param  array $settings An array of integration settings.
  * @return array
  */
-function getpaid_register_userswp_settings( $settings ) {
+function getpaid_register_userswp_settings($settings) {
 
-    if ( defined( 'USERSWP_PLUGIN_FILE' ) ) {
+    if (defined('USERSWP_PLUGIN_FILE')) {
 
         $settings[] = array(
 
             'id'       => 'userswp',
-            'label'    => __( 'UsersWP', 'invoicing' ),
+            'label'    => __('UsersWP', 'invoicing'),
             'settings' => array(
 
                 'userswp_settings' => array(
                     'id'   => 'userswp_settings',
-                    'name' => '<h3>' . __( 'UsersWP', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('UsersWP', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
 
                 'enable_userswp'   => array(
                     'id'   => 'enable_userswp',
-                    'name' => __( 'Enable Integration', 'invoicing' ),
-                    'desc' => __( 'Display GetPaid items on UsersWP account page.', 'invoicing' ),
+                    'name' => __('Enable Integration', 'invoicing'),
+                    'desc' => __('Display GetPaid items on UsersWP account page.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => 1,
                 ),
@@ -527,7 +527,7 @@ 
 
     return $settings;
 }
-add_filter( 'getpaid_integration_settings', 'getpaid_register_userswp_settings' );
+add_filter('getpaid_integration_settings', 'getpaid_register_userswp_settings');
 
 /**
  * Ovewrites the invoices history page to UsersWP.
@@ -535,18 +535,18 @@ 
  * @since  2.3.1
  * @return bool
  */
-function getpaid_userswp_overwrite_invoice_history_page( $url, $post_type ) {
+function getpaid_userswp_overwrite_invoice_history_page($url, $post_type) {
 
     $our_tabs = getpaid_get_user_content_tabs();
     $tab      = "gp-{$post_type}s";
-    if ( getpaid_is_userswp_integration_active() && isset( $our_tabs[ $tab ] ) ) {
-        return add_query_arg( 'type', $tab, uwp_get_account_page_url() );
+    if (getpaid_is_userswp_integration_active() && isset($our_tabs[$tab])) {
+        return add_query_arg('type', $tab, uwp_get_account_page_url());
     }
 
     return $url;
 
 }
-add_filter( 'wpinv_get_history_page_uri', 'getpaid_userswp_overwrite_invoice_history_page', 10, 2 );
+add_filter('wpinv_get_history_page_uri', 'getpaid_userswp_overwrite_invoice_history_page', 10, 2);
 
 /**
  * Checks if the integration is enabled.
@@ -555,8 +555,8 @@ 
  * @return bool
  */
 function getpaid_is_userswp_integration_active() {
-    $enabled = wpinv_get_option( 'enable_userswp', 1 );
-    return defined( 'USERSWP_PLUGIN_FILE' ) && ! empty( $enabled );
+    $enabled = wpinv_get_option('enable_userswp', 1);
+    return defined('USERSWP_PLUGIN_FILE') && !empty($enabled);
 }
 
 /*
@@ -574,26 +574,26 @@ 
  * @param  array $settings An array of integration settings.
  * @return array
  */
-function getpaid_register_buddypress_settings( $settings ) {
+function getpaid_register_buddypress_settings($settings) {
 
-    if ( class_exists( 'BuddyPress' ) ) {
+    if (class_exists('BuddyPress')) {
 
         $settings[] = array(
 
             'id'       => 'buddypress',
-            'label'    => __( 'BuddyPress', 'invoicing' ),
+            'label'    => __('BuddyPress', 'invoicing'),
             'settings' => array(
 
                 'buddypress_settings' => array(
                     'id'   => 'buddypress_settings',
-                    'name' => '<h3>' . __( 'BuddyPress', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('BuddyPress', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
 
                 'enable_buddypress'   => array(
                     'id'   => 'enable_buddypress',
-                    'name' => __( 'Enable Integration', 'invoicing' ),
-                    'desc' => __( 'Display GetPaid items on BuddyPress account pages.', 'invoicing' ),
+                    'name' => __('Enable Integration', 'invoicing'),
+                    'desc' => __('Display GetPaid items on BuddyPress account pages.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => 1,
                 ),
@@ -606,7 +606,7 @@ 
 
     return $settings;
 }
-add_filter( 'getpaid_integration_settings', 'getpaid_register_buddypress_settings' );
+add_filter('getpaid_integration_settings', 'getpaid_register_buddypress_settings');
 
 /**
  * Checks if the integration is enabled.
@@ -615,8 +615,8 @@ 
  * @return bool
  */
 function getpaid_is_buddypress_integration_active() {
-    $enabled = wpinv_get_option( 'enable_buddypress', 1 );
-    return class_exists( 'BuddyPress' ) && ! empty( $enabled );
+    $enabled = wpinv_get_option('enable_buddypress', 1);
+    return class_exists('BuddyPress') && !empty($enabled);
 }
 
 /**
@@ -627,13 +627,13 @@ 
  */
 function getpaid_setup_buddypress_integration() {
 
-    if ( getpaid_is_buddypress_integration_active() ) {
+    if (getpaid_is_buddypress_integration_active()) {
         require_once WPINV_PLUGIN_DIR . 'includes/class-bp-getpaid-component.php';
         buddypress()->getpaid = new BP_GetPaid_Component();
     }
 
 }
-add_action( 'bp_setup_components', 'getpaid_setup_buddypress_integration' );
+add_action('bp_setup_components', 'getpaid_setup_buddypress_integration');
 
 /**
  * Checks if a given user has purchased a given item.
@@ -641,10 +641,10 @@ 
  * @since 2.6.17
  * @param int $user_id The user id.
  */
-function getpaid_has_user_purchased_item( $user_id, $item_id ) {
+function getpaid_has_user_purchased_item($user_id, $item_id) {
     global $wpdb;
 
-    if ( empty( $user_id ) ) {
+    if (empty($user_id)) {
         return false;
     }
 
@@ -659,5 +659,5 @@ 
         )
     );
 
-    return ! empty( $count );
+    return !empty($count);
 }

templates/payment-forms/embed.php

Indentation +39 added lines, -39 removed lines

@@ -1,32 +1,32 @@ 
 <?php
 
-	// Is the request set up correctly?
-	if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
-		return aui()->alert(
-			array(
-				'type'    => 'warning',
-				'content' => __( 'No payment form or item selected', 'invoicing' ),
-			)
-		);
-		wp_die( esc_html__( 'No payment form or item selected', 'invoicing' ), 400 );
-	}
-
-	// Payment form or button?
-	if ( ! empty( $_GET['form'] ) ) {
-
-		$shortcode = sprintf(
-			'[getpaid form=%s]',
-			(int) $_GET['form']
-		);
-
-	} else {
-
-		$shortcode = sprintf(
-			'[getpaid item=%s]',
-			esc_attr( urldecode( $_GET['item'] ) )
-		);
-
-	}
+    // Is the request set up correctly?
+    if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
+        return aui()->alert(
+            array(
+                'type'    => 'warning',
+                'content' => __( 'No payment form or item selected', 'invoicing' ),
+            )
+        );
+        wp_die( esc_html__( 'No payment form or item selected', 'invoicing' ), 400 );
+    }
+
+    // Payment form or button?
+    if ( ! empty( $_GET['form'] ) ) {
+
+        $shortcode = sprintf(
+            '[getpaid form=%s]',
+            (int) $_GET['form']
+        );
+
+    } else {
+
+        $shortcode = sprintf(
+            '[getpaid item=%s]',
+            esc_attr( urldecode( $_GET['item'] ) )
+        );
+
+    }
 
 ?>
 
@@ -44,13 +44,13 @@ 
 
         <title><?php echo esc_html( get_bloginfo( 'name' ) ); ?></title>
 		<?php
-			wp_enqueue_scripts();
-			wp_print_styles();
-			wp_print_head_scripts();
-			wp_custom_css_cb();
-			wpinv_get_template( 'frontend-head.php' );
-			wp_site_icon();
-		?>
+            wp_enqueue_scripts();
+            wp_print_styles();
+            wp_print_head_scripts();
+            wp_custom_css_cb();
+            wpinv_get_template( 'frontend-head.php' );
+            wp_site_icon();
+        ?>
 
 		<style type="text/css">
 			.body{ 
@@ -84,11 +84,11 @@ 
 	<body class="body page-template-default page">
 		<div id="getpaid-form-embed" class="container my-5 page type-page status-publish hentry post post-content">
 			<?php
-				do_action( 'getpaid_payment_form_embed_top' );
-				echo do_shortcode( $shortcode );
-				do_action( 'getpaid_payment_form_embed_bottom' );
-				wpinv_get_template( 'frontend-footer.php' );
-			?>
+                do_action( 'getpaid_payment_form_embed_top' );
+                echo do_shortcode( $shortcode );
+                do_action( 'getpaid_payment_form_embed_bottom' );
+                wpinv_get_template( 'frontend-footer.php' );
+            ?>
 		</div>
 		<?php wp_footer(); ?>
 	</body>

Spacing +12 added lines, -12 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 
 	// Is the request set up correctly?
-	if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
+	if (empty($_GET['form']) && empty($_GET['item'])) {
 		return aui()->alert(
 			array(
 				'type'    => 'warning',
-				'content' => __( 'No payment form or item selected', 'invoicing' ),
+				'content' => __('No payment form or item selected', 'invoicing'),
 			)
 		);
-		wp_die( esc_html__( 'No payment form or item selected', 'invoicing' ), 400 );
+		wp_die(esc_html__('No payment form or item selected', 'invoicing'), 400);
 	}
 
 	// Payment form or button?
-	if ( ! empty( $_GET['form'] ) ) {
+	if (!empty($_GET['form'])) {
 
 		$shortcode = sprintf(
 			'[getpaid form=%s]',
@@ -23,7 +23,7 @@ 
 
 		$shortcode = sprintf(
 			'[getpaid item=%s]',
-			esc_attr( urldecode( $_GET['item'] ) )
+			esc_attr(urldecode($_GET['item']))
 		);
 
 	}
@@ -35,20 +35,20 @@ 
 
 	<head>
 
-		<meta charset="<?php bloginfo( 'charset' ); ?>">
+		<meta charset="<?php bloginfo('charset'); ?>">
         <meta name="viewport" content="width=device-width, initial-scale=1.0" >
 
         <meta name="robots" content="noindex,nofollow">
 
 		<link rel="profile" href="https://gmpg.org/xfn/11">
 
-        <title><?php echo esc_html( get_bloginfo( 'name' ) ); ?></title>
+        <title><?php echo esc_html(get_bloginfo('name')); ?></title>
 		<?php
 			wp_enqueue_scripts();
 			wp_print_styles();
 			wp_print_head_scripts();
 			wp_custom_css_cb();
-			wpinv_get_template( 'frontend-head.php' );
+			wpinv_get_template('frontend-head.php');
 			wp_site_icon();
 		?>
 
@@ -84,10 +84,10 @@ 
 	<body class="body page-template-default page">
 		<div id="getpaid-form-embed" class="container my-5 page type-page status-publish hentry post post-content">
 			<?php
-				do_action( 'getpaid_payment_form_embed_top' );
-				echo do_shortcode( $shortcode );
-				do_action( 'getpaid_payment_form_embed_bottom' );
-				wpinv_get_template( 'frontend-footer.php' );
+				do_action('getpaid_payment_form_embed_top');
+				echo do_shortcode($shortcode);
+				do_action('getpaid_payment_form_embed_bottom');
+				wpinv_get_template('frontend-footer.php');
 			?>
 		</div>
 		<?php wp_footer(); ?>

includes/gateways/class-getpaid-manual-gateway.php

Indentation +37 added lines, -37 removed lines

@@ -13,30 +13,30 @@ 
 class GetPaid_Manual_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'manual';
 
     /**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
     protected $supports = array( 'subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups' );
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
-	public $order = 11;
+     * Payment method order.
+     *
+     * @var int
+     */
+    public $order = 11;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
         parent::__construct();
 
         $this->title        = __( 'Test Gateway', 'invoicing' );
@@ -46,15 +46,15 @@ 
     }
 
     /**
-	 * Process Payment.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Mark it as paid.
         $invoice->mark_paid();
@@ -84,12 +84,12 @@ 
     }
 
     /**
-	 * (Maybe) renews a manual subscription profile.
-	 *
-	 *
+     * (Maybe) renews a manual subscription profile.
+     *
+     *
      * @param WPInv_Subscription $subscription
-	 */
-	public function maybe_renew_subscription( $subscription ) {
+     */
+    public function maybe_renew_subscription( $subscription ) {
 
         // Ensure its our subscription && it's active.
         if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
@@ -109,13 +109,13 @@ 
     }
 
     /**
-	 * Processes invoice addons.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	public function process_addons( $invoice, $items ) {
+     * Processes invoice addons.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    public function process_addons( $invoice, $items ) {
 
         foreach ( $items as $item ) {
             $invoice->add_item( $item );

Spacing +22 added lines, -22 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Manual Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups' );
+    protected $supports = array('subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups');
 
     /**
 	 * Payment method order.
@@ -39,10 +39,10 @@ 
 	public function __construct() {
         parent::__construct();
 
-        $this->title        = __( 'Test Gateway', 'invoicing' );
-        $this->method_title = __( 'Test Gateway', 'invoicing' );
+        $this->title        = __('Test Gateway', 'invoicing');
+        $this->method_title = __('Test Gateway', 'invoicing');
 
-        add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
+        add_action('getpaid_should_renew_subscription', array($this, 'maybe_renew_subscription'));
     }
 
     /**
@@ -54,32 +54,32 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Mark it as paid.
         $invoice->mark_paid();
 
         // (Maybe) activate subscriptions.
-        $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+        $subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
-        if ( ! empty( $subscriptions ) ) {
-            $subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+        if (!empty($subscriptions)) {
+            $subscriptions = is_array($subscriptions) ? $subscriptions : array($subscriptions);
 
-            foreach ( $subscriptions as $subscription ) {
-                if ( $subscription->exists() ) {
-                    $duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-                    $expiry   = date( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+            foreach ($subscriptions as $subscription) {
+                if ($subscription->exists()) {
+                    $duration = strtotime($subscription->get_expiration()) - strtotime($subscription->get_date_created());
+                    $expiry   = date('Y-m-d H:i:s', (current_time('timestamp') + $duration));
 
-                    $subscription->set_next_renewal_date( $expiry );
-                    $subscription->set_date_created( current_time( 'mysql' ) );
-                    $subscription->set_profile_id( $invoice->generate_key( 'manual_sub_' . $invoice->get_id() . '_' . $subscription->get_id() ) );
+                    $subscription->set_next_renewal_date($expiry);
+                    $subscription->set_date_created(current_time('mysql'));
+                    $subscription->set_profile_id($invoice->generate_key('manual_sub_' . $invoice->get_id() . '_' . $subscription->get_id()));
                     $subscription->activate();
                 }
             }
 }
 
         // Send to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
 
@@ -89,10 +89,10 @@ 
 	 *
      * @param WPInv_Subscription $subscription
 	 */
-	public function maybe_renew_subscription( $subscription ) {
+	public function maybe_renew_subscription($subscription) {
 
         // Ensure its our subscription && it's active.
-        if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
+        if ($this->id === $subscription->get_gateway() && $subscription->has_status('active trialling')) {
 
             // Renew the subscription.
             $subscription->add_payment(
@@ -115,10 +115,10 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
-        foreach ( $items as $item ) {
-            $invoice->add_item( $item );
+        foreach ($items as $item) {
+            $invoice->add_item($item);
         }
 
         $invoice->recalculate_total();

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

Indentation +269 added lines, -269 removed lines

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

Spacing +73 added lines, -73 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * This class handles subscription notificaiton emails.
@@ -45,21 +45,21 @@ 
 	 */
 	public function init_hooks() {
 
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'subscription_merge_tags' ), 10, 2 );
-		foreach ( $this->subscription_actions as $hook => $email_type ) {
+		add_filter('getpaid_get_email_merge_tags', array($this, 'subscription_merge_tags'), 10, 2);
+		foreach ($this->subscription_actions as $hook => $email_type) {
 
-			$email = new GetPaid_Notification_Email( $email_type );
+			$email = new GetPaid_Notification_Email($email_type);
 
-			if ( ! $email->is_active() ) {
+			if (!$email->is_active()) {
 				continue;
 			}
 
-			if ( method_exists( $this, $email_type ) ) {
-				add_action( $hook, array( $this, $email_type ), 100, 2 );
+			if (method_exists($this, $email_type)) {
+				add_action($hook, array($this, $email_type), 100, 2);
 				continue;
 			}
 
-			do_action( 'getpaid_subscription_notification_email_register_hook', $email_type, $hook );
+			do_action('getpaid_subscription_notification_email_register_hook', $email_type, $hook);
 
 		}
 
@@ -71,12 +71,12 @@ 
 	 * @param array $merge_tags
 	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
 	 */
-	public function subscription_merge_tags( $merge_tags, $object ) {
+	public function subscription_merge_tags($merge_tags, $object) {
 
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
+		if (is_a($object, 'WPInv_Subscription')) {
 			$merge_tags = array_merge(
 				$merge_tags,
-				$this->get_subscription_merge_tags( $object )
+				$this->get_subscription_merge_tags($object)
 			);
 		}
 
@@ -90,25 +90,25 @@ 
 	 * @param WPInv_Subscription $subscription
 	 * @return array
 	 */
-	public function get_subscription_merge_tags( $subscription ) {
+	public function get_subscription_merge_tags($subscription) {
 
 		// Abort if it does not exist.
-		if ( ! $subscription->get_id() ) {
+		if (!$subscription->get_id()) {
 			return array();
 		}
 
-		$invoice    = $subscription->get_parent_invoice();
+		$invoice = $subscription->get_parent_invoice();
 		return array(
-			'{subscription_renewal_date}'     => getpaid_format_date_value( $subscription->get_next_renewal_date(), __( 'Never', 'invoicing' ) ),
-			'{subscription_created}'          => getpaid_format_date_value( $subscription->get_date_created() ),
-			'{subscription_status}'           => sanitize_text_field( $subscription->get_status_label() ),
-			'{subscription_profile_id}'       => sanitize_text_field( $subscription->get_profile_id() ),
-			'{subscription_id}'               => absint( $subscription->get_id() ),
-			'{subscription_recurring_amount}' => sanitize_text_field( wpinv_price( $subscription->get_recurring_amount(), $invoice->get_currency() ) ),
-			'{subscription_initial_amount}'   => sanitize_text_field( wpinv_price( $subscription->get_initial_amount(), $invoice->get_currency() ) ),
-			'{subscription_recurring_period}' => getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' ),
+			'{subscription_renewal_date}'     => getpaid_format_date_value($subscription->get_next_renewal_date(), __('Never', 'invoicing')),
+			'{subscription_created}'          => getpaid_format_date_value($subscription->get_date_created()),
+			'{subscription_status}'           => sanitize_text_field($subscription->get_status_label()),
+			'{subscription_profile_id}'       => sanitize_text_field($subscription->get_profile_id()),
+			'{subscription_id}'               => absint($subscription->get_id()),
+			'{subscription_recurring_amount}' => sanitize_text_field(wpinv_price($subscription->get_recurring_amount(), $invoice->get_currency())),
+			'{subscription_initial_amount}'   => sanitize_text_field(wpinv_price($subscription->get_initial_amount(), $invoice->get_currency())),
+			'{subscription_recurring_period}' => getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), ''),
 			'{subscription_bill_times}'       => $subscription->get_bill_times(),
-			'{subscription_url}'              => esc_url( $subscription->get_view_url() ),
+			'{subscription_url}'              => esc_url($subscription->get_view_url()),
 		);
 
 	}
@@ -119,7 +119,7 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return bool
 	 */
-	public function should_send_notification( $invoice ) {
+	public function should_send_notification($invoice) {
 		return 0 != $invoice->get_id();
 	}
 
@@ -129,14 +129,14 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return array
 	 */
-	public function get_recipients( $invoice ) {
-		$recipients = array( $invoice->get_email() );
+	public function get_recipients($invoice) {
+		$recipients = array($invoice->get_email());
 
 		$cc = $invoice->get_email_cc();
 
-		if ( ! empty( $cc ) ) {
-			$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-			$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+		if (!empty($cc)) {
+			$cc = array_map('sanitize_email', wpinv_parse_list($cc));
+			$recipients = array_filter(array_unique(array_merge($recipients, $cc)));
 		}
 
 		return $recipients;
@@ -150,75 +150,75 @@ 
 	 * @param string $type
 	 * @param array $extra_args Extra template args.
 	 */
-	public function send_email( $subscription, $email, $type, $extra_args = array() ) {
+	public function send_email($subscription, $email, $type, $extra_args = array()) {
 
-		if ( empty( $subscription ) ) {
+		if (empty($subscription)) {
 			return;
 		}
 
-		if ( is_array( $subscription ) ) {
-			$subscription = current( $subscription );
+		if (is_array($subscription)) {
+			$subscription = current($subscription);
 		}
 
-		if ( ! $subscription instanceof WPInv_Subscription ) {
+		if (!$subscription instanceof WPInv_Subscription) {
 			return;
 		}
 
 		// Abort in case the parent invoice does not exist.
 		$invoice = $subscription->get_parent_invoice();
-		if ( ! $this->should_send_notification( $invoice ) ) {
+		if (!$this->should_send_notification($invoice)) {
 			return;
 		}
 
-		if ( apply_filters( 'getpaid_skip_subscription_email', false, $type, $subscription ) ) {
+		if (apply_filters('getpaid_skip_subscription_email', false, $type, $subscription)) {
 			return;
 		}
 
-		do_action( 'getpaid_before_send_subscription_notification', $type, $subscription, $email );
+		do_action('getpaid_before_send_subscription_notification', $type, $subscription, $email);
 
-		$recipients  = $this->get_recipients( $invoice );
+		$recipients  = $this->get_recipients($invoice);
 		$mailer      = new GetPaid_Notification_Email_Sender();
 		$merge_tags  = $email->get_merge_tags();
-		$content     = $email->get_content( $merge_tags, $extra_args );
-		$subject     = $email->add_merge_tags( $email->get_subject(), $merge_tags );
+		$content     = $email->get_content($merge_tags, $extra_args);
+		$subject     = $email->add_merge_tags($email->get_subject(), $merge_tags);
 		$attachments = $email->get_attachments();
 
 		$result = $mailer->send(
-			apply_filters( 'getpaid_subscription_email_recipients', wpinv_parse_list( $recipients ), $email ),
+			apply_filters('getpaid_subscription_email_recipients', wpinv_parse_list($recipients), $email),
 			$subject,
 			$content,
 			$attachments
 		);
 
 		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
+		if ($email->include_admin_bcc()) {
 			$mailer->send(
 				wpinv_get_admin_email(),
-				$subject . __( ' - ADMIN BCC COPY', 'invoicing' ),
+				$subject . __(' - ADMIN BCC COPY', 'invoicing'),
 				$content,
 				$attachments
 			);
 		}
 
-		if ( $result ) {
+		if ($result) {
 			$invoice->add_system_note(
 				sprintf(
-					__( 'Successfully sent %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+					__('Successfully sent %1$s notification email to %2$s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin') : __('the customer')
 				)
 			);
 		} else {
 			$invoice->add_system_note(
 				sprintf(
-					__( 'Failed sending %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+					__('Failed sending %1$s notification email to %2$s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin') : __('the customer')
 				)
 			);
 		}
 
-		do_action( 'getpaid_after_send_subscription_notification', $type, $subscription, $email );
+		do_action('getpaid_after_send_subscription_notification', $type, $subscription, $email);
 
 	}
 
@@ -227,10 +227,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_trial( $subscription ) {
+	public function subscription_trial($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -239,10 +239,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_cancelled( $subscription ) {
+	public function subscription_cancelled($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -251,10 +251,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_expired( $subscription ) {
+	public function subscription_expired($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -263,10 +263,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_complete( $subscription ) {
+	public function subscription_complete($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -276,18 +276,18 @@ 
 	 */
 	public function renewal_reminder() {
 
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__);
 
 		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+		$reminder_days = array_unique(wp_parse_id_list($email->get_option('days')));
 
 		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
+		if (empty($reminder_days)) {
 			return;
 		}
 
 		// Fetch matching subscriptions.
-        $args  = array(
+        $args = array(
             'number'             => -1,
 			'count_total'        => false,
 			'status'             => 'trialling active',
@@ -296,8 +296,8 @@ 
             ),
 		);
 
-		foreach ( $reminder_days as $days ) {
-			$date = date_parse( date( 'Y-m-d', strtotime( "+$days days", current_time( 'timestamp' ) ) ) );
+		foreach ($reminder_days as $days) {
+			$date = date_parse(date('Y-m-d', strtotime("+$days days", current_time('timestamp'))));
 
 			$args['date_expires_query'][] = array(
 				'year'  => $date['year'],
@@ -307,14 +307,14 @@ 
 
 		}
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+		$subscriptions = new GetPaid_Subscriptions_Query($args);
 
-        foreach ( $subscriptions->get_results() as $subscription ) {
+        foreach ($subscriptions->get_results() as $subscription) {
 
 			// Skip packages.
-			if ( apply_filters( 'getpaid_send_subscription_renewal_reminder_email', true ) ) {
+			if (apply_filters('getpaid_send_subscription_renewal_reminder_email', true)) {
 				$email->object = $subscription;
-            	$this->send_email( $subscription, $email, __FUNCTION__ );
+            	$this->send_email($subscription, $email, __FUNCTION__);
 			}
 		}