Inspection of "sanitize all inputs early" - AyeCode/invoicing - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 02cd26...7c0663 )

by Brian

created 2022-03-30 07:12 UTC

Status

Indentation +38 added lines, -38 removed lines patch added patch discarded remove patch

@@ -1,32 +1,32 @@  discard block
 block discarded – undo
 <?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( __( '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( __( '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,12 +44,12 @@  discard block
 block discarded – undo
 
         <title>GetPaid</title>
 		<?php
-			wp_enqueue_scripts();
-			wp_print_styles();
-			wp_print_head_scripts();
-			wp_custom_css_cb();
-			wpinv_get_template( 'frontend-head.php' );
-		?>
+            wp_enqueue_scripts();
+            wp_print_styles();
+            wp_print_head_scripts();
+            wp_custom_css_cb();
+            wpinv_get_template( 'frontend-head.php' );
+        ?>
 
 		<style type="text/css">
 			.body{ 
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
 	<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>

Please login to merge, or discard this patch.

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,18 +1,18 @@  discard block
 block discarded – undo
 <?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( __( 'No payment form or item selected', 'invoicing' ), 400 );
+		wp_die(__('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 @@  discard block
 block discarded – undo
 
 		$shortcode = sprintf(
 			'[getpaid item=%s]',
-			esc_attr( urldecode( $_GET['item'] ) )
+			esc_attr(urldecode($_GET['item']))
 		);
 
 	}
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
 
 	<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">
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
 			wp_print_styles();
 			wp_print_head_scripts();
 			wp_custom_css_cb();
-			wpinv_get_template( 'frontend-head.php' );
+			wpinv_get_template('frontend-head.php');
 		?>
 
 		<style type="text/css">
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
 	<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(); ?>

Please login to merge, or discard this patch.

widgets/subscriptions.php 2 patches

Indentation +346 added lines, -346 removed lines patch added patch discarded remove patch

@@ -14,144 +14,144 @@  discard block
 block discarded – undo
  */
 class WPInv_Subscriptions_Widget extends WP_Super_Duper {
 
-	/**
-	 * Register the widget with WordPress.
-	 *
-	 */
-	public function __construct() {
-
-		$options = array(
-			'textdomain'    => 'invoicing',
-			'block-icon'    => 'controls-repeat',
-			'block-category'=> 'widgets',
-			'block-keywords'=> "['invoicing','subscriptions', 'getpaid']",
-			'class_name'     => __CLASS__,
-			'base_id'       => 'wpinv_subscriptions',
-			'name'          => __( 'GetPaid > Subscriptions', 'invoicing' ),
-			'widget_ops'    => array(
-				'classname'   => 'getpaid-subscriptions bsui',
-				'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
-			),
-			'arguments'     => array(
-				'title'  => array(
-					'title'       => __( 'Widget title', 'invoicing' ),
-					'desc'        => __( 'Enter widget title.', 'invoicing' ),
-					'type'        => 'text',
-					'desc_tip'    => true,
-					'default'     => '',
-					'advanced'    => false
-				),
-			)
-
-		);
-
-
-		parent::__construct( $options );
-	}
-
-	/**
-	 * Retrieves current user's subscriptions.
-	 *
-	 * @return GetPaid_Subscriptions_Query
-	 */
-	public function get_subscriptions() {
-
-		// Prepare license args.
-		$args  = array(
-			'customer_in' => get_current_user_id(),
-			'paged'       => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
-		);
-
-		return new GetPaid_Subscriptions_Query( $args );
-
-	}
-
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
-	public function output( $args = array(), $widget_args = array(), $content = '' ) {
-
-		// Ensure that the user is logged in.
-		if ( ! is_user_logged_in() ) {
-
-			return aui()->alert(
-				array(
-					'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
-					'type'    => 'error',
-				)
-			);
-
-		}
-
-		// Are we displaying a single subscription?
-		if ( isset( $_GET['subscription'] ) ) {
-			return $this->display_single_subscription( intval( $_GET['subscription'] ) );
-		}
-
-		// Retrieve the user's subscriptions.
-		$subscriptions = $this->get_subscriptions();
-
-		// Start the output buffer.
-		ob_start();
-
-		// Backwards compatibility.
-		do_action( 'wpinv_before_user_subscriptions' );
-
-		// Display errors and notices.
-		wpinv_print_errors();
-
-		do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
-
-		// Print the table header.
-		$this->print_table_header();
-
-		// Print table body.
-		$this->print_table_body( $subscriptions->get_results() );
-
-		// Print table footer.
-		$this->print_table_footer();
-
-		// Print the navigation.
-		$this->print_navigation( $subscriptions->get_total() );
-
-		// Backwards compatibility.
-		do_action( 'wpinv_after_user_subscriptions' );
-
-		// Return the output.
-		return ob_get_clean();
-
-	}
-
-	/**
-	 * Retrieves the subscription columns.
-	 *
-	 * @return array
-	 */
-	public function get_subscriptions_table_columns() {
+    /**
+     * Register the widget with WordPress.
+     *
+     */
+    public function __construct() {
+
+        $options = array(
+            'textdomain'    => 'invoicing',
+            'block-icon'    => 'controls-repeat',
+            'block-category'=> 'widgets',
+            'block-keywords'=> "['invoicing','subscriptions', 'getpaid']",
+            'class_name'     => __CLASS__,
+            'base_id'       => 'wpinv_subscriptions',
+            'name'          => __( 'GetPaid > Subscriptions', 'invoicing' ),
+            'widget_ops'    => array(
+                'classname'   => 'getpaid-subscriptions bsui',
+                'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
+            ),
+            'arguments'     => array(
+                'title'  => array(
+                    'title'       => __( 'Widget title', 'invoicing' ),
+                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'type'        => 'text',
+                    'desc_tip'    => true,
+                    'default'     => '',
+                    'advanced'    => false
+                ),
+            )
+
+        );
+
+
+        parent::__construct( $options );
+    }
+
+    /**
+     * Retrieves current user's subscriptions.
+     *
+     * @return GetPaid_Subscriptions_Query
+     */
+    public function get_subscriptions() {
+
+        // Prepare license args.
+        $args  = array(
+            'customer_in' => get_current_user_id(),
+            'paged'       => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
+        );
+
+        return new GetPaid_Subscriptions_Query( $args );
+
+    }
+
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
+    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+
+        // Ensure that the user is logged in.
+        if ( ! is_user_logged_in() ) {
+
+            return aui()->alert(
+                array(
+                    'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
+                    'type'    => 'error',
+                )
+            );
+
+        }
+
+        // Are we displaying a single subscription?
+        if ( isset( $_GET['subscription'] ) ) {
+            return $this->display_single_subscription( intval( $_GET['subscription'] ) );
+        }
+
+        // Retrieve the user's subscriptions.
+        $subscriptions = $this->get_subscriptions();
+
+        // Start the output buffer.
+        ob_start();
+
+        // Backwards compatibility.
+        do_action( 'wpinv_before_user_subscriptions' );
+
+        // Display errors and notices.
+        wpinv_print_errors();
+
+        do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
+
+        // Print the table header.
+        $this->print_table_header();
+
+        // Print table body.
+        $this->print_table_body( $subscriptions->get_results() );
+
+        // Print table footer.
+        $this->print_table_footer();
+
+        // Print the navigation.
+        $this->print_navigation( $subscriptions->get_total() );
+
+        // Backwards compatibility.
+        do_action( 'wpinv_after_user_subscriptions' );
+
+        // Return the output.
+        return ob_get_clean();
+
+    }
+
+    /**
+     * Retrieves the subscription columns.
+     *
+     * @return array
+     */
+    public function get_subscriptions_table_columns() {
 
-		$columns = array(
-			'subscription'   => __( 'Subscription', 'invoicing' ),
-			'amount'         => __( 'Amount', 'invoicing' ),
-			'renewal-date'   => __( 'Next payment', 'invoicing' ),
-			'status'         => __( 'Status', 'invoicing' ),
-		);
+        $columns = array(
+            'subscription'   => __( 'Subscription', 'invoicing' ),
+            'amount'         => __( 'Amount', 'invoicing' ),
+            'renewal-date'   => __( 'Next payment', 'invoicing' ),
+            'status'         => __( 'Status', 'invoicing' ),
+        );
 
-		return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
-	}
+        return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
+    }
 
-	/**
-	 * Displays the table header.
-	 *
-	 */
-	public function print_table_header() {
+    /**
+     * Displays the table header.
+     *
+     */
+    public function print_table_header() {
 
-		?>
+        ?>
 
 			<table class="table table-bordered table-striped">
 
@@ -167,121 +167,121 @@  discard block
 block discarded – undo
 
 		<?php
 
-	}
+    }
 
-	/**
-	 * Displays the table body.
-	 *
-	 * @param WPInv_Subscription[] $subscriptions
-	 */
-	public function print_table_body( $subscriptions ) {
+    /**
+     * Displays the table body.
+     *
+     * @param WPInv_Subscription[] $subscriptions
+     */
+    public function print_table_body( $subscriptions ) {
 
-		if ( empty( $subscriptions ) ) {
-			$this->print_table_body_no_subscriptions();
-		} else {
-			$this->print_table_body_subscriptions( $subscriptions );
-		}
+        if ( empty( $subscriptions ) ) {
+            $this->print_table_body_no_subscriptions();
+        } else {
+            $this->print_table_body_subscriptions( $subscriptions );
+        }
 
-	}
+    }
 
-	/**
-	 * Displays the table body if no subscriptions were found.
-	 *
-	 */
-	public function print_table_body_no_subscriptions() {
+    /**
+     * Displays the table body if no subscriptions were found.
+     *
+     */
+    public function print_table_body_no_subscriptions() {
 
-		?>
+        ?>
 		<tbody>
 
 			<tr>
 				<td colspan="<?php echo count( $this->get_subscriptions_table_columns() ); ?>">
 
 					<?php
-						echo aui()->alert(
-							array(
-								'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
-								'type'    => 'warning',
-							)
-						);
-					?>
+                        echo aui()->alert(
+                            array(
+                                'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
+                                'type'    => 'warning',
+                            )
+                        );
+                    ?>
 
 				</td>
 			</tr>
 
 		</tbody>
 		<?php
-	}
+    }
 
-	/**
-	 * Displays the table body if subscriptions were found.
-	 *
-	 * @param WPInv_Subscription[] $subscriptions
-	 */
-	public function print_table_body_subscriptions( $subscriptions ) {
+    /**
+     * Displays the table body if subscriptions were found.
+     *
+     * @param WPInv_Subscription[] $subscriptions
+     */
+    public function print_table_body_subscriptions( $subscriptions ) {
 
-		?>
+        ?>
 		<tbody>
 
 			<?php foreach ( $subscriptions as $subscription ) : ?>
 				<tr class="getpaid-subscriptions-table-row subscription-<?php echo (int) $subscription->get_id(); ?>">
 					<?php
-						wpinv_get_template(
-							'subscriptions/subscriptions-table-row.php',
-							array(
-								'subscription' => $subscription,
-								'widget'       => $this
-							)
-						);
-					?>
+                        wpinv_get_template(
+                            'subscriptions/subscriptions-table-row.php',
+                            array(
+                                'subscription' => $subscription,
+                                'widget'       => $this
+                            )
+                        );
+                    ?>
 				</tr>
 			<?php endforeach; ?>
 
 		</tbody>
 		<?php
-	}
-
-	/**
-	 * Adds row actions to a column
-	 *
-	 * @param string $content column content
-	 * @param WPInv_Subscription $subscription
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	public function add_row_actions( $content, $subscription ) {
-
-		// Prepare row actions.
-		$actions = array();
-
-		// View subscription action.
-		$view_url        = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
-		$view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
-		$actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
-
-		// Filter the actions.
-		$actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
-
-		$sanitized  = array();
-		foreach ( $actions as $key => $action ) {
-			$key         = sanitize_html_class( $key );
-			$action      = wp_kses_post( $action );
-			$sanitized[] = "<span class='$key'>$action</span>";
-		}
-
-		$row_actions  = "<small class='form-text getpaid-subscription-item-actions'>";
-		$row_actions .= implode( ' | ', $sanitized );
-		$row_actions .= '</small>';
-
-		return $content . $row_actions;
-	}
-
-	/**
-	 * Displays the table footer.
-	 *
-	 */
-	public function print_table_footer() {
-
-		?>
+    }
+
+    /**
+     * Adds row actions to a column
+     *
+     * @param string $content column content
+     * @param WPInv_Subscription $subscription
+     * @since       1.0.0
+     * @return      string
+     */
+    public function add_row_actions( $content, $subscription ) {
+
+        // Prepare row actions.
+        $actions = array();
+
+        // View subscription action.
+        $view_url        = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
+        $view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
+        $actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
+
+        // Filter the actions.
+        $actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
+
+        $sanitized  = array();
+        foreach ( $actions as $key => $action ) {
+            $key         = sanitize_html_class( $key );
+            $action      = wp_kses_post( $action );
+            $sanitized[] = "<span class='$key'>$action</span>";
+        }
+
+        $row_actions  = "<small class='form-text getpaid-subscription-item-actions'>";
+        $row_actions .= implode( ' | ', $sanitized );
+        $row_actions .= '</small>';
+
+        return $content . $row_actions;
+    }
+
+    /**
+     * Displays the table footer.
+     *
+     */
+    public function print_table_footer() {
+
+        ?>
 
 				<tfoot>
 					<tr>
@@ -296,143 +296,143 @@  discard block
 block discarded – undo
 			</table>
 		<?php
 
-	}
+    }
 
-	/**
-	 * Displays the navigation.
-	 *
-	 * @param int $total
-	 */
-	public function print_navigation( $total ) {
+    /**
+     * Displays the navigation.
+     *
+     * @param int $total
+     */
+    public function print_navigation( $total ) {
 
-		if ( $total < 1 ) {
+        if ( $total < 1 ) {
 
-			// Out-of-bounds, run the query again without LIMIT for total count.
-			$args  = array(
-				'customer_in' => get_current_user_id(),
-				'fields'      => 'id',
-			);
+            // Out-of-bounds, run the query again without LIMIT for total count.
+            $args  = array(
+                'customer_in' => get_current_user_id(),
+                'fields'      => 'id',
+            );
 
-			$count_query = new GetPaid_Subscriptions_Query( $args );
-			$total       = $count_query->get_total();
-		}
+            $count_query = new GetPaid_Subscriptions_Query( $args );
+            $total       = $count_query->get_total();
+        }
 
-		// Abort if we do not have pages.
-		if ( 2 > $total ) {
-			return;
-		}
+        // Abort if we do not have pages.
+        if ( 2 > $total ) {
+            return;
+        }
 
-		?>
+        ?>
 
 		<div class="getpaid-subscriptions-pagination">
 			<?php
-				$big = 999999;
-
-				echo getpaid_paginate_links(
-					array(
-						'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
-						'format'  => '?paged=%#%',
-						'total'   => (int) ceil( $total / 10 ),
-					)
-				);
-			?>
+                $big = 999999;
+
+                echo getpaid_paginate_links(
+                    array(
+                        'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+                        'format'  => '?paged=%#%',
+                        'total'   => (int) ceil( $total / 10 ),
+                    )
+                );
+            ?>
 		</div>
 
 		<?php
-	}
-
-	/**
-	 * Returns a single subscription's columns.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 *
-	 * @return array
-	 */
-	public function get_single_subscription_columns( $subscription ) {
-
-		// Prepare subscription detail columns.
-		$subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
-		$items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
-		$fields             = apply_filters(
-			'getpaid_single_subscription_details_fields',
-			array(
-				'status'           => __( 'Status', 'invoicing' ),
-				'initial_amount'   => __( 'Initial amount', 'invoicing' ),
-				'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
-				'start_date'       => __( 'Start date', 'invoicing' ),
-				'expiry_date'      => __( 'Next payment', 'invoicing' ),
-				'payments'         => __( 'Payments', 'invoicing' ),
-				'item'             => _n( 'Item', 'Items', $items_count, 'invoicing' ),
-			),
-			$subscription
-		);
-
-		if ( isset( $fields['expiry_date'] ) ) {
-
-			if ( ! $subscription->is_active() || $subscription->is_last_renewal() ) {
-				$fields['expiry_date'] = __( 'End date', 'invoicing' );
-			}
-
-			if ( 'pending' == $subscription->get_status() ) {
-				unset( $fields['expiry_date'] );
-			}
-
-		}
-
-		if ( isset( $fields['start_date'] ) && 'pending' == $subscription->get_status() ) {
-			unset( $fields['start_date'] );
-		}
-
-		if ( $subscription->get_initial_amount() == $subscription->get_recurring_amount() ) {
-			unset( $fields['initial_amount'] );
-		}
-
-		return $fields;
-	}
-
-	/**
-	 * Displays a single subscription.
-	 *
-	 * @param string $subscription
-	 *
-	 * @return string
-	 */
-	public function display_single_subscription( $subscription ) {
-
-		// Fetch the subscription.
-		$subscription = new WPInv_Subscription( (int) $subscription );
-
-		if ( ! $subscription->exists() ) {
-
-			return aui()->alert(
-				array(
-					'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
-					'type'    => 'error',
-				)
-			);
-
-		}
-
-		// Ensure that the user owns this subscription key.
-		if ( get_current_user_id() != $subscription->get_customer_id() && ! wpinv_current_user_can_manage_invoicing() ) {
-
-			return aui()->alert(
-				array(
-					'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
-					'type'    => 'error',
-				)
-			);
-
-		}
-
-		return wpinv_get_template_html(
-			'subscriptions/subscription-details.php',
-			array(
-				'subscription' => $subscription,
-				'widget'       => $this
-			)
-		);
-
-	}
+    }
+
+    /**
+     * Returns a single subscription's columns.
+     *
+     * @param WPInv_Subscription $subscription
+     *
+     * @return array
+     */
+    public function get_single_subscription_columns( $subscription ) {
+
+        // Prepare subscription detail columns.
+        $subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
+        $items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
+        $fields             = apply_filters(
+            'getpaid_single_subscription_details_fields',
+            array(
+                'status'           => __( 'Status', 'invoicing' ),
+                'initial_amount'   => __( 'Initial amount', 'invoicing' ),
+                'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
+                'start_date'       => __( 'Start date', 'invoicing' ),
+                'expiry_date'      => __( 'Next payment', 'invoicing' ),
+                'payments'         => __( 'Payments', 'invoicing' ),
+                'item'             => _n( 'Item', 'Items', $items_count, 'invoicing' ),
+            ),
+            $subscription
+        );
+
+        if ( isset( $fields['expiry_date'] ) ) {
+
+            if ( ! $subscription->is_active() || $subscription->is_last_renewal() ) {
+                $fields['expiry_date'] = __( 'End date', 'invoicing' );
+            }
+
+            if ( 'pending' == $subscription->get_status() ) {
+                unset( $fields['expiry_date'] );
+            }
+
+        }
+
+        if ( isset( $fields['start_date'] ) && 'pending' == $subscription->get_status() ) {
+            unset( $fields['start_date'] );
+        }
+
+        if ( $subscription->get_initial_amount() == $subscription->get_recurring_amount() ) {
+            unset( $fields['initial_amount'] );
+        }
+
+        return $fields;
+    }
+
+    /**
+     * Displays a single subscription.
+     *
+     * @param string $subscription
+     *
+     * @return string
+     */
+    public function display_single_subscription( $subscription ) {
+
+        // Fetch the subscription.
+        $subscription = new WPInv_Subscription( (int) $subscription );
+
+        if ( ! $subscription->exists() ) {
+
+            return aui()->alert(
+                array(
+                    'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
+                    'type'    => 'error',
+                )
+            );
+
+        }
+
+        // Ensure that the user owns this subscription key.
+        if ( get_current_user_id() != $subscription->get_customer_id() && ! wpinv_current_user_can_manage_invoicing() ) {
+
+            return aui()->alert(
+                array(
+                    'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
+                    'type'    => 'error',
+                )
+            );
+
+        }
+
+        return wpinv_get_template_html(
+            'subscriptions/subscription-details.php',
+            array(
+                'subscription' => $subscription,
+                'widget'       => $this
+            )
+        );
+
+    }
 
 }

Please login to merge, or discard this patch.

Spacing +79 added lines, -79 removed lines patch added patch discarded remove patch

@@ -5,7 +5,7 @@  discard block
 block discarded – undo
  * @version 1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Contains the subscriptions widget.
@@ -27,15 +27,15 @@  discard block
 block discarded – undo
 			'block-keywords'=> "['invoicing','subscriptions', 'getpaid']",
 			'class_name'     => __CLASS__,
 			'base_id'       => 'wpinv_subscriptions',
-			'name'          => __( 'GetPaid > Subscriptions', 'invoicing' ),
+			'name'          => __('GetPaid > Subscriptions', 'invoicing'),
 			'widget_ops'    => array(
 				'classname'   => 'getpaid-subscriptions bsui',
-				'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
+				'description' => esc_html__("Displays the current user's subscriptions.", 'invoicing'),
 			),
 			'arguments'     => array(
 				'title'  => array(
-					'title'       => __( 'Widget title', 'invoicing' ),
-					'desc'        => __( 'Enter widget title.', 'invoicing' ),
+					'title'       => __('Widget title', 'invoicing'),
+					'desc'        => __('Enter widget title.', 'invoicing'),
 					'type'        => 'text',
 					'desc_tip'    => true,
 					'default'     => '',
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
 		);
 
 
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 
 	/**
@@ -57,12 +57,12 @@  discard block
 block discarded – undo
 	public function get_subscriptions() {
 
 		// Prepare license args.
-		$args  = array(
+		$args = array(
 			'customer_in' => get_current_user_id(),
-			'paged'       => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
+			'paged'       => (get_query_var('paged')) ? absint(get_query_var('paged')) : 1,
 		);
 
-		return new GetPaid_Subscriptions_Query( $args );
+		return new GetPaid_Subscriptions_Query($args);
 
 	}
 
@@ -75,14 +75,14 @@  discard block
 block discarded – undo
 	 *
 	 * @return mixed|string|bool
 	 */
-	public function output( $args = array(), $widget_args = array(), $content = '' ) {
+	public function output($args = array(), $widget_args = array(), $content = '') {
 
 		// Ensure that the user is logged in.
-		if ( ! is_user_logged_in() ) {
+		if (!is_user_logged_in()) {
 
 			return aui()->alert(
 				array(
-					'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
+					'content' => wp_kses_post(__('You need to log-in or create an account to view this section.', 'invoicing')),
 					'type'    => 'error',
 				)
 			);
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
 		}
 
 		// Are we displaying a single subscription?
-		if ( isset( $_GET['subscription'] ) ) {
-			return $this->display_single_subscription( intval( $_GET['subscription'] ) );
+		if (isset($_GET['subscription'])) {
+			return $this->display_single_subscription(intval($_GET['subscription']));
 		}
 
 		// Retrieve the user's subscriptions.
@@ -101,27 +101,27 @@  discard block
 block discarded – undo
 		ob_start();
 
 		// Backwards compatibility.
-		do_action( 'wpinv_before_user_subscriptions' );
+		do_action('wpinv_before_user_subscriptions');
 
 		// Display errors and notices.
 		wpinv_print_errors();
 
-		do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
+		do_action('getpaid_license_manager_before_subscriptions', $subscriptions);
 
 		// Print the table header.
 		$this->print_table_header();
 
 		// Print table body.
-		$this->print_table_body( $subscriptions->get_results() );
+		$this->print_table_body($subscriptions->get_results());
 
 		// Print table footer.
 		$this->print_table_footer();
 
 		// Print the navigation.
-		$this->print_navigation( $subscriptions->get_total() );
+		$this->print_navigation($subscriptions->get_total());
 
 		// Backwards compatibility.
-		do_action( 'wpinv_after_user_subscriptions' );
+		do_action('wpinv_after_user_subscriptions');
 
 		// Return the output.
 		return ob_get_clean();
@@ -136,13 +136,13 @@  discard block
 block discarded – undo
 	public function get_subscriptions_table_columns() {
 
 		$columns = array(
-			'subscription'   => __( 'Subscription', 'invoicing' ),
-			'amount'         => __( 'Amount', 'invoicing' ),
-			'renewal-date'   => __( 'Next payment', 'invoicing' ),
-			'status'         => __( 'Status', 'invoicing' ),
+			'subscription'   => __('Subscription', 'invoicing'),
+			'amount'         => __('Amount', 'invoicing'),
+			'renewal-date'   => __('Next payment', 'invoicing'),
+			'status'         => __('Status', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
+		return apply_filters('getpaid_frontend_subscriptions_table_columns', $columns);
 	}
 
 	/**
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
 
 				<thead>
 					<tr>
-						<?php foreach ( $this->get_subscriptions_table_columns() as $key => $label ) : ?>
-							<th scope="col" class="font-weight-bold getpaid-subscriptions-table-<?php echo sanitize_html_class( $key ); ?>">
-								<?php echo sanitize_text_field( $label ); ?>
+						<?php foreach ($this->get_subscriptions_table_columns() as $key => $label) : ?>
+							<th scope="col" class="font-weight-bold getpaid-subscriptions-table-<?php echo sanitize_html_class($key); ?>">
+								<?php echo sanitize_text_field($label); ?>
 							</th>
 						<?php endforeach; ?>
 					</tr>
@@ -174,12 +174,12 @@  discard block
 block discarded – undo
 	 *
 	 * @param WPInv_Subscription[] $subscriptions
 	 */
-	public function print_table_body( $subscriptions ) {
+	public function print_table_body($subscriptions) {
 
-		if ( empty( $subscriptions ) ) {
+		if (empty($subscriptions)) {
 			$this->print_table_body_no_subscriptions();
 		} else {
-			$this->print_table_body_subscriptions( $subscriptions );
+			$this->print_table_body_subscriptions($subscriptions);
 		}
 
 	}
@@ -194,12 +194,12 @@  discard block
 block discarded – undo
 		<tbody>
 
 			<tr>
-				<td colspan="<?php echo count( $this->get_subscriptions_table_columns() ); ?>">
+				<td colspan="<?php echo count($this->get_subscriptions_table_columns()); ?>">
 
 					<?php
 						echo aui()->alert(
 							array(
-								'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
+								'content' => wp_kses_post(__('No subscriptions found.', 'invoicing')),
 								'type'    => 'warning',
 							)
 						);
@@ -217,12 +217,12 @@  discard block
 block discarded – undo
 	 *
 	 * @param WPInv_Subscription[] $subscriptions
 	 */
-	public function print_table_body_subscriptions( $subscriptions ) {
+	public function print_table_body_subscriptions($subscriptions) {
 
 		?>
 		<tbody>
 
-			<?php foreach ( $subscriptions as $subscription ) : ?>
+			<?php foreach ($subscriptions as $subscription) : ?>
 				<tr class="getpaid-subscriptions-table-row subscription-<?php echo (int) $subscription->get_id(); ?>">
 					<?php
 						wpinv_get_template(
@@ -248,28 +248,28 @@  discard block
 block discarded – undo
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function add_row_actions( $content, $subscription ) {
+	public function add_row_actions($content, $subscription) {
 
 		// Prepare row actions.
 		$actions = array();
 
 		// View subscription action.
-		$view_url        = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
-		$view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
-		$actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
+		$view_url        = getpaid_get_tab_url('gp-subscriptions', get_permalink((int) wpinv_get_option('invoice_subscription_page')));
+		$view_url        = esc_url(add_query_arg('subscription', (int) $subscription->get_id(), $view_url));
+		$actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __('Manage Subscription', 'invoicing') . '</a>';
 
 		// Filter the actions.
-		$actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
+		$actions = apply_filters('getpaid_subscriptions_table_subscription_actions', $actions, $subscription);
 
-		$sanitized  = array();
-		foreach ( $actions as $key => $action ) {
-			$key         = sanitize_html_class( $key );
-			$action      = wp_kses_post( $action );
+		$sanitized = array();
+		foreach ($actions as $key => $action) {
+			$key         = sanitize_html_class($key);
+			$action      = wp_kses_post($action);
 			$sanitized[] = "<span class='$key'>$action</span>";
 		}
 
 		$row_actions  = "<small class='form-text getpaid-subscription-item-actions'>";
-		$row_actions .= implode( ' | ', $sanitized );
+		$row_actions .= implode(' | ', $sanitized);
 		$row_actions .= '</small>';
 
 		return $content . $row_actions;
@@ -285,9 +285,9 @@  discard block
 block discarded – undo
 
 				<tfoot>
 					<tr>
-						<?php foreach ( $this->get_subscriptions_table_columns() as $key => $label ) : ?>
-							<th class="font-weight-bold getpaid-subscriptions-<?php echo sanitize_html_class( $key ); ?>">
-								<?php echo sanitize_text_field( $label ); ?>
+						<?php foreach ($this->get_subscriptions_table_columns() as $key => $label) : ?>
+							<th class="font-weight-bold getpaid-subscriptions-<?php echo sanitize_html_class($key); ?>">
+								<?php echo sanitize_text_field($label); ?>
 							</th>
 						<?php endforeach; ?>
 					</tr>
@@ -303,22 +303,22 @@  discard block
 block discarded – undo
 	 *
 	 * @param int $total
 	 */
-	public function print_navigation( $total ) {
+	public function print_navigation($total) {
 
-		if ( $total < 1 ) {
+		if ($total < 1) {
 
 			// Out-of-bounds, run the query again without LIMIT for total count.
-			$args  = array(
+			$args = array(
 				'customer_in' => get_current_user_id(),
 				'fields'      => 'id',
 			);
 
-			$count_query = new GetPaid_Subscriptions_Query( $args );
+			$count_query = new GetPaid_Subscriptions_Query($args);
 			$total       = $count_query->get_total();
 		}
 
 		// Abort if we do not have pages.
-		if ( 2 > $total ) {
+		if (2 > $total) {
 			return;
 		}
 
@@ -330,9 +330,9 @@  discard block
 block discarded – undo
 
 				echo getpaid_paginate_links(
 					array(
-						'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+						'base'    => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 						'format'  => '?paged=%#%',
-						'total'   => (int) ceil( $total / 10 ),
+						'total'   => (int) ceil($total / 10),
 					)
 				);
 			?>
@@ -348,43 +348,43 @@  discard block
 block discarded – undo
 	 *
 	 * @return array
 	 */
-	public function get_single_subscription_columns( $subscription ) {
+	public function get_single_subscription_columns($subscription) {
 
 		// Prepare subscription detail columns.
-		$subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
-		$items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
+		$subscription_group = getpaid_get_invoice_subscription_group($subscription->get_parent_invoice_id(), $subscription->get_id());
+		$items_count        = empty($subscription_group) ? 1 : count($subscription_group['items']);
 		$fields             = apply_filters(
 			'getpaid_single_subscription_details_fields',
 			array(
-				'status'           => __( 'Status', 'invoicing' ),
-				'initial_amount'   => __( 'Initial amount', 'invoicing' ),
-				'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
-				'start_date'       => __( 'Start date', 'invoicing' ),
-				'expiry_date'      => __( 'Next payment', 'invoicing' ),
-				'payments'         => __( 'Payments', 'invoicing' ),
-				'item'             => _n( 'Item', 'Items', $items_count, 'invoicing' ),
+				'status'           => __('Status', 'invoicing'),
+				'initial_amount'   => __('Initial amount', 'invoicing'),
+				'recurring_amount' => __('Recurring amount', 'invoicing'),
+				'start_date'       => __('Start date', 'invoicing'),
+				'expiry_date'      => __('Next payment', 'invoicing'),
+				'payments'         => __('Payments', 'invoicing'),
+				'item'             => _n('Item', 'Items', $items_count, 'invoicing'),
 			),
 			$subscription
 		);
 
-		if ( isset( $fields['expiry_date'] ) ) {
+		if (isset($fields['expiry_date'])) {
 
-			if ( ! $subscription->is_active() || $subscription->is_last_renewal() ) {
-				$fields['expiry_date'] = __( 'End date', 'invoicing' );
+			if (!$subscription->is_active() || $subscription->is_last_renewal()) {
+				$fields['expiry_date'] = __('End date', 'invoicing');
 			}
 
-			if ( 'pending' == $subscription->get_status() ) {
-				unset( $fields['expiry_date'] );
+			if ('pending' == $subscription->get_status()) {
+				unset($fields['expiry_date']);
 			}
 
 		}
 
-		if ( isset( $fields['start_date'] ) && 'pending' == $subscription->get_status() ) {
-			unset( $fields['start_date'] );
+		if (isset($fields['start_date']) && 'pending' == $subscription->get_status()) {
+			unset($fields['start_date']);
 		}
 
-		if ( $subscription->get_initial_amount() == $subscription->get_recurring_amount() ) {
-			unset( $fields['initial_amount'] );
+		if ($subscription->get_initial_amount() == $subscription->get_recurring_amount()) {
+			unset($fields['initial_amount']);
 		}
 
 		return $fields;
@@ -397,16 +397,16 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function display_single_subscription( $subscription ) {
+	public function display_single_subscription($subscription) {
 
 		// Fetch the subscription.
-		$subscription = new WPInv_Subscription( (int) $subscription );
+		$subscription = new WPInv_Subscription((int) $subscription);
 
-		if ( ! $subscription->exists() ) {
+		if (!$subscription->exists()) {
 
 			return aui()->alert(
 				array(
-					'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
+					'content' => wp_kses_post(__('Subscription not found.', 'invoicing')),
 					'type'    => 'error',
 				)
 			);
@@ -414,11 +414,11 @@  discard block
 block discarded – undo
 		}
 
 		// Ensure that the user owns this subscription key.
-		if ( get_current_user_id() != $subscription->get_customer_id() && ! wpinv_current_user_can_manage_invoicing() ) {
+		if (get_current_user_id() != $subscription->get_customer_id() && !wpinv_current_user_can_manage_invoicing()) {
 
 			return aui()->alert(
 				array(
-					'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
+					'content' => wp_kses_post(__('You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing')),
 					'type'    => 'error',
 				)
 			);

Please login to merge, or discard this patch.

includes/error-functions.php 1 patch

Spacing +39 added lines, -39 removed lines patch added patch discarded remove patch

@@ -6,7 +6,7 @@  discard block
 block discarded – undo
  * @package Invoicing
  */
  
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Returns the errors as html
@@ -15,36 +15,36 @@  discard block
 block discarded – undo
  * @param bool $wrap whether or not to wrap the errors.
  * @since  1.0.19
  */
-function getpaid_get_errors_html( $clear = true, $wrap = true ) {
+function getpaid_get_errors_html($clear = true, $wrap = true) {
 
     $errors = '';
-    foreach ( wpinv_get_errors() as $id => $error ) {
-        $type     = 'error';
+    foreach (wpinv_get_errors() as $id => $error) {
+        $type = 'error';
 
-        if ( is_array( $error ) ) {
+        if (is_array($error)) {
             $type  = $error['type'];
             $error = $error['text'];
         }
 
-        if ( $wrap ) {
+        if ($wrap) {
 
             $errors .= aui()->alert(
                 array(
-                    'content'     => wp_kses_post( $error ),
+                    'content'     => wp_kses_post($error),
                     'type'        => $type,
                 )
             );
 
         } else {
 
-            $id      = esc_attr( $id );
-            $error   = wp_kses_post( $error );
+            $id      = esc_attr($id);
+            $error   = wp_kses_post($error);
             $errors .= "<div data-code='$id'>$error</div>";
         }
 
     }
 
-    if ( $clear ){
+    if ($clear) {
         wpinv_clear_errors();
     }
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
  * Prints (then clears) all available errors.
  */
 function wpinv_print_errors() {
-    echo wp_kses_post( getpaid_get_errors_html() );
+    echo wp_kses_post(getpaid_get_errors_html());
 }
 
 /**
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_errors() {
-    $errors = getpaid_session()->get( 'wpinv_errors' );
-    return is_array( $errors ) ? $errors : array();
+    $errors = getpaid_session()->get('wpinv_errors');
+    return is_array($errors) ? $errors : array();
 }
 
 /**
@@ -76,15 +76,15 @@  discard block
 block discarded – undo
  * @param string $error_message The error message.
  * @param string $type Either error, info, warning, primary, dark, light or success.
  */
-function wpinv_set_error( $error_id, $error_message, $type = 'error' ) {
+function wpinv_set_error($error_id, $error_message, $type = 'error') {
 
     $errors              = wpinv_get_errors();
-    $errors[ $error_id ] = array(
+    $errors[$error_id] = array(
         'type' =>  $type,
         'text' =>  $error_message,
     );
 
-    getpaid_session()->set( 'wpinv_errors', $errors );
+    getpaid_session()->set('wpinv_errors', $errors);
 }
 
 /**
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
  * 
  */
 function wpinv_has_errors() {
-    return count( wpinv_get_errors() ) > 0;
+    return count(wpinv_get_errors()) > 0;
 }
 
 /**
@@ -100,21 +100,21 @@  discard block
 block discarded – undo
  * 
  */
 function wpinv_clear_errors() {
-    getpaid_session()->set( 'wpinv_errors', null );
+    getpaid_session()->set('wpinv_errors', null);
 }
 
 /**
  * Clears a single error.
  * 
  */
-function wpinv_unset_error( $error_id ) {
+function wpinv_unset_error($error_id) {
     $errors = wpinv_get_errors();
 
-    if ( isset( $errors[ $error_id ] ) ) {
-        unset( $errors[ $error_id ] );
+    if (isset($errors[$error_id])) {
+        unset($errors[$error_id]);
     }
 
-    getpaid_session()->set( 'wpinv_errors', $errors );
+    getpaid_session()->set('wpinv_errors', $errors);
 }
 
 /**
@@ -125,15 +125,15 @@  discard block
 block discarded – undo
  * @param string $message Message to log.
  * @param string $version Version the message was added in.
  */
-function getpaid_doing_it_wrong( $function, $message, $version ) {
+function getpaid_doing_it_wrong($function, $message, $version) {
 
 	$message .= ' Backtrace: ' . wp_debug_backtrace_summary();
 
-	if ( wp_doing_ajax() || defined( 'REST_REQUEST' ) ) {
-		do_action( 'doing_it_wrong_run', $function, $message, $version );
-		error_log( "{$function} was called incorrectly. {$message}. This message was added in version {$version}." );
+	if (wp_doing_ajax() || defined('REST_REQUEST')) {
+		do_action('doing_it_wrong_run', $function, $message, $version);
+		error_log("{$function} was called incorrectly. {$message}. This message was added in version {$version}.");
 	} else {
-		_doing_it_wrong( $function, $message, $version );
+		_doing_it_wrong($function, $message, $version);
 	}
 
 }
@@ -147,42 +147,42 @@  discard block
 block discarded – undo
  * @param string $line The line that contains the error.
  * @param bool $exit Whether or not to exit function execution.
  */
-function wpinv_error_log( $log, $title = '', $file = '', $line = '', $exit = false ) {
+function wpinv_error_log($log, $title = '', $file = '', $line = '', $exit = false) {
     
-    if ( true === apply_filters( 'wpinv_log_errors', true ) ) {
+    if (true === apply_filters('wpinv_log_errors', true)) {
 
         // Ensure the log is a scalar.
-        if ( ! is_scalar( $log ) ) {
-            $log = print_r( $log, true );
+        if (!is_scalar($log)) {
+            $log = print_r($log, true);
         }
 
         // Add title.
-        if ( ! empty( $title ) ) {
-            $log  = $title . ' ' . trim( $log );
+        if (!empty($title)) {
+            $log = $title . ' ' . trim($log);
         }
 
         // Add the file to the label.
-        if ( ! empty( $file ) ) {
+        if (!empty($file)) {
             $log .= ' in ' . $file;
         }
 
         // Add the line number to the label.
-        if ( ! empty( $line ) ) {
+        if (!empty($line)) {
             $log .= ' on line ' . $line;
         }
 
         // Log the message.
-        error_log( trim ( $log ) );
+        error_log(trim($log));
 
         // ... and a backtrace.
-        if ( false !== $title && false !== $file ) {
-            error_log( 'Backtrace ' . wp_debug_backtrace_summary() );
+        if (false !== $title && false !== $file) {
+            error_log('Backtrace ' . wp_debug_backtrace_summary());
         }
 
     }
 
     // Maybe exit.
-    if ( $exit ) {
+    if ($exit) {
         exit;
     }
 

Please login to merge, or discard this patch.

includes/reports/class-getpaid-reports-report.php 2 patches

Indentation +180 added lines, -180 removed lines patch added patch discarded remove patch

@@ -12,88 +12,88 @@  discard block
 block discarded – undo
  */
 class GetPaid_Reports_Report {
 
-	/**
-	 * @var array
-	 */
-	public $views;
+    /**
+     * @var array
+     */
+    public $views;
 
-	/**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
+    /**
+     * Class constructor.
+     *
+     */
+    public function __construct() {
 
-		$this->views        = array(
+        $this->views        = array(
 
             'items'     => array(
-				'label' => __( 'Items', 'invoicing' ),
-				'class' => 'GetPaid_Reports_Report_Items',
-			),
+                'label' => __( 'Items', 'invoicing' ),
+                'class' => 'GetPaid_Reports_Report_Items',
+            ),
 
-			'gateways'  => array(
-				'label' => __( 'Payment Methods', 'invoicing' ),
-				'class' => 'GetPaid_Reports_Report_Gateways',
-			),
+            'gateways'  => array(
+                'label' => __( 'Payment Methods', 'invoicing' ),
+                'class' => 'GetPaid_Reports_Report_Gateways',
+            ),
 
-			'discounts'  => array(
-				'label' => __( 'Discount Codes', 'invoicing' ),
-				'class' => 'GetPaid_Reports_Report_Discounts',
-			),
+            'discounts'  => array(
+                'label' => __( 'Discount Codes', 'invoicing' ),
+                'class' => 'GetPaid_Reports_Report_Discounts',
+            ),
 
         );
 
-		$this->views        = apply_filters( 'wpinv_report_views', $this->views );
-
-	}
-
-	/**
-	 * Retrieves the current range.
-	 *
-	 */
-	public function get_range() {
-		$valid_ranges = $this->get_periods();
-
-		if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
-			return sanitize_key( $_GET['date_range'] );
-		}
-
-		return '7_days';
-	}
-
-	/**
-	 * Returns an array of date ranges.
-	 *
-	 * @return array
-	 */
-	public function get_periods() {
-
-		$periods = array(
-			'today'        => __( 'Today', 'invoicing' ),
-			'yesterday'    => __( 'Yesterday', 'invoicing' ),
-			'week'         => __( 'This week', 'invoicing' ),
-			'last_week'    => __( 'Last week', 'invoicing' ),
-			'7_days'       => __( 'Last 7 days', 'invoicing' ),
-			'month'        => __( 'This month', 'invoicing' ),
-			'last_month'   => __( 'Last month', 'invoicing' ),
-			'30_days'      => __( 'Last 30 days', 'invoicing' ),
-			'quarter'      => __( 'This Quarter', 'invoicing' ),
-			'last_quarter' => __( 'Last Quarter', 'invoicing' ),
-			'year'         => __( 'This year', 'invoicing' ),
-			'last_year'    => __( 'Last Year', 'invoicing' ),
-			'custom'       => __( 'Custom Date Range', 'invoicing' ),
-		);
-
-		return apply_filters( 'getpaid_earning_periods', $periods );
-	}
-
-	/**
-	 * Displays the range selector.
-	 *
-	 */
-	public function display_range_selector() {
-
-		$range = $this->get_range();
-		?>
+        $this->views        = apply_filters( 'wpinv_report_views', $this->views );
+
+    }
+
+    /**
+     * Retrieves the current range.
+     *
+     */
+    public function get_range() {
+        $valid_ranges = $this->get_periods();
+
+        if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
+            return sanitize_key( $_GET['date_range'] );
+        }
+
+        return '7_days';
+    }
+
+    /**
+     * Returns an array of date ranges.
+     *
+     * @return array
+     */
+    public function get_periods() {
+
+        $periods = array(
+            'today'        => __( 'Today', 'invoicing' ),
+            'yesterday'    => __( 'Yesterday', 'invoicing' ),
+            'week'         => __( 'This week', 'invoicing' ),
+            'last_week'    => __( 'Last week', 'invoicing' ),
+            '7_days'       => __( 'Last 7 days', 'invoicing' ),
+            'month'        => __( 'This month', 'invoicing' ),
+            'last_month'   => __( 'Last month', 'invoicing' ),
+            '30_days'      => __( 'Last 30 days', 'invoicing' ),
+            'quarter'      => __( 'This Quarter', 'invoicing' ),
+            'last_quarter' => __( 'Last Quarter', 'invoicing' ),
+            'year'         => __( 'This year', 'invoicing' ),
+            'last_year'    => __( 'Last Year', 'invoicing' ),
+            'custom'       => __( 'Custom Date Range', 'invoicing' ),
+        );
+
+        return apply_filters( 'getpaid_earning_periods', $periods );
+    }
+
+    /**
+     * Displays the range selector.
+     *
+     */
+    public function display_range_selector() {
+
+        $range = $this->get_range();
+        ?>
 
 			<form method="get" class="getpaid-filter-earnings float-right">
 				<?php getpaid_hidden_field( 'page', isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : 'wpinv-reports' );  ?>
@@ -115,14 +115,14 @@  discard block
 block discarded – undo
 			</form>
 
 		<?php
-	}
+    }
 
-	/**
-	 * Displays the reports tab.
-	 *
-	 */
-	public function display() {
-		?>
+    /**
+     * Displays the reports tab.
+     *
+     */
+    public function display() {
+        ?>
 
 		<div class="mt-4">
 
@@ -202,16 +202,16 @@  discard block
 block discarded – undo
 
 		<?php
 
-	}
+    }
 
-	/**
-	 * Displays the left side.
-	 *
-	 */
-	public function display_left() {
-		$graphs = wpinv_get_report_graphs();
+    /**
+     * Displays the left side.
+     *
+     */
+    public function display_left() {
+        $graphs = wpinv_get_report_graphs();
 
-		?>
+        ?>
 
 			<?php foreach ( $graphs as $key => $graph ) : ?>
 				<div class="row mb-4">
@@ -230,35 +230,35 @@  discard block
 block discarded – undo
 
 		<?php
 
-	}
-
-	/**
-	 * Retrieves the download url.
-	 *
-	 */
-	public function get_download_url( $graph, $file_type ) {
-
-		return wp_nonce_url(
-			add_query_arg(
-				array(
-					'getpaid-admin-action' => 'download_graph',
-					'file_type'            => urlencode( $file_type ),
-					'graph'                => urlencode( $graph ),
-				)
-			),
-			'getpaid-nonce',
-			'getpaid-nonce'
-		);
+    }
+
+    /**
+     * Retrieves the download url.
+     *
+     */
+    public function get_download_url( $graph, $file_type ) {
+
+        return wp_nonce_url(
+            add_query_arg(
+                array(
+                    'getpaid-admin-action' => 'download_graph',
+                    'file_type'            => urlencode( $file_type ),
+                    'graph'                => urlencode( $graph ),
+                )
+            ),
+            'getpaid-nonce',
+            'getpaid-nonce'
+        );
 
-	}
+    }
 
-	/**
-	 * Displays the right side.
-	 *
-	 */
-	public function display_right() {
+    /**
+     * Displays the right side.
+     *
+     */
+    public function display_right() {
 
-		?>
+        ?>
 
 			<?php foreach ( $this->views as $key => $view ) : ?>
 				<div class="row mb-4">
@@ -287,10 +287,10 @@  discard block
 block discarded – undo
 							</div>
 							<div class="card-body">
 								<?php
-									$class = $view['class'];
-									$class = new $class();
-									$class->display_stats();
-								?>
+                                    $class = $view['class'];
+                                    $class = new $class();
+                                    $class->display_stats();
+                                ?>
 							</div>
 						</div>
 					</div>
@@ -299,68 +299,68 @@  discard block
 block discarded – undo
 
 		<?php
 
-		do_action( 'getpaid_reports_display_right', $this );
-	}
-
-	/**
-	 * Returns a list of report cards.
-	 *
-	 */
-	public function get_cards() {
-
-		$cards = array(
-			'total_sales' => array(
-				'description' => __( 'Gross sales in the period.', 'invoicing' ),
-				'label'       => __( 'Gross Revenue', 'invoicing' ),
-			),
-			'net_sales' => array(
-				'description' => __( 'Net sales in the period.', 'invoicing' ),
-				'label'       => __( 'Net Revenue', 'invoicing' ),
-			),
-			'average_sales' => array(
-				'description' => __( 'Average net daily/monthly sales.', 'invoicing' ),
-				'label'       => __( 'Avg. Net Sales', 'invoicing' ),
-			),
-			'average_total_sales' => array(
-				'description' => __( 'Average gross daily/monthly sales.', 'invoicing' ),
-				'label'       => __( 'Avg. Gross Sales', 'invoicing' ),
-			),
-			'total_invoices'  => array(
-				'description' => __( 'Number of paid invoices.', 'invoicing' ),
-				'label'       => __( 'Paid Invoices', 'invoicing' ),
-			),
-			'total_items' => array(
-				'description' => __( 'Number of items purchased.', 'invoicing' ),
-				'label'       => __( 'Purchased Items', 'invoicing' ),
-			),
-			'refunded_items' => array(
-				'description' => __( 'Number of items refunded.', 'invoicing' ),
-				'label'       => __( 'Refunded Items', 'invoicing' ),
-			),
-			'total_tax' => array(
-				'description' => __( 'Total charged for taxes.', 'invoicing' ),
-				'label'       => __( 'Tax', 'invoicing' ),
-			),
-			'total_refunded_tax' => array(
-				'description' => __( 'Total refunded for taxes.', 'invoicing' ),
-				'label'       => __( 'Refunded Tax', 'invoicing' ),
-			),
-			'total_fees' => array(
-				'description' => __( 'Total fees charged.', 'invoicing' ),
-				'label'       => __( 'Fees', 'invoicing' ),
-			),
-			'total_refunds' => array(
-				'description' => __( 'Total of refunded invoices.', 'invoicing' ),
-				'label'       => __( 'Refunded', 'invoicing' ),
-			),
-			'total_discount'  => array(
-				'description' => __( 'Total of discounts used.', 'invoicing' ),
-				'label'       => __( 'Discounted', 'invoicing' ),
-			),
-		);
-
-		return apply_filters( 'wpinv_report_cards', $cards );
-	}
+        do_action( 'getpaid_reports_display_right', $this );
+    }
+
+    /**
+     * Returns a list of report cards.
+     *
+     */
+    public function get_cards() {
+
+        $cards = array(
+            'total_sales' => array(
+                'description' => __( 'Gross sales in the period.', 'invoicing' ),
+                'label'       => __( 'Gross Revenue', 'invoicing' ),
+            ),
+            'net_sales' => array(
+                'description' => __( 'Net sales in the period.', 'invoicing' ),
+                'label'       => __( 'Net Revenue', 'invoicing' ),
+            ),
+            'average_sales' => array(
+                'description' => __( 'Average net daily/monthly sales.', 'invoicing' ),
+                'label'       => __( 'Avg. Net Sales', 'invoicing' ),
+            ),
+            'average_total_sales' => array(
+                'description' => __( 'Average gross daily/monthly sales.', 'invoicing' ),
+                'label'       => __( 'Avg. Gross Sales', 'invoicing' ),
+            ),
+            'total_invoices'  => array(
+                'description' => __( 'Number of paid invoices.', 'invoicing' ),
+                'label'       => __( 'Paid Invoices', 'invoicing' ),
+            ),
+            'total_items' => array(
+                'description' => __( 'Number of items purchased.', 'invoicing' ),
+                'label'       => __( 'Purchased Items', 'invoicing' ),
+            ),
+            'refunded_items' => array(
+                'description' => __( 'Number of items refunded.', 'invoicing' ),
+                'label'       => __( 'Refunded Items', 'invoicing' ),
+            ),
+            'total_tax' => array(
+                'description' => __( 'Total charged for taxes.', 'invoicing' ),
+                'label'       => __( 'Tax', 'invoicing' ),
+            ),
+            'total_refunded_tax' => array(
+                'description' => __( 'Total refunded for taxes.', 'invoicing' ),
+                'label'       => __( 'Refunded Tax', 'invoicing' ),
+            ),
+            'total_fees' => array(
+                'description' => __( 'Total fees charged.', 'invoicing' ),
+                'label'       => __( 'Fees', 'invoicing' ),
+            ),
+            'total_refunds' => array(
+                'description' => __( 'Total of refunded invoices.', 'invoicing' ),
+                'label'       => __( 'Refunded', 'invoicing' ),
+            ),
+            'total_discount'  => array(
+                'description' => __( 'Total of discounts used.', 'invoicing' ),
+                'label'       => __( 'Discounted', 'invoicing' ),
+            ),
+        );
+
+        return apply_filters( 'wpinv_report_cards', $cards );
+    }
 
 	
 

Please login to merge, or discard this patch.

Spacing +77 added lines, -77 removed lines patch added patch discarded remove patch

@@ -5,7 +5,7 @@  discard block
 block discarded – undo
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report Class.
@@ -23,26 +23,26 @@  discard block
 block discarded – undo
 	 */
 	public function __construct() {
 
-		$this->views        = array(
+		$this->views = array(
 
             'items'     => array(
-				'label' => __( 'Items', 'invoicing' ),
+				'label' => __('Items', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Items',
 			),
 
 			'gateways'  => array(
-				'label' => __( 'Payment Methods', 'invoicing' ),
+				'label' => __('Payment Methods', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Gateways',
 			),
 
 			'discounts'  => array(
-				'label' => __( 'Discount Codes', 'invoicing' ),
+				'label' => __('Discount Codes', 'invoicing'),
 				'class' => 'GetPaid_Reports_Report_Discounts',
 			),
 
         );
 
-		$this->views        = apply_filters( 'wpinv_report_views', $this->views );
+		$this->views = apply_filters('wpinv_report_views', $this->views);
 
 	}
 
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
 	public function get_range() {
 		$valid_ranges = $this->get_periods();
 
-		if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
-			return sanitize_key( $_GET['date_range'] );
+		if (isset($_GET['date_range']) && array_key_exists($_GET['date_range'], $valid_ranges)) {
+			return sanitize_key($_GET['date_range']);
 		}
 
 		return '7_days';
@@ -68,22 +68,22 @@  discard block
 block discarded – undo
 	public function get_periods() {
 
 		$periods = array(
-			'today'        => __( 'Today', 'invoicing' ),
-			'yesterday'    => __( 'Yesterday', 'invoicing' ),
-			'week'         => __( 'This week', 'invoicing' ),
-			'last_week'    => __( 'Last week', 'invoicing' ),
-			'7_days'       => __( 'Last 7 days', 'invoicing' ),
-			'month'        => __( 'This month', 'invoicing' ),
-			'last_month'   => __( 'Last month', 'invoicing' ),
-			'30_days'      => __( 'Last 30 days', 'invoicing' ),
-			'quarter'      => __( 'This Quarter', 'invoicing' ),
-			'last_quarter' => __( 'Last Quarter', 'invoicing' ),
-			'year'         => __( 'This year', 'invoicing' ),
-			'last_year'    => __( 'Last Year', 'invoicing' ),
-			'custom'       => __( 'Custom Date Range', 'invoicing' ),
+			'today'        => __('Today', 'invoicing'),
+			'yesterday'    => __('Yesterday', 'invoicing'),
+			'week'         => __('This week', 'invoicing'),
+			'last_week'    => __('Last week', 'invoicing'),
+			'7_days'       => __('Last 7 days', 'invoicing'),
+			'month'        => __('This month', 'invoicing'),
+			'last_month'   => __('Last month', 'invoicing'),
+			'30_days'      => __('Last 30 days', 'invoicing'),
+			'quarter'      => __('This Quarter', 'invoicing'),
+			'last_quarter' => __('Last Quarter', 'invoicing'),
+			'year'         => __('This year', 'invoicing'),
+			'last_year'    => __('Last Year', 'invoicing'),
+			'custom'       => __('Custom Date Range', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_earning_periods', $periods );
+		return apply_filters('getpaid_earning_periods', $periods);
 	}
 
 	/**
@@ -96,21 +96,21 @@  discard block
 block discarded – undo
 		?>
 
 			<form method="get" class="getpaid-filter-earnings float-right">
-				<?php getpaid_hidden_field( 'page', isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : 'wpinv-reports' );  ?>
-				<?php getpaid_hidden_field( 'tab', 'reports' );  ?>
+				<?php getpaid_hidden_field('page', isset($_GET['page']) ? sanitize_text_field($_GET['page']) : 'wpinv-reports'); ?>
+				<?php getpaid_hidden_field('tab', 'reports'); ?>
 				<select name='date_range'>
-					<?php foreach( $this->get_periods() as $key => $label ) :?>
-						<option value="<?php echo sanitize_key( $key ); ?>" <?php selected( $key, $range ); ?>><?php echo sanitize_text_field( $label ); ?></option>
-					<?php endforeach;?>
+					<?php foreach ($this->get_periods() as $key => $label) :?>
+						<option value="<?php echo sanitize_key($key); ?>" <?php selected($key, $range); ?>><?php echo sanitize_text_field($label); ?></option>
+					<?php endforeach; ?>
 				</select>
 				<span class="getpaid-date-range-picker <?php echo 'custom' == $range ? '' : 'd-none'; ?>">
 					<input type="text" name="from" class="getpaid-from align-middle" />
-						<?php _e( 'to', 'invoicing' ); ?>
+						<?php _e('to', 'invoicing'); ?>
 					<input type="text" name="to" class="getpaid-to align-middle" />
 				</span>
 				<button type="submit" class="button button-primary">
 					<i class="fa fa-chevron-right fa-lg"></i>
-					<span class="screen-reader-text"><?php _e( 'View Reports', 'invoicing' ); ?></span>
+					<span class="screen-reader-text"><?php _e('View Reports', 'invoicing'); ?></span>
 				</button>
 			</form>
 
@@ -159,17 +159,17 @@  discard block
 block discarded – undo
 
 				<div class="col-12 col-md-4">
 					<div class="row getpaid-report-cards">
-						<?php foreach( $this->get_cards() as $key => $card ) : ?>
+						<?php foreach ($this->get_cards() as $key => $card) : ?>
 							<div class="col-12 mb-4">
 
-								<!-- <?php echo sanitize_text_field(  $card['label']  ); ?> Card -->
-								<div class="card p-0 m-0 shadow-none <?php echo sanitize_html_class( $key ); ?>">
+								<!-- <?php echo sanitize_text_field($card['label']); ?> Card -->
+								<div class="card p-0 m-0 shadow-none <?php echo sanitize_html_class($key); ?>">
 
 									<div class="card-body">
 
 										<p class="getpaid-current text-uppercase small mb-2">
-											<strong><?php echo sanitize_text_field( $card['label']  ); ?></strong>
-											<span title="<?php echo esc_attr( $card['description'] ); ?>" class="wpi-help-tip dashicons dashicons-editor-help text-muted" style="margin-top: -2px;"></span>
+											<strong><?php echo sanitize_text_field($card['label']); ?></strong>
+											<span title="<?php echo esc_attr($card['description']); ?>" class="wpi-help-tip dashicons dashicons-editor-help text-muted" style="margin-top: -2px;"></span>
 										</p>
 										<h5 class="font-weight-bold mb-0">
 											<span class="getpaid-report-card-value">
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
 
 										<hr>
 
-										<p class="getpaid-previous text-uppercase text-muted small mb-2"><strong><?php _e( 'Previous Period', 'invoicing' ); ?></strong></p>
+										<p class="getpaid-previous text-uppercase text-muted small mb-2"><strong><?php _e('Previous Period', 'invoicing'); ?></strong></p>
 										<h5 class="getpaid-report-card-previous-value font-weight-bold text-muted mb-0">
 											<span class="spinner is-active float-none"></span>
 										</h5>
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
 									</div>
 
 								</div>
-								<!-- <?php echo sanitize_text_field( $card['label'] ); ?> Card -->
+								<!-- <?php echo sanitize_text_field($card['label']); ?> Card -->
 
 							</div>
 						<?php endforeach; ?>
@@ -213,15 +213,15 @@  discard block
 block discarded – undo
 
 		?>
 
-			<?php foreach ( $graphs as $key => $graph ) : ?>
+			<?php foreach ($graphs as $key => $graph) : ?>
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card m-0 p-0 single-report-card" style="max-width:100%">
 							<div class="card-header">
-								<strong><?php echo wpinv_clean( $graph ); ?></strong>
+								<strong><?php echo wpinv_clean($graph); ?></strong>
 							</div>
 							<div class="card-body">
-								<canvas id="getpaid-chartjs-<?php echo sanitize_key( $key ); ?>"></canvas>
+								<canvas id="getpaid-chartjs-<?php echo sanitize_key($key); ?>"></canvas>
 							</div>
 						</div>
 					</div>
@@ -236,14 +236,14 @@  discard block
 block discarded – undo
 	 * Retrieves the download url.
 	 *
 	 */
-	public function get_download_url( $graph, $file_type ) {
+	public function get_download_url($graph, $file_type) {
 
 		return wp_nonce_url(
 			add_query_arg(
 				array(
 					'getpaid-admin-action' => 'download_graph',
-					'file_type'            => urlencode( $file_type ),
-					'graph'                => urlencode( $graph ),
+					'file_type'            => urlencode($file_type),
+					'graph'                => urlencode($graph),
 				)
 			),
 			'getpaid-nonce',
@@ -260,27 +260,27 @@  discard block
 block discarded – undo
 
 		?>
 
-			<?php foreach ( $this->views as $key => $view ) : ?>
+			<?php foreach ($this->views as $key => $view) : ?>
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card m-0 p-0" style="max-width:100%">
 							<div class="card-header">
 								<div class="row">
-									<div class="<?php echo empty( $view['disable-downloads'] ) ? 'col-9' : 'col-12'; ?>">
+									<div class="<?php echo empty($view['disable-downloads']) ? 'col-9' : 'col-12'; ?>">
 										<strong><?php echo $view['label']; ?></strong>
 									</div>
-									<div class="<?php echo empty( $view['disable-downloads'] ) ? 'col-3' : 'd-none'; ?>">
-										<a title="<?php esc_attr_e( 'Download JSON', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'json' ) ); ?>">
+									<div class="<?php echo empty($view['disable-downloads']) ? 'col-3' : 'd-none'; ?>">
+										<a title="<?php esc_attr_e('Download JSON', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'json')); ?>">
 											<i class="fa fa-download text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php _e( 'Download JSON', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php _e('Download JSON', 'invoicing'); ?></span>
 										</a>
-										<a title="<?php esc_attr_e( 'Download CSV', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'csv' ) ); ?>">
+										<a title="<?php esc_attr_e('Download CSV', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'csv')); ?>">
 											<i class="fa fa-file-csv text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php _e( 'Download CSV', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php _e('Download CSV', 'invoicing'); ?></span>
 										</a>
-										<a title="<?php esc_attr_e( 'Download XML', 'invoicing' ); ?>" href="<?php echo esc_url( $this->get_download_url( $key, 'xml' ) ); ?>">
+										<a title="<?php esc_attr_e('Download XML', 'invoicing'); ?>" href="<?php echo esc_url($this->get_download_url($key, 'xml')); ?>">
 											<i class="fa fa-file-code text-dark" style="font-size: 16px" aria-hidden="true"></i>
-											<span class="screen-reader-text"><?php _e( 'Download XML', 'invoicing' ); ?></span>
+											<span class="screen-reader-text"><?php _e('Download XML', 'invoicing'); ?></span>
 										</a>
 									</div>
 								</div>
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
 
 		<?php
 
-		do_action( 'getpaid_reports_display_right', $this );
+		do_action('getpaid_reports_display_right', $this);
 	}
 
 	/**
@@ -310,56 +310,56 @@  discard block
 block discarded – undo
 
 		$cards = array(
 			'total_sales' => array(
-				'description' => __( 'Gross sales in the period.', 'invoicing' ),
-				'label'       => __( 'Gross Revenue', 'invoicing' ),
+				'description' => __('Gross sales in the period.', 'invoicing'),
+				'label'       => __('Gross Revenue', 'invoicing'),
 			),
 			'net_sales' => array(
-				'description' => __( 'Net sales in the period.', 'invoicing' ),
-				'label'       => __( 'Net Revenue', 'invoicing' ),
+				'description' => __('Net sales in the period.', 'invoicing'),
+				'label'       => __('Net Revenue', 'invoicing'),
 			),
 			'average_sales' => array(
-				'description' => __( 'Average net daily/monthly sales.', 'invoicing' ),
-				'label'       => __( 'Avg. Net Sales', 'invoicing' ),
+				'description' => __('Average net daily/monthly sales.', 'invoicing'),
+				'label'       => __('Avg. Net Sales', 'invoicing'),
 			),
 			'average_total_sales' => array(
-				'description' => __( 'Average gross daily/monthly sales.', 'invoicing' ),
-				'label'       => __( 'Avg. Gross Sales', 'invoicing' ),
+				'description' => __('Average gross daily/monthly sales.', 'invoicing'),
+				'label'       => __('Avg. Gross Sales', 'invoicing'),
 			),
 			'total_invoices'  => array(
-				'description' => __( 'Number of paid invoices.', 'invoicing' ),
-				'label'       => __( 'Paid Invoices', 'invoicing' ),
+				'description' => __('Number of paid invoices.', 'invoicing'),
+				'label'       => __('Paid Invoices', 'invoicing'),
 			),
 			'total_items' => array(
-				'description' => __( 'Number of items purchased.', 'invoicing' ),
-				'label'       => __( 'Purchased Items', 'invoicing' ),
+				'description' => __('Number of items purchased.', 'invoicing'),
+				'label'       => __('Purchased Items', 'invoicing'),
 			),
 			'refunded_items' => array(
-				'description' => __( 'Number of items refunded.', 'invoicing' ),
-				'label'       => __( 'Refunded Items', 'invoicing' ),
+				'description' => __('Number of items refunded.', 'invoicing'),
+				'label'       => __('Refunded Items', 'invoicing'),
 			),
 			'total_tax' => array(
-				'description' => __( 'Total charged for taxes.', 'invoicing' ),
-				'label'       => __( 'Tax', 'invoicing' ),
+				'description' => __('Total charged for taxes.', 'invoicing'),
+				'label'       => __('Tax', 'invoicing'),
 			),
 			'total_refunded_tax' => array(
-				'description' => __( 'Total refunded for taxes.', 'invoicing' ),
-				'label'       => __( 'Refunded Tax', 'invoicing' ),
+				'description' => __('Total refunded for taxes.', 'invoicing'),
+				'label'       => __('Refunded Tax', 'invoicing'),
 			),
 			'total_fees' => array(
-				'description' => __( 'Total fees charged.', 'invoicing' ),
-				'label'       => __( 'Fees', 'invoicing' ),
+				'description' => __('Total fees charged.', 'invoicing'),
+				'label'       => __('Fees', 'invoicing'),
 			),
 			'total_refunds' => array(
-				'description' => __( 'Total of refunded invoices.', 'invoicing' ),
-				'label'       => __( 'Refunded', 'invoicing' ),
+				'description' => __('Total of refunded invoices.', 'invoicing'),
+				'label'       => __('Refunded', 'invoicing'),
 			),
 			'total_discount'  => array(
-				'description' => __( 'Total of discounts used.', 'invoicing' ),
-				'label'       => __( 'Discounted', 'invoicing' ),
+				'description' => __('Total of discounts used.', 'invoicing'),
+				'label'       => __('Discounted', 'invoicing'),
 			),
 		);
 
-		return apply_filters( 'wpinv_report_cards', $cards );
+		return apply_filters('wpinv_report_cards', $cards);
 	}
 
 	

Please login to merge, or discard this patch.

includes/wpinv-address-functions.php 2 patches

Indentation +88 added lines, -88 removed lines patch added patch discarded remove patch

@@ -13,9 +13,9 @@  discard block
 block discarded – undo
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+    $country = wpinv_get_option( 'default_country', 'UK' );
 
-	return apply_filters( 'wpinv_default_country', $country );
+    return apply_filters( 'wpinv_default_country', $country );
 }
 
 /**
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
  */
 function wpinv_sanitize_country( $country ) {
 
-	// Enure the country is specified
+    // Enure the country is specified
     if ( empty( $country ) ) {
         $country = wpinv_get_default_country();
     }
@@ -66,9 +66,9 @@  discard block
 block discarded – undo
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', '' );
+    $state = wpinv_get_option( 'default_state', '' );
 
-	return apply_filters( 'wpinv_default_state', $state );
+    return apply_filters( 'wpinv_default_state', $state );
 }
 
 function wpinv_state_name( $state_code = '', $country_code = '' ) {
@@ -308,11 +308,11 @@  discard block
 block discarded – undo
 
     $country = wpinv_sanitize_country( $country );
     
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
-			return $continent_code;
-		}
-	}
+    foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
+        if ( false !== array_search( $country, $countries, true ) ) {
+            return $continent_code;
+        }
+    }
 
     return '';
     
@@ -604,33 +604,33 @@  discard block
 block discarded – undo
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
-		$_POST['country'] = wpinv_get_default_country();
-	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+    if( empty( $_POST['country'] ) ) {
+        $_POST['country'] = wpinv_get_default_country();
+    }
+    $states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+    if( !empty( $states ) ) {
+        $sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
 
         $class  = isset( $_POST['class'] ) ? esc_attr( sanitize_text_field( $_POST['class'] ) ) : '';
         $class .= " $sanitized_field_name getpaid_js_field-state custom-select wpinv-select wpi_select2";
 
         $args  = array(
-			'name'    => $sanitized_field_name,
-			'id'      => $sanitized_field_name,
-			'class'   => implode( ' ', array_unique( explode( ' ', $class ) ) ),
-			'options' => array_merge( array( '' => '' ), $states ),
-			'show_option_all'  => false,
-			'show_option_none' => false
-		);
-
-		$response = wpinv_html_select( $args );
-
-	} else {
-		$response = 'nostates';
-	}
+            'name'    => $sanitized_field_name,
+            'id'      => $sanitized_field_name,
+            'class'   => implode( ' ', array_unique( explode( ' ', $class ) ) ),
+            'options' => array_merge( array( '' => '' ), $states ),
+            'show_option_all'  => false,
+            'show_option_none' => false
+        );
+
+        $response = wpinv_html_select( $args );
+
+    } else {
+        $response = 'nostates';
+    }
 
-	return $response;
+    return $response;
 }
 
 function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
@@ -648,46 +648,46 @@  discard block
 block discarded – undo
  */
 function wpinv_get_address_formats() {
 
-		return apply_filters( 'wpinv_localisation_address_formats',
-			array(
-				'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
-				'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
-				'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}&nbsp;&nbsp;{{zip}}\n{{country}}",
-				'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
-				'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
-				'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
-				'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
-				'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
-				'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
-				'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
-				'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
-				'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
-				'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
-				'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
-				'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
-				'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
-				'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
-				'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
-			)
-		);
+        return apply_filters( 'wpinv_localisation_address_formats',
+            array(
+                'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
+                'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
+                'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}&nbsp;&nbsp;{{zip}}\n{{country}}",
+                'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
+                'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
+                'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
+                'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
+                'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
+                'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
+                'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
+                'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
+                'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
+                'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
+                'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
+                'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
+                'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
+                'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
+                'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
+            )
+        );
 }
 
 /**
@@ -704,21 +704,21 @@  discard block
 block discarded – undo
     }
 
     // Get all formats.
-	$formats = wpinv_get_address_formats();
+    $formats = wpinv_get_address_formats();
 
-	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+    // Get format for the specified country.
+    $format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
     
     /**
-	 * Filters the address format to use on Invoices.
+     * Filters the address format to use on Invoices.
      * 
      * New lines will be replaced by a `br` element. Double new lines will be replaced by a paragraph. HTML tags are allowed.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string $format  The address format to use.
+     *
+     * @since 1.0.13
+     *
+     * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
-	 */
+     */
     return apply_filters( 'wpinv_get_full_address_format', $format, $country );
 }
 
@@ -739,8 +739,8 @@  discard block
 block discarded – undo
         'country'           => '',
         'zip'               => '',
         'first_name'        => '',
-		'last_name'         => '',
-		'company'           => '',
+        'last_name'         => '',
+        'company'           => '',
     );
 
     $args    = map_deep( wp_parse_args( $billing_details, $default_args ), 'trim' );
@@ -761,14 +761,14 @@  discard block
 block discarded – undo
     $args['country_code']= $country;
 
     /**
-	 * Filters the address format replacements to use on Invoices.
+     * Filters the address format replacements to use on Invoices.
      * 
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param array $replacements  The address replacements to use.
+     *
+     * @since 1.0.13
+     *
+     * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
-	 */
+     */
     $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
 
     $return = array();
@@ -791,5 +791,5 @@  discard block
 block discarded – undo
  * @return string
  */
 function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+    return trim( $line, ', ' );
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +145 added lines, -145 removed lines patch added patch discarded remove patch

@@ -7,15 +7,15 @@  discard block
 block discarded – undo
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+	$country = wpinv_get_option('default_country', 'UK');
 
-	return apply_filters( 'wpinv_default_country', $country );
+	return apply_filters('wpinv_default_country', $country);
 }
 
 /**
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
  *
  * @return string
  */
-function getpaid_get_ip_country( $ip_address = '' ) {
-    $country = GetPaid_Geolocation::geolocate_ip( $ip_address, true );
+function getpaid_get_ip_country($ip_address = '') {
+    $country = GetPaid_Geolocation::geolocate_ip($ip_address, true);
     return $country['country'];
 }
 
@@ -34,59 +34,59 @@  discard block
 block discarded – undo
  * @param string $country The country code to sanitize
  * @return array
  */
-function wpinv_sanitize_country( $country ) {
+function wpinv_sanitize_country($country) {
 
 	// Enure the country is specified
-    if ( empty( $country ) ) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
-    return trim( wpinv_utf8_strtoupper( $country ) );
+    return trim(wpinv_utf8_strtoupper($country));
 
 }
 
-function wpinv_is_base_country( $country ) {
+function wpinv_is_base_country($country) {
     $base_country = wpinv_get_default_country();
     
-    if ( $base_country === 'UK' ) {
+    if ($base_country === 'UK') {
         $base_country = 'GB';
     }
-    if ( $country == 'UK' ) {
+    if ($country == 'UK') {
         $country = 'GB';
     }
 
-    return ( $country && $country === $base_country ) ? true : false;
+    return ($country && $country === $base_country) ? true : false;
 }
 
-function wpinv_country_name( $country_code = '' ) { 
+function wpinv_country_name($country_code = '') { 
     $countries = wpinv_get_country_list();
     $country_code = $country_code == 'UK' ? 'GB' : $country_code;
-    $country = isset( $countries[$country_code] ) ? $countries[$country_code] : $country_code;
+    $country = isset($countries[$country_code]) ? $countries[$country_code] : $country_code;
 
-    return apply_filters( 'wpinv_country_name', $country, $country_code );
+    return apply_filters('wpinv_country_name', $country, $country_code);
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', '' );
+	$state = wpinv_get_option('default_state', '');
 
-	return apply_filters( 'wpinv_default_state', $state );
+	return apply_filters('wpinv_default_state', $state);
 }
 
-function wpinv_state_name( $state_code = '', $country_code = '' ) {
+function wpinv_state_name($state_code = '', $country_code = '') {
     $state = $state_code;
     
-    if ( !empty( $country_code ) ) {
-        $states = wpinv_get_country_states( $country_code );
+    if (!empty($country_code)) {
+        $states = wpinv_get_country_states($country_code);
         
-        $state = !empty( $states ) && isset( $states[$state_code] ) ? $states[$state_code] : $state;
+        $state = !empty($states) && isset($states[$state_code]) ? $states[$state_code] : $state;
     }
 
-    return apply_filters( 'wpinv_state_name', $state, $state_code, $country_code );
+    return apply_filters('wpinv_state_name', $state, $state_code, $country_code);
 }
 
 function wpinv_store_address() {
-    $address = wpinv_get_option( 'store_address', '' );
+    $address = wpinv_get_option('store_address', '');
 
-    return apply_filters( 'wpinv_store_address', $address );
+    return apply_filters('wpinv_store_address', $address);
 }
 
 /**
@@ -94,24 +94,24 @@  discard block
 block discarded – undo
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_maybe_add_default_address( &$invoice ) {
+function getpaid_maybe_add_default_address(&$invoice) {
 
     $user_id = $invoice->get_user_id();
 
     // Abort if the invoice belongs to no one.
-    if ( empty( $user_id ) ) {
+    if (empty($user_id)) {
         return;
     }
 
     // Fill in defaults whenever necessary.
-    foreach ( wpinv_get_user_address( $user_id ) as $key => $value ) {
+    foreach (wpinv_get_user_address($user_id) as $key => $value) {
 
-        if ( is_callable( $invoice, "get_$key" ) ) {
-            $current = call_user_func( array( $invoice, "get_$key" ) );
+        if (is_callable($invoice, "get_$key")) {
+            $current = call_user_func(array($invoice, "get_$key"));
 
-            if ( empty( $current ) ) {
+            if (empty($current)) {
                 $method = "set_$key";
-                $invoice->$method( $value );
+                $invoice->$method($value);
             }
 
         }
@@ -130,22 +130,22 @@  discard block
 block discarded – undo
     $address_fields = apply_filters(
         'getpaid_user_address_fields',
         array(
-            'first_name' => __( 'First Name', 'invoicing' ),
-            'last_name'  => __( 'Last Name', 'invoicing' ),
-            'address'    => __( 'Address', 'invoicing' ),
-            'city'       => __( 'City', 'invoicing' ),
-            'country'    => __( 'Country', 'invoicing' ),
-            'state'      => __( 'State', 'invoicing' ),
-            'zip'        => __( 'Zip/Postal Code', 'invoicing' ),
-            'phone'      => __( 'Phone Number', 'invoicing' ),
-            'company'    => __( 'Company', 'invoicing' ),
-            'company_id'    => __( 'Company ID', 'invoicing' ),
-            'vat_number' => __( 'VAT Number', 'invoicing' ),
+            'first_name' => __('First Name', 'invoicing'),
+            'last_name'  => __('Last Name', 'invoicing'),
+            'address'    => __('Address', 'invoicing'),
+            'city'       => __('City', 'invoicing'),
+            'country'    => __('Country', 'invoicing'),
+            'state'      => __('State', 'invoicing'),
+            'zip'        => __('Zip/Postal Code', 'invoicing'),
+            'phone'      => __('Phone Number', 'invoicing'),
+            'company'    => __('Company', 'invoicing'),
+            'company_id'    => __('Company ID', 'invoicing'),
+            'vat_number' => __('VAT Number', 'invoicing'),
         )
     );
 
-    if ( ! wpinv_use_taxes() && isset( $address_fields['vat_number'] ) ) {
-        unset( $address_fields['vat_number'] );
+    if (!wpinv_use_taxes() && isset($address_fields['vat_number'])) {
+        unset($address_fields['vat_number']);
     }
 
     return $address_fields;
@@ -156,8 +156,8 @@  discard block
 block discarded – undo
  * 
  * @return bool
  */
-function getpaid_is_address_field_whitelisted( $key ) {
-    return array_key_exists( $key, getpaid_user_address_fields() );
+function getpaid_is_address_field_whitelisted($key) {
+    return array_key_exists($key, getpaid_user_address_fields());
 }
 
 /**
@@ -167,24 +167,24 @@  discard block
 block discarded – undo
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_save_invoice_user_address( $invoice ) {
+function getpaid_save_invoice_user_address($invoice) {
 
     // Retrieve the invoice.
-    $invoice = wpinv_get_invoice( $invoice );
+    $invoice = wpinv_get_invoice($invoice);
 
     // Abort if it does not exist.
-    if ( empty( $invoice ) || $invoice->is_renewal() ) {
+    if (empty($invoice) || $invoice->is_renewal()) {
         return;
     }
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-        if ( is_callable( array( $invoice, "get_$field" ) ) ) {
-            $value = call_user_func( array( $invoice, "get_$field" ) );
+        if (is_callable(array($invoice, "get_$field"))) {
+            $value = call_user_func(array($invoice, "get_$field"));
 
             // Only save if it is not empty.
-            if ( ! empty( $value ) ) {
-                update_user_meta( $invoice->get_user_id(), '_wpinv_' . $field, $value );
+            if (!empty($value)) {
+                update_user_meta($invoice->get_user_id(), '_wpinv_' . $field, $value);
             }
 
         }
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
     }
 
 }
-add_action( 'getpaid_checkout_invoice_updated', 'getpaid_save_invoice_user_address' );
+add_action('getpaid_checkout_invoice_updated', 'getpaid_save_invoice_user_address');
 
 /**
  * Retrieves a saved user address.
@@ -201,14 +201,14 @@  discard block
 block discarded – undo
  * @param bool $with_default Whether or not we should use the default country and state.
  * @return array
  */
-function wpinv_get_user_address( $user_id = 0, $with_default = true ) {
+function wpinv_get_user_address($user_id = 0, $with_default = true) {
 
     // Prepare the user id.
-    $user_id   = empty( $user_id ) ? get_current_user_id() : $user_id;
-    $user_info = get_userdata( $user_id );
+    $user_id   = empty($user_id) ? get_current_user_id() : $user_id;
+    $user_info = get_userdata($user_id);
 
     // Abort if non exists.
-    if ( empty( $user_info ) ) {
+    if (empty($user_info)) {
         return array();
     }
 
@@ -218,13 +218,13 @@  discard block
 block discarded – undo
         'email'   => $user_info->user_email,
     );
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
-        $address[$field] = getpaid_get_user_address_field( $user_id, $field );
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
+        $address[$field] = getpaid_get_user_address_field($user_id, $field);
     }
 
-    $address = array_filter( $address );
+    $address = array_filter($address);
 
-    if ( ! $with_default ) {
+    if (!$with_default) {
         return $address;
     }
 
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
         'country'    => wpinv_get_default_country(),
     );
 
-    return getpaid_array_merge_if_empty( $address, $defaults );
+    return getpaid_array_merge_if_empty($address, $defaults);
 
 }
 
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
  * @param string $field The field to use.
  * @return string|null
  */
-function getpaid_get_user_address_field( $user_id, $field ) {
+function getpaid_get_user_address_field($user_id, $field) {
 
     $prefixes = array(
         '_wpinv_',
@@ -254,15 +254,15 @@  discard block
 block discarded – undo
         ''
     );
 
-    foreach ( $prefixes as $prefix ) {
+    foreach ($prefixes as $prefix) {
 
         // Meta table.
-        $value = get_user_meta( $user_id, $prefix . $field, true );
+        $value = get_user_meta($user_id, $prefix . $field, true);
         
         // UWP table.
-        $value = ( empty( $value ) && function_exists( 'uwp_get_usermeta' ) ) ? uwp_get_usermeta( $user_id, $prefix . $field ) : $value;
+        $value = (empty($value) && function_exists('uwp_get_usermeta')) ? uwp_get_usermeta($user_id, $prefix . $field) : $value;
 
-        if ( ! empty( $value ) ) {
+        if (!empty($value)) {
             return $value;
         }
 
@@ -279,16 +279,16 @@  discard block
 block discarded – undo
  * @param string $return What to return.
  * @return array
  */
-function wpinv_get_continents( $return = 'all' ) {
+function wpinv_get_continents($return = 'all') {
 
-    $continents = wpinv_get_data( 'continents' );
+    $continents = wpinv_get_data('continents');
 
-    switch( $return ) {
+    switch ($return) {
         case 'name' :
-            return wp_list_pluck( $continents, 'name' );
+            return wp_list_pluck($continents, 'name');
             break;
         case 'countries' :
-            return wp_list_pluck( $continents, 'countries' );
+            return wp_list_pluck($continents, 'countries');
             break;
         default :
             return $continents;
@@ -304,12 +304,12 @@  discard block
 block discarded – undo
  * @param string $country Country code. If no code is specified, defaults to the default country.
  * @return string
  */
-function wpinv_get_continent_code_for_country( $country = false ) {
+function wpinv_get_continent_code_for_country($country = false) {
 
-    $country = wpinv_sanitize_country( $country );
+    $country = wpinv_sanitize_country($country);
     
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
+	foreach (wpinv_get_continents('countries') as $continent_code => $countries) {
+		if (false !== array_search($country, $countries, true)) {
 			return $continent_code;
 		}
 	}
@@ -325,13 +325,13 @@  discard block
 block discarded – undo
  * @param string $country Country code. If no code is specified, defaults to the default country.
  * @return array
  */
-function wpinv_get_country_calling_code( $country = null) {
+function wpinv_get_country_calling_code($country = null) {
 
-    $country = wpinv_sanitize_country( $country );
-    $codes   = wpinv_get_data( 'phone-codes' );
-    $code    = isset( $codes[ $country ] ) ? $codes[ $country ] : '';
+    $country = wpinv_sanitize_country($country);
+    $codes   = wpinv_get_data('phone-codes');
+    $code    = isset($codes[$country]) ? $codes[$country] : '';
 
-    if ( is_array( $code ) ) {
+    if (is_array($code)) {
         return $code[0];
     }
     return $code;
@@ -344,8 +344,8 @@  discard block
 block discarded – undo
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return array
  */
-function wpinv_get_country_list( $first_empty = false ) {
-    return wpinv_maybe_add_empty_option( apply_filters( 'wpinv_countries', wpinv_get_data( 'countries' ) ), $first_empty );
+function wpinv_get_country_list($first_empty = false) {
+    return wpinv_maybe_add_empty_option(apply_filters('wpinv_countries', wpinv_get_data('countries')), $first_empty);
 }
 
 /**
@@ -355,22 +355,22 @@  discard block
 block discarded – undo
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return array
  */
-function wpinv_get_country_states( $country = null, $first_empty = false ) {
+function wpinv_get_country_states($country = null, $first_empty = false) {
     
     // Prepare the country.
-    $country = wpinv_sanitize_country( $country );
+    $country = wpinv_sanitize_country($country);
 
     // Fetch all states.
-    $all_states = wpinv_get_data( 'states' );
+    $all_states = wpinv_get_data('states');
 
     // Fetch the specified country's states.
-    $states     = isset( $all_states[ $country ] ) ? $all_states[ $country ] : array() ;
-    $states     = apply_filters( "wpinv_{$country}_states", $states );
-    $states     = apply_filters( 'wpinv_country_states', $states, $country );
+    $states     = isset($all_states[$country]) ? $all_states[$country] : array();
+    $states     = apply_filters("wpinv_{$country}_states", $states);
+    $states     = apply_filters('wpinv_country_states', $states, $country);
 
-    asort( $states );
+    asort($states);
      
-    return wpinv_maybe_add_empty_option( $states, $first_empty );
+    return wpinv_maybe_add_empty_option($states, $first_empty);
 }
 
 /**
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_us_states_list() {
-    return apply_filters( 'wpinv_usa_states', wpinv_get_country_states( 'US' ) );
+    return apply_filters('wpinv_usa_states', wpinv_get_country_states('US'));
 }
 
 /**
@@ -390,7 +390,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_canada_states_list() {
-    return apply_filters( 'wpinv_canada_provinces', wpinv_get_country_states( 'CA' ) );
+    return apply_filters('wpinv_canada_provinces', wpinv_get_country_states('CA'));
 }
 
 /**
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_australia_states_list() {
-    return apply_filters( 'wpinv_australia_states', wpinv_get_country_states( 'AU' ) );
+    return apply_filters('wpinv_australia_states', wpinv_get_country_states('AU'));
 }
 
 /**
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_bangladesh_states_list() {
-    return apply_filters( 'wpinv_bangladesh_states', wpinv_get_country_states( 'BD' ) );
+    return apply_filters('wpinv_bangladesh_states', wpinv_get_country_states('BD'));
 }
 
 /**
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_brazil_states_list() {
-    return apply_filters( 'wpinv_brazil_states', wpinv_get_country_states( 'BR' ) );
+    return apply_filters('wpinv_brazil_states', wpinv_get_country_states('BR'));
 }
 
 /**
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_bulgaria_states_list() {
-    return apply_filters( 'wpinv_bulgaria_states', wpinv_get_country_states( 'BG' ) );
+    return apply_filters('wpinv_bulgaria_states', wpinv_get_country_states('BG'));
 }
 
 /**
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_hong_kong_states_list() {
-    return apply_filters( 'wpinv_hong_kong_states', wpinv_get_country_states( 'HK' ) );
+    return apply_filters('wpinv_hong_kong_states', wpinv_get_country_states('HK'));
 }
 
 /**
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_hungary_states_list() {
-    return apply_filters( 'wpinv_hungary_states', wpinv_get_country_states( 'HU' ) );
+    return apply_filters('wpinv_hungary_states', wpinv_get_country_states('HU'));
 }
 
 /**
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_japan_states_list() {
-    return apply_filters( 'wpinv_japan_states', wpinv_get_country_states( 'JP' ) );
+    return apply_filters('wpinv_japan_states', wpinv_get_country_states('JP'));
 }
 
 /**
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_china_states_list() {
-    return apply_filters( 'wpinv_china_states', wpinv_get_country_states( 'CN' ) );
+    return apply_filters('wpinv_china_states', wpinv_get_country_states('CN'));
 }
 
 /**
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_new_zealand_states_list() {
-    return apply_filters( 'wpinv_new_zealand_states', wpinv_get_country_states( 'NZ' ) );
+    return apply_filters('wpinv_new_zealand_states', wpinv_get_country_states('NZ'));
 }
 
 /**
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_peru_states_list() {
-    return apply_filters( 'wpinv_peru_states', wpinv_get_country_states( 'PE' ) );
+    return apply_filters('wpinv_peru_states', wpinv_get_country_states('PE'));
 }
 
 /**
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_indonesia_states_list() {
-    return apply_filters( 'wpinv_indonesia_states', wpinv_get_country_states( 'ID' ) );
+    return apply_filters('wpinv_indonesia_states', wpinv_get_country_states('ID'));
 }
 
 /**
@@ -510,7 +510,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_india_states_list() {
-    return apply_filters( 'wpinv_india_states', wpinv_get_country_states( 'IN' ) );
+    return apply_filters('wpinv_india_states', wpinv_get_country_states('IN'));
 }
 
 /**
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_iran_states_list() {
-    return apply_filters( 'wpinv_iran_states', wpinv_get_country_states( 'IR' ) );
+    return apply_filters('wpinv_iran_states', wpinv_get_country_states('IR'));
 }
 
 /**
@@ -530,7 +530,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_italy_states_list() {
-    return apply_filters( 'wpinv_italy_states', wpinv_get_country_states( 'IT' ) );
+    return apply_filters('wpinv_italy_states', wpinv_get_country_states('IT'));
 }
 
 /**
@@ -540,7 +540,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_malaysia_states_list() {
-    return apply_filters( 'wpinv_malaysia_states', wpinv_get_country_states( 'MY' ) );
+    return apply_filters('wpinv_malaysia_states', wpinv_get_country_states('MY'));
 }
 
 /**
@@ -550,7 +550,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_mexico_states_list() {
-    return apply_filters( 'wpinv_mexico_states', wpinv_get_country_states( 'MX' ) );
+    return apply_filters('wpinv_mexico_states', wpinv_get_country_states('MX'));
 }
 
 /**
@@ -560,7 +560,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_nepal_states_list() {
-    return apply_filters( 'wpinv_nepal_states', wpinv_get_country_states( 'NP' ) );
+    return apply_filters('wpinv_nepal_states', wpinv_get_country_states('NP'));
 }
 
 /**
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_south_africa_states_list() {
-    return apply_filters( 'wpinv_south_africa_states', wpinv_get_country_states( 'ZA' ) );
+    return apply_filters('wpinv_south_africa_states', wpinv_get_country_states('ZA'));
 }
 
 /**
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_thailand_states_list() {
-    return apply_filters( 'wpinv_thailand_states', wpinv_get_country_states( 'TH' ) );
+    return apply_filters('wpinv_thailand_states', wpinv_get_country_states('TH'));
 }
 
 /**
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_turkey_states_list() {
-    return apply_filters( 'wpinv_turkey_states', wpinv_get_country_states( 'TR' ) );
+    return apply_filters('wpinv_turkey_states', wpinv_get_country_states('TR'));
 }
 
 /**
@@ -600,31 +600,31 @@  discard block
 block discarded – undo
  * @return array
  */
 function wpinv_get_spain_states_list() {
-    return apply_filters( 'wpinv_spain_states', wpinv_get_country_states( 'ES' ) );
+    return apply_filters('wpinv_spain_states', wpinv_get_country_states('ES'));
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
+	if (empty($_POST['country'])) {
 		$_POST['country'] = wpinv_get_default_country();
 	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+	$states = wpinv_get_country_states(sanitize_text_field($_POST['country']));
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+	if (!empty($states)) {
+		$sanitized_field_name = sanitize_text_field($_POST['field_name']);
 
-        $class  = isset( $_POST['class'] ) ? esc_attr( sanitize_text_field( $_POST['class'] ) ) : '';
+        $class  = isset($_POST['class']) ? esc_attr(sanitize_text_field($_POST['class'])) : '';
         $class .= " $sanitized_field_name getpaid_js_field-state custom-select wpinv-select wpi_select2";
 
-        $args  = array(
+        $args = array(
 			'name'    => $sanitized_field_name,
 			'id'      => $sanitized_field_name,
-			'class'   => implode( ' ', array_unique( explode( ' ', $class ) ) ),
-			'options' => array_merge( array( '' => '' ), $states ),
+			'class'   => implode(' ', array_unique(explode(' ', $class))),
+			'options' => array_merge(array('' => ''), $states),
 			'show_option_all'  => false,
 			'show_option_none' => false
 		);
 
-		$response = wpinv_html_select( $args );
+		$response = wpinv_html_select($args);
 
 	} else {
 		$response = 'nostates';
@@ -633,10 +633,10 @@  discard block
 block discarded – undo
 	return $response;
 }
 
-function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
-    $country = !empty( $country ) ? $country : wpinv_get_default_country();
+function wpinv_default_billing_country($country = '', $user_id = 0) {
+    $country = !empty($country) ? $country : wpinv_get_default_country();
     
-    return apply_filters( 'wpinv_default_billing_country', $country, $user_id );
+    return apply_filters('wpinv_default_billing_country', $country, $user_id);
 }
 
 /**
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
  */
 function wpinv_get_address_formats() {
 
-		return apply_filters( 'wpinv_localisation_address_formats',
+		return apply_filters('wpinv_localisation_address_formats',
 			array(
 				'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
 				'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
@@ -697,9 +697,9 @@  discard block
 block discarded – undo
  * @see `wpinv_get_invoice_address_replacements`
  * @return string
  */
-function wpinv_get_full_address_format( $country = false) {
+function wpinv_get_full_address_format($country = false) {
 
-    if( empty( $country ) ) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
 
@@ -707,7 +707,7 @@  discard block
 block discarded – undo
 	$formats = wpinv_get_address_formats();
 
 	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+	$format = ($country && isset($formats[$country])) ? $formats[$country] : $formats['default'];
     
     /**
 	 * Filters the address format to use on Invoices.
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
 	 * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
 	 */
-    return apply_filters( 'wpinv_get_full_address_format', $format, $country );
+    return apply_filters('wpinv_get_full_address_format', $format, $country);
 }
 
 /**
@@ -730,7 +730,7 @@  discard block
 block discarded – undo
  * @param array $billing_details customer's billing details
  * @return array
  */
-function wpinv_get_invoice_address_replacements( $billing_details ) {
+function wpinv_get_invoice_address_replacements($billing_details) {
 
     $default_args = array(
         'address'           => '',
@@ -743,22 +743,22 @@  discard block
 block discarded – undo
 		'company'           => '',
     );
 
-    $args    = map_deep( wp_parse_args( $billing_details, $default_args ), 'trim' );
+    $args    = map_deep(wp_parse_args($billing_details, $default_args), 'trim');
     $state   = $args['state'];
     $country = $args['country'];
 
     // Handle full country name.
-    $full_country = empty( $country ) ? $country : wpinv_country_name( $country );
+    $full_country = empty($country) ? $country : wpinv_country_name($country);
 
     // Handle full state name.
-    $full_state   = ( $country && $state ) ?  wpinv_state_name( $state, $country ) : $state;
+    $full_state   = ($country && $state) ?  wpinv_state_name($state, $country) : $state;
 
     $args['postcode']    = $args['zip'];
     $args['name']        = $args['first_name'] . ' ' . $args['last_name'];
     $args['state']       = $full_state;
     $args['state_code']  = $state;
     $args['country']     = $full_country;
-    $args['country_code']= $country;
+    $args['country_code'] = $country;
 
     /**
 	 * Filters the address format replacements to use on Invoices.
@@ -769,14 +769,14 @@  discard block
 block discarded – undo
 	 * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
 	 */
-    $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
+    $replacements = apply_filters('wpinv_get_invoice_address_replacements', $args, $billing_details);
 
     $return = array();
 
-    foreach( $replacements as $key => $value ) {
-        $value  = is_scalar( $value ) ? trim( sanitize_text_field( $value ) ) : '';
+    foreach ($replacements as $key => $value) {
+        $value = is_scalar($value) ? trim(sanitize_text_field($value)) : '';
         $return['{{' . $key . '}}'] = $value;
-        $return['{{' . $key . '_upper}}'] = wpinv_utf8_strtoupper( $value );
+        $return['{{' . $key . '_upper}}'] = wpinv_utf8_strtoupper($value);
     }
 
     return $return;
@@ -790,6 +790,6 @@  discard block
 block discarded – undo
  * @since 1.0.14
  * @return string
  */
-function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+function wpinv_trim_formatted_address_line($line) {
+	return trim($line, ', ');
 }
\ No newline at end of file

Please login to merge, or discard this patch.

includes/class-wpinv-addons.php 2 patches

Indentation +212 added lines, -212 removed lines patch added patch discarded remove patch

@@ -6,7 +6,7 @@  discard block
 block discarded – undo
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -15,85 +15,85 @@  discard block
 block discarded – undo
 class WPInv_Admin_Addons extends Ayecode_Addons {
 
 
-	/**
-	 * Get the extensions page tabs.
-	 *
-	 * @return array of tabs.
-	 */
-	public function get_tabs(){
-		$tabs = array(
-			'addons' => __("Addons", "invoicing"),
+    /**
+     * Get the extensions page tabs.
+     *
+     * @return array of tabs.
+     */
+    public function get_tabs(){
+        $tabs = array(
+            'addons' => __("Addons", "invoicing"),
             'gateways' => __("Payment Gateways", "invoicing"),
             'recommended_plugins' => __("Recommended plugins", "invoicing"),
             'membership' => __("Membership", "invoicing"),
-		);
-
-		return $tabs;
-	}
-
-	/**
-	 * Get section content for the addons screen.
-	 *
-	 * @param  string $section_id
-	 *
-	 * @return array
-	 */
-	public function get_section_data( $section_id ) {
-		$section      = self::get_tab( $section_id );
-		$api_url = "https://wpinvoicing.com/edd-api/v2/products/";
-		$section_data = new stdClass();
-
-		if($section_id=='recommended_plugins'){
-			$section_data->products = self::get_recommend_wp_plugins_edd_formatted();
-		}
-		elseif ( ! empty( $section ) ) {
-			if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
-			//if ( 1==1) {
-
-				$query_args = array( 'category' => $section_id, 'number' => 100);
-				$query_args = apply_filters('wpeu_edd_api_query_args',$query_args,$api_url,$section_id);
-
-				$raw_section = wp_safe_remote_get( esc_url_raw( add_query_arg($query_args ,$api_url) ), array( 'user-agent' => 'Invoicing Addons Page','timeout'     => 15, ) );
-
-				if ( ! is_wp_error( $raw_section ) ) {
-					$section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
-
-					if ( ! empty( $section_data->products ) ) {
-						set_transient( 'wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS );
-					}
-				}
-			}
-
-		}
-
-		$products = isset($section_data->products) ? $section_data->products : array();
-		if ( 'addons' == $section_id ) {
-
-			$quotes = new stdClass();
-			$quotes->info = new stdClass();
-			$quotes->info->id = '';
-			$quotes->info->slug = 'invoicing-quotes';
-			$quotes->info->title = __( 'Quotes', 'invoicing' );
-			$quotes->info->excerpt = __( 'Create quotes and estimates', 'invoicing' );
-			$quotes->info->link = 'https://wordpress.org/plugins/invoicing-quotes/';
-			$quotes->info->thumbnail = 'https://wpgetpaid.com/wp-content/uploads/sites/13/edd/2019/11/Quotes-1-768x384.png';
-
-			$products[] = $quotes;
-		}
+        );
+
+        return $tabs;
+    }
+
+    /**
+     * Get section content for the addons screen.
+     *
+     * @param  string $section_id
+     *
+     * @return array
+     */
+    public function get_section_data( $section_id ) {
+        $section      = self::get_tab( $section_id );
+        $api_url = "https://wpinvoicing.com/edd-api/v2/products/";
+        $section_data = new stdClass();
+
+        if($section_id=='recommended_plugins'){
+            $section_data->products = self::get_recommend_wp_plugins_edd_formatted();
+        }
+        elseif ( ! empty( $section ) ) {
+            if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
+            //if ( 1==1) {
+
+                $query_args = array( 'category' => $section_id, 'number' => 100);
+                $query_args = apply_filters('wpeu_edd_api_query_args',$query_args,$api_url,$section_id);
+
+                $raw_section = wp_safe_remote_get( esc_url_raw( add_query_arg($query_args ,$api_url) ), array( 'user-agent' => 'Invoicing Addons Page','timeout'     => 15, ) );
+
+                if ( ! is_wp_error( $raw_section ) ) {
+                    $section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
+
+                    if ( ! empty( $section_data->products ) ) {
+                        set_transient( 'wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS );
+                    }
+                }
+            }
+
+        }
+
+        $products = isset($section_data->products) ? $section_data->products : array();
+        if ( 'addons' == $section_id ) {
+
+            $quotes = new stdClass();
+            $quotes->info = new stdClass();
+            $quotes->info->id = '';
+            $quotes->info->slug = 'invoicing-quotes';
+            $quotes->info->title = __( 'Quotes', 'invoicing' );
+            $quotes->info->excerpt = __( 'Create quotes and estimates', 'invoicing' );
+            $quotes->info->link = 'https://wordpress.org/plugins/invoicing-quotes/';
+            $quotes->info->thumbnail = 'https://wpgetpaid.com/wp-content/uploads/sites/13/edd/2019/11/Quotes-1-768x384.png';
+
+            $products[] = $quotes;
+        }
 		
-		return apply_filters( 'wpi_addons_section_data', $products, $section_id );
-	}
-
-	/**
-	 * Outputs a button.
-	 *ccc
-	 * @param string $url
-	 * @param string $text
-	 * @param string $theme
-	 * @param string $plugin
-	 */
-	public function output_button( $addon ) {
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+        return apply_filters( 'wpi_addons_section_data', $products, $section_id );
+    }
+
+    /**
+     * Outputs a button.
+     *ccc
+     * @param string $url
+     * @param string $text
+     * @param string $theme
+     * @param string $plugin
+     */
+    public function output_button( $addon ) {
+        $current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
 //		$button_text = __('Free','invoicing');
 //		$licensing = false;
 //		$installed = false;
@@ -105,123 +105,123 @@  discard block
 block discarded – undo
 //		$install_status = 'get';
 //		$onclick = '';
 
-		$wp_org_themes = array('supreme-directory','directory-starter');
-
-		$button_args = array(
-			'type' => ($current_tab == 'addons' || $current_tab =='gateways') ? 'addons' : $current_tab,
-			'id' => isset($addon->info->id) ? absint($addon->info->id) : '',
-			'title' => isset($addon->info->title) ? $addon->info->title : '',
-			'button_text' => __('Free','invoicing'),
-			'price_text' => __('Free','invoicing'),
-			'link' => isset($addon->info->link) ? $addon->info->link : '', // link to product
-			'url' => isset($addon->info->link) ? $addon->info->link : '', // button url
-			'class' => 'button-primary',
-			'install_status' => 'get',
-			'installed' => false,
-			'price' => '',
-			'licensing' => isset($addon->licensing->enabled) && $addon->licensing->enabled ? true : false,
-			'license' => isset($addon->licensing->license) && $addon->licensing->license ? $addon->licensing->license : '',
-			'onclick' => '',
-			'slug' => isset($addon->info->slug) ? $addon->info->slug : '',
-			'active' => false,
-			'file' => '',
-			'update_url' => '',
-		);
-
-		if( 'invoicing-quotes' == $addon->info->slug || 'getpaid-stripe-payments' == $addon->info->slug || ( $current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug )){
-			include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
-			$status = install_plugin_install_status(array("slug"=>$button_args['slug'],"version"=>""));
-			$button_args['install_status'] = isset($status['status']) ? $status['status'] : 'install';
-			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
-		}elseif( ($current_tab == 'addons' || $current_tab =='gateways') && isset($addon->info->id) && $addon->info->id){
-			include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
-			if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
-			$status = self::install_plugin_install_status($addon);
-			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
-			if(isset($status['status'])){$button_args['install_status'] = $status['status'];}
-			$button_args['update_url'] = "https://wpinvoicing.com";
-		}elseif($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
-			if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
-			$button_args['installed'] = self::is_theme_installed($addon);
-			if(!in_array($button_args['slug'],$wp_org_themes)){
-				$button_args['update_url'] = "https://wpinvoicing.com";
-			}
-		}
-
-		// set price
-		if(isset($addon->pricing) && !empty($addon->pricing)){
-			if(is_object($addon->pricing)){
-				$prices = (Array)$addon->pricing;
-				$button_args['price'] = reset($prices);
-			}elseif(isset($addon->pricing)){
-				$button_args['price'] = $addon->pricing;
-			}
-		}
-
-		// set price text
-		if( $button_args['price'] && $button_args['price'] != '0.00' ){
-			$button_args['price_text'] = sprintf( __('From: $%d', 'invoicing'), $button_args['price']);
-		}
-
-
-		// set if installed
-		if(in_array($button_args['install_status'], array('installed','latest_installed','update_available','newer_installed'))){
-			$button_args['installed'] = true;
-		}
+        $wp_org_themes = array('supreme-directory','directory-starter');
+
+        $button_args = array(
+            'type' => ($current_tab == 'addons' || $current_tab =='gateways') ? 'addons' : $current_tab,
+            'id' => isset($addon->info->id) ? absint($addon->info->id) : '',
+            'title' => isset($addon->info->title) ? $addon->info->title : '',
+            'button_text' => __('Free','invoicing'),
+            'price_text' => __('Free','invoicing'),
+            'link' => isset($addon->info->link) ? $addon->info->link : '', // link to product
+            'url' => isset($addon->info->link) ? $addon->info->link : '', // button url
+            'class' => 'button-primary',
+            'install_status' => 'get',
+            'installed' => false,
+            'price' => '',
+            'licensing' => isset($addon->licensing->enabled) && $addon->licensing->enabled ? true : false,
+            'license' => isset($addon->licensing->license) && $addon->licensing->license ? $addon->licensing->license : '',
+            'onclick' => '',
+            'slug' => isset($addon->info->slug) ? $addon->info->slug : '',
+            'active' => false,
+            'file' => '',
+            'update_url' => '',
+        );
+
+        if( 'invoicing-quotes' == $addon->info->slug || 'getpaid-stripe-payments' == $addon->info->slug || ( $current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug )){
+            include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
+            $status = install_plugin_install_status(array("slug"=>$button_args['slug'],"version"=>""));
+            $button_args['install_status'] = isset($status['status']) ? $status['status'] : 'install';
+            $button_args['file'] = isset($status['file']) ? $status['file'] : '';
+        }elseif( ($current_tab == 'addons' || $current_tab =='gateways') && isset($addon->info->id) && $addon->info->id){
+            include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
+            if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
+            $status = self::install_plugin_install_status($addon);
+            $button_args['file'] = isset($status['file']) ? $status['file'] : '';
+            if(isset($status['status'])){$button_args['install_status'] = $status['status'];}
+            $button_args['update_url'] = "https://wpinvoicing.com";
+        }elseif($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
+            if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
+            $button_args['installed'] = self::is_theme_installed($addon);
+            if(!in_array($button_args['slug'],$wp_org_themes)){
+                $button_args['update_url'] = "https://wpinvoicing.com";
+            }
+        }
+
+        // set price
+        if(isset($addon->pricing) && !empty($addon->pricing)){
+            if(is_object($addon->pricing)){
+                $prices = (Array)$addon->pricing;
+                $button_args['price'] = reset($prices);
+            }elseif(isset($addon->pricing)){
+                $button_args['price'] = $addon->pricing;
+            }
+        }
+
+        // set price text
+        if( $button_args['price'] && $button_args['price'] != '0.00' ){
+            $button_args['price_text'] = sprintf( __('From: $%d', 'invoicing'), $button_args['price']);
+        }
+
+
+        // set if installed
+        if(in_array($button_args['install_status'], array('installed','latest_installed','update_available','newer_installed'))){
+            $button_args['installed'] = true;
+        }
 
 //		print_r($button_args);
-		// set if active
-		if($button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes')){
-			if($button_args['type'] != 'themes'){
-				$button_args['active'] = is_plugin_active($button_args['file']);
-			}else{
-				$button_args['active'] = self::is_theme_active($addon);
-			}
-		}
-
-		// set button text and class
-		if($button_args['active']){
-			$button_args['button_text'] = __('Active','invoicing');
-			$button_args['class'] = ' button-secondary disabled ';
-		}elseif($button_args['installed']){
-			$button_args['button_text'] = __('Activate','invoicing');
-
-			if($button_args['type'] != 'themes'){
-				if ( current_user_can( 'manage_options' ) ) {
-					$button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin='.$button_args['file']), 'activate-plugin_' . $button_args['file']);
-				}else{
-					$button_args['url'] = '#';
-				}
-			}else{
-				if ( current_user_can( 'switch_themes' ) ) {
-					$button_args['url'] = self::get_theme_activation_url($addon);
-				}else{
-					$button_args['url'] = '#';
-				}
-			}
-
-		}else{
-			if($button_args['type'] == 'recommended_plugins'){
-				$button_args['button_text'] = __('Install','invoicing');
-			}else{
-				$button_args['button_text'] = __('Get it','invoicing');
-
-				/*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
+        // set if active
+        if($button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes')){
+            if($button_args['type'] != 'themes'){
+                $button_args['active'] = is_plugin_active($button_args['file']);
+            }else{
+                $button_args['active'] = self::is_theme_active($addon);
+            }
+        }
+
+        // set button text and class
+        if($button_args['active']){
+            $button_args['button_text'] = __('Active','invoicing');
+            $button_args['class'] = ' button-secondary disabled ';
+        }elseif($button_args['installed']){
+            $button_args['button_text'] = __('Activate','invoicing');
+
+            if($button_args['type'] != 'themes'){
+                if ( current_user_can( 'manage_options' ) ) {
+                    $button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin='.$button_args['file']), 'activate-plugin_' . $button_args['file']);
+                }else{
+                    $button_args['url'] = '#';
+                }
+            }else{
+                if ( current_user_can( 'switch_themes' ) ) {
+                    $button_args['url'] = self::get_theme_activation_url($addon);
+                }else{
+                    $button_args['url'] = '#';
+                }
+            }
+
+        }else{
+            if($button_args['type'] == 'recommended_plugins'){
+                $button_args['button_text'] = __('Install','invoicing');
+            }else{
+                $button_args['button_text'] = __('Get it','invoicing');
+
+                /*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
 					$button_args['button_text'] = __('Install','invoicing');
 					$button_args['url'] = self::get_theme_install_url($button_args['slug']);
 					$button_args['onclick'] = 'gd_set_button_installing(this);';
 				}*/
 
-			}
-		}
+            }
+        }
 
 		
-		// filter the button arguments
-		$button_args = apply_filters('edd_api_button_args',$button_args);
+        // filter the button arguments
+        $button_args = apply_filters('edd_api_button_args',$button_args);
 //		print_r($button_args);
-		// set price text
-		if(isset($button_args['price_text'])){
-			?>
+        // set price text
+        if(isset($button_args['price_text'])){
+            ?>
 			<a
 				target="_blank"
 				class="addons-price-text"
@@ -229,9 +229,9 @@  discard block
 block discarded – undo
 				<?php echo esc_html( $button_args['price_text'] ); ?>
 			</a>
 			<?php
-		}
+        }
 
-		?>
+        ?>
 		<a
 			data-licence="<?php echo esc_attr($button_args['license']);?>"
 			data-licensing="<?php echo $button_args['licensing'] ? 1 : 0;?>"
@@ -253,33 +253,33 @@  discard block
 block discarded – undo
 		<?php
 
 
-	}
-
-
-	/**
-	 * Handles output of the addons page in admin.
-	 */
-	public function output() {
-		$tabs            = self::get_tabs();
-		$sections        = self::get_sections();
-		$theme           = wp_get_theme();
-		$section_keys    = array_keys( $sections );
-		$current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys );
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
-		include_once( WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php' );
-	}
-
-	/**
-	 * A list of recommended wp.org plugins.
-	 * @return array
-	 */
-	public function get_recommend_wp_plugins(){
-		$plugins = array(
+    }
+
+
+    /**
+     * Handles output of the addons page in admin.
+     */
+    public function output() {
+        $tabs            = self::get_tabs();
+        $sections        = self::get_sections();
+        $theme           = wp_get_theme();
+        $section_keys    = array_keys( $sections );
+        $current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys );
+        $current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+        include_once( WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php' );
+    }
+
+    /**
+     * A list of recommended wp.org plugins.
+     * @return array
+     */
+    public function get_recommend_wp_plugins(){
+        $plugins = array(
             'invoicing-quotes' => array(
                 'url'   => 'https://wordpress.org/plugins/invoicing-quotes/',
                 'slug'   => 'invoicing-quotes',
-				'name'   => 'Quotes',
-				'thumbnail'  => 'https://ps.w.org/invoicing-quotes/assets/banner-772x250.png',
+                'name'   => 'Quotes',
+                'thumbnail'  => 'https://ps.w.org/invoicing-quotes/assets/banner-772x250.png',
                 'desc'   => __('Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.','invoicing'),
             ),
             'geodirectory' => array(
@@ -294,8 +294,8 @@  discard block
 block discarded – undo
                 'name'   => 'UsersWP',
                 'desc'   => __('Allow frontend user login and registration as well as have slick profile pages.','invoicing'),
             ),
-		);
+        );
 
-		return $plugins;
-	}
+        return $plugins;
+    }
 }

Please login to merge, or discard this patch.

Spacing +88 added lines, -88 removed lines patch added patch discarded remove patch

@@ -5,7 +5,7 @@  discard block
 block discarded – undo
  * All Invoicing extensions screen related functions can be found here.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
 	 *
 	 * @return array of tabs.
 	 */
-	public function get_tabs(){
+	public function get_tabs() {
 		$tabs = array(
 			'addons' => __("Addons", "invoicing"),
             'gateways' => __("Payment Gateways", "invoicing"),
@@ -38,28 +38,28 @@  discard block
 block discarded – undo
 	 *
 	 * @return array
 	 */
-	public function get_section_data( $section_id ) {
-		$section      = self::get_tab( $section_id );
+	public function get_section_data($section_id) {
+		$section      = self::get_tab($section_id);
 		$api_url = "https://wpinvoicing.com/edd-api/v2/products/";
 		$section_data = new stdClass();
 
-		if($section_id=='recommended_plugins'){
+		if ($section_id == 'recommended_plugins') {
 			$section_data->products = self::get_recommend_wp_plugins_edd_formatted();
 		}
-		elseif ( ! empty( $section ) ) {
-			if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
+		elseif (!empty($section)) {
+			if (false === ($section_data = get_transient('wpi_addons_section_' . $section_id))) { //@todo restore after testing
 			//if ( 1==1) {
 
-				$query_args = array( 'category' => $section_id, 'number' => 100);
-				$query_args = apply_filters('wpeu_edd_api_query_args',$query_args,$api_url,$section_id);
+				$query_args = array('category' => $section_id, 'number' => 100);
+				$query_args = apply_filters('wpeu_edd_api_query_args', $query_args, $api_url, $section_id);
 
-				$raw_section = wp_safe_remote_get( esc_url_raw( add_query_arg($query_args ,$api_url) ), array( 'user-agent' => 'Invoicing Addons Page','timeout'     => 15, ) );
+				$raw_section = wp_safe_remote_get(esc_url_raw(add_query_arg($query_args, $api_url)), array('user-agent' => 'Invoicing Addons Page', 'timeout'     => 15,));
 
-				if ( ! is_wp_error( $raw_section ) ) {
-					$section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
+				if (!is_wp_error($raw_section)) {
+					$section_data = json_decode(wp_remote_retrieve_body($raw_section));
 
-					if ( ! empty( $section_data->products ) ) {
-						set_transient( 'wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS );
+					if (!empty($section_data->products)) {
+						set_transient('wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS);
 					}
 				}
 			}
@@ -67,21 +67,21 @@  discard block
 block discarded – undo
 		}
 
 		$products = isset($section_data->products) ? $section_data->products : array();
-		if ( 'addons' == $section_id ) {
+		if ('addons' == $section_id) {
 
 			$quotes = new stdClass();
 			$quotes->info = new stdClass();
 			$quotes->info->id = '';
 			$quotes->info->slug = 'invoicing-quotes';
-			$quotes->info->title = __( 'Quotes', 'invoicing' );
-			$quotes->info->excerpt = __( 'Create quotes and estimates', 'invoicing' );
+			$quotes->info->title = __('Quotes', 'invoicing');
+			$quotes->info->excerpt = __('Create quotes and estimates', 'invoicing');
 			$quotes->info->link = 'https://wordpress.org/plugins/invoicing-quotes/';
 			$quotes->info->thumbnail = 'https://wpgetpaid.com/wp-content/uploads/sites/13/edd/2019/11/Quotes-1-768x384.png';
 
 			$products[] = $quotes;
 		}
 		
-		return apply_filters( 'wpi_addons_section_data', $products, $section_id );
+		return apply_filters('wpi_addons_section_data', $products, $section_id);
 	}
 
 	/**
@@ -92,8 +92,8 @@  discard block
 block discarded – undo
 	 * @param string $theme
 	 * @param string $plugin
 	 */
-	public function output_button( $addon ) {
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+	public function output_button($addon) {
+		$current_tab = empty($_GET['tab']) ? 'addons' : sanitize_title($_GET['tab']);
 //		$button_text = __('Free','invoicing');
 //		$licensing = false;
 //		$installed = false;
@@ -105,14 +105,14 @@  discard block
 block discarded – undo
 //		$install_status = 'get';
 //		$onclick = '';
 
-		$wp_org_themes = array('supreme-directory','directory-starter');
+		$wp_org_themes = array('supreme-directory', 'directory-starter');
 
 		$button_args = array(
-			'type' => ($current_tab == 'addons' || $current_tab =='gateways') ? 'addons' : $current_tab,
+			'type' => ($current_tab == 'addons' || $current_tab == 'gateways') ? 'addons' : $current_tab,
 			'id' => isset($addon->info->id) ? absint($addon->info->id) : '',
 			'title' => isset($addon->info->title) ? $addon->info->title : '',
-			'button_text' => __('Free','invoicing'),
-			'price_text' => __('Free','invoicing'),
+			'button_text' => __('Free', 'invoicing'),
+			'price_text' => __('Free', 'invoicing'),
 			'link' => isset($addon->info->link) ? $addon->info->link : '', // link to product
 			'url' => isset($addon->info->link) ? $addon->info->link : '', // button url
 			'class' => 'button-primary',
@@ -128,83 +128,83 @@  discard block
 block discarded – undo
 			'update_url' => '',
 		);
 
-		if( 'invoicing-quotes' == $addon->info->slug || 'getpaid-stripe-payments' == $addon->info->slug || ( $current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug )){
-			include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
-			$status = install_plugin_install_status(array("slug"=>$button_args['slug'],"version"=>""));
+		if ('invoicing-quotes' == $addon->info->slug || 'getpaid-stripe-payments' == $addon->info->slug || ($current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug)) {
+			include_once(ABSPATH . 'wp-admin/includes/plugin-install.php'); //for plugins_api..
+			$status = install_plugin_install_status(array("slug"=>$button_args['slug'], "version"=>""));
 			$button_args['install_status'] = isset($status['status']) ? $status['status'] : 'install';
 			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
-		}elseif( ($current_tab == 'addons' || $current_tab =='gateways') && isset($addon->info->id) && $addon->info->id){
-			include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
-			if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
+		}elseif (($current_tab == 'addons' || $current_tab == 'gateways') && isset($addon->info->id) && $addon->info->id) {
+			include_once(ABSPATH . 'wp-admin/includes/plugin-install.php'); //for plugins_api..
+			if (!empty($addon->licensing->edd_slug)) {$button_args['slug'] = $addon->licensing->edd_slug; }
 			$status = self::install_plugin_install_status($addon);
 			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
-			if(isset($status['status'])){$button_args['install_status'] = $status['status'];}
+			if (isset($status['status'])) {$button_args['install_status'] = $status['status']; }
 			$button_args['update_url'] = "https://wpinvoicing.com";
-		}elseif($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
-			if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
+		}elseif ($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
+			if (!empty($addon->licensing->edd_slug)) {$button_args['slug'] = $addon->licensing->edd_slug; }
 			$button_args['installed'] = self::is_theme_installed($addon);
-			if(!in_array($button_args['slug'],$wp_org_themes)){
+			if (!in_array($button_args['slug'], $wp_org_themes)) {
 				$button_args['update_url'] = "https://wpinvoicing.com";
 			}
 		}
 
 		// set price
-		if(isset($addon->pricing) && !empty($addon->pricing)){
-			if(is_object($addon->pricing)){
-				$prices = (Array)$addon->pricing;
+		if (isset($addon->pricing) && !empty($addon->pricing)) {
+			if (is_object($addon->pricing)) {
+				$prices = (Array) $addon->pricing;
 				$button_args['price'] = reset($prices);
-			}elseif(isset($addon->pricing)){
+			}elseif (isset($addon->pricing)) {
 				$button_args['price'] = $addon->pricing;
 			}
 		}
 
 		// set price text
-		if( $button_args['price'] && $button_args['price'] != '0.00' ){
-			$button_args['price_text'] = sprintf( __('From: $%d', 'invoicing'), $button_args['price']);
+		if ($button_args['price'] && $button_args['price'] != '0.00') {
+			$button_args['price_text'] = sprintf(__('From: $%d', 'invoicing'), $button_args['price']);
 		}
 
 
 		// set if installed
-		if(in_array($button_args['install_status'], array('installed','latest_installed','update_available','newer_installed'))){
+		if (in_array($button_args['install_status'], array('installed', 'latest_installed', 'update_available', 'newer_installed'))) {
 			$button_args['installed'] = true;
 		}
 
 //		print_r($button_args);
 		// set if active
-		if($button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes')){
-			if($button_args['type'] != 'themes'){
+		if ($button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes')) {
+			if ($button_args['type'] != 'themes') {
 				$button_args['active'] = is_plugin_active($button_args['file']);
-			}else{
+			} else {
 				$button_args['active'] = self::is_theme_active($addon);
 			}
 		}
 
 		// set button text and class
-		if($button_args['active']){
-			$button_args['button_text'] = __('Active','invoicing');
+		if ($button_args['active']) {
+			$button_args['button_text'] = __('Active', 'invoicing');
 			$button_args['class'] = ' button-secondary disabled ';
-		}elseif($button_args['installed']){
-			$button_args['button_text'] = __('Activate','invoicing');
+		}elseif ($button_args['installed']) {
+			$button_args['button_text'] = __('Activate', 'invoicing');
 
-			if($button_args['type'] != 'themes'){
-				if ( current_user_can( 'manage_options' ) ) {
-					$button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin='.$button_args['file']), 'activate-plugin_' . $button_args['file']);
-				}else{
+			if ($button_args['type'] != 'themes') {
+				if (current_user_can('manage_options')) {
+					$button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin=' . $button_args['file']), 'activate-plugin_' . $button_args['file']);
+				} else {
 					$button_args['url'] = '#';
 				}
-			}else{
-				if ( current_user_can( 'switch_themes' ) ) {
+			} else {
+				if (current_user_can('switch_themes')) {
 					$button_args['url'] = self::get_theme_activation_url($addon);
-				}else{
+				} else {
 					$button_args['url'] = '#';
 				}
 			}
 
-		}else{
-			if($button_args['type'] == 'recommended_plugins'){
-				$button_args['button_text'] = __('Install','invoicing');
-			}else{
-				$button_args['button_text'] = __('Get it','invoicing');
+		} else {
+			if ($button_args['type'] == 'recommended_plugins') {
+				$button_args['button_text'] = __('Install', 'invoicing');
+			} else {
+				$button_args['button_text'] = __('Get it', 'invoicing');
 
 				/*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
 					$button_args['button_text'] = __('Install','invoicing');
@@ -217,38 +217,38 @@  discard block
 block discarded – undo
 
 		
 		// filter the button arguments
-		$button_args = apply_filters('edd_api_button_args',$button_args);
+		$button_args = apply_filters('edd_api_button_args', $button_args);
 //		print_r($button_args);
 		// set price text
-		if(isset($button_args['price_text'])){
+		if (isset($button_args['price_text'])) {
 			?>
 			<a
 				target="_blank"
 				class="addons-price-text"
-				href="<?php echo esc_url( $button_args['link'] ); ?>">
-				<?php echo esc_html( $button_args['price_text'] ); ?>
+				href="<?php echo esc_url($button_args['link']); ?>">
+				<?php echo esc_html($button_args['price_text']); ?>
 			</a>
 			<?php
 		}
 
 		?>
 		<a
-			data-licence="<?php echo esc_attr($button_args['license']);?>"
-			data-licensing="<?php echo $button_args['licensing'] ? 1 : 0;?>"
-			data-title="<?php echo esc_attr($button_args['title']);?>"
-			data-type="<?php echo esc_attr($button_args['type']);?>"
-			data-text-error-message="<?php _e('Something went wrong!','invoicing');?>"
-			data-text-activate="<?php _e('Activate','invoicing');?>"
-			data-text-activating="<?php _e('Activating','invoicing');?>"
-			data-text-deactivate="<?php _e('Deactivate','invoicing');?>"
-			data-text-installed="<?php _e('Installed','invoicing');?>"
-			data-text-install="<?php _e('Install','invoicing');?>"
-			data-text-installing="<?php _e('Installing','invoicing');?>"
-			data-text-error="<?php _e('Error','invoicing');?>"
-			<?php if(!empty($button_args['onclick'])){echo " onclick='".esc_attr( $button_args['onclick'] )."' ";}?>
-			class="addons-button  <?php echo esc_attr( $button_args['class'] ); ?>"
-			href="<?php echo esc_url( $button_args['url'] ); ?>">
-			<?php echo esc_html( $button_args['button_text'] ); ?>
+			data-licence="<?php echo esc_attr($button_args['license']); ?>"
+			data-licensing="<?php echo $button_args['licensing'] ? 1 : 0; ?>"
+			data-title="<?php echo esc_attr($button_args['title']); ?>"
+			data-type="<?php echo esc_attr($button_args['type']); ?>"
+			data-text-error-message="<?php _e('Something went wrong!', 'invoicing'); ?>"
+			data-text-activate="<?php _e('Activate', 'invoicing'); ?>"
+			data-text-activating="<?php _e('Activating', 'invoicing'); ?>"
+			data-text-deactivate="<?php _e('Deactivate', 'invoicing'); ?>"
+			data-text-installed="<?php _e('Installed', 'invoicing'); ?>"
+			data-text-install="<?php _e('Install', 'invoicing'); ?>"
+			data-text-installing="<?php _e('Installing', 'invoicing'); ?>"
+			data-text-error="<?php _e('Error', 'invoicing'); ?>"
+			<?php if (!empty($button_args['onclick'])) {echo " onclick='" . esc_attr($button_args['onclick']) . "' "; }?>
+			class="addons-button  <?php echo esc_attr($button_args['class']); ?>"
+			href="<?php echo esc_url($button_args['url']); ?>">
+			<?php echo esc_html($button_args['button_text']); ?>
 		</a>
 		<?php
 
@@ -263,36 +263,36 @@  discard block
 block discarded – undo
 		$tabs            = self::get_tabs();
 		$sections        = self::get_sections();
 		$theme           = wp_get_theme();
-		$section_keys    = array_keys( $sections );
-		$current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys );
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
-		include_once( WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php' );
+		$section_keys    = array_keys($sections);
+		$current_section = isset($_GET['section']) ? sanitize_text_field($_GET['section']) : current($section_keys);
+		$current_tab     = empty($_GET['tab']) ? 'addons' : sanitize_title($_GET['tab']);
+		include_once(WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php');
 	}
 
 	/**
 	 * A list of recommended wp.org plugins.
 	 * @return array
 	 */
-	public function get_recommend_wp_plugins(){
+	public function get_recommend_wp_plugins() {
 		$plugins = array(
             'invoicing-quotes' => array(
                 'url'   => 'https://wordpress.org/plugins/invoicing-quotes/',
                 'slug'   => 'invoicing-quotes',
 				'name'   => 'Quotes',
 				'thumbnail'  => 'https://ps.w.org/invoicing-quotes/assets/banner-772x250.png',
-                'desc'   => __('Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.','invoicing'),
+                'desc'   => __('Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.', 'invoicing'),
             ),
             'geodirectory' => array(
                 'url'   => 'https://wordpress.org/plugins/geodirectory/',
                 'slug'   => 'geodirectory',
                 'name'   => 'GeoDirectory',
-                'desc'   => __('Turn any WordPress theme into a global business directory portal.','invoicing'),
+                'desc'   => __('Turn any WordPress theme into a global business directory portal.', 'invoicing'),
             ),
             'userswp' => array(
                 'url'   => 'https://wordpress.org/plugins/userswp/',
                 'slug'   => 'userswp',
                 'name'   => 'UsersWP',
-                'desc'   => __('Allow frontend user login and registration as well as have slick profile pages.','invoicing'),
+                'desc'   => __('Allow frontend user login and registration as well as have slick profile pages.', 'invoicing'),
             ),
 		);
 

Please login to merge, or discard this patch.

includes/invoice-functions.php 1 patch

Spacing +370 added lines, -370 removed lines patch added patch discarded remove patch

@@ -6,7 +6,7 @@  discard block
 block discarded – undo
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Retrieves the current invoice.
@@ -14,15 +14,15 @@  discard block
 block discarded – undo
 function getpaid_get_current_invoice_id() {
 
     // Ensure that we have an invoice key.
-    if ( empty( $_GET['invoice_key'] ) ) {
+    if (empty($_GET['invoice_key'])) {
         return 0;
     }
 
     // Retrieve an invoice using the key.
-    $invoice = new WPInv_Invoice( sanitize_text_field( $_GET['invoice_key'] ) );
+    $invoice = new WPInv_Invoice(sanitize_text_field($_GET['invoice_key']));
 
     // Compare the invoice key and the parsed key.
-    if ( $invoice->get_id() != 0 && $invoice->get_key() == sanitize_text_field( $_GET['invoice_key'] ) ) {
+    if ($invoice->get_id() != 0 && $invoice->get_key() == sanitize_text_field($_GET['invoice_key'])) {
         return $invoice->get_id();
     }
 
@@ -32,42 +32,42 @@  discard block
 block discarded – undo
 /**
  * Checks if the current user cna view an invoice.
  */
-function wpinv_user_can_view_invoice( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_user_can_view_invoice($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if the invoice does not exist.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return false;
     }
 
     // Don't allow trash, draft status
-    if ( $invoice->is_draft() ) {
+    if ($invoice->is_draft()) {
         return false;
     }
 
     // If users are not required to login to check out, compare the invoice keys.
-    if ( ! wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && sanitize_text_field( $_GET['invoice_key'] ) == $invoice->get_key() ) {
+    if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && sanitize_text_field($_GET['invoice_key']) == $invoice->get_key()) {
         return true;
     }
 
     // Always enable for admins..
-    if ( wpinv_current_user_can_manage_invoicing() || current_user_can( 'view_invoices', $invoice->get_id() ) ) { // Admin user
+    if (wpinv_current_user_can_manage_invoicing() || current_user_can('view_invoices', $invoice->get_id())) { // Admin user
         return true;
     }
 
     // Else, ensure that this is their invoice.
-    if ( is_user_logged_in() && $invoice->get_user_id() == get_current_user_id() ) {
+    if (is_user_logged_in() && $invoice->get_user_id() == get_current_user_id()) {
         return true;
     }
 
-    return apply_filters( 'wpinv_current_user_can_view_invoice', false, $invoice );
+    return apply_filters('wpinv_current_user_can_view_invoice', false, $invoice);
 }
 
 /**
  * Checks if the current user cna view an invoice receipt.
  */
-function wpinv_can_view_receipt( $invoice ) {
-	return (bool) apply_filters( 'wpinv_can_view_receipt', wpinv_user_can_view_invoice( $invoice ), $invoice );
+function wpinv_can_view_receipt($invoice) {
+	return (bool) apply_filters('wpinv_can_view_receipt', wpinv_user_can_view_invoice($invoice), $invoice);
 }
 
 /**
@@ -77,16 +77,16 @@  discard block
 block discarded – undo
  */
 function getpaid_get_invoice_post_types() {
     $post_types = array(
-        'wpi_quote'   => __( 'Quote', 'invoicing' ),
-        'wpi_invoice' => __( 'Invoice', 'invoicing' ),
+        'wpi_quote'   => __('Quote', 'invoicing'),
+        'wpi_invoice' => __('Invoice', 'invoicing'),
     );
 
     // Ensure the quotes addon is installed.
-    if ( ! defined( 'WPINV_QUOTES_VERSION' ) ) {
-        unset( $post_types['wpi_quote'] );
+    if (!defined('WPINV_QUOTES_VERSION')) {
+        unset($post_types['wpi_quote']);
     }
 
-    return apply_filters( 'getpaid_invoice_post_types', $post_types );
+    return apply_filters('getpaid_invoice_post_types', $post_types);
 }
 
 /**
@@ -95,8 +95,8 @@  discard block
 block discarded – undo
  *
  * @param string $post_type The post type to check for.
  */
-function getpaid_is_invoice_post_type( $post_type ) {
-    return is_scalar( $post_type ) && ! empty( $post_type ) && array_key_exists( $post_type, getpaid_get_invoice_post_types() );
+function getpaid_is_invoice_post_type($post_type) {
+    return is_scalar($post_type) && !empty($post_type) && array_key_exists($post_type, getpaid_get_invoice_post_types());
 }
 
 /**
@@ -106,9 +106,9 @@  discard block
 block discarded – undo
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_create_invoice( $data = array(), $deprecated = null, $wp_error = false ) {
-    $data[ 'invoice_id' ] = 0;
-    return wpinv_insert_invoice( $data, $wp_error );
+function wpinv_create_invoice($data = array(), $deprecated = null, $wp_error = false) {
+    $data['invoice_id'] = 0;
+    return wpinv_insert_invoice($data, $wp_error);
 }
 
 /**
@@ -118,36 +118,36 @@  discard block
 block discarded – undo
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_update_invoice( $data = array(), $wp_error = false ) {
+function wpinv_update_invoice($data = array(), $wp_error = false) {
 
     // Backwards compatibility.
-    if ( ! empty( $data['ID'] ) ) {
+    if (!empty($data['ID'])) {
         $data['invoice_id'] = $data['ID'];
     }
 
     // Do we have an invoice id?
-    if ( empty( $data['invoice_id'] ) ) {
-        return $wp_error ? new WP_Error( 'invalid_invoice_id', __( 'Invalid invoice ID.', 'invoicing' ) ) : 0;
+    if (empty($data['invoice_id'])) {
+        return $wp_error ? new WP_Error('invalid_invoice_id', __('Invalid invoice ID.', 'invoicing')) : 0;
     }
 
     // Retrieve the invoice.
-    $invoice = wpinv_get_invoice( $data['invoice_id'] );
+    $invoice = wpinv_get_invoice($data['invoice_id']);
 
     // And abort if it does not exist.
-    if ( empty( $invoice ) ) {
-        return $wp_error ? new WP_Error( 'missing_invoice', __( 'Invoice not found.', 'invoicing' ) ) : 0;
+    if (empty($invoice)) {
+        return $wp_error ? new WP_Error('missing_invoice', __('Invoice not found.', 'invoicing')) : 0;
     }
 
     // Do not update totals for paid / refunded invoices.
-    if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+    if ($invoice->is_paid() || $invoice->is_refunded()) {
 
-        if ( ! empty( $data['items'] ) || ! empty( $data['cart_details'] ) ) {
-            return $wp_error ? new WP_Error( 'paid_invoice', __( 'You can not update cart items for invoices that have already been paid for.', 'invoicing' ) ) : 0;
+        if (!empty($data['items']) || !empty($data['cart_details'])) {
+            return $wp_error ? new WP_Error('paid_invoice', __('You can not update cart items for invoices that have already been paid for.', 'invoicing')) : 0;
         }
 
     }
 
-    return wpinv_insert_invoice( $data, $wp_error );
+    return wpinv_insert_invoice($data, $wp_error);
 
 }
 
@@ -158,34 +158,34 @@  discard block
 block discarded – undo
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_insert_invoice( $data = array(), $wp_error = false ) {
+function wpinv_insert_invoice($data = array(), $wp_error = false) {
 
     // Ensure that we have invoice data.
-    if ( empty( $data ) ) {
+    if (empty($data)) {
         return false;
     }
 
     // The invoice id will be provided when updating an invoice.
-    $data['invoice_id'] = ! empty( $data['invoice_id'] ) ? (int) $data['invoice_id'] : false;
+    $data['invoice_id'] = !empty($data['invoice_id']) ? (int) $data['invoice_id'] : false;
 
     // Retrieve the invoice.
-    $invoice = new WPInv_Invoice( $data['invoice_id'] );
+    $invoice = new WPInv_Invoice($data['invoice_id']);
 
     // Do we have an error?
-    if ( ! empty( $invoice->last_error ) ) {
-        return $wp_error ? new WP_Error( 'invalid_invoice_id', $invoice->last_error ) : 0;
+    if (!empty($invoice->last_error)) {
+        return $wp_error ? new WP_Error('invalid_invoice_id', $invoice->last_error) : 0;
     }
 
     // Backwards compatibility (billing address).
-    if ( ! empty( $data['user_info'] ) ) {
+    if (!empty($data['user_info'])) {
 
-        foreach ( $data['user_info'] as $key => $value ) {
+        foreach ($data['user_info'] as $key => $value) {
 
-            if ( $key == 'discounts' ) {
+            if ($key == 'discounts') {
                 $value = (array) $value;
-                $data[ 'discount_code' ] = empty( $value ) ? null : $value[0];
+                $data['discount_code'] = empty($value) ? null : $value[0];
             } else {
-                $data[ $key ] = $value;
+                $data[$key] = $value;
             }
 
         }
@@ -193,30 +193,30 @@  discard block
 block discarded – undo
     }
 
     // Backwards compatibility.
-    if ( ! empty( $data['payment_details'] ) ) {
+    if (!empty($data['payment_details'])) {
 
-        foreach ( $data['payment_details'] as $key => $value ) {
-            $data[ $key ] = $value;
+        foreach ($data['payment_details'] as $key => $value) {
+            $data[$key] = $value;
         }
 
     }
 
     // Set up the owner of the invoice.
-    $user_id = ! empty( $data['user_id'] ) ? wpinv_clean( $data['user_id'] ) : get_current_user_id();
+    $user_id = !empty($data['user_id']) ? wpinv_clean($data['user_id']) : get_current_user_id();
 
     // Make sure the user exists.
-    if ( ! get_userdata( $user_id ) ) {
-        return $wp_error ? new WP_Error( 'wpinv_invalid_user', __( 'There is no user with that ID.', 'invoicing' ) ) : 0;
+    if (!get_userdata($user_id)) {
+        return $wp_error ? new WP_Error('wpinv_invalid_user', __('There is no user with that ID.', 'invoicing')) : 0;
     }
 
-    $address = wpinv_get_user_address( $user_id );
+    $address = wpinv_get_user_address($user_id);
 
-    foreach ( $address as $key => $value ) {
+    foreach ($address as $key => $value) {
 
-        if ( $value == '' ) {
-            $address[ $key ] = null;
+        if ($value == '') {
+            $address[$key] = null;
         } else {
-            $address[ $key ] = wpinv_clean( $value );
+            $address[$key] = wpinv_clean($value);
         }
 
     }
@@ -227,103 +227,103 @@  discard block
 block discarded – undo
         array(
 
             // Basic info.
-            'template'             => isset( $data['template'] ) ? wpinv_clean( $data['template'] ) : null,
-            'email_cc'             => isset( $data['email_cc'] ) ? wpinv_clean( $data['email_cc'] ) : null,
-            'date_created'         => isset( $data['created_date'] ) ? wpinv_clean( $data['created_date'] ) : null,
-            'due_date'             => isset( $data['due_date'] ) ? wpinv_clean( $data['due_date'] ) : null,
-            'date_completed'       => isset( $data['date_completed'] ) ? wpinv_clean( $data['date_completed'] ) : null,
-            'number'               => isset( $data['number'] ) ? wpinv_clean( $data['number'] ) : null,
-            'key'                  => isset( $data['key'] ) ? wpinv_clean( $data['key'] ) : null,
-            'status'               => isset( $data['status'] ) ? wpinv_clean( $data['status'] ) : null,
-            'post_type'            => isset( $data['post_type'] ) ? wpinv_clean( $data['post_type'] ) : null,
-            'user_ip'              => isset( $data['ip'] ) ? wpinv_clean( $data['ip'] ) : wpinv_get_ip(),
-            'parent_id'            => isset( $data['parent'] ) ? intval( $data['parent'] ) : null,
-            'mode'                 => isset( $data['mode'] ) ? wpinv_clean( $data['mode'] ) : null,
-            'description'          => isset( $data['description'] ) ? wp_kses_post( $data['description'] ) : null,
+            'template'             => isset($data['template']) ? wpinv_clean($data['template']) : null,
+            'email_cc'             => isset($data['email_cc']) ? wpinv_clean($data['email_cc']) : null,
+            'date_created'         => isset($data['created_date']) ? wpinv_clean($data['created_date']) : null,
+            'due_date'             => isset($data['due_date']) ? wpinv_clean($data['due_date']) : null,
+            'date_completed'       => isset($data['date_completed']) ? wpinv_clean($data['date_completed']) : null,
+            'number'               => isset($data['number']) ? wpinv_clean($data['number']) : null,
+            'key'                  => isset($data['key']) ? wpinv_clean($data['key']) : null,
+            'status'               => isset($data['status']) ? wpinv_clean($data['status']) : null,
+            'post_type'            => isset($data['post_type']) ? wpinv_clean($data['post_type']) : null,
+            'user_ip'              => isset($data['ip']) ? wpinv_clean($data['ip']) : wpinv_get_ip(),
+            'parent_id'            => isset($data['parent']) ? intval($data['parent']) : null,
+            'mode'                 => isset($data['mode']) ? wpinv_clean($data['mode']) : null,
+            'description'          => isset($data['description']) ? wp_kses_post($data['description']) : null,
 
             // Payment info.
-            'disable_taxes'        => ! empty( $data['disable_taxes'] ),
-            'currency'             => isset( $data['currency'] ) ? wpinv_clean( $data['currency'] ) : wpinv_get_currency(),
-            'gateway'              => isset( $data['gateway'] ) ? wpinv_clean( $data['gateway'] ) : null,
-            'transaction_id'       => isset( $data['transaction_id'] ) ? wpinv_clean( $data['transaction_id'] ) : null,
-            'discount_code'        => isset( $data['discount_code'] ) ? wpinv_clean( $data['discount_code'] ) : null,
-            'payment_form'         => isset( $data['payment_form'] ) ? intval( $data['payment_form'] ) : null,
-            'submission_id'        => isset( $data['submission_id'] ) ? wpinv_clean( $data['submission_id'] ) : null,
-            'subscription_id'      => isset( $data['subscription_id'] ) ? wpinv_clean( $data['subscription_id'] ) : null,
-            'is_viewed'            => isset( $data['is_viewed'] ) ? wpinv_clean( $data['is_viewed'] ) : null,
-            'fees'                 => isset( $data['fees'] ) ? wpinv_clean( $data['fees'] ) : null,
-            'discounts'            => isset( $data['discounts'] ) ? wpinv_clean( $data['discounts'] ) : null,
-            'taxes'                => isset( $data['taxes'] ) ? wpinv_clean( $data['taxes'] ) : null,
+            'disable_taxes'        => !empty($data['disable_taxes']),
+            'currency'             => isset($data['currency']) ? wpinv_clean($data['currency']) : wpinv_get_currency(),
+            'gateway'              => isset($data['gateway']) ? wpinv_clean($data['gateway']) : null,
+            'transaction_id'       => isset($data['transaction_id']) ? wpinv_clean($data['transaction_id']) : null,
+            'discount_code'        => isset($data['discount_code']) ? wpinv_clean($data['discount_code']) : null,
+            'payment_form'         => isset($data['payment_form']) ? intval($data['payment_form']) : null,
+            'submission_id'        => isset($data['submission_id']) ? wpinv_clean($data['submission_id']) : null,
+            'subscription_id'      => isset($data['subscription_id']) ? wpinv_clean($data['subscription_id']) : null,
+            'is_viewed'            => isset($data['is_viewed']) ? wpinv_clean($data['is_viewed']) : null,
+            'fees'                 => isset($data['fees']) ? wpinv_clean($data['fees']) : null,
+            'discounts'            => isset($data['discounts']) ? wpinv_clean($data['discounts']) : null,
+            'taxes'                => isset($data['taxes']) ? wpinv_clean($data['taxes']) : null,
 
 
             // Billing details.
             'user_id'              => $data['user_id'],
-            'first_name'           => isset( $data['first_name'] ) ? wpinv_clean( $data['first_name'] ) : $address['first_name'],
-            'last_name'            => isset( $data['last_name'] ) ? wpinv_clean( $data['last_name'] ) : $address['last_name'],
-            'address'              => isset( $data['address'] ) ? wpinv_clean( $data['address'] ) : $address['address'] ,
-            'vat_number'           => isset( $data['vat_number'] ) ? wpinv_clean( $data['vat_number'] ) : $address['vat_number'],
-            'company'              => isset( $data['company'] ) ? wpinv_clean( $data['company'] ) : $address['company'],
-            'zip'                  => isset( $data['zip'] ) ? wpinv_clean( $data['zip'] ) : $address['zip'],
-            'state'                => isset( $data['state'] ) ? wpinv_clean( $data['state'] ) : $address['state'],
-            'city'                 => isset( $data['city'] ) ? wpinv_clean( $data['city'] ) : $address['city'],
-            'country'              => isset( $data['country'] ) ? wpinv_clean( $data['country'] ) : $address['country'],
-            'phone'                => isset( $data['phone'] ) ? wpinv_clean( $data['phone'] ) : $address['phone'],
-            'address_confirmed'    => ! empty( $data['address_confirmed'] ),
+            'first_name'           => isset($data['first_name']) ? wpinv_clean($data['first_name']) : $address['first_name'],
+            'last_name'            => isset($data['last_name']) ? wpinv_clean($data['last_name']) : $address['last_name'],
+            'address'              => isset($data['address']) ? wpinv_clean($data['address']) : $address['address'],
+            'vat_number'           => isset($data['vat_number']) ? wpinv_clean($data['vat_number']) : $address['vat_number'],
+            'company'              => isset($data['company']) ? wpinv_clean($data['company']) : $address['company'],
+            'zip'                  => isset($data['zip']) ? wpinv_clean($data['zip']) : $address['zip'],
+            'state'                => isset($data['state']) ? wpinv_clean($data['state']) : $address['state'],
+            'city'                 => isset($data['city']) ? wpinv_clean($data['city']) : $address['city'],
+            'country'              => isset($data['country']) ? wpinv_clean($data['country']) : $address['country'],
+            'phone'                => isset($data['phone']) ? wpinv_clean($data['phone']) : $address['phone'],
+            'address_confirmed'    => !empty($data['address_confirmed']),
 
         )
 
     );
 
     // Backwards compatibililty.
-    if ( ! empty( $data['cart_details'] ) && is_array( $data['cart_details'] ) ) {
+    if (!empty($data['cart_details']) && is_array($data['cart_details'])) {
         $data['items'] = array();
 
-        foreach( $data['cart_details'] as $_item ) {
+        foreach ($data['cart_details'] as $_item) {
 
             // Ensure that we have an item id.
-            if ( empty(  $_item['id']  ) ) {
+            if (empty($_item['id'])) {
                 continue;
             }
 
             // Retrieve the item.
-            $item = new GetPaid_Form_Item(  $_item['id']  );
+            $item = new GetPaid_Form_Item($_item['id']);
 
             // Ensure that it is purchasable.
-            if ( ! $item->can_purchase() ) {
+            if (!$item->can_purchase()) {
                 continue;
             }
 
             // Set quantity.
-            if ( ! empty( $_item['quantity'] ) && is_numeric( $_item['quantity'] ) ) {
-                $item->set_quantity( $_item['quantity'] );
+            if (!empty($_item['quantity']) && is_numeric($_item['quantity'])) {
+                $item->set_quantity($_item['quantity']);
             }
 
             // Set price.
-            if ( isset( $_item['item_price'] ) ) {
-                $item->set_price( $_item['item_price'] );
+            if (isset($_item['item_price'])) {
+                $item->set_price($_item['item_price']);
             }
 
-            if ( isset( $_item['custom_price'] ) ) {
-                $item->set_price( $_item['custom_price'] );
+            if (isset($_item['custom_price'])) {
+                $item->set_price($_item['custom_price']);
             }
 
             // Set name.
-            if ( ! empty( $_item['name'] ) ) {
-                $item->set_name( $_item['name'] );
+            if (!empty($_item['name'])) {
+                $item->set_name($_item['name']);
             }
 
             // Set description.
-            if ( isset( $_item['description'] ) ) {
-                $item->set_custom_description( $_item['description'] );
+            if (isset($_item['description'])) {
+                $item->set_custom_description($_item['description']);
             }
 
             // Set meta.
-            if ( isset( $_item['meta'] ) && is_array( $_item['meta'] ) ) {
+            if (isset($_item['meta']) && is_array($_item['meta'])) {
 
-                $item->set_item_meta( $_item['meta'] );
+                $item->set_item_meta($_item['meta']);
 
-                if ( isset( $_item['meta']['description'] ) ) {
-                    $item->set_custom_description( $_item['meta']['description'] );
+                if (isset($_item['meta']['description'])) {
+                    $item->set_custom_description($_item['meta']['description']);
                 }
 
             }
@@ -334,14 +334,14 @@  discard block
 block discarded – undo
     }
 
     // Add invoice items.
-    if ( ! empty( $data['items'] ) && is_array( $data['items'] ) ) {
+    if (!empty($data['items']) && is_array($data['items'])) {
 
-        $invoice->set_items( array() );
+        $invoice->set_items(array());
 
-        foreach ( $data['items'] as $item ) {
+        foreach ($data['items'] as $item) {
 
-            if ( is_object( $item ) && is_a( $item, 'GetPaid_Form_Item' ) && $item->can_purchase() ) {
-                $invoice->add_item( $item );
+            if (is_object($item) && is_a($item, 'GetPaid_Form_Item') && $item->can_purchase()) {
+                $invoice->add_item($item);
             }
 
         }
@@ -352,30 +352,30 @@  discard block
 block discarded – undo
     $invoice->recalculate_total();
     $invoice->save();
 
-    if ( ! $invoice->get_id() ) {
-        return $wp_error ? new WP_Error( 'wpinv_insert_invoice_error', __( 'An error occured when saving your invoice.', 'invoicing' ) ) : 0;
+    if (!$invoice->get_id()) {
+        return $wp_error ? new WP_Error('wpinv_insert_invoice_error', __('An error occured when saving your invoice.', 'invoicing')) : 0;
     }
 
     // Add private note.
-    if ( ! empty( $data['private_note'] ) ) {
-        $invoice->add_note( $data['private_note'] );
+    if (!empty($data['private_note'])) {
+        $invoice->add_note($data['private_note']);
     }
 
     // User notes.
-    if ( !empty( $data['user_note'] ) ) {
-        $invoice->add_note( $data['user_note'], true );
+    if (!empty($data['user_note'])) {
+        $invoice->add_note($data['user_note'], true);
     }
 
     // Created via.
-    if ( isset( $data['created_via'] ) ) {
-        update_post_meta( $invoice->get_id(), 'wpinv_created_via', $data['created_via'] );
+    if (isset($data['created_via'])) {
+        update_post_meta($invoice->get_id(), 'wpinv_created_via', $data['created_via']);
     }
 
     // Backwards compatiblity.
-    if ( $invoice->is_quote() ) {
+    if ($invoice->is_quote()) {
 
-        if ( isset( $data['valid_until'] ) ) {
-            update_post_meta( $invoice->get_id(), 'wpinv_quote_valid_until', $data['valid_until'] );
+        if (isset($data['valid_until'])) {
+            update_post_meta($invoice->get_id(), 'wpinv_quote_valid_until', $data['valid_until']);
         }
 
     }
@@ -390,20 +390,20 @@  discard block
 block discarded – undo
  * @param $bool $deprecated
  * @return WPInv_Invoice|null
  */
-function wpinv_get_invoice( $invoice = 0, $deprecated = false ) {
+function wpinv_get_invoice($invoice = 0, $deprecated = false) {
 
     // If we are retrieving the invoice from the cart...
-    if ( $deprecated && empty( $invoice ) ) {
+    if ($deprecated && empty($invoice)) {
         $invoice = (int) getpaid_get_current_invoice_id();
     }
 
     // Retrieve the invoice.
-    if ( ! is_a( $invoice, 'WPInv_Invoice' ) ) {
-        $invoice = new WPInv_Invoice( $invoice );
+    if (!is_a($invoice, 'WPInv_Invoice')) {
+        $invoice = new WPInv_Invoice($invoice);
     }
 
     // Check if it exists.
-    if ( $invoice->exists() ) {
+    if ($invoice->exists()) {
         return $invoice;
     }
 
@@ -416,15 +416,15 @@  discard block
 block discarded – undo
  * @param array $args Args to search for.
  * @return WPInv_Invoice[]|int[]|object
  */
-function wpinv_get_invoices( $args ) {
+function wpinv_get_invoices($args) {
 
     // Prepare args.
     $args = wp_parse_args(
         $args,
         array(
-            'status'   => array_keys( wpinv_get_invoice_statuses() ),
+            'status'   => array_keys(wpinv_get_invoice_statuses()),
             'type'     => 'wpi_invoice',
-            'limit'    => get_option( 'posts_per_page' ),
+            'limit'    => get_option('posts_per_page'),
             'return'   => 'objects',
         )
     );
@@ -442,24 +442,24 @@  discard block
 block discarded – undo
         'post__in'       => 'include',
     );
 
-    foreach ( $map_legacy as $to => $from ) {
-        if ( isset( $args[ $from ] ) ) {
-            $args[ $to ] = $args[ $from ];
-            unset( $args[ $from ] );
+    foreach ($map_legacy as $to => $from) {
+        if (isset($args[$from])) {
+            $args[$to] = $args[$from];
+            unset($args[$from]);
         }
     }
 
     // Backwards compatibility.
-    if ( ! empty( $args['email'] ) && empty( $args['user'] ) ) {
+    if (!empty($args['email']) && empty($args['user'])) {
         $args['user'] = $args['email'];
-        unset( $args['email'] );
+        unset($args['email']);
     }
 
     // Handle cases where the user is set as an email.
-    if ( ! empty( $args['author'] ) && is_email( $args['author'] ) ) {
-        $user = get_user_by( 'email', $args['user'] );
+    if (!empty($args['author']) && is_email($args['author'])) {
+        $user = get_user_by('email', $args['user']);
 
-        if ( $user ) {
+        if ($user) {
             $args['author'] = $user->user_email;
         }
 
@@ -470,31 +470,31 @@  discard block
 block discarded – undo
 
     // Show all posts.
     $paginate = true;
-    if ( isset( $args['paginate'] ) ) {
+    if (isset($args['paginate'])) {
 
         $paginate = $args['paginate'];
-        $args['no_found_rows'] = empty( $args['paginate'] );
-        unset( $args['paginate'] );
+        $args['no_found_rows'] = empty($args['paginate']);
+        unset($args['paginate']);
 
     }
 
     // Whether to return objects or fields.
     $return = $args['return'];
-    unset( $args['return'] );
+    unset($args['return']);
 
     // Get invoices.
-    $invoices = new WP_Query( apply_filters( 'wpinv_get_invoices_args', $args ) );
+    $invoices = new WP_Query(apply_filters('wpinv_get_invoices_args', $args));
 
     // Prepare the results.
-    if ( 'objects' === $return ) {
-        $results = array_map( 'wpinv_get_invoice', $invoices->posts );
-    } elseif ( 'self' === $return ) {
+    if ('objects' === $return) {
+        $results = array_map('wpinv_get_invoice', $invoices->posts);
+    } elseif ('self' === $return) {
         return $invoices;
     } else {
         $results = $invoices->posts;
     }
 
-    if ( $paginate ) {
+    if ($paginate) {
         return (object) array(
             'invoices'      => $results,
             'total'         => $invoices->found_posts,
@@ -512,8 +512,8 @@  discard block
 block discarded – undo
  * @param string $transaction_id The transaction id to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_id_by_transaction_id( $transaction_id ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $transaction_id, 'transaction_id' );
+function wpinv_get_id_by_transaction_id($transaction_id) {
+    return WPInv_Invoice::get_invoice_id_by_field($transaction_id, 'transaction_id');
 }
 
 /**
@@ -522,8 +522,8 @@  discard block
 block discarded – undo
  * @param string $invoice_number The invoice number to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_id_by_invoice_number( $invoice_number ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $invoice_number, 'number' );
+function wpinv_get_id_by_invoice_number($invoice_number) {
+    return WPInv_Invoice::get_invoice_id_by_field($invoice_number, 'number');
 }
 
 /**
@@ -532,8 +532,8 @@  discard block
 block discarded – undo
  * @param string $invoice_key The invoice key to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_invoice_id_by_key( $invoice_key ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $invoice_key, 'key' );
+function wpinv_get_invoice_id_by_key($invoice_key) {
+    return WPInv_Invoice::get_invoice_id_by_field($invoice_key, 'key');
 }
 
 /**
@@ -543,19 +543,19 @@  discard block
 block discarded – undo
  * @param string $type Optionally filter by type i.e customer|system
  * @return array|null
  */
-function wpinv_get_invoice_notes( $invoice = 0, $type = '' ) {
+function wpinv_get_invoice_notes($invoice = 0, $type = '') {
 
     // Prepare the invoice.
-    $invoice = wpinv_get_invoice( $invoice );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice);
+    if (empty($invoice)) {
         return NULL;
     }
 
     // Fetch notes.
-    $notes = getpaid_notes()->get_invoice_notes( $invoice->get_id(), $type );
+    $notes = getpaid_notes()->get_invoice_notes($invoice->get_id(), $type);
 
     // Filter the notes.
-    return apply_filters( 'wpinv_invoice_notes', $notes, $invoice->get_id(), $type );
+    return apply_filters('wpinv_invoice_notes', $notes, $invoice->get_id(), $type);
 }
 
 /**
@@ -563,10 +563,10 @@  discard block
 block discarded – undo
  *
  * @param string $post_type
  */
-function wpinv_get_user_invoices_columns( $post_type = 'wpi_invoice' ) {
+function wpinv_get_user_invoices_columns($post_type = 'wpi_invoice') {
 
-    $label   = getpaid_get_post_type_label( $post_type, false );
-    $label   = empty( $label ) ? __( 'Invoice', 'invoicing' ) : sanitize_text_field( $label );
+    $label   = getpaid_get_post_type_label($post_type, false);
+    $label   = empty($label) ? __('Invoice', 'invoicing') : sanitize_text_field($label);
     $columns = array(
 
             'invoice-number'  => array(
@@ -575,22 +575,22 @@  discard block
 block discarded – undo
             ),
 
             'created-date'    => array(
-                'title' => __( 'Created Date', 'invoicing' ),
+                'title' => __('Created Date', 'invoicing'),
                 'class' => 'text-left'
             ),
 
             'payment-date'    => array(
-                'title' => __( 'Payment Date', 'invoicing' ),
+                'title' => __('Payment Date', 'invoicing'),
                 'class' => 'text-left'
             ),
 
             'invoice-status'  => array(
-                'title' => __( 'Status', 'invoicing' ),
+                'title' => __('Status', 'invoicing'),
                 'class' => 'text-center'
             ),
 
             'invoice-total'   => array(
-                'title' => __( 'Total', 'invoicing' ),
+                'title' => __('Total', 'invoicing'),
                 'class' => 'text-right'
             ),
 
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
 
         );
 
-    return apply_filters( 'wpinv_user_invoices_columns', $columns, $post_type );
+    return apply_filters('wpinv_user_invoices_columns', $columns, $post_type);
 }
 
 /**
@@ -611,59 +611,59 @@  discard block
 block discarded – undo
 
     // Find the invoice.
     $invoice_id = getpaid_get_current_invoice_id();
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
     // Abort if non was found.
-    if ( empty( $invoice_id ) || $invoice->is_draft() ) {
+    if (empty($invoice_id) || $invoice->is_draft()) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'We could not find your invoice', 'invoicing' ),
+                'content' => __('We could not find your invoice', 'invoicing'),
             )
         );
 
     }
 
     // Can the user view this invoice?
-    if ( ! wpinv_can_view_receipt( $invoice_id ) ) {
+    if (!wpinv_can_view_receipt($invoice_id)) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'You are not allowed to view this receipt', 'invoicing' ),
+                'content' => __('You are not allowed to view this receipt', 'invoicing'),
             )
         );
 
     }
 
     // Load the template.
-    return wpinv_get_template_html( 'invoice-receipt.php', compact( 'invoice' ) );
+    return wpinv_get_template_html('invoice-receipt.php', compact('invoice'));
 
 }
 
 /**
  * Displays the invoice history.
  */
-function getpaid_invoice_history( $user_id = 0, $post_type = 'wpi_invoice' ) {
+function getpaid_invoice_history($user_id = 0, $post_type = 'wpi_invoice') {
 
     // Ensure that we have a user id.
-    if ( empty( $user_id ) || ! is_numeric( $user_id ) ) {
+    if (empty($user_id) || !is_numeric($user_id)) {
         $user_id = get_current_user_id();
     }
 
-    $label = getpaid_get_post_type_label( $post_type );
-    $label = empty( $label ) ? __( 'Invoices', 'invoicing' ) : sanitize_text_field( $label );
+    $label = getpaid_get_post_type_label($post_type);
+    $label = empty($label) ? __('Invoices', 'invoicing') : sanitize_text_field($label);
 
     // View user id.
-    if ( empty( $user_id ) ) {
+    if (empty($user_id)) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
                 'content' => sprintf(
-                    __( 'You must be logged in to view your %s.', 'invoicing' ),
-                    strtolower( $label )
+                    __('You must be logged in to view your %s.', 'invoicing'),
+                    strtolower($label)
                 )
             )
         );
@@ -674,23 +674,23 @@  discard block
 block discarded – undo
     $invoices = wpinv_get_invoices(
 
         array(
-            'page'      => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
+            'page'      => (get_query_var('paged')) ? absint(get_query_var('paged')) : 1,
             'user'      => $user_id,
             'paginate'  => true,
             'type'      => $post_type,
-            'status'    => array_keys( wpinv_get_invoice_statuses( false, false, $post_type ) ),
+            'status'    => array_keys(wpinv_get_invoice_statuses(false, false, $post_type)),
         )
 
     );
 
-    if ( empty( $invoices->total ) ) {
+    if (empty($invoices->total)) {
 
         return aui()->alert(
             array(
                 'type'    => 'info',
                 'content' => sprintf(
-                    __( 'No %s found.', 'invoicing' ),
-                    strtolower( $label )
+                    __('No %s found.', 'invoicing'),
+                    strtolower($label)
                 )
             )
         );
@@ -698,38 +698,38 @@  discard block
 block discarded – undo
     }
 
     // Load the template.
-    return wpinv_get_template_html( 'invoice-history.php', compact( 'invoices', 'post_type' ) );
+    return wpinv_get_template_html('invoice-history.php', compact('invoices', 'post_type'));
 
 }
 
 /**
  * Formats an invoice number given an invoice type.
  */
-function wpinv_format_invoice_number( $number, $type = '' ) {
+function wpinv_format_invoice_number($number, $type = '') {
 
     // Allow other plugins to overide this.
-    $check = apply_filters( 'wpinv_pre_format_invoice_number', null, $number, $type );
-    if ( null !== $check ) {
+    $check = apply_filters('wpinv_pre_format_invoice_number', null, $number, $type);
+    if (null !== $check) {
         return $check;
     }
 
     // Ensure that we have a numeric number.
-    if ( ! is_numeric( $number ) ) {
+    if (!is_numeric($number)) {
         return $number;
     }
 
     // Format the number.
-    $padd             = absint( (int) wpinv_get_option( 'invoice_number_padd', 5 ) );
-    $prefix           = sanitize_text_field( (string) wpinv_get_option( 'invoice_number_prefix', 'INV-' ) );
-    $prefix           = sanitize_text_field( apply_filters( 'getpaid_invoice_type_prefix', $prefix, $type ) );
-    $postfix          = sanitize_text_field( (string) wpinv_get_option( 'invoice_number_postfix' ) );
-    $postfix          = sanitize_text_field( apply_filters( 'getpaid_invoice_type_postfix', $postfix, $type ) );
-    $formatted_number = zeroise( absint( $number ), $padd );
+    $padd             = absint((int) wpinv_get_option('invoice_number_padd', 5));
+    $prefix           = sanitize_text_field((string) wpinv_get_option('invoice_number_prefix', 'INV-'));
+    $prefix           = sanitize_text_field(apply_filters('getpaid_invoice_type_prefix', $prefix, $type));
+    $postfix          = sanitize_text_field((string) wpinv_get_option('invoice_number_postfix'));
+    $postfix          = sanitize_text_field(apply_filters('getpaid_invoice_type_postfix', $postfix, $type));
+    $formatted_number = zeroise(absint($number), $padd);
 
     // Add the prefix and post fix.
     $formatted_number = $prefix . $formatted_number . $postfix;
 
-    return apply_filters( 'wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd );
+    return apply_filters('wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd);
 }
 
 /**
@@ -738,58 +738,58 @@  discard block
 block discarded – undo
  * @param string $type.
  * @return int|null|bool
  */
-function wpinv_get_next_invoice_number( $type = '' ) {
+function wpinv_get_next_invoice_number($type = '') {
 
     // Allow plugins to overide this.
-    $check = apply_filters( 'wpinv_get_pre_next_invoice_number', null, $type );
-    if ( null !== $check ) {
+    $check = apply_filters('wpinv_get_pre_next_invoice_number', null, $type);
+    if (null !== $check) {
         return $check;
     }
 
     // Ensure sequential invoice numbers is active.
-    if ( ! wpinv_sequential_number_active() ) {
+    if (!wpinv_sequential_number_active()) {
         return false;
     }
 
     // Retrieve the current number and the start number.
-    $number = (int) get_option( 'wpinv_last_invoice_number', 0 );
-    $start  = absint( (int) wpinv_get_option( 'invoice_sequence_start', 1 ) );
+    $number = (int) get_option('wpinv_last_invoice_number', 0);
+    $start  = absint((int) wpinv_get_option('invoice_sequence_start', 1));
 
     // Ensure that we are starting at a positive integer.
-    $start  = max( $start, 1 );
+    $start  = max($start, 1);
 
     // If this is the first invoice, use the start number.
-    $number = max( $start, $number );
+    $number = max($start, $number);
 
     // Format the invoice number.
-    $formatted_number = wpinv_format_invoice_number( $number, $type );
+    $formatted_number = wpinv_format_invoice_number($number, $type);
 
     // Ensure that this number is unique.
-    $invoice_id = WPInv_Invoice::get_invoice_id_by_field( $formatted_number, 'number' );
+    $invoice_id = WPInv_Invoice::get_invoice_id_by_field($formatted_number, 'number');
 
     // We found a match. Nice.
-    if ( empty( $invoice_id ) ) {
-        update_option( 'wpinv_last_invoice_number', $number );
-        return apply_filters( 'wpinv_get_next_invoice_number', $number );
+    if (empty($invoice_id)) {
+        update_option('wpinv_last_invoice_number', $number);
+        return apply_filters('wpinv_get_next_invoice_number', $number);
     }
 
-    update_option( 'wpinv_last_invoice_number', $number + 1 );
-    return wpinv_get_next_invoice_number( $type );
+    update_option('wpinv_last_invoice_number', $number + 1);
+    return wpinv_get_next_invoice_number($type);
 
 }
 
 /**
  * The prefix used for invoice paths.
  */
-function wpinv_post_name_prefix( $post_type = 'wpi_invoice' ) {
-    return apply_filters( 'wpinv_post_name_prefix', 'inv-', $post_type );
+function wpinv_post_name_prefix($post_type = 'wpi_invoice') {
+    return apply_filters('wpinv_post_name_prefix', 'inv-', $post_type);
 }
 
-function wpinv_generate_post_name( $post_ID ) {
-    $prefix = wpinv_post_name_prefix( get_post_type( $post_ID ) );
-    $post_name = sanitize_title( $prefix . $post_ID );
+function wpinv_generate_post_name($post_ID) {
+    $prefix = wpinv_post_name_prefix(get_post_type($post_ID));
+    $post_name = sanitize_title($prefix . $post_ID);
 
-    return apply_filters( 'wpinv_generate_post_name', $post_name, $post_ID, $prefix );
+    return apply_filters('wpinv_generate_post_name', $post_name, $post_ID, $prefix);
 }
 
 /**
@@ -797,8 +797,8 @@  discard block
 block discarded – undo
  *
  * @param int|string|object|WPInv_Invoice|WPInv_Legacy_Invoice|WP_Post $invoice Invoice id, key, transaction id, number or object.
  */
-function wpinv_is_invoice_viewed( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_is_invoice_viewed($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return (bool) $invoice->get_is_viewed();
 }
 
@@ -807,17 +807,17 @@  discard block
 block discarded – undo
  *
  * @param int|string|object|WPInv_Invoice|WPInv_Legacy_Invoice|WP_Post $invoice Invoice id, key, transaction id, number or object.
  */
-function getpaid_maybe_mark_invoice_as_viewed( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function getpaid_maybe_mark_invoice_as_viewed($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
 
-    if ( get_current_user_id() == $invoice->get_user_id() && ! $invoice->get_is_viewed() ) {
-        $invoice->set_is_viewed( true );
+    if (get_current_user_id() == $invoice->get_user_id() && !$invoice->get_is_viewed()) {
+        $invoice->set_is_viewed(true);
         $invoice->save();
     }
 
 }
-add_action( 'wpinv_invoice_print_before_display', 'getpaid_maybe_mark_invoice_as_viewed' );
-add_action( 'wpinv_before_receipt', 'getpaid_maybe_mark_invoice_as_viewed' );
+add_action('wpinv_invoice_print_before_display', 'getpaid_maybe_mark_invoice_as_viewed');
+add_action('wpinv_before_receipt', 'getpaid_maybe_mark_invoice_as_viewed');
 
 /**
  * Processes an invoice refund.
@@ -826,27 +826,27 @@  discard block
 block discarded – undo
  * @param array $status_transition
  * @todo: descrease customer/store earnings
  */
-function getpaid_maybe_process_refund( $invoice, $status_transition ) {
+function getpaid_maybe_process_refund($invoice, $status_transition) {
 
-    if ( empty( $status_transition['from'] ) || ! in_array( $status_transition['from'], array( 'publish', 'wpi-processing', 'wpi-renewal' ) ) ) {
+    if (empty($status_transition['from']) || !in_array($status_transition['from'], array('publish', 'wpi-processing', 'wpi-renewal'))) {
         return;
     }
 
     $discount_code = $invoice->get_discount_code();
-    if ( ! empty( $discount_code ) ) {
-        $discount = wpinv_get_discount_obj( $discount_code );
+    if (!empty($discount_code)) {
+        $discount = wpinv_get_discount_obj($discount_code);
 
-        if ( $discount->exists() ) {
+        if ($discount->exists()) {
             $discount->increase_usage( -1 );
         }
 
     }
 
-    do_action( 'wpinv_pre_refund_invoice', $invoice, $invoice->get_id() );
-    do_action( 'wpinv_refund_invoice', $invoice, $invoice->get_id() );
-    do_action( 'wpinv_post_refund_invoice', $invoice, $invoice->get_id() );
+    do_action('wpinv_pre_refund_invoice', $invoice, $invoice->get_id());
+    do_action('wpinv_refund_invoice', $invoice, $invoice->get_id());
+    do_action('wpinv_post_refund_invoice', $invoice, $invoice->get_id());
 }
-add_action( 'getpaid_invoice_status_wpi-refunded', 'getpaid_maybe_process_refund', 10, 2 );
+add_action('getpaid_invoice_status_wpi-refunded', 'getpaid_maybe_process_refund', 10, 2);
 
 
 /**
@@ -854,49 +854,49 @@  discard block
 block discarded – undo
  *
  * @param int $invoice_id
  */
-function getpaid_process_invoice_payment( $invoice_id ) {
+function getpaid_process_invoice_payment($invoice_id) {
 
     // Fetch the invoice.
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
     // We only want to do this once.
-    if ( 1 ==  get_post_meta( $invoice->get_id(), 'wpinv_processed_payment', true ) ) {
+    if (1 == get_post_meta($invoice->get_id(), 'wpinv_processed_payment', true)) {
         return;
     }
 
-    update_post_meta( $invoice->get_id(), 'wpinv_processed_payment', 1 );
+    update_post_meta($invoice->get_id(), 'wpinv_processed_payment', 1);
 
     // Fires when processing a payment.
-    do_action( 'getpaid_process_payment', $invoice );
+    do_action('getpaid_process_payment', $invoice);
 
     // Fire an action for each invoice item.
-    foreach( $invoice->get_items() as $item ) {
-        do_action( 'getpaid_process_item_payment', $item, $invoice );
+    foreach ($invoice->get_items() as $item) {
+        do_action('getpaid_process_item_payment', $item, $invoice);
     }
 
     // Increase discount usage.
     $discount_code = $invoice->get_discount_code();
-    if ( ! empty( $discount_code ) && ! $invoice->is_renewal() ) {
-        $discount = wpinv_get_discount_obj( $discount_code );
+    if (!empty($discount_code) && !$invoice->is_renewal()) {
+        $discount = wpinv_get_discount_obj($discount_code);
 
-        if ( $discount->exists() ) {
+        if ($discount->exists()) {
             $discount->increase_usage();
         }
 
     }
 
     // Record reverse vat.
-    if ( 'invoice' == $invoice->get_type() && wpinv_use_taxes() && ! $invoice->get_disable_taxes() ) {
+    if ('invoice' == $invoice->get_type() && wpinv_use_taxes() && !$invoice->get_disable_taxes()) {
 
         $taxes = $invoice->get_total_tax();
-        if ( empty( $taxes ) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction( $invoice->get_country() ) ) {
-            $invoice->add_note( __( 'VAT was reverse charged', 'invoicing' ), false, false, true );
+        if (empty($taxes) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction($invoice->get_country())) {
+            $invoice->add_note(__('VAT was reverse charged', 'invoicing'), false, false, true);
         }
 
     }
 
 }
-add_action( 'getpaid_invoice_payment_status_changed', 'getpaid_process_invoice_payment' );
+add_action('getpaid_invoice_payment_status_changed', 'getpaid_process_invoice_payment');
 
 /**
  * Returns an array of invoice item columns
@@ -904,13 +904,13 @@  discard block
 block discarded – undo
  * @param int|WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_invoice_item_columns( $invoice ) {
+function getpaid_invoice_item_columns($invoice) {
 
     // Prepare the invoice.
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if there is no invoice.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return array();
     }
 
@@ -918,57 +918,57 @@  discard block
 block discarded – undo
     $columns = apply_filters(
         'getpaid_invoice_item_columns',
         array(
-            'name'     => __( 'Item', 'invoicing' ),
-            'price'    => __( 'Price', 'invoicing' ),
-            'tax_rate' => __( 'Tax Rate', 'invoicing' ),
-            'quantity' => __( 'Quantity', 'invoicing' ),
-            'subtotal' => __( 'Item Subtotal', 'invoicing' ),
+            'name'     => __('Item', 'invoicing'),
+            'price'    => __('Price', 'invoicing'),
+            'tax_rate' => __('Tax Rate', 'invoicing'),
+            'quantity' => __('Quantity', 'invoicing'),
+            'subtotal' => __('Item Subtotal', 'invoicing'),
         ),
         $invoice
     );
 
     // Quantities.
-    if ( isset( $columns[ 'quantity' ] ) ) {
+    if (isset($columns['quantity'])) {
 
-        if ( 'hours' == $invoice->get_template() ) {
-            $columns[ 'quantity' ] = __( 'Hours', 'invoicing' );
+        if ('hours' == $invoice->get_template()) {
+            $columns['quantity'] = __('Hours', 'invoicing');
         }
 
-        if ( ! wpinv_item_quantities_enabled() || 'amount' == $invoice->get_template() ) {
-            unset( $columns[ 'quantity' ] );
+        if (!wpinv_item_quantities_enabled() || 'amount' == $invoice->get_template()) {
+            unset($columns['quantity']);
         }
 
     }
 
 
     // Price.
-    if ( isset( $columns[ 'price' ] ) ) {
+    if (isset($columns['price'])) {
 
-        if ( 'amount' == $invoice->get_template() ) {
-            $columns[ 'price' ] = __( 'Amount', 'invoicing' );
+        if ('amount' == $invoice->get_template()) {
+            $columns['price'] = __('Amount', 'invoicing');
         }
 
-        if ( 'hours' == $invoice->get_template() ) {
-            $columns[ 'price' ] = __( 'Rate', 'invoicing' );
+        if ('hours' == $invoice->get_template()) {
+            $columns['price'] = __('Rate', 'invoicing');
         }
 
     }
 
 
     // Sub total.
-    if ( isset( $columns[ 'subtotal' ] ) ) {
+    if (isset($columns['subtotal'])) {
 
-        if ( 'amount' == $invoice->get_template() ) {
-            unset( $columns[ 'subtotal' ] );
+        if ('amount' == $invoice->get_template()) {
+            unset($columns['subtotal']);
         }
 
     }
 
     // Tax rates.
-    if ( isset( $columns[ 'tax_rate' ] ) ) {
+    if (isset($columns['tax_rate'])) {
 
-        if ( 0 == $invoice->get_tax() ) {
-            unset( $columns[ 'tax_rate' ] );
+        if (0 == $invoice->get_tax()) {
+            unset($columns['tax_rate']);
         }
 
     }
@@ -982,43 +982,43 @@  discard block
 block discarded – undo
  * @param int|WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_invoice_totals_rows( $invoice ) {
+function getpaid_invoice_totals_rows($invoice) {
 
     // Prepare the invoice.
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if there is no invoice.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return array();
     }
 
     $totals = apply_filters(
         'getpaid_invoice_totals_rows',
         array(
-            'subtotal' => __( 'Subtotal', 'invoicing' ),
-            'shipping' => __( 'Shipping', 'invoicing' ),
-            'tax'      => __( 'Tax', 'invoicing' ),
-            'fee'      => __( 'Fee', 'invoicing' ),
-            'discount' => __( 'Discount', 'invoicing' ),
-            'total'    => __( 'Total', 'invoicing' ),
+            'subtotal' => __('Subtotal', 'invoicing'),
+            'shipping' => __('Shipping', 'invoicing'),
+            'tax'      => __('Tax', 'invoicing'),
+            'fee'      => __('Fee', 'invoicing'),
+            'discount' => __('Discount', 'invoicing'),
+            'total'    => __('Total', 'invoicing'),
         ),
         $invoice
     );
 
-    if ( ! $invoice->has_shipping() ) {
-        unset( $totals['shipping'] );
+    if (!$invoice->has_shipping()) {
+        unset($totals['shipping']);
     }
 
-    if ( ( $invoice->get_disable_taxes() || ! wpinv_use_taxes() ) && isset( $totals['tax'] ) ) {
-        unset( $totals['tax'] );
+    if (($invoice->get_disable_taxes() || !wpinv_use_taxes()) && isset($totals['tax'])) {
+        unset($totals['tax']);
     }
 
-    if ( 0 == $invoice->get_total_fees() && isset( $totals['fee'] ) ) {
-        unset( $totals['fee'] );
+    if (0 == $invoice->get_total_fees() && isset($totals['fee'])) {
+        unset($totals['fee']);
     }
 
-    if ( 0 == $invoice->get_total_discount() && isset( $totals['discount'] ) ) {
-        unset( $totals['discount'] );
+    if (0 == $invoice->get_total_discount() && isset($totals['discount'])) {
+        unset($totals['discount']);
     }
 
     return $totals;
@@ -1029,47 +1029,47 @@  discard block
 block discarded – undo
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_new_invoice( $invoice ) {
+function getpaid_new_invoice($invoice) {
 
-    if ( ! $invoice->get_status() ) {
+    if (!$invoice->get_status()) {
         return;
     }
 
     // Add an invoice created note.
     $invoice->add_note(
         sprintf(
-            __( '%s created with the status "%s".', 'invoicing' ),
-            ucfirst( $invoice->get_invoice_quote_type() ),
-            wpinv_status_nicename( $invoice->get_status(), $invoice  )
+            __('%s created with the status "%s".', 'invoicing'),
+            ucfirst($invoice->get_invoice_quote_type()),
+            wpinv_status_nicename($invoice->get_status(), $invoice)
         )
     );
 
 }
-add_action( 'getpaid_new_invoice', 'getpaid_new_invoice' );
+add_action('getpaid_new_invoice', 'getpaid_new_invoice');
 
 /**
  * This function updates invoice caches.
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_update_invoice_caches( $invoice ) {
+function getpaid_update_invoice_caches($invoice) {
 
     // Cache invoice number.
-    wp_cache_set( $invoice->get_number(), $invoice->get_id(), "getpaid_invoice_numbers_to_invoice_ids" );
+    wp_cache_set($invoice->get_number(), $invoice->get_id(), "getpaid_invoice_numbers_to_invoice_ids");
 
     // Cache invoice key.
-    wp_cache_set( $invoice->get_key(), $invoice->get_id(), "getpaid_invoice_keys_to_invoice_ids" );
+    wp_cache_set($invoice->get_key(), $invoice->get_id(), "getpaid_invoice_keys_to_invoice_ids");
 
     // (Maybe) cache transaction id.
     $transaction_id = $invoice->get_transaction_id();
 
-    if ( ! empty( $transaction_id ) ) {
-        wp_cache_set( $transaction_id, $invoice->get_id(), "getpaid_invoice_transaction_ids_to_invoice_ids" );
+    if (!empty($transaction_id)) {
+        wp_cache_set($transaction_id, $invoice->get_id(), "getpaid_invoice_transaction_ids_to_invoice_ids");
     }
 
 }
-add_action( 'getpaid_new_invoice', 'getpaid_update_invoice_caches', 5 );
-add_action( 'getpaid_update_invoice', 'getpaid_update_invoice_caches', 5 );
+add_action('getpaid_new_invoice', 'getpaid_update_invoice_caches', 5);
+add_action('getpaid_update_invoice', 'getpaid_update_invoice_caches', 5);
 
 /**
  * Duplicates an invoice.
@@ -1079,7 +1079,7 @@  discard block
 block discarded – undo
  * @param  WPInv_Invoice $old_invoice The invoice to duplicate
  * @return WPInv_Invoice The new invoice.
  */
-function getpaid_duplicate_invoice( $old_invoice ) {
+function getpaid_duplicate_invoice($old_invoice) {
 
     // Create the new invoice.
     $invoice = new WPInv_Invoice();
@@ -1141,138 +1141,138 @@  discard block
 block discarded – undo
  * @param WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_get_invoice_meta( $invoice ) {
+function getpaid_get_invoice_meta($invoice) {
 
     // Load the invoice meta.
     $meta = array(
 
         'number' => array(
             'label' => sprintf(
-                __( '%s Number', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('%s Number', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
-            'value' => sanitize_text_field( $invoice->get_number() ),
+            'value' => sanitize_text_field($invoice->get_number()),
         ),
 
         'status' => array(
             'label' => sprintf(
-                __( '%s Status', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('%s Status', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
             'value' => $invoice->get_status_label_html(),
         ),
 
         'date' => array(
             'label' => sprintf(
-                __( '%s Date', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('%s Date', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
-            'value' => getpaid_format_date( $invoice->get_created_date() ),
+            'value' => getpaid_format_date($invoice->get_created_date()),
         ),
 
         'date_paid' => array(
-            'label' => __( 'Paid On', 'invoicing' ),
-            'value' => getpaid_format_date( $invoice->get_completed_date() ),
+            'label' => __('Paid On', 'invoicing'),
+            'value' => getpaid_format_date($invoice->get_completed_date()),
         ),
 
         'gateway'   => array(
-            'label' => __( 'Payment Method', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_gateway_title() ),
+            'label' => __('Payment Method', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_gateway_title()),
         ),
 
         'transaction_id' => array(
-            'label' => __( 'Transaction ID', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_transaction_id() ),
+            'label' => __('Transaction ID', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_transaction_id()),
         ),
 
         'due_date'  => array(
-            'label' => __( 'Due Date', 'invoicing' ),
-            'value' => getpaid_format_date( $invoice->get_due_date() ),
+            'label' => __('Due Date', 'invoicing'),
+            'value' => getpaid_format_date($invoice->get_due_date()),
         ),
 
         'vat_number' => array(
-            'label' => __( 'VAT Number', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_vat_number() ),
+            'label' => __('VAT Number', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_vat_number()),
         ),
 
     );
 
-    $additional_meta = get_post_meta( $invoice->get_id(), 'additional_meta_data', true );
+    $additional_meta = get_post_meta($invoice->get_id(), 'additional_meta_data', true);
 
-    if ( ! empty( $additional_meta ) ) {
+    if (!empty($additional_meta)) {
 
-        foreach ( $additional_meta as $label => $value ) {
-            $meta[ sanitize_key( $label ) ] = array(
-                'label' => esc_html( $label ),
-                'value' => esc_html( $value ),
+        foreach ($additional_meta as $label => $value) {
+            $meta[sanitize_key($label)] = array(
+                'label' => esc_html($label),
+                'value' => esc_html($value),
             );
         }
 
     }
     // If it is not paid, remove the date of payment.
-    if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
-        unset( $meta[ 'date_paid' ] );
-        unset( $meta[ 'transaction_id' ] );
+    if (!$invoice->is_paid() && !$invoice->is_refunded()) {
+        unset($meta['date_paid']);
+        unset($meta['transaction_id']);
     }
 
-    if ( ! $invoice->is_paid() || 'none' == $invoice->get_gateway() ) {
-        unset( $meta[ 'gateway' ] );
+    if (!$invoice->is_paid() || 'none' == $invoice->get_gateway()) {
+        unset($meta['gateway']);
     }
 
     // Only display the due date if due dates are enabled.
-    if ( ! $invoice->needs_payment() || ! wpinv_get_option( 'overdue_active' ) ) {
-        unset( $meta[ 'due_date' ] );
+    if (!$invoice->needs_payment() || !wpinv_get_option('overdue_active')) {
+        unset($meta['due_date']);
     }
 
     // Only display the vat number if taxes are enabled.
-    if ( ! wpinv_use_taxes() ) {
-        unset( $meta[ 'vat_number' ] );
+    if (!wpinv_use_taxes()) {
+        unset($meta['vat_number']);
     }
 
     // Link to the parent invoice.
-    if ( $invoice->get_parent_id() > 0 ) {
+    if ($invoice->get_parent_id() > 0) {
 
-        $meta[ 'parent' ] = array(
+        $meta['parent'] = array(
 
             'label' => sprintf(
-                __( 'Parent %s', 'invoicing' ),
-                ucfirst( $invoice->get_invoice_quote_type() )
+                __('Parent %s', 'invoicing'),
+                ucfirst($invoice->get_invoice_quote_type())
             ),
 
-            'value' => wpinv_invoice_link( $invoice->get_parent_id() ),
+            'value' => wpinv_invoice_link($invoice->get_parent_id()),
 
         );
 
     }
 
     
-    if ( $invoice->is_recurring() ) {
+    if ($invoice->is_recurring()) {
 
-        $subscription = getpaid_get_invoice_subscriptions( $invoice );
-        if ( ! empty ( $subscription ) && ! is_array( $subscription ) && $subscription->exists() ) {
+        $subscription = getpaid_get_invoice_subscriptions($invoice);
+        if (!empty ($subscription) && !is_array($subscription) && $subscription->exists()) {
 
             // Display the renewal date.
-            if ( $subscription->is_active() && 'cancelled' != $subscription->get_status() ) {
+            if ($subscription->is_active() && 'cancelled' != $subscription->get_status()) {
 
-                $meta[ 'renewal_date' ] = array(
-                    'label' => __( 'Renews On', 'invoicing' ),
-                    'value' => getpaid_format_date( $subscription->get_expiration() ) . 
+                $meta['renewal_date'] = array(
+                    'label' => __('Renews On', 'invoicing'),
+                    'value' => getpaid_format_date($subscription->get_expiration()) . 
                     sprintf(
                        ' <a class="small" href="%s">%s<a>',
                        $subscription->get_view_url(),
-                       __( '(View Subscription)', 'invoicing' )
+                       __('(View Subscription)', 'invoicing')
                     ),
                 );
 
             }
 
-            if ( $invoice->is_parent() ) {
+            if ($invoice->is_parent()) {
 
                 // Display the recurring amount.
-                $meta[ 'recurring_total' ] = array(
+                $meta['recurring_total'] = array(
 
-                    'label' => __( 'Recurring Amount', 'invoicing' ),
-                    'value' => wpinv_price( $subscription->get_recurring_amount(), $invoice->get_currency() ),
+                    'label' => __('Recurring Amount', 'invoicing'),
+                    'value' => wpinv_price($subscription->get_recurring_amount(), $invoice->get_currency()),
 
                 );
 
@@ -1282,15 +1282,15 @@  discard block
 block discarded – undo
     }
 
     // Add the invoice total to the meta.
-    $meta[ 'invoice_total' ] = array(
+    $meta['invoice_total'] = array(
 
-        'label' => __( 'Total Amount', 'invoicing' ),
-        'value' => wpinv_price( $invoice->get_total(), $invoice->get_currency() ),
+        'label' => __('Total Amount', 'invoicing'),
+        'value' => wpinv_price($invoice->get_total(), $invoice->get_currency()),
 
     );
 
     // Provide a way for third party plugins to filter the meta.
-    $meta = apply_filters( 'getpaid_invoice_meta_data', $meta, $invoice );
+    $meta = apply_filters('getpaid_invoice_meta_data', $meta, $invoice);
 
     return $meta;
 
@@ -1329,12 +1329,12 @@  discard block
 block discarded – undo
  * @param GetPaid_Form_Item $item
  * @return float
  */
-function getpaid_get_invoice_tax_rate( $invoice, $item ) {
+function getpaid_get_invoice_tax_rate($invoice, $item) {
 
-    $rates   = getpaid_get_item_tax_rates( $item, $invoice->get_country(), $invoice->get_state() );
-	$rates   = getpaid_filter_item_tax_rates( $item, $rates );
-    $rates   = wp_list_pluck( $rates, 'rate' );
+    $rates   = getpaid_get_item_tax_rates($item, $invoice->get_country(), $invoice->get_state());
+	$rates = getpaid_filter_item_tax_rates($item, $rates);
+    $rates   = wp_list_pluck($rates, 'rate');
 
-    return array_sum( $rates );
+    return array_sum($rates);
 
 }

Please login to merge, or discard this patch.

includes/class-getpaid-invoice-notification-emails.php 2 patches

Indentation +454 added lines, -454 removed lines patch added patch discarded remove patch

@@ -12,491 +12,491 @@
 block discarded – undo
  */
 class GetPaid_Invoice_Notification_Emails {
 
-	/**
-	 * The array of invoice email actions.
-	 *
-	 * @param array
-	 */
-	public $invoice_actions;
-
-	/**
-	 * Class constructor
-	 *
-	 */
-	public function __construct() {
-
-		$this->invoice_actions = apply_filters(
-			'getpaid_notification_email_invoice_triggers',
-			array(
-				'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
-				'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
-				'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
-				'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
-				'getpaid_invoice_status_wpi-processing' => 'processing_invoice',
-				'getpaid_invoice_status_publish'        => 'completed_invoice',
-				'getpaid_invoice_status_wpi-renewal'    => 'completed_invoice',
-				'getpaid_invoice_status_wpi-refunded'   => 'refunded_invoice',
-				'getpaid_new_customer_note'             => 'user_note',
-				'getpaid_daily_maintenance'             => 'overdue',
-			)
-		);
-
-		$this->init_hooks();
-
-	}
-
-	/**
-	 * Registers email hooks.
-	 */
-	public function init_hooks() {
-
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
-		add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
-
-		foreach ( $this->invoice_actions as $hook => $email_type ) {
-			$this->init_email_type_hook( $hook, $email_type );
-		}
-	}
-
-	/**
-	 * Registers an email hook for an invoice action.
-	 * 
-	 * @param string $hook
-	 * @param string|array $email_type
-	 */
-	public function init_email_type_hook( $hook, $email_type ) {
-
-		$email_type = wpinv_parse_list( $email_type );
-
-		foreach ( $email_type as $type ) {
-
-			$email = new GetPaid_Notification_Email( $type );
-
-			// Abort if it is not active.
-			if ( ! $email->is_active() ) {
-				continue;
-			}
-
-			if ( method_exists( $this, $type ) ) {
-				add_action( $hook, array( $this, $type ), 100, 2 );
-				continue;
-			}
-
-			do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
-		}
-
-	}
-
-	/**
-	 * Filters invoice merge tags.
-	 *
-	 * @param array $merge_tags
-	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
-	 */
-	public function invoice_merge_tags( $merge_tags, $object ) {
-
-		if ( is_a( $object, 'WPInv_Invoice' ) ) {
-			return array_merge(
-				$merge_tags,
-				$this->get_invoice_merge_tags( $object )
-			);
-		}
-
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
-			return array_merge(
-				$merge_tags,
-				$this->get_invoice_merge_tags( $object->get_parent_payment() )
-			);
-		}
-
-		return $merge_tags;
-
-	}
-
-	/**
-	 * Generates invoice merge tags.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @return array
-	 */
-	public function get_invoice_merge_tags( $invoice ) {
-
-		// Abort if it does not exist.
-		if ( ! $invoice->get_id() ) {
-			return array();
-		}
-
-		$merge_tags = array(
-			'{name}'                => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{full_name}'           => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{first_name}'          => sanitize_text_field( $invoice->get_first_name() ),
-			'{last_name}'           => sanitize_text_field( $invoice->get_last_name() ),
-			'{email}'               => sanitize_email( $invoice->get_email() ),
-			'{invoice_number}'      => sanitize_text_field( $invoice->get_number() ),
-			'{invoice_currency}'    => sanitize_text_field( $invoice->get_currency() ),
-			'{invoice_total}'       => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
-			'{invoice_link}'        => esc_url( $invoice->get_view_url() ),
-			'{invoice_pay_link}'    => esc_url( $invoice->get_checkout_payment_url() ),
-			'{invoice_receipt_link}'=> esc_url( $invoice->get_receipt_url() ),
-			'{invoice_date}'        => getpaid_format_date_value( $invoice->get_date_created() ),
-			'{invoice_due_date}'    => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
-			'{invoice_quote}'       => sanitize_text_field( strtolower( $invoice->get_label() ) ),
-			'{invoice_label}'       => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
-			'{invoice_description}' => wp_kses_post( $invoice->get_description() ),
-			'{subscription_name}'   => wp_kses_post( $invoice->get_subscription_name() ),
-			'{is_was}'              => strtotime( $invoice->get_due_date() ) < current_time( 'timestamp' ) ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
-		);
-
-		$payment_form_data = $invoice->get_meta( 'payment_form_data', true );
-
-		if ( is_array( $payment_form_data ) ) {
-
-			foreach ( $payment_form_data as $label => $value ) {
-
-				$label = preg_replace( '/[^a-z0-9]+/', '_', strtolower( $label ) );
-				$value = is_array( $value ) ? implode( ', ', $value ) : $value;
-
-				if ( is_scalar ( $value ) ) {
-					$merge_tags[ "{{$label}}" ] = wp_kses_post( $value );
-				}
-
-			}
-
-		}
-
-		return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
-	}
-
-	/**
-	 * Helper function to send an email.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Notification_Email $email
-	 * @param string $type
-	 * @param string|array $recipients
-	 * @param array $extra_args Extra template args.
-	 */
-	public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
-
-		do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
-
-		$skip = $invoice->is_free() && wpinv_get_option( 'skip_email_free_invoice' );
-		if ( apply_filters( 'getpaid_skip_invoice_email', $skip, $type, $invoice ) ) {
-			return;
-		}
-
-		$mailer     = new GetPaid_Notification_Email_Sender();
-		$merge_tags = $email->get_merge_tags();
-
-		$result = $mailer->send(
-			apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
-			$email->add_merge_tags( $email->get_subject(), $merge_tags ),
-			$email->get_content( $merge_tags, $extra_args ),
-			$email->get_attachments()
-		);
-
-		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
-			$mailer->send(
-				wpinv_get_admin_email(),
-				$email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
-				$email->get_content( $merge_tags ),
-				$email->get_attachments()
-			);
-		}
-
-		if ( $result ) {
-			$invoice->add_system_note(
-				sprintf(
-					__( 'Successfully sent %s notification email to %s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
-				)
-			);
-		} else {
-			$invoice->add_system_note(
-				sprintf(
-					__( 'Failed sending %s notification email to %s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
-				)
-			);	
-		}
-
-		do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
-
-		return $result;
-	}
-
-	/**
-	 * Also send emails to any cc users.
-	 *
-	 * @param array $recipients
-	 * @param GetPaid_Notification_Email $email
-	 */
-	public function filter_email_recipients( $recipients, $email ) {
-
-		if ( ! $email->is_admin_email() ) {
-			$cc   = $email->object->get_email_cc();
-			$cc_2 = get_user_meta( $email->object->get_user_id(), '_wpinv_email_cc', true );
-
-			if ( ! empty( $cc ) ) {
-				$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
-			}
-
-			if ( ! empty( $cc_2 ) ) {
-				$cc_2 = array_map( 'sanitize_email', wpinv_parse_list( $cc_2 ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc_2 ) ) );
-			}
-
-		}
-
-		return $recipients;
-
-	}
-
-	/**
-	 * Sends a new invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function new_invoice( $invoice ) {
-
-		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_paid() || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
-			return;
-		}
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = wpinv_get_admin_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a cancelled invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function cancelled_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-	}
-
-	/**
-	 * Sends a failed invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function failed_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = wpinv_get_admin_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a notification whenever an invoice is put on hold.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function onhold_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+    /**
+     * The array of invoice email actions.
+     *
+     * @param array
+     */
+    public $invoice_actions;
+
+    /**
+     * Class constructor
+     *
+     */
+    public function __construct() {
+
+        $this->invoice_actions = apply_filters(
+            'getpaid_notification_email_invoice_triggers',
+            array(
+                'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
+                'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
+                'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
+                'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
+                'getpaid_invoice_status_wpi-processing' => 'processing_invoice',
+                'getpaid_invoice_status_publish'        => 'completed_invoice',
+                'getpaid_invoice_status_wpi-renewal'    => 'completed_invoice',
+                'getpaid_invoice_status_wpi-refunded'   => 'refunded_invoice',
+                'getpaid_new_customer_note'             => 'user_note',
+                'getpaid_daily_maintenance'             => 'overdue',
+            )
+        );
+
+        $this->init_hooks();
+
+    }
+
+    /**
+     * Registers email hooks.
+     */
+    public function init_hooks() {
+
+        add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
+        add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
+
+        foreach ( $this->invoice_actions as $hook => $email_type ) {
+            $this->init_email_type_hook( $hook, $email_type );
+        }
+    }
+
+    /**
+     * Registers an email hook for an invoice action.
+     * 
+     * @param string $hook
+     * @param string|array $email_type
+     */
+    public function init_email_type_hook( $hook, $email_type ) {
+
+        $email_type = wpinv_parse_list( $email_type );
+
+        foreach ( $email_type as $type ) {
+
+            $email = new GetPaid_Notification_Email( $type );
+
+            // Abort if it is not active.
+            if ( ! $email->is_active() ) {
+                continue;
+            }
+
+            if ( method_exists( $this, $type ) ) {
+                add_action( $hook, array( $this, $type ), 100, 2 );
+                continue;
+            }
+
+            do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
+        }
+
+    }
+
+    /**
+     * Filters invoice merge tags.
+     *
+     * @param array $merge_tags
+     * @param mixed|WPInv_Invoice|WPInv_Subscription $object
+     */
+    public function invoice_merge_tags( $merge_tags, $object ) {
+
+        if ( is_a( $object, 'WPInv_Invoice' ) ) {
+            return array_merge(
+                $merge_tags,
+                $this->get_invoice_merge_tags( $object )
+            );
+        }
+
+        if ( is_a( $object, 'WPInv_Subscription' ) ) {
+            return array_merge(
+                $merge_tags,
+                $this->get_invoice_merge_tags( $object->get_parent_payment() )
+            );
+        }
+
+        return $merge_tags;
+
+    }
+
+    /**
+     * Generates invoice merge tags.
+     *
+     * @param WPInv_Invoice $invoice
+     * @return array
+     */
+    public function get_invoice_merge_tags( $invoice ) {
+
+        // Abort if it does not exist.
+        if ( ! $invoice->get_id() ) {
+            return array();
+        }
+
+        $merge_tags = array(
+            '{name}'                => sanitize_text_field( $invoice->get_user_full_name() ),
+            '{full_name}'           => sanitize_text_field( $invoice->get_user_full_name() ),
+            '{first_name}'          => sanitize_text_field( $invoice->get_first_name() ),
+            '{last_name}'           => sanitize_text_field( $invoice->get_last_name() ),
+            '{email}'               => sanitize_email( $invoice->get_email() ),
+            '{invoice_number}'      => sanitize_text_field( $invoice->get_number() ),
+            '{invoice_currency}'    => sanitize_text_field( $invoice->get_currency() ),
+            '{invoice_total}'       => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
+            '{invoice_link}'        => esc_url( $invoice->get_view_url() ),
+            '{invoice_pay_link}'    => esc_url( $invoice->get_checkout_payment_url() ),
+            '{invoice_receipt_link}'=> esc_url( $invoice->get_receipt_url() ),
+            '{invoice_date}'        => getpaid_format_date_value( $invoice->get_date_created() ),
+            '{invoice_due_date}'    => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
+            '{invoice_quote}'       => sanitize_text_field( strtolower( $invoice->get_label() ) ),
+            '{invoice_label}'       => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
+            '{invoice_description}' => wp_kses_post( $invoice->get_description() ),
+            '{subscription_name}'   => wp_kses_post( $invoice->get_subscription_name() ),
+            '{is_was}'              => strtotime( $invoice->get_due_date() ) < current_time( 'timestamp' ) ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
+        );
+
+        $payment_form_data = $invoice->get_meta( 'payment_form_data', true );
+
+        if ( is_array( $payment_form_data ) ) {
+
+            foreach ( $payment_form_data as $label => $value ) {
+
+                $label = preg_replace( '/[^a-z0-9]+/', '_', strtolower( $label ) );
+                $value = is_array( $value ) ? implode( ', ', $value ) : $value;
+
+                if ( is_scalar ( $value ) ) {
+                    $merge_tags[ "{{$label}}" ] = wp_kses_post( $value );
+                }
+
+            }
+
+        }
+
+        return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
+    }
+
+    /**
+     * Helper function to send an email.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Notification_Email $email
+     * @param string $type
+     * @param string|array $recipients
+     * @param array $extra_args Extra template args.
+     */
+    public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
+
+        do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
+
+        $skip = $invoice->is_free() && wpinv_get_option( 'skip_email_free_invoice' );
+        if ( apply_filters( 'getpaid_skip_invoice_email', $skip, $type, $invoice ) ) {
+            return;
+        }
+
+        $mailer     = new GetPaid_Notification_Email_Sender();
+        $merge_tags = $email->get_merge_tags();
+
+        $result = $mailer->send(
+            apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
+            $email->add_merge_tags( $email->get_subject(), $merge_tags ),
+            $email->get_content( $merge_tags, $extra_args ),
+            $email->get_attachments()
+        );
+
+        // Maybe send a copy to the admin.
+        if ( $email->include_admin_bcc() ) {
+            $mailer->send(
+                wpinv_get_admin_email(),
+                $email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
+                $email->get_content( $merge_tags ),
+                $email->get_attachments()
+            );
+        }
+
+        if ( $result ) {
+            $invoice->add_system_note(
+                sprintf(
+                    __( 'Successfully sent %s notification email to %s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+                )
+            );
+        } else {
+            $invoice->add_system_note(
+                sprintf(
+                    __( 'Failed sending %s notification email to %s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+                )
+            );	
+        }
+
+        do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
+
+        return $result;
+    }
+
+    /**
+     * Also send emails to any cc users.
+     *
+     * @param array $recipients
+     * @param GetPaid_Notification_Email $email
+     */
+    public function filter_email_recipients( $recipients, $email ) {
+
+        if ( ! $email->is_admin_email() ) {
+            $cc   = $email->object->get_email_cc();
+            $cc_2 = get_user_meta( $email->object->get_user_id(), '_wpinv_email_cc', true );
+
+            if ( ! empty( $cc ) ) {
+                $cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
+                $recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+            }
+
+            if ( ! empty( $cc_2 ) ) {
+                $cc_2 = array_map( 'sanitize_email', wpinv_parse_list( $cc_2 ) );
+                $recipients = array_filter( array_unique( array_merge( $recipients, $cc_2 ) ) );
+            }
+
+        }
+
+        return $recipients;
+
+    }
+
+    /**
+     * Sends a new invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function new_invoice( $invoice ) {
+
+        // Only send this email for invoices created via the admin page.
+        if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_paid() || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
+            return;
+        }
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = wpinv_get_admin_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a cancelled invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function cancelled_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+    }
+
+    /**
+     * Sends a failed invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function failed_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = wpinv_get_admin_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is put on hold.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function onhold_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
 
-	}
+    }
 
-	/**
-	 * Sends a notification whenever an invoice is marked as processing payment.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function processing_invoice( $invoice ) {
+    /**
+     * Sends a notification whenever an invoice is marked as processing payment.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function processing_invoice( $invoice ) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a notification whenever an invoice is paid.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function completed_invoice( $invoice ) {
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is paid.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function completed_invoice( $invoice ) {
 
-		// (Maybe) abort if it is a renewal invoice.
-		if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
-			return;
-		}
+        // (Maybe) abort if it is a renewal invoice.
+        if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
+            return;
+        }
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
 
-	}
+    }
 
-	/**
-	 * Sends a notification whenever an invoice is refunded.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function refunded_invoice( $invoice ) {
+    /**
+     * Sends a notification whenever an invoice is refunded.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function refunded_invoice( $invoice ) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
 
-	}
+    }
 
-	/**
-	 * Notifies a user about new invoices
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param bool $force
-	 */
-	public function user_invoice( $invoice, $force = false ) {
+    /**
+     * Notifies a user about new invoices
+     *
+     * @param WPInv_Invoice $invoice
+     * @param bool $force
+     */
+    public function user_invoice( $invoice, $force = false ) {
 
-		if ( ! $force && ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
-			return;
-		}
-
-		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $invoice->is_paid() ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
-			return;
-		}
+        if ( ! $force && ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
+            return;
+        }
+
+        // Only send this email for invoices created via the admin page.
+        if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $invoice->is_paid() ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
+            return;
+        }
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
 
-	}
-
-	/**
-	 * Checks if an invoice is a payment form invoice.
-	 *
-	 * @param int $invoice
-	 * @return bool
-	 */
-	public function is_payment_form_invoice( $invoice ) {
-		$is_payment_form_invoice = empty( $_GET['getpaid-admin-action'] ) && ( 'payment_form' === get_post_meta( $invoice, 'wpinv_created_via', true ) || 'geodirectory' === get_post_meta( $invoice, 'wpinv_created_via', true ) );
-		return apply_filters( 'getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice );
-	}
+    }
+
+    /**
+     * Checks if an invoice is a payment form invoice.
+     *
+     * @param int $invoice
+     * @return bool
+     */
+    public function is_payment_form_invoice( $invoice ) {
+        $is_payment_form_invoice = empty( $_GET['getpaid-admin-action'] ) && ( 'payment_form' === get_post_meta( $invoice, 'wpinv_created_via', true ) || 'geodirectory' === get_post_meta( $invoice, 'wpinv_created_via', true ) );
+        return apply_filters( 'getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice );
+    }
 
-	/**
-	 * Notifies admin about new invoice notes
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param string $note
-	 */
-	public function user_note( $invoice, $note ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
+    /**
+     * Notifies admin about new invoice notes
+     *
+     * @param WPInv_Invoice $invoice
+     * @param string $note
+     */
+    public function user_note( $invoice, $note ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
-
-	}
-
-	/**
-	 * (Force) Sends overdue notices.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function force_send_overdue_notice( $invoice ) {
-		$email = new GetPaid_Notification_Email( 'overdue', $invoice );
-		return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
-	}
-
-	/**
-	 * Sends overdue notices.
-	 *
-	 * @TODO: Create an invoices query class.
-	 */
-	public function overdue() {
-		global $wpdb;
-
-		$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;
-		}
-
-		// Retrieve date query.
-		$date_query = $this->get_date_query( $reminder_days );
-
-		// Invoices table.
-		$table = $wpdb->prefix . 'getpaid_invoices';
-
-		// Fetch invoices.
-		$invoices  = $wpdb->get_col(
-			"SELECT posts.ID FROM $wpdb->posts as posts
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
+
+    }
+
+    /**
+     * (Force) Sends overdue notices.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function force_send_overdue_notice( $invoice ) {
+        $email = new GetPaid_Notification_Email( 'overdue', $invoice );
+        return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
+    }
+
+    /**
+     * Sends overdue notices.
+     *
+     * @TODO: Create an invoices query class.
+     */
+    public function overdue() {
+        global $wpdb;
+
+        $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;
+        }
+
+        // Retrieve date query.
+        $date_query = $this->get_date_query( $reminder_days );
+
+        // Invoices table.
+        $table = $wpdb->prefix . 'getpaid_invoices';
+
+        // Fetch invoices.
+        $invoices  = $wpdb->get_col(
+            "SELECT posts.ID FROM $wpdb->posts as posts
 			LEFT JOIN $table as invoices ON invoices.post_id = posts.ID
 			WHERE posts.post_type = 'wpi_invoice' AND posts.post_status = 'wpi-pending' $date_query");
 
-		foreach ( $invoices as $invoice ) {
+        foreach ( $invoices as $invoice ) {
 
-			// Only send this email for invoices created via the admin page.
-			if ( ! $this->is_payment_form_invoice( $invoice ) ) {
-				$invoice       = new WPInv_Invoice( $invoice );
-				$email->object = $invoice;
+            // Only send this email for invoices created via the admin page.
+            if ( ! $this->is_payment_form_invoice( $invoice ) ) {
+                $invoice       = new WPInv_Invoice( $invoice );
+                $email->object = $invoice;
 
-				if ( $invoice->needs_payment() ) {
-					$this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
-				}
+                if ( $invoice->needs_payment() ) {
+                    $this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
+                }
 
-			}
+            }
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Calculates the date query for an invoices query
-	 *
-	 * @param array $reminder_days
-	 * @return string
-	 */
-	public function get_date_query( $reminder_days ) {
+    /**
+     * Calculates the date query for an invoices query
+     *
+     * @param array $reminder_days
+     * @return string
+     */
+    public function get_date_query( $reminder_days ) {
 
-		$date_query = array(
-			'relation'  => 'OR'
-		);
+        $date_query = array(
+            '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' ) ) ) );
 
-			$date_query[] = array(
-				'year'  => $date['year'],
-				'month' => $date['month'],
-				'day'   => $date['day'],
-			);
+            $date_query[] = array(
+                'year'  => $date['year'],
+                'month' => $date['month'],
+                'day'   => $date['day'],
+            );
 
-		}
+        }
 
-		$date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
+        $date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
 
-		return $date_query->get_sql();
+        return $date_query->get_sql();
 
-	}
+    }
 
 }

Please login to merge, or discard this patch.

Spacing +125 added lines, -125 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * This class handles invoice notificaiton emails.
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
 		$this->invoice_actions = apply_filters(
 			'getpaid_notification_email_invoice_triggers',
 			array(
-				'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
+				'getpaid_new_invoice'                   => array('new_invoice', 'user_invoice'),
 				'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
 				'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
 				'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
@@ -50,11 +50,11 @@  discard block
 block discarded – undo
 	 */
 	public function init_hooks() {
 
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
-		add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
+		add_filter('getpaid_get_email_merge_tags', array($this, 'invoice_merge_tags'), 10, 2);
+		add_filter('getpaid_invoice_email_recipients', array($this, 'filter_email_recipients'), 10, 2);
 
-		foreach ( $this->invoice_actions as $hook => $email_type ) {
-			$this->init_email_type_hook( $hook, $email_type );
+		foreach ($this->invoice_actions as $hook => $email_type) {
+			$this->init_email_type_hook($hook, $email_type);
 		}
 	}
 
@@ -64,25 +64,25 @@  discard block
 block discarded – undo
 	 * @param string $hook
 	 * @param string|array $email_type
 	 */
-	public function init_email_type_hook( $hook, $email_type ) {
+	public function init_email_type_hook($hook, $email_type) {
 
-		$email_type = wpinv_parse_list( $email_type );
+		$email_type = wpinv_parse_list($email_type);
 
-		foreach ( $email_type as $type ) {
+		foreach ($email_type as $type) {
 
-			$email = new GetPaid_Notification_Email( $type );
+			$email = new GetPaid_Notification_Email($type);
 
 			// Abort if it is not active.
-			if ( ! $email->is_active() ) {
+			if (!$email->is_active()) {
 				continue;
 			}
 
-			if ( method_exists( $this, $type ) ) {
-				add_action( $hook, array( $this, $type ), 100, 2 );
+			if (method_exists($this, $type)) {
+				add_action($hook, array($this, $type), 100, 2);
 				continue;
 			}
 
-			do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
+			do_action('getpaid_invoice_init_email_type_hook', $type, $hook);
 		}
 
 	}
@@ -93,19 +93,19 @@  discard block
 block discarded – undo
 	 * @param array $merge_tags
 	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
 	 */
-	public function invoice_merge_tags( $merge_tags, $object ) {
+	public function invoice_merge_tags($merge_tags, $object) {
 
-		if ( is_a( $object, 'WPInv_Invoice' ) ) {
+		if (is_a($object, 'WPInv_Invoice')) {
 			return array_merge(
 				$merge_tags,
-				$this->get_invoice_merge_tags( $object )
+				$this->get_invoice_merge_tags($object)
 			);
 		}
 
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
+		if (is_a($object, 'WPInv_Subscription')) {
 			return array_merge(
 				$merge_tags,
-				$this->get_invoice_merge_tags( $object->get_parent_payment() )
+				$this->get_invoice_merge_tags($object->get_parent_payment())
 			);
 		}
 
@@ -119,52 +119,52 @@  discard block
 block discarded – undo
 	 * @param WPInv_Invoice $invoice
 	 * @return array
 	 */
-	public function get_invoice_merge_tags( $invoice ) {
+	public function get_invoice_merge_tags($invoice) {
 
 		// Abort if it does not exist.
-		if ( ! $invoice->get_id() ) {
+		if (!$invoice->get_id()) {
 			return array();
 		}
 
 		$merge_tags = array(
-			'{name}'                => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{full_name}'           => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{first_name}'          => sanitize_text_field( $invoice->get_first_name() ),
-			'{last_name}'           => sanitize_text_field( $invoice->get_last_name() ),
-			'{email}'               => sanitize_email( $invoice->get_email() ),
-			'{invoice_number}'      => sanitize_text_field( $invoice->get_number() ),
-			'{invoice_currency}'    => sanitize_text_field( $invoice->get_currency() ),
-			'{invoice_total}'       => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
-			'{invoice_link}'        => esc_url( $invoice->get_view_url() ),
-			'{invoice_pay_link}'    => esc_url( $invoice->get_checkout_payment_url() ),
-			'{invoice_receipt_link}'=> esc_url( $invoice->get_receipt_url() ),
-			'{invoice_date}'        => getpaid_format_date_value( $invoice->get_date_created() ),
-			'{invoice_due_date}'    => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
-			'{invoice_quote}'       => sanitize_text_field( strtolower( $invoice->get_label() ) ),
-			'{invoice_label}'       => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
-			'{invoice_description}' => wp_kses_post( $invoice->get_description() ),
-			'{subscription_name}'   => wp_kses_post( $invoice->get_subscription_name() ),
-			'{is_was}'              => strtotime( $invoice->get_due_date() ) < current_time( 'timestamp' ) ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
+			'{name}'                => sanitize_text_field($invoice->get_user_full_name()),
+			'{full_name}'           => sanitize_text_field($invoice->get_user_full_name()),
+			'{first_name}'          => sanitize_text_field($invoice->get_first_name()),
+			'{last_name}'           => sanitize_text_field($invoice->get_last_name()),
+			'{email}'               => sanitize_email($invoice->get_email()),
+			'{invoice_number}'      => sanitize_text_field($invoice->get_number()),
+			'{invoice_currency}'    => sanitize_text_field($invoice->get_currency()),
+			'{invoice_total}'       => sanitize_text_field(wpinv_price($invoice->get_total(), $invoice->get_currency())),
+			'{invoice_link}'        => esc_url($invoice->get_view_url()),
+			'{invoice_pay_link}'    => esc_url($invoice->get_checkout_payment_url()),
+			'{invoice_receipt_link}'=> esc_url($invoice->get_receipt_url()),
+			'{invoice_date}'        => getpaid_format_date_value($invoice->get_date_created()),
+			'{invoice_due_date}'    => getpaid_format_date_value($invoice->get_due_date(), __('on receipt', 'invoicing')),
+			'{invoice_quote}'       => sanitize_text_field(strtolower($invoice->get_label())),
+			'{invoice_label}'       => sanitize_text_field(ucfirst($invoice->get_label())),
+			'{invoice_description}' => wp_kses_post($invoice->get_description()),
+			'{subscription_name}'   => wp_kses_post($invoice->get_subscription_name()),
+			'{is_was}'              => strtotime($invoice->get_due_date()) < current_time('timestamp') ? __('was', 'invoicing') : __('is', 'invoicing'),
 		);
 
-		$payment_form_data = $invoice->get_meta( 'payment_form_data', true );
+		$payment_form_data = $invoice->get_meta('payment_form_data', true);
 
-		if ( is_array( $payment_form_data ) ) {
+		if (is_array($payment_form_data)) {
 
-			foreach ( $payment_form_data as $label => $value ) {
+			foreach ($payment_form_data as $label => $value) {
 
-				$label = preg_replace( '/[^a-z0-9]+/', '_', strtolower( $label ) );
-				$value = is_array( $value ) ? implode( ', ', $value ) : $value;
+				$label = preg_replace('/[^a-z0-9]+/', '_', strtolower($label));
+				$value = is_array($value) ? implode(', ', $value) : $value;
 
-				if ( is_scalar ( $value ) ) {
-					$merge_tags[ "{{$label}}" ] = wp_kses_post( $value );
+				if (is_scalar($value)) {
+					$merge_tags["{{$label}}"] = wp_kses_post($value);
 				}
 
 			}
 
 		}
 
-		return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
+		return apply_filters('getpaid_invoice_email_merge_tags', $merge_tags, $invoice);
 	}
 
 	/**
@@ -176,12 +176,12 @@  discard block
 block discarded – undo
 	 * @param string|array $recipients
 	 * @param array $extra_args Extra template args.
 	 */
-	public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
+	public function send_email($invoice, $email, $type, $recipients, $extra_args = array()) {
 
-		do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
+		do_action('getpaid_before_send_invoice_notification', $type, $invoice, $email);
 
-		$skip = $invoice->is_free() && wpinv_get_option( 'skip_email_free_invoice' );
-		if ( apply_filters( 'getpaid_skip_invoice_email', $skip, $type, $invoice ) ) {
+		$skip = $invoice->is_free() && wpinv_get_option('skip_email_free_invoice');
+		if (apply_filters('getpaid_skip_invoice_email', $skip, $type, $invoice)) {
 			return;
 		}
 
@@ -189,41 +189,41 @@  discard block
 block discarded – undo
 		$merge_tags = $email->get_merge_tags();
 
 		$result = $mailer->send(
-			apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
-			$email->add_merge_tags( $email->get_subject(), $merge_tags ),
-			$email->get_content( $merge_tags, $extra_args ),
+			apply_filters('getpaid_invoice_email_recipients', wpinv_parse_list($recipients), $email),
+			$email->add_merge_tags($email->get_subject(), $merge_tags),
+			$email->get_content($merge_tags, $extra_args),
 			$email->get_attachments()
 		);
 
 		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
+		if ($email->include_admin_bcc()) {
 			$mailer->send(
 				wpinv_get_admin_email(),
-				$email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
-				$email->get_content( $merge_tags ),
+				$email->add_merge_tags($email->get_subject() . __(' - ADMIN BCC COPY', 'invoicing'), $merge_tags),
+				$email->get_content($merge_tags),
 				$email->get_attachments()
 			);
 		}
 
-		if ( $result ) {
+		if ($result) {
 			$invoice->add_system_note(
 				sprintf(
-					__( 'Successfully sent %s notification email to %s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+					__('Successfully sent %s notification email to %s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin') : __('the customer')
 				)
 			);
 		} else {
 			$invoice->add_system_note(
 				sprintf(
-					__( 'Failed sending %s notification email to %s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+					__('Failed sending %s notification email to %s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin') : __('the customer')
 				)
 			);	
 		}
 
-		do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
+		do_action('getpaid_after_send_invoice_notification', $type, $invoice, $email);
 
 		return $result;
 	}
@@ -234,20 +234,20 @@  discard block
 block discarded – undo
 	 * @param array $recipients
 	 * @param GetPaid_Notification_Email $email
 	 */
-	public function filter_email_recipients( $recipients, $email ) {
+	public function filter_email_recipients($recipients, $email) {
 
-		if ( ! $email->is_admin_email() ) {
+		if (!$email->is_admin_email()) {
 			$cc   = $email->object->get_email_cc();
-			$cc_2 = get_user_meta( $email->object->get_user_id(), '_wpinv_email_cc', true );
+			$cc_2 = get_user_meta($email->object->get_user_id(), '_wpinv_email_cc', true);
 
-			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)));
 			}
 
-			if ( ! empty( $cc_2 ) ) {
-				$cc_2 = array_map( 'sanitize_email', wpinv_parse_list( $cc_2 ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc_2 ) ) );
+			if (!empty($cc_2)) {
+				$cc_2 = array_map('sanitize_email', wpinv_parse_list($cc_2));
+				$recipients = array_filter(array_unique(array_merge($recipients, $cc_2)));
 			}
 
 		}
@@ -261,17 +261,17 @@  discard block
 block discarded – undo
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function new_invoice( $invoice ) {
+	public function new_invoice($invoice) {
 
 		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_paid() || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
+		if (!$invoice->is_type('invoice') || $invoice->is_paid() || $this->is_payment_form_invoice($invoice->get_id())) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = wpinv_get_admin_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -280,12 +280,12 @@  discard block
 block discarded – undo
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function cancelled_invoice( $invoice ) {
+	public function cancelled_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 	}
 
 	/**
@@ -293,12 +293,12 @@  discard block
 block discarded – undo
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function failed_invoice( $invoice ) {
+	public function failed_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = wpinv_get_admin_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -307,12 +307,12 @@  discard block
 block discarded – undo
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function onhold_invoice( $invoice ) {
+	public function onhold_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -321,12 +321,12 @@  discard block
 block discarded – undo
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function processing_invoice( $invoice ) {
+	public function processing_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -335,17 +335,17 @@  discard block
 block discarded – undo
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function completed_invoice( $invoice ) {
+	public function completed_invoice($invoice) {
 
 		// (Maybe) abort if it is a renewal invoice.
-		if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
+		if ($invoice->is_renewal() && !wpinv_get_option('email_completed_invoice_renewal_active', false)) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -354,12 +354,12 @@  discard block
 block discarded – undo
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function refunded_invoice( $invoice ) {
+	public function refunded_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -369,21 +369,21 @@  discard block
 block discarded – undo
 	 * @param WPInv_Invoice $invoice
 	 * @param bool $force
 	 */
-	public function user_invoice( $invoice, $force = false ) {
+	public function user_invoice($invoice, $force = false) {
 
-		if ( ! $force && ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
+		if (!$force && !empty($GLOBALS['wpinv_skip_invoice_notification'])) {
 			return;
 		}
 
 		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $invoice->is_paid() ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
+		if (!$invoice->is_type('invoice') || (empty($force) && $invoice->is_paid()) || (empty($force) && $this->is_payment_form_invoice($invoice->get_id()))) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -393,9 +393,9 @@  discard block
 block discarded – undo
 	 * @param int $invoice
 	 * @return bool
 	 */
-	public function is_payment_form_invoice( $invoice ) {
-		$is_payment_form_invoice = empty( $_GET['getpaid-admin-action'] ) && ( 'payment_form' === get_post_meta( $invoice, 'wpinv_created_via', true ) || 'geodirectory' === get_post_meta( $invoice, 'wpinv_created_via', true ) );
-		return apply_filters( 'getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice );
+	public function is_payment_form_invoice($invoice) {
+		$is_payment_form_invoice = empty($_GET['getpaid-admin-action']) && ('payment_form' === get_post_meta($invoice, 'wpinv_created_via', true) || 'geodirectory' === get_post_meta($invoice, 'wpinv_created_via', true));
+		return apply_filters('getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice);
 	}
 
 	/**
@@ -404,12 +404,12 @@  discard block
 block discarded – undo
 	 * @param WPInv_Invoice $invoice
 	 * @param string $note
 	 */
-	public function user_note( $invoice, $note ) {
+	public function user_note($invoice, $note) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient, array('customer_note' => $note));
 
 	}
 
@@ -418,9 +418,9 @@  discard block
 block discarded – undo
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function force_send_overdue_notice( $invoice ) {
-		$email = new GetPaid_Notification_Email( 'overdue', $invoice );
-		return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
+	public function force_send_overdue_notice($invoice) {
+		$email = new GetPaid_Notification_Email('overdue', $invoice);
+		return $this->send_email($invoice, $email, 'overdue', $invoice->get_email());
 	}
 
 	/**
@@ -431,37 +431,37 @@  discard block
 block discarded – undo
 	public function overdue() {
 		global $wpdb;
 
-		$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;
 		}
 
 		// Retrieve date query.
-		$date_query = $this->get_date_query( $reminder_days );
+		$date_query = $this->get_date_query($reminder_days);
 
 		// Invoices table.
 		$table = $wpdb->prefix . 'getpaid_invoices';
 
 		// Fetch invoices.
-		$invoices  = $wpdb->get_col(
+		$invoices = $wpdb->get_col(
 			"SELECT posts.ID FROM $wpdb->posts as posts
 			LEFT JOIN $table as invoices ON invoices.post_id = posts.ID
 			WHERE posts.post_type = 'wpi_invoice' AND posts.post_status = 'wpi-pending' $date_query");
 
-		foreach ( $invoices as $invoice ) {
+		foreach ($invoices as $invoice) {
 
 			// Only send this email for invoices created via the admin page.
-			if ( ! $this->is_payment_form_invoice( $invoice ) ) {
-				$invoice       = new WPInv_Invoice( $invoice );
+			if (!$this->is_payment_form_invoice($invoice)) {
+				$invoice       = new WPInv_Invoice($invoice);
 				$email->object = $invoice;
 
-				if ( $invoice->needs_payment() ) {
-					$this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
+				if ($invoice->needs_payment()) {
+					$this->send_email($invoice, $email, __FUNCTION__, $invoice->get_email());
 				}
 
 			}
@@ -476,14 +476,14 @@  discard block
 block discarded – undo
 	 * @param array $reminder_days
 	 * @return string
 	 */
-	public function get_date_query( $reminder_days ) {
+	public function get_date_query($reminder_days) {
 
 		$date_query = array(
 			'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'))));
 
 			$date_query[] = array(
 				'year'  => $date['year'],
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
 
 		}
 
-		$date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
+		$date_query = new WP_Date_Query($date_query, 'invoices.due_date');
 
 		return $date_query->get_sql();
 

Please login to merge, or discard this patch.

includes/deprecated-functions.php 1 patch

Spacing +93 added lines, -93 removed lines patch added patch discarded remove patch

@@ -6,7 +6,7 @@  discard block
 block discarded – undo
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * @deprecated
@@ -19,48 +19,48 @@  discard block
 block discarded – undo
  * @deprecated
  */
 function wpinv_get_invoice_cart() {
-    return wpinv_get_invoice( getpaid_get_current_invoice_id() );
+    return wpinv_get_invoice(getpaid_get_current_invoice_id());
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_description( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_description($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_description();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_currency_code( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_currency_code($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_currency();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_payment_user_email( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_payment_user_email($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_email();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_user_id( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_user_id($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_user_id();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_status( $invoice, $return_label = false ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_status($invoice, $return_label = false) {
+    $invoice = new WPInv_Invoice($invoice);
     
-    if ( $return_label ) {
+    if ($return_label) {
         return $invoice->get_status_nicename();
     }
 
@@ -70,10 +70,10 @@  discard block
 block discarded – undo
 /**
  * @deprecated
  */
-function wpinv_get_payment_gateway( $invoice, $return_label = false ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_payment_gateway($invoice, $return_label = false) {
+    $invoice = new WPInv_Invoice($invoice);
 
-    if ( $return_label ) {
+    if ($return_label) {
         return $invoice->get_gateway_title();
     }
 
@@ -83,75 +83,75 @@  discard block
 block discarded – undo
 /**
  * @deprecated
  */
-function wpinv_get_payment_gateway_name( $invoice ) {
-    return wpinv_get_payment_gateway( $invoice, true );
+function wpinv_get_payment_gateway_name($invoice) {
+    return wpinv_get_payment_gateway($invoice, true);
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_payment_transaction_id( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_payment_transaction_id($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_transaction_id();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_meta( $invoice_id = 0, $meta_key = '_wpinv_payment_meta', $single = true ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
-    return $invoice->get_meta( $meta_key, $single );
+function wpinv_get_invoice_meta($invoice_id = 0, $meta_key = '_wpinv_payment_meta', $single = true) {
+    $invoice = new WPInv_Invoice($invoice_id);
+    return $invoice->get_meta($meta_key, $single);
 }
 
 /**
  * @deprecated
  */
-function wpinv_update_invoice_meta( $invoice_id = 0, $meta_key = '', $meta_value = '' ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
-    return $invoice->update_meta_data( $meta_key, $meta_value );
+function wpinv_update_invoice_meta($invoice_id = 0, $meta_key = '', $meta_value = '') {
+    $invoice = new WPInv_Invoice($invoice_id);
+    return $invoice->update_meta_data($meta_key, $meta_value);
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_items( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_items($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_items();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_fees( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_fees($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_fees();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_ip( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_ip($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_ip();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_user_info( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_user_info($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_user_info();
 }
 
 /**
  * @deprecated
  */
-function wpinv_subtotal( $invoice = 0, $currency = false ) {
-    $invoice  = new WPInv_Invoice( $invoice );
+function wpinv_subtotal($invoice = 0, $currency = false) {
+    $invoice  = new WPInv_Invoice($invoice);
     $subtotal = $invoice->get_subtotal();
 
-    if ( $currency ) {
-        return wpinv_price( $subtotal, $invoice->get_currency() );
+    if ($currency) {
+        return wpinv_price($subtotal, $invoice->get_currency());
     }
 
     return $subtotal;
@@ -160,12 +160,12 @@  discard block
 block discarded – undo
 /**
  * @deprecated
  */
-function wpinv_tax( $invoice = 0, $currency = false ) {
-    $invoice  = new WPInv_Invoice( $invoice );
+function wpinv_tax($invoice = 0, $currency = false) {
+    $invoice  = new WPInv_Invoice($invoice);
     $tax      = $invoice->get_total_tax();
 
-    if ( $currency ) {
-        return wpinv_price( $tax, $invoice->get_currency() );
+    if ($currency) {
+        return wpinv_price($tax, $invoice->get_currency());
     }
 
     return $tax;
@@ -174,12 +174,12 @@  discard block
 block discarded – undo
 /**
  * @deprecated
  */
-function wpinv_discount( $invoice = 0, $currency = false ) {
-    $invoice  = new WPInv_Invoice( $invoice );
+function wpinv_discount($invoice = 0, $currency = false) {
+    $invoice  = new WPInv_Invoice($invoice);
     $discount = $invoice->get_total_discount();
 
-    if ( $currency ) {
-        return wpinv_price( $discount, $invoice->get_currency() );
+    if ($currency) {
+        return wpinv_price($discount, $invoice->get_currency());
     }
 
     return $discount;
@@ -188,20 +188,20 @@  discard block
 block discarded – undo
 /**
  * @deprecated
  */
-function wpinv_discount_code( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_discount_code($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_discount_code();
 }
 
 /**
  * @deprecated
  */
-function wpinv_payment_total( $invoice = 0, $currency = false ) {
-    $invoice  = new WPInv_Invoice( $invoice );
+function wpinv_payment_total($invoice = 0, $currency = false) {
+    $invoice = new WPInv_Invoice($invoice);
     $total = $invoice->get_total();
 
-    if ( $currency ) {
-        return wpinv_price( $total, $invoice->get_currency() );
+    if ($currency) {
+        return wpinv_price($total, $invoice->get_currency());
     }
 
     return $total;
@@ -210,51 +210,51 @@  discard block
 block discarded – undo
 /**
  * @deprecated
  */
-function wpinv_get_date_created( $invoice = 0, $format = '' ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_date_created($invoice = 0, $format = '') {
+    $invoice = new WPInv_Invoice($invoice);
 
-    $format         = ! empty( $format ) ? $format : get_option( 'date_format' );
+    $format         = !empty($format) ? $format : get_option('date_format');
     $date_created   = $invoice->get_created_date();
 
-    return empty( $date_created ) ? date_i18n( $format, strtotime( $date_created ) ) : '';
+    return empty($date_created) ? date_i18n($format, strtotime($date_created)) : '';
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_date( $invoice = 0, $format = '' ) {
-    wpinv_get_date_created( $invoice, $format );
+function wpinv_get_invoice_date($invoice = 0, $format = '') {
+    wpinv_get_date_created($invoice, $format);
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_vat_number( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_vat_number($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_vat_number();
 }
 
 /**
  * @deprecated
  */
-function wpinv_insert_payment_note( $invoice = 0, $note = '', $user_type = false, $added_by_user = false, $system = false ) {
-    $invoice = new WPInv_Invoice( $invoice );
-    return $invoice->add_note( $note, $user_type, $added_by_user, $system );
+function wpinv_insert_payment_note($invoice = 0, $note = '', $user_type = false, $added_by_user = false, $system = false) {
+    $invoice = new WPInv_Invoice($invoice);
+    return $invoice->add_note($note, $user_type, $added_by_user, $system);
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_payment_key( $invoice = 0 ) {
-	$invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_payment_key($invoice = 0) {
+	$invoice = new WPInv_Invoice($invoice);
     return $invoice->get_key();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_number( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_number($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_number();
 }
 
@@ -401,9 +401,9 @@  discard block
 block discarded – undo
 /**
  * @deprecated
  */
-function wpinv_update_payment_status( $invoice, $new_status = 'publish' ) {    
-    $invoice = new WPInv_Invoice( $invoice );
-    return $invoice->update_status( $new_status );
+function wpinv_update_payment_status($invoice, $new_status = 'publish') {    
+    $invoice = new WPInv_Invoice($invoice);
+    return $invoice->update_status($new_status);
 }
 
 /**
@@ -456,22 +456,22 @@  discard block
 block discarded – undo
 /**
  * @deprecated
  */
-function wpinv_set_payment_transaction_id( $invoice_id = 0, $transaction_id = '' ) {
+function wpinv_set_payment_transaction_id($invoice_id = 0, $transaction_id = '') {
 
     // Fetch the invoice.
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    if ( 0 ==  $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return false;
     }
 
     // Prepare the transaction id.
-    if ( empty( $transaction_id ) ) {
+    if (empty($transaction_id)) {
         $transaction_id = $invoice_id;
     }
 
     // Set the transaction id;
-    $invoice->set_transaction_id( apply_filters( 'wpinv_set_payment_transaction_id', $transaction_id, $invoice ) );
+    $invoice->set_transaction_id(apply_filters('wpinv_set_payment_transaction_id', $transaction_id, $invoice));
 
     // Save the invoice.
     return $invoice->save();
@@ -484,12 +484,12 @@  discard block
 block discarded – undo
  * @param WPInv_Invoice $invoice
  * @param string $gateway
  */
-function wpinv_send_to_gateway( $gateway, $invoice ) {
+function wpinv_send_to_gateway($gateway, $invoice) {
 
     $payment_data = array(
         'invoice_id'        => $invoice->get_id(),
         'items'             => $invoice->get_cart_details(),
-        'cart_discounts'    => array( $invoice->get_discount_code() ),
+        'cart_discounts'    => array($invoice->get_discount_code()),
         'fees'              => $invoice->get_total_fees(),
         'subtotal'          => $invoice->get_subtotal(),
         'discount'          => $invoice->get_total_discount(),
@@ -497,16 +497,16 @@  discard block
 block discarded – undo
         'price'             => $invoice->get_total(),
         'invoice_key'       => $invoice->get_key(),
         'user_email'        => $invoice->get_email(),
-        'date'              => date( 'Y-m-d H:i:s', current_time( 'timestamp' ) ),
+        'date'              => date('Y-m-d H:i:s', current_time('timestamp')),
         'user_info'         => $invoice->get_user_info(),
-        'post_data'         => wp_kses_post( wp_unslash( $_POST ) ),
+        'post_data'         => wp_kses_post(wp_unslash($_POST)),
         'cart_details'      => $invoice->get_cart_details(),
         'gateway'           => $gateway,
         'card_info'         => array(),
         'gateway_nonce'     => wp_create_nonce('wpi-gateway'),
     );
 
-    do_action( 'wpinv_gateway_' . $gateway, $payment_data );
+    do_action('wpinv_gateway_' . $gateway, $payment_data);
 }
 
 /**
@@ -519,10 +519,10 @@  discard block
 block discarded – undo
 /**
  * @deprecated
  */
-function wpinv_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', 'wpinv_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', 'wpinv_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+function wpinv_die($message = '', $title = '', $status = 400) {
+    add_filter('wp_die_ajax_handler', 'wpinv_die_handler', 10, 3);
+    add_filter('wp_die_handler', 'wpinv_die_handler', 10, 3);
+    wp_die($message, $title, array('response' => $status));
 }
 
 /**
@@ -640,14 +640,14 @@  discard block
 block discarded – undo
 /**
  * @deprecated
  */
-function wpinv_invoice_status_label( $status, $status_display = '' ) {
-    return empty( $status_display ) ? sanitize_text_field( $status ) : sanitize_text_field( $status_display );
+function wpinv_invoice_status_label($status, $status_display = '') {
+    return empty($status_display) ? sanitize_text_field($status) : sanitize_text_field($status_display);
 }
 
 /**
  * @deprecated
  */
-function wpinv_clean_invoice_number( $number ) {
+function wpinv_clean_invoice_number($number) {
     return $number;
 }
 
@@ -852,12 +852,12 @@  discard block
 block discarded – undo
 /**
  * @deprecated
  */
-function wpinv_item_show_price( $item_id = 0, $echo = true ) {
+function wpinv_item_show_price($item_id = 0, $echo = true) {
 
-    if ( $echo ) {
-        echo wp_kses_post( wpinv_item_price( $item_id ) );
+    if ($echo) {
+        echo wp_kses_post(wpinv_item_price($item_id));
     } else {
-        return wpinv_item_price( $item_id );
+        return wpinv_item_price($item_id);
     }
 
 }
@@ -1272,6 +1272,6 @@  discard block
 block discarded – undo
  * @return WPInv_Subscription|bool
  * @deprecated
  */
-function wpinv_get_subscription( $invoice ) {
-	return wpinv_get_invoice_subscription( $invoice );
+function wpinv_get_subscription($invoice) {
+	return wpinv_get_invoice_subscription($invoice);
 }

Please login to merge, or discard this patch.

		@@ -1,32 +1,32 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		- // Is the request set up correctly?
4		- if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
5		- return aui()->alert(
6		- array(
7		- 'type' => 'warning',
8		- 'content' => __( 'No payment form or item selected', 'invoicing' ),
9		- )
10		- );
11		- wp_die( __( 'No payment form or item selected', 'invoicing' ), 400 );
12		- }
13		-
14		- // Payment form or button?
15		- if ( ! empty( $_GET['form'] ) ) {
16		-
17		- $shortcode = sprintf(
18		- '[getpaid form=%s]',
19		- (int) $_GET['form']
20		- );
21		-
22		- } else {
23		-
24		- $shortcode = sprintf(
25		- '[getpaid item=%s]',
26		- esc_attr( urldecode( $_GET['item'] ) )
27		- );
28		-
29		- }
	3	+ // Is the request set up correctly?
	4	+ if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
	5	+ return aui()->alert(
	6	+ array(
	7	+ 'type' => 'warning',
	8	+ 'content' => __( 'No payment form or item selected', 'invoicing' ),
	9	+ )
	10	+ );
	11	+ wp_die( __( 'No payment form or item selected', 'invoicing' ), 400 );
	12	+ }
	13	+
	14	+ // Payment form or button?
	15	+ if ( ! empty( $_GET['form'] ) ) {
	16	+
	17	+ $shortcode = sprintf(
	18	+ '[getpaid form=%s]',
	19	+ (int) $_GET['form']
	20	+ );
	21	+
	22	+ } else {
	23	+
	24	+ $shortcode = sprintf(
	25	+ '[getpaid item=%s]',
	26	+ esc_attr( urldecode( $_GET['item'] ) )
	27	+ );
	28	+
	29	+ }
30	30
31	31	?>
32	32
		@@ -44,12 +44,12 @@ discard block
		block discarded – undo
44	44
45	45	<title>GetPaid</title>
46	46	<?php
47		- wp_enqueue_scripts();
48		- wp_print_styles();
49		- wp_print_head_scripts();
50		- wp_custom_css_cb();
51		- wpinv_get_template( 'frontend-head.php' );
52		- ?>
	47	+ wp_enqueue_scripts();
	48	+ wp_print_styles();
	49	+ wp_print_head_scripts();
	50	+ wp_custom_css_cb();
	51	+ wpinv_get_template( 'frontend-head.php' );
	52	+ ?>
53	53
54	54	<style type="text/css">
55	55	.body{
		@@ -83,11 +83,11 @@ discard block
		block discarded – undo
83	83	<body class="body page-template-default page">
84	84	<div id="getpaid-form-embed" class="container my-5 page type-page status-publish hentry post post-content">
85	85	<?php
86		- do_action( 'getpaid_payment_form_embed_top' );
87		- echo do_shortcode( $shortcode );
88		- do_action( 'getpaid_payment_form_embed_bottom' );
89		- wpinv_get_template( 'frontend-footer.php' );
90		- ?>
	86	+ do_action( 'getpaid_payment_form_embed_top' );
	87	+ echo do_shortcode( $shortcode );
	88	+ do_action( 'getpaid_payment_form_embed_bottom' );
	89	+ wpinv_get_template( 'frontend-footer.php' );
	90	+ ?>
91	91	</div>
92	92	<?php wp_footer(); ?>
93	93	</body>

		@@ -1,18 +1,18 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3	3	// Is the request set up correctly?
4		- if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
	4	+ if (empty($_GET['form']) && empty($_GET['item'])) {
5	5	return aui()->alert(
6	6	array(
7	7	'type' => 'warning',
8		- 'content' => __( 'No payment form or item selected', 'invoicing' ),
	8	+ 'content' => __('No payment form or item selected', 'invoicing'),
9	9	)
10	10	);
11		- wp_die( __( 'No payment form or item selected', 'invoicing' ), 400 );
	11	+ wp_die(__('No payment form or item selected', 'invoicing'), 400);
12	12	}
13	13
14	14	// Payment form or button?
15		- if ( ! empty( $_GET['form'] ) ) {
	15	+ if (!empty($_GET['form'])) {
16	16
17	17	$shortcode = sprintf(
18	18	'[getpaid form=%s]',
		@@ -23,7 +23,7 @@ discard block
		block discarded – undo
23	23
24	24	$shortcode = sprintf(
25	25	'[getpaid item=%s]',
26		- esc_attr( urldecode( $_GET['item'] ) )
	26	+ esc_attr(urldecode($_GET['item']))
27	27	);
28	28
29	29	}
		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35
36	36	<head>
37	37
38		- <meta charset="<?php bloginfo( 'charset' ); ?>">
	38	+ <meta charset="<?php bloginfo('charset'); ?>">
39	39	<meta name="viewport" content="width=device-width, initial-scale=1.0" >
40	40
41	41	<meta name="robots" content="noindex,nofollow">
		@@ -48,7 +48,7 @@ discard block
		block discarded – undo
48	48	wp_print_styles();
49	49	wp_print_head_scripts();
50	50	wp_custom_css_cb();
51		- wpinv_get_template( 'frontend-head.php' );
	51	+ wpinv_get_template('frontend-head.php');
52	52	?>
53	53
54	54	<style type="text/css">
		@@ -83,10 +83,10 @@ discard block
		block discarded – undo
83	83	<body class="body page-template-default page">
84	84	<div id="getpaid-form-embed" class="container my-5 page type-page status-publish hentry post post-content">
85	85	<?php
86		- do_action( 'getpaid_payment_form_embed_top' );
87		- echo do_shortcode( $shortcode );
88		- do_action( 'getpaid_payment_form_embed_bottom' );
89		- wpinv_get_template( 'frontend-footer.php' );
	86	+ do_action('getpaid_payment_form_embed_top');
	87	+ echo do_shortcode($shortcode);
	88	+ do_action('getpaid_payment_form_embed_bottom');
	89	+ wpinv_get_template('frontend-footer.php');
90	90	?>
91	91	</div>
92	92	<?php wp_footer(); ?>

		@@ -14,144 +14,144 @@ discard block
		block discarded – undo
14	14	*/
15	15	class WPInv_Subscriptions_Widget extends WP_Super_Duper {
16	16
17		- /**
18		- * Register the widget with WordPress.
19		- *
20		- */
21		- public function __construct() {
22		-
23		- $options = array(
24		- 'textdomain' => 'invoicing',
25		- 'block-icon' => 'controls-repeat',
26		- 'block-category'=> 'widgets',
27		- 'block-keywords'=> "['invoicing','subscriptions', 'getpaid']",
28		- 'class_name' => __CLASS__,
29		- 'base_id' => 'wpinv_subscriptions',
30		- 'name' => __( 'GetPaid > Subscriptions', 'invoicing' ),
31		- 'widget_ops' => array(
32		- 'classname' => 'getpaid-subscriptions bsui',
33		- 'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
34		- ),
35		- 'arguments' => array(
36		- 'title' => array(
37		- 'title' => __( 'Widget title', 'invoicing' ),
38		- 'desc' => __( 'Enter widget title.', 'invoicing' ),
39		- 'type' => 'text',
40		- 'desc_tip' => true,
41		- 'default' => '',
42		- 'advanced' => false
43		- ),
44		- )
45		-
46		- );
47		-
48		-
49		- parent::__construct( $options );
50		- }
51		-
52		- /**
53		- * Retrieves current user's subscriptions.
54		- *
55		- * @return GetPaid_Subscriptions_Query
56		- */
57		- public function get_subscriptions() {
58		-
59		- // Prepare license args.
60		- $args = array(
61		- 'customer_in' => get_current_user_id(),
62		- 'paged' => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
63		- );
64		-
65		- return new GetPaid_Subscriptions_Query( $args );
66		-
67		- }
68		-
69		- /**
70		- * The Super block output function.
71		- *
72		- * @param array $args
73		- * @param array $widget_args
74		- * @param string $content
75		- *
76		- * @return mixed\|string\|bool
77		- */
78		- public function output( $args = array(), $widget_args = array(), $content = '' ) {
79		-
80		- // Ensure that the user is logged in.
81		- if ( ! is_user_logged_in() ) {
82		-
83		- return aui()->alert(
84		- array(
85		- 'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
86		- 'type' => 'error',
87		- )
88		- );
89		-
90		- }
91		-
92		- // Are we displaying a single subscription?
93		- if ( isset( $_GET['subscription'] ) ) {
94		- return $this->display_single_subscription( intval( $_GET['subscription'] ) );
95		- }
96		-
97		- // Retrieve the user's subscriptions.
98		- $subscriptions = $this->get_subscriptions();
99		-
100		- // Start the output buffer.
101		- ob_start();
102		-
103		- // Backwards compatibility.
104		- do_action( 'wpinv_before_user_subscriptions' );
105		-
106		- // Display errors and notices.
107		- wpinv_print_errors();
108		-
109		- do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
110		-
111		- // Print the table header.
112		- $this->print_table_header();
113		-
114		- // Print table body.
115		- $this->print_table_body( $subscriptions->get_results() );
116		-
117		- // Print table footer.
118		- $this->print_table_footer();
119		-
120		- // Print the navigation.
121		- $this->print_navigation( $subscriptions->get_total() );
122		-
123		- // Backwards compatibility.
124		- do_action( 'wpinv_after_user_subscriptions' );
125		-
126		- // Return the output.
127		- return ob_get_clean();
128		-
129		- }
130		-
131		- /**
132		- * Retrieves the subscription columns.
133		- *
134		- * @return array
135		- */
136		- public function get_subscriptions_table_columns() {
	17	+ /**
	18	+ * Register the widget with WordPress.
	19	+ *
	20	+ */
	21	+ public function __construct() {
	22	+
	23	+ $options = array(
	24	+ 'textdomain' => 'invoicing',
	25	+ 'block-icon' => 'controls-repeat',
	26	+ 'block-category'=> 'widgets',
	27	+ 'block-keywords'=> "['invoicing','subscriptions', 'getpaid']",
	28	+ 'class_name' => __CLASS__,
	29	+ 'base_id' => 'wpinv_subscriptions',
	30	+ 'name' => __( 'GetPaid > Subscriptions', 'invoicing' ),
	31	+ 'widget_ops' => array(
	32	+ 'classname' => 'getpaid-subscriptions bsui',
	33	+ 'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
	34	+ ),
	35	+ 'arguments' => array(
	36	+ 'title' => array(
	37	+ 'title' => __( 'Widget title', 'invoicing' ),
	38	+ 'desc' => __( 'Enter widget title.', 'invoicing' ),
	39	+ 'type' => 'text',
	40	+ 'desc_tip' => true,
	41	+ 'default' => '',
	42	+ 'advanced' => false
	43	+ ),
	44	+ )
	45	+
	46	+ );
	47	+
	48	+
	49	+ parent::__construct( $options );
	50	+ }
	51	+
	52	+ /**
	53	+ * Retrieves current user's subscriptions.
	54	+ *
	55	+ * @return GetPaid_Subscriptions_Query
	56	+ */
	57	+ public function get_subscriptions() {
	58	+
	59	+ // Prepare license args.
	60	+ $args = array(
	61	+ 'customer_in' => get_current_user_id(),
	62	+ 'paged' => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
	63	+ );
	64	+
	65	+ return new GetPaid_Subscriptions_Query( $args );
	66	+
	67	+ }
	68	+
	69	+ /**
	70	+ * The Super block output function.
	71	+ *
	72	+ * @param array $args
	73	+ * @param array $widget_args
	74	+ * @param string $content
	75	+ *
	76	+ * @return mixed\|string\|bool
	77	+ */
	78	+ public function output( $args = array(), $widget_args = array(), $content = '' ) {
	79	+
	80	+ // Ensure that the user is logged in.
	81	+ if ( ! is_user_logged_in() ) {
	82	+
	83	+ return aui()->alert(
	84	+ array(
	85	+ 'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
	86	+ 'type' => 'error',
	87	+ )
	88	+ );
	89	+
	90	+ }
	91	+
	92	+ // Are we displaying a single subscription?
	93	+ if ( isset( $_GET['subscription'] ) ) {
	94	+ return $this->display_single_subscription( intval( $_GET['subscription'] ) );
	95	+ }
	96	+
	97	+ // Retrieve the user's subscriptions.
	98	+ $subscriptions = $this->get_subscriptions();
	99	+
	100	+ // Start the output buffer.
	101	+ ob_start();
	102	+
	103	+ // Backwards compatibility.
	104	+ do_action( 'wpinv_before_user_subscriptions' );
	105	+
	106	+ // Display errors and notices.
	107	+ wpinv_print_errors();
	108	+
	109	+ do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
	110	+
	111	+ // Print the table header.
	112	+ $this->print_table_header();
	113	+
	114	+ // Print table body.
	115	+ $this->print_table_body( $subscriptions->get_results() );
	116	+
	117	+ // Print table footer.
	118	+ $this->print_table_footer();
	119	+
	120	+ // Print the navigation.
	121	+ $this->print_navigation( $subscriptions->get_total() );
	122	+
	123	+ // Backwards compatibility.
	124	+ do_action( 'wpinv_after_user_subscriptions' );
	125	+
	126	+ // Return the output.
	127	+ return ob_get_clean();
	128	+
	129	+ }
	130	+
	131	+ /**
	132	+ * Retrieves the subscription columns.
	133	+ *
	134	+ * @return array
	135	+ */
	136	+ public function get_subscriptions_table_columns() {
137	137
138		- $columns = array(
139		- 'subscription' => __( 'Subscription', 'invoicing' ),
140		- 'amount' => __( 'Amount', 'invoicing' ),
141		- 'renewal-date' => __( 'Next payment', 'invoicing' ),
142		- 'status' => __( 'Status', 'invoicing' ),
143		- );
	138	+ $columns = array(
	139	+ 'subscription' => __( 'Subscription', 'invoicing' ),
	140	+ 'amount' => __( 'Amount', 'invoicing' ),
	141	+ 'renewal-date' => __( 'Next payment', 'invoicing' ),
	142	+ 'status' => __( 'Status', 'invoicing' ),
	143	+ );
144	144
145		- return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
146		- }
	145	+ return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
	146	+ }
147	147
148		- /**
149		- * Displays the table header.
150		- *
151		- */
152		- public function print_table_header() {
	148	+ /**
	149	+ * Displays the table header.
	150	+ *
	151	+ */
	152	+ public function print_table_header() {
153	153
154		- ?>
	154	+ ?>
155	155
156	156	<table class="table table-bordered table-striped">
157	157
		@@ -167,121 +167,121 @@ discard block
		block discarded – undo
167	167
168	168	<?php
169	169
170		- }
	170	+ }
171	171
172		- /**
173		- * Displays the table body.
174		- *
175		- * @param WPInv_Subscription[] $subscriptions
176		- */
177		- public function print_table_body( $subscriptions ) {
	172	+ /**
	173	+ * Displays the table body.
	174	+ *
	175	+ * @param WPInv_Subscription[] $subscriptions
	176	+ */
	177	+ public function print_table_body( $subscriptions ) {
178	178
179		- if ( empty( $subscriptions ) ) {
180		- $this->print_table_body_no_subscriptions();
181		- } else {
182		- $this->print_table_body_subscriptions( $subscriptions );
183		- }
	179	+ if ( empty( $subscriptions ) ) {
	180	+ $this->print_table_body_no_subscriptions();
	181	+ } else {
	182	+ $this->print_table_body_subscriptions( $subscriptions );
	183	+ }
184	184
185		- }
	185	+ }
186	186
187		- /**
188		- * Displays the table body if no subscriptions were found.
189		- *
190		- */
191		- public function print_table_body_no_subscriptions() {
	187	+ /**
	188	+ * Displays the table body if no subscriptions were found.
	189	+ *
	190	+ */
	191	+ public function print_table_body_no_subscriptions() {
192	192
193		- ?>
	193	+ ?>
194	194	<tbody>
195	195
196	196	<tr>
197	197	<td colspan="<?php echo count( $this->get_subscriptions_table_columns() ); ?>">
198	198
199	199	<?php
200		- echo aui()->alert(
201		- array(
202		- 'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
203		- 'type' => 'warning',
204		- )
205		- );
206		- ?>
	200	+ echo aui()->alert(
	201	+ array(
	202	+ 'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
	203	+ 'type' => 'warning',
	204	+ )
	205	+ );
	206	+ ?>
207	207
208	208	</td>
209	209	</tr>
210	210
211	211	</tbody>
212	212	<?php
213		- }
	213	+ }
214	214
215		- /**
216		- * Displays the table body if subscriptions were found.
217		- *
218		- * @param WPInv_Subscription[] $subscriptions
219		- */
220		- public function print_table_body_subscriptions( $subscriptions ) {
	215	+ /**
	216	+ * Displays the table body if subscriptions were found.
	217	+ *
	218	+ * @param WPInv_Subscription[] $subscriptions
	219	+ */
	220	+ public function print_table_body_subscriptions( $subscriptions ) {
221	221
222		- ?>
	222	+ ?>
223	223	<tbody>
224	224
225	225	<?php foreach ( $subscriptions as $subscription ) : ?>
226	226	<tr class="getpaid-subscriptions-table-row subscription-<?php echo (int) $subscription->get_id(); ?>">
227	227	<?php
228		- wpinv_get_template(
229		- 'subscriptions/subscriptions-table-row.php',
230		- array(
231		- 'subscription' => $subscription,
232		- 'widget' => $this
233		- )
234		- );
235		- ?>
	228	+ wpinv_get_template(
	229	+ 'subscriptions/subscriptions-table-row.php',
	230	+ array(
	231	+ 'subscription' => $subscription,
	232	+ 'widget' => $this
	233	+ )
	234	+ );
	235	+ ?>
236	236	</tr>
237	237	<?php endforeach; ?>
238	238
239	239	</tbody>
240	240	<?php
241		- }
242		-
243		- /**
244		- * Adds row actions to a column
245		- *
246		- * @param string $content column content
247		- * @param WPInv_Subscription $subscription
248		- * @since 1.0.0
249		- * @return string
250		- */
251		- public function add_row_actions( $content, $subscription ) {
252		-
253		- // Prepare row actions.
254		- $actions = array();
255		-
256		- // View subscription action.
257		- $view_url = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
258		- $view_url = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
259		- $actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
260		-
261		- // Filter the actions.
262		- $actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
263		-
264		- $sanitized = array();
265		- foreach ( $actions as $key => $action ) {
266		- $key = sanitize_html_class( $key );
267		- $action = wp_kses_post( $action );
268		- $sanitized[] = "<span class='$key'>$action</span>";
269		- }
270		-
271		- $row_actions = "<small class='form-text getpaid-subscription-item-actions'>";
272		- $row_actions .= implode( ' \| ', $sanitized );
273		- $row_actions .= '</small>';
274		-
275		- return $content . $row_actions;
276		- }
277		-
278		- /**
279		- * Displays the table footer.
280		- *
281		- */
282		- public function print_table_footer() {
283		-
284		- ?>
	241	+ }
	242	+
	243	+ /**
	244	+ * Adds row actions to a column
	245	+ *
	246	+ * @param string $content column content
	247	+ * @param WPInv_Subscription $subscription
	248	+ * @since 1.0.0
	249	+ * @return string
	250	+ */
	251	+ public function add_row_actions( $content, $subscription ) {
	252	+
	253	+ // Prepare row actions.
	254	+ $actions = array();
	255	+
	256	+ // View subscription action.
	257	+ $view_url = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
	258	+ $view_url = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
	259	+ $actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
	260	+
	261	+ // Filter the actions.
	262	+ $actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
	263	+
	264	+ $sanitized = array();
	265	+ foreach ( $actions as $key => $action ) {
	266	+ $key = sanitize_html_class( $key );
	267	+ $action = wp_kses_post( $action );
	268	+ $sanitized[] = "<span class='$key'>$action</span>";
	269	+ }
	270	+
	271	+ $row_actions = "<small class='form-text getpaid-subscription-item-actions'>";
	272	+ $row_actions .= implode( ' \| ', $sanitized );
	273	+ $row_actions .= '</small>';
	274	+
	275	+ return $content . $row_actions;
	276	+ }
	277	+
	278	+ /**
	279	+ * Displays the table footer.
	280	+ *
	281	+ */
	282	+ public function print_table_footer() {
	283	+
	284	+ ?>
285	285
286	286	<tfoot>
287	287	<tr>
		@@ -296,143 +296,143 @@ discard block
		block discarded – undo
296	296	</table>
297	297	<?php
298	298
299		- }
	299	+ }
300	300
301		- /**
302		- * Displays the navigation.
303		- *
304		- * @param int $total
305		- */
306		- public function print_navigation( $total ) {
	301	+ /**
	302	+ * Displays the navigation.
	303	+ *
	304	+ * @param int $total
	305	+ */
	306	+ public function print_navigation( $total ) {
307	307
308		- if ( $total < 1 ) {
	308	+ if ( $total < 1 ) {
309	309
310		- // Out-of-bounds, run the query again without LIMIT for total count.
311		- $args = array(
312		- 'customer_in' => get_current_user_id(),
313		- 'fields' => 'id',
314		- );
	310	+ // Out-of-bounds, run the query again without LIMIT for total count.
	311	+ $args = array(
	312	+ 'customer_in' => get_current_user_id(),
	313	+ 'fields' => 'id',
	314	+ );
315	315
316		- $count_query = new GetPaid_Subscriptions_Query( $args );
317		- $total = $count_query->get_total();
318		- }
	316	+ $count_query = new GetPaid_Subscriptions_Query( $args );
	317	+ $total = $count_query->get_total();
	318	+ }
319	319
320		- // Abort if we do not have pages.
321		- if ( 2 > $total ) {
322		- return;
323		- }
	320	+ // Abort if we do not have pages.
	321	+ if ( 2 > $total ) {
	322	+ return;
	323	+ }
324	324
325		- ?>
	325	+ ?>
326	326
327	327	<div class="getpaid-subscriptions-pagination">
328	328	<?php
329		- $big = 999999;
330		-
331		- echo getpaid_paginate_links(
332		- array(
333		- 'base' => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
334		- 'format' => '?paged=%#%',
335		- 'total' => (int) ceil( $total / 10 ),
336		- )
337		- );
338		- ?>
	329	+ $big = 999999;
	330	+
	331	+ echo getpaid_paginate_links(
	332	+ array(
	333	+ 'base' => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
	334	+ 'format' => '?paged=%#%',
	335	+ 'total' => (int) ceil( $total / 10 ),
	336	+ )
	337	+ );
	338	+ ?>
339	339	</div>
340	340
341	341	<?php
342		- }
343		-
344		- /**
345		- * Returns a single subscription's columns.
346		- *
347		- * @param WPInv_Subscription $subscription
348		- *
349		- * @return array
350		- */
351		- public function get_single_subscription_columns( $subscription ) {
352		-
353		- // Prepare subscription detail columns.
354		- $subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
355		- $items_count = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
356		- $fields = apply_filters(
357		- 'getpaid_single_subscription_details_fields',
358		- array(
359		- 'status' => __( 'Status', 'invoicing' ),
360		- 'initial_amount' => __( 'Initial amount', 'invoicing' ),
361		- 'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
362		- 'start_date' => __( 'Start date', 'invoicing' ),
363		- 'expiry_date' => __( 'Next payment', 'invoicing' ),
364		- 'payments' => __( 'Payments', 'invoicing' ),
365		- 'item' => _n( 'Item', 'Items', $items_count, 'invoicing' ),
366		- ),
367		- $subscription
368		- );
369		-
370		- if ( isset( $fields['expiry_date'] ) ) {
371		-
372		- if ( ! $subscription->is_active() \|\| $subscription->is_last_renewal() ) {
373		- $fields['expiry_date'] = __( 'End date', 'invoicing' );
374		- }
375		-
376		- if ( 'pending' == $subscription->get_status() ) {
377		- unset( $fields['expiry_date'] );
378		- }
379		-
380		- }
381		-
382		- if ( isset( $fields['start_date'] ) && 'pending' == $subscription->get_status() ) {
383		- unset( $fields['start_date'] );
384		- }
385		-
386		- if ( $subscription->get_initial_amount() == $subscription->get_recurring_amount() ) {
387		- unset( $fields['initial_amount'] );
388		- }
389		-
390		- return $fields;
391		- }
392		-
393		- /**
394		- * Displays a single subscription.
395		- *
396		- * @param string $subscription
397		- *
398		- * @return string
399		- */
400		- public function display_single_subscription( $subscription ) {
401		-
402		- // Fetch the subscription.
403		- $subscription = new WPInv_Subscription( (int) $subscription );
404		-
405		- if ( ! $subscription->exists() ) {
406		-
407		- return aui()->alert(
408		- array(
409		- 'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
410		- 'type' => 'error',
411		- )
412		- );
413		-
414		- }
415		-
416		- // Ensure that the user owns this subscription key.
417		- if ( get_current_user_id() != $subscription->get_customer_id() && ! wpinv_current_user_can_manage_invoicing() ) {
418		-
419		- return aui()->alert(
420		- array(
421		- 'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
422		- 'type' => 'error',
423		- )
424		- );
425		-
426		- }
427		-
428		- return wpinv_get_template_html(
429		- 'subscriptions/subscription-details.php',
430		- array(
431		- 'subscription' => $subscription,
432		- 'widget' => $this
433		- )
434		- );
435		-
436		- }
	342	+ }
	343	+
	344	+ /**
	345	+ * Returns a single subscription's columns.
	346	+ *
	347	+ * @param WPInv_Subscription $subscription
	348	+ *
	349	+ * @return array
	350	+ */
	351	+ public function get_single_subscription_columns( $subscription ) {
	352	+
	353	+ // Prepare subscription detail columns.
	354	+ $subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
	355	+ $items_count = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
	356	+ $fields = apply_filters(
	357	+ 'getpaid_single_subscription_details_fields',
	358	+ array(
	359	+ 'status' => __( 'Status', 'invoicing' ),
	360	+ 'initial_amount' => __( 'Initial amount', 'invoicing' ),
	361	+ 'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
	362	+ 'start_date' => __( 'Start date', 'invoicing' ),
	363	+ 'expiry_date' => __( 'Next payment', 'invoicing' ),
	364	+ 'payments' => __( 'Payments', 'invoicing' ),
	365	+ 'item' => _n( 'Item', 'Items', $items_count, 'invoicing' ),
	366	+ ),
	367	+ $subscription
	368	+ );
	369	+
	370	+ if ( isset( $fields['expiry_date'] ) ) {
	371	+
	372	+ if ( ! $subscription->is_active() \|\| $subscription->is_last_renewal() ) {
	373	+ $fields['expiry_date'] = __( 'End date', 'invoicing' );
	374	+ }
	375	+
	376	+ if ( 'pending' == $subscription->get_status() ) {
	377	+ unset( $fields['expiry_date'] );
	378	+ }
	379	+
	380	+ }
	381	+
	382	+ if ( isset( $fields['start_date'] ) && 'pending' == $subscription->get_status() ) {
	383	+ unset( $fields['start_date'] );
	384	+ }
	385	+
	386	+ if ( $subscription->get_initial_amount() == $subscription->get_recurring_amount() ) {
	387	+ unset( $fields['initial_amount'] );
	388	+ }
	389	+
	390	+ return $fields;
	391	+ }
	392	+
	393	+ /**
	394	+ * Displays a single subscription.
	395	+ *
	396	+ * @param string $subscription
	397	+ *
	398	+ * @return string
	399	+ */
	400	+ public function display_single_subscription( $subscription ) {
	401	+
	402	+ // Fetch the subscription.
	403	+ $subscription = new WPInv_Subscription( (int) $subscription );
	404	+
	405	+ if ( ! $subscription->exists() ) {
	406	+
	407	+ return aui()->alert(
	408	+ array(
	409	+ 'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
	410	+ 'type' => 'error',
	411	+ )
	412	+ );
	413	+
	414	+ }
	415	+
	416	+ // Ensure that the user owns this subscription key.
	417	+ if ( get_current_user_id() != $subscription->get_customer_id() && ! wpinv_current_user_can_manage_invoicing() ) {
	418	+
	419	+ return aui()->alert(
	420	+ array(
	421	+ 'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
	422	+ 'type' => 'error',
	423	+ )
	424	+ );
	425	+
	426	+ }
	427	+
	428	+ return wpinv_get_template_html(
	429	+ 'subscriptions/subscription-details.php',
	430	+ array(
	431	+ 'subscription' => $subscription,
	432	+ 'widget' => $this
	433	+ )
	434	+ );
	435	+
	436	+ }
437	437
438	438	}

		@@ -5,7 +5,7 @@ discard block
		block discarded – undo
5	5	* @version 1.0.0
6	6	*/
7	7
8		-defined( 'ABSPATH' ) \|\| exit;
	8	+defined('ABSPATH') \|\| exit;
9	9
10	10	/**
11	11	* Contains the subscriptions widget.
		@@ -27,15 +27,15 @@ discard block
		block discarded – undo
27	27	'block-keywords'=> "['invoicing','subscriptions', 'getpaid']",
28	28	'class_name' => __CLASS__,
29	29	'base_id' => 'wpinv_subscriptions',
30		- 'name' => __( 'GetPaid > Subscriptions', 'invoicing' ),
	30	+ 'name' => __('GetPaid > Subscriptions', 'invoicing'),
31	31	'widget_ops' => array(
32	32	'classname' => 'getpaid-subscriptions bsui',
33		- 'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
	33	+ 'description' => esc_html__("Displays the current user's subscriptions.", 'invoicing'),
34	34	),
35	35	'arguments' => array(
36	36	'title' => array(
37		- 'title' => __( 'Widget title', 'invoicing' ),
38		- 'desc' => __( 'Enter widget title.', 'invoicing' ),
	37	+ 'title' => __('Widget title', 'invoicing'),
	38	+ 'desc' => __('Enter widget title.', 'invoicing'),
39	39	'type' => 'text',
40	40	'desc_tip' => true,
41	41	'default' => '',
		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	);
47	47
48	48
49		- parent::__construct( $options );
	49	+ parent::__construct($options);
50	50	}
51	51
52	52	/**
		@@ -57,12 +57,12 @@ discard block
		block discarded – undo
57	57	public function get_subscriptions() {
58	58
59	59	// Prepare license args.
60		- $args = array(
	60	+ $args = array(
61	61	'customer_in' => get_current_user_id(),
62		- 'paged' => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
	62	+ 'paged' => (get_query_var('paged')) ? absint(get_query_var('paged')) : 1,
63	63	);
64	64
65		- return new GetPaid_Subscriptions_Query( $args );
	65	+ return new GetPaid_Subscriptions_Query($args);
66	66
67	67	}
68	68
		@@ -75,14 +75,14 @@ discard block
		block discarded – undo
75	75	*
76	76	* @return mixed\|string\|bool
77	77	*/
78		- public function output( $args = array(), $widget_args = array(), $content = '' ) {
	78	+ public function output($args = array(), $widget_args = array(), $content = '') {
79	79
80	80	// Ensure that the user is logged in.
81		- if ( ! is_user_logged_in() ) {
	81	+ if (!is_user_logged_in()) {
82	82
83	83	return aui()->alert(
84	84	array(
85		- 'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
	85	+ 'content' => wp_kses_post(__('You need to log-in or create an account to view this section.', 'invoicing')),
86	86	'type' => 'error',
87	87	)
88	88	);
		@@ -90,8 +90,8 @@ discard block
		block discarded – undo
90	90	}
91	91
92	92	// Are we displaying a single subscription?
93		- if ( isset( $_GET['subscription'] ) ) {
94		- return $this->display_single_subscription( intval( $_GET['subscription'] ) );
	93	+ if (isset($_GET['subscription'])) {
	94	+ return $this->display_single_subscription(intval($_GET['subscription']));
95	95	}
96	96
97	97	// Retrieve the user's subscriptions.
		@@ -101,27 +101,27 @@ discard block
		block discarded – undo
101	101	ob_start();
102	102
103	103	// Backwards compatibility.
104		- do_action( 'wpinv_before_user_subscriptions' );
	104	+ do_action('wpinv_before_user_subscriptions');
105	105
106	106	// Display errors and notices.
107	107	wpinv_print_errors();
108	108
109		- do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
	109	+ do_action('getpaid_license_manager_before_subscriptions', $subscriptions);
110	110
111	111	// Print the table header.
112	112	$this->print_table_header();
113	113
114	114	// Print table body.
115		- $this->print_table_body( $subscriptions->get_results() );
	115	+ $this->print_table_body($subscriptions->get_results());
116	116
117	117	// Print table footer.
118	118	$this->print_table_footer();
119	119
120	120	// Print the navigation.
121		- $this->print_navigation( $subscriptions->get_total() );
	121	+ $this->print_navigation($subscriptions->get_total());
122	122
123	123	// Backwards compatibility.
124		- do_action( 'wpinv_after_user_subscriptions' );
	124	+ do_action('wpinv_after_user_subscriptions');
125	125
126	126	// Return the output.
127	127	return ob_get_clean();
		@@ -136,13 +136,13 @@ discard block
		block discarded – undo
136	136	public function get_subscriptions_table_columns() {
137	137
138	138	$columns = array(
139		- 'subscription' => __( 'Subscription', 'invoicing' ),
140		- 'amount' => __( 'Amount', 'invoicing' ),
141		- 'renewal-date' => __( 'Next payment', 'invoicing' ),
142		- 'status' => __( 'Status', 'invoicing' ),
	139	+ 'subscription' => __('Subscription', 'invoicing'),
	140	+ 'amount' => __('Amount', 'invoicing'),
	141	+ 'renewal-date' => __('Next payment', 'invoicing'),
	142	+ 'status' => __('Status', 'invoicing'),
143	143	);
144	144
145		- return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
	145	+ return apply_filters('getpaid_frontend_subscriptions_table_columns', $columns);
146	146	}
147	147
148	148	/**
		@@ -157,9 +157,9 @@ discard block
		block discarded – undo
157	157
158	158	<thead>
159	159	<tr>
160		- <?php foreach ( $this->get_subscriptions_table_columns() as $key => $label ) : ?>
161		- <th scope="col" class="font-weight-bold getpaid-subscriptions-table-<?php echo sanitize_html_class( $key ); ?>">
162		- <?php echo sanitize_text_field( $label ); ?>
	160	+ <?php foreach ($this->get_subscriptions_table_columns() as $key => $label) : ?>
	161	+ <th scope="col" class="font-weight-bold getpaid-subscriptions-table-<?php echo sanitize_html_class($key); ?>">
	162	+ <?php echo sanitize_text_field($label); ?>
163	163	</th>
164	164	<?php endforeach; ?>
165	165	</tr>
		@@ -174,12 +174,12 @@ discard block
		block discarded – undo
174	174	*
175	175	* @param WPInv_Subscription[] $subscriptions
176	176	*/
177		- public function print_table_body( $subscriptions ) {
	177	+ public function print_table_body($subscriptions) {
178	178
179		- if ( empty( $subscriptions ) ) {
	179	+ if (empty($subscriptions)) {
180	180	$this->print_table_body_no_subscriptions();
181	181	} else {
182		- $this->print_table_body_subscriptions( $subscriptions );
	182	+ $this->print_table_body_subscriptions($subscriptions);
183	183	}
184	184
185	185	}
		@@ -194,12 +194,12 @@ discard block
		block discarded – undo
194	194	<tbody>
195	195
196	196	<tr>
197		- <td colspan="<?php echo count( $this->get_subscriptions_table_columns() ); ?>">
	197	+ <td colspan="<?php echo count($this->get_subscriptions_table_columns()); ?>">
198	198
199	199	<?php
200	200	echo aui()->alert(
201	201	array(
202		- 'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
	202	+ 'content' => wp_kses_post(__('No subscriptions found.', 'invoicing')),
203	203	'type' => 'warning',
204	204	)
205	205	);
		@@ -217,12 +217,12 @@ discard block
		block discarded – undo
217	217	*
218	218	* @param WPInv_Subscription[] $subscriptions
219	219	*/
220		- public function print_table_body_subscriptions( $subscriptions ) {
	220	+ public function print_table_body_subscriptions($subscriptions) {
221	221
222	222	?>
223	223	<tbody>
224	224
225		- <?php foreach ( $subscriptions as $subscription ) : ?>
	225	+ <?php foreach ($subscriptions as $subscription) : ?>
226	226	<tr class="getpaid-subscriptions-table-row subscription-<?php echo (int) $subscription->get_id(); ?>">
227	227	<?php
228	228	wpinv_get_template(
		@@ -248,28 +248,28 @@ discard block
		block discarded – undo
248	248	* @since 1.0.0
249	249	* @return string
250	250	*/
251		- public function add_row_actions( $content, $subscription ) {
	251	+ public function add_row_actions($content, $subscription) {
252	252
253	253	// Prepare row actions.
254	254	$actions = array();
255	255
256	256	// View subscription action.
257		- $view_url = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
258		- $view_url = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
259		- $actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
	257	+ $view_url = getpaid_get_tab_url('gp-subscriptions', get_permalink((int) wpinv_get_option('invoice_subscription_page')));
	258	+ $view_url = esc_url(add_query_arg('subscription', (int) $subscription->get_id(), $view_url));
	259	+ $actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __('Manage Subscription', 'invoicing') . '</a>';
260	260
261	261	// Filter the actions.
262		- $actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
	262	+ $actions = apply_filters('getpaid_subscriptions_table_subscription_actions', $actions, $subscription);
263	263
264		- $sanitized = array();
265		- foreach ( $actions as $key => $action ) {
266		- $key = sanitize_html_class( $key );
267		- $action = wp_kses_post( $action );
	264	+ $sanitized = array();
	265	+ foreach ($actions as $key => $action) {
	266	+ $key = sanitize_html_class($key);
	267	+ $action = wp_kses_post($action);
268	268	$sanitized[] = "<span class='$key'>$action</span>";
269	269	}
270	270
271	271	$row_actions = "<small class='form-text getpaid-subscription-item-actions'>";
272		- $row_actions .= implode( ' \| ', $sanitized );
	272	+ $row_actions .= implode(' \| ', $sanitized);
273	273	$row_actions .= '</small>';
274	274
275	275	return $content . $row_actions;
		@@ -285,9 +285,9 @@ discard block
		block discarded – undo
285	285
286	286	<tfoot>
287	287	<tr>
288		- <?php foreach ( $this->get_subscriptions_table_columns() as $key => $label ) : ?>
289		- <th class="font-weight-bold getpaid-subscriptions-<?php echo sanitize_html_class( $key ); ?>">
290		- <?php echo sanitize_text_field( $label ); ?>
	288	+ <?php foreach ($this->get_subscriptions_table_columns() as $key => $label) : ?>
	289	+ <th class="font-weight-bold getpaid-subscriptions-<?php echo sanitize_html_class($key); ?>">
	290	+ <?php echo sanitize_text_field($label); ?>
291	291	</th>
292	292	<?php endforeach; ?>
293	293	</tr>
		@@ -303,22 +303,22 @@ discard block
		block discarded – undo
303	303	*
304	304	* @param int $total
305	305	*/
306		- public function print_navigation( $total ) {
	306	+ public function print_navigation($total) {
307	307
308		- if ( $total < 1 ) {
	308	+ if ($total < 1) {
309	309
310	310	// Out-of-bounds, run the query again without LIMIT for total count.
311		- $args = array(
	311	+ $args = array(
312	312	'customer_in' => get_current_user_id(),
313	313	'fields' => 'id',
314	314	);
315	315
316		- $count_query = new GetPaid_Subscriptions_Query( $args );
	316	+ $count_query = new GetPaid_Subscriptions_Query($args);
317	317	$total = $count_query->get_total();
318	318	}
319	319
320	320	// Abort if we do not have pages.
321		- if ( 2 > $total ) {
	321	+ if (2 > $total) {
322	322	return;
323	323	}
324	324
		@@ -330,9 +330,9 @@ discard block
		block discarded – undo
330	330
331	331	echo getpaid_paginate_links(
332	332	array(
333		- 'base' => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
	333	+ 'base' => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
334	334	'format' => '?paged=%#%',
335		- 'total' => (int) ceil( $total / 10 ),
	335	+ 'total' => (int) ceil($total / 10),
336	336	)
337	337	);
338	338	?>
		@@ -348,43 +348,43 @@ discard block
		block discarded – undo
348	348	*
349	349	* @return array
350	350	*/
351		- public function get_single_subscription_columns( $subscription ) {
	351	+ public function get_single_subscription_columns($subscription) {
352	352
353	353	// Prepare subscription detail columns.
354		- $subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
355		- $items_count = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
	354	+ $subscription_group = getpaid_get_invoice_subscription_group($subscription->get_parent_invoice_id(), $subscription->get_id());
	355	+ $items_count = empty($subscription_group) ? 1 : count($subscription_group['items']);
356	356	$fields = apply_filters(
357	357	'getpaid_single_subscription_details_fields',
358	358	array(
359		- 'status' => __( 'Status', 'invoicing' ),
360		- 'initial_amount' => __( 'Initial amount', 'invoicing' ),
361		- 'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
362		- 'start_date' => __( 'Start date', 'invoicing' ),
363		- 'expiry_date' => __( 'Next payment', 'invoicing' ),
364		- 'payments' => __( 'Payments', 'invoicing' ),
365		- 'item' => _n( 'Item', 'Items', $items_count, 'invoicing' ),
	359	+ 'status' => __('Status', 'invoicing'),
	360	+ 'initial_amount' => __('Initial amount', 'invoicing'),
	361	+ 'recurring_amount' => __('Recurring amount', 'invoicing'),
	362	+ 'start_date' => __('Start date', 'invoicing'),
	363	+ 'expiry_date' => __('Next payment', 'invoicing'),
	364	+ 'payments' => __('Payments', 'invoicing'),
	365	+ 'item' => _n('Item', 'Items', $items_count, 'invoicing'),
366	366	),
367	367	$subscription
368	368	);
369	369
370		- if ( isset( $fields['expiry_date'] ) ) {
	370	+ if (isset($fields['expiry_date'])) {
371	371
372		- if ( ! $subscription->is_active() \|\| $subscription->is_last_renewal() ) {
373		- $fields['expiry_date'] = __( 'End date', 'invoicing' );
	372	+ if (!$subscription->is_active() \|\| $subscription->is_last_renewal()) {
	373	+ $fields['expiry_date'] = __('End date', 'invoicing');
374	374	}
375	375
376		- if ( 'pending' == $subscription->get_status() ) {
377		- unset( $fields['expiry_date'] );
	376	+ if ('pending' == $subscription->get_status()) {
	377	+ unset($fields['expiry_date']);
378	378	}
379	379
380	380	}
381	381
382		- if ( isset( $fields['start_date'] ) && 'pending' == $subscription->get_status() ) {
383		- unset( $fields['start_date'] );
	382	+ if (isset($fields['start_date']) && 'pending' == $subscription->get_status()) {
	383	+ unset($fields['start_date']);
384	384	}
385	385
386		- if ( $subscription->get_initial_amount() == $subscription->get_recurring_amount() ) {
387		- unset( $fields['initial_amount'] );
	386	+ if ($subscription->get_initial_amount() == $subscription->get_recurring_amount()) {
	387	+ unset($fields['initial_amount']);
388	388	}
389	389
390	390	return $fields;
		@@ -397,16 +397,16 @@ discard block
		block discarded – undo
397	397	*
398	398	* @return string
399	399	*/
400		- public function display_single_subscription( $subscription ) {
	400	+ public function display_single_subscription($subscription) {
401	401
402	402	// Fetch the subscription.
403		- $subscription = new WPInv_Subscription( (int) $subscription );
	403	+ $subscription = new WPInv_Subscription((int) $subscription);
404	404
405		- if ( ! $subscription->exists() ) {
	405	+ if (!$subscription->exists()) {
406	406
407	407	return aui()->alert(
408	408	array(
409		- 'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
	409	+ 'content' => wp_kses_post(__('Subscription not found.', 'invoicing')),
410	410	'type' => 'error',
411	411	)
412	412	);
		@@ -414,11 +414,11 @@ discard block
		block discarded – undo
414	414	}
415	415
416	416	// Ensure that the user owns this subscription key.
417		- if ( get_current_user_id() != $subscription->get_customer_id() && ! wpinv_current_user_can_manage_invoicing() ) {
	417	+ if (get_current_user_id() != $subscription->get_customer_id() && !wpinv_current_user_can_manage_invoicing()) {
418	418
419	419	return aui()->alert(
420	420	array(
421		- 'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
	421	+ 'content' => wp_kses_post(__('You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing')),
422	422	'type' => 'error',
423	423	)
424	424	);

		@@ -6,7 +6,7 @@ discard block
		block discarded – undo
6	6	* @package Invoicing
7	7	*/
8	8
9		-defined( 'ABSPATH' ) \|\| exit;
	9	+defined('ABSPATH') \|\| exit;
10	10
11	11	/**
12	12	* Returns the errors as html
		@@ -15,36 +15,36 @@ discard block
		block discarded – undo
15	15	* @param bool $wrap whether or not to wrap the errors.
16	16	* @since 1.0.19
17	17	*/
18		-function getpaid_get_errors_html( $clear = true, $wrap = true ) {
	18	+function getpaid_get_errors_html($clear = true, $wrap = true) {
19	19
20	20	$errors = '';
21		- foreach ( wpinv_get_errors() as $id => $error ) {
22		- $type = 'error';
	21	+ foreach (wpinv_get_errors() as $id => $error) {
	22	+ $type = 'error';
23	23
24		- if ( is_array( $error ) ) {
	24	+ if (is_array($error)) {
25	25	$type = $error['type'];
26	26	$error = $error['text'];
27	27	}
28	28
29		- if ( $wrap ) {
	29	+ if ($wrap) {
30	30
31	31	$errors .= aui()->alert(
32	32	array(
33		- 'content' => wp_kses_post( $error ),
	33	+ 'content' => wp_kses_post($error),
34	34	'type' => $type,
35	35	)
36	36	);
37	37
38	38	} else {
39	39
40		- $id = esc_attr( $id );
41		- $error = wp_kses_post( $error );
	40	+ $id = esc_attr($id);
	41	+ $error = wp_kses_post($error);
42	42	$errors .= "<div data-code='$id'>$error</div>";
43	43	}
44	44
45	45	}
46	46
47		- if ( $clear ){
	47	+ if ($clear) {
48	48	wpinv_clear_errors();
49	49	}
50	50
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	* Prints (then clears) all available errors.
57	57	*/
58	58	function wpinv_print_errors() {
59		- echo wp_kses_post( getpaid_get_errors_html() );
	59	+ echo wp_kses_post(getpaid_get_errors_html());
60	60	}
61	61
62	62	/**
		@@ -65,8 +65,8 @@ discard block
		block discarded – undo
65	65	* @return array
66	66	*/
67	67	function wpinv_get_errors() {
68		- $errors = getpaid_session()->get( 'wpinv_errors' );
69		- return is_array( $errors ) ? $errors : array();
	68	+ $errors = getpaid_session()->get('wpinv_errors');
	69	+ return is_array($errors) ? $errors : array();
70	70	}
71	71
72	72	/**
		@@ -76,15 +76,15 @@ discard block
		block discarded – undo
76	76	* @param string $error_message The error message.
77	77	* @param string $type Either error, info, warning, primary, dark, light or success.
78	78	*/
79		-function wpinv_set_error( $error_id, $error_message, $type = 'error' ) {
	79	+function wpinv_set_error($error_id, $error_message, $type = 'error') {
80	80
81	81	$errors = wpinv_get_errors();
82		- $errors[ $error_id ] = array(
	82	+ $errors[$error_id] = array(
83	83	'type' => $type,
84	84	'text' => $error_message,
85	85	);
86	86
87		- getpaid_session()->set( 'wpinv_errors', $errors );
	87	+ getpaid_session()->set('wpinv_errors', $errors);
88	88	}
89	89
90	90	/**
		@@ -92,7 +92,7 @@ discard block
		block discarded – undo
92	92	*
93	93	*/
94	94	function wpinv_has_errors() {
95		- return count( wpinv_get_errors() ) > 0;
	95	+ return count(wpinv_get_errors()) > 0;
96	96	}
97	97
98	98	/**
		@@ -100,21 +100,21 @@ discard block
		block discarded – undo
100	100	*
101	101	*/
102	102	function wpinv_clear_errors() {
103		- getpaid_session()->set( 'wpinv_errors', null );
	103	+ getpaid_session()->set('wpinv_errors', null);
104	104	}
105	105
106	106	/**
107	107	* Clears a single error.
108	108	*
109	109	*/
110		-function wpinv_unset_error( $error_id ) {
	110	+function wpinv_unset_error($error_id) {
111	111	$errors = wpinv_get_errors();
112	112
113		- if ( isset( $errors[ $error_id ] ) ) {
114		- unset( $errors[ $error_id ] );
	113	+ if (isset($errors[$error_id])) {
	114	+ unset($errors[$error_id]);
115	115	}
116	116
117		- getpaid_session()->set( 'wpinv_errors', $errors );
	117	+ getpaid_session()->set('wpinv_errors', $errors);
118	118	}
119	119
120	120	/**
		@@ -125,15 +125,15 @@ discard block
		block discarded – undo
125	125	* @param string $message Message to log.
126	126	* @param string $version Version the message was added in.
127	127	*/
128		-function getpaid_doing_it_wrong( $function, $message, $version ) {
	128	+function getpaid_doing_it_wrong($function, $message, $version) {
129	129
130	130	$message .= ' Backtrace: ' . wp_debug_backtrace_summary();
131	131
132		- if ( wp_doing_ajax() \|\| defined( 'REST_REQUEST' ) ) {
133		- do_action( 'doing_it_wrong_run', $function, $message, $version );
134		- error_log( "{$function} was called incorrectly. {$message}. This message was added in version {$version}." );
	132	+ if (wp_doing_ajax() \|\| defined('REST_REQUEST')) {
	133	+ do_action('doing_it_wrong_run', $function, $message, $version);
	134	+ error_log("{$function} was called incorrectly. {$message}. This message was added in version {$version}.");
135	135	} else {
136		- _doing_it_wrong( $function, $message, $version );
	136	+ _doing_it_wrong($function, $message, $version);
137	137	}
138	138
139	139	}
		@@ -147,42 +147,42 @@ discard block
		block discarded – undo
147	147	* @param string $line The line that contains the error.
148	148	* @param bool $exit Whether or not to exit function execution.
149	149	*/
150		-function wpinv_error_log( $log, $title = '', $file = '', $line = '', $exit = false ) {
	150	+function wpinv_error_log($log, $title = '', $file = '', $line = '', $exit = false) {
151	151
152		- if ( true === apply_filters( 'wpinv_log_errors', true ) ) {
	152	+ if (true === apply_filters('wpinv_log_errors', true)) {
153	153
154	154	// Ensure the log is a scalar.
155		- if ( ! is_scalar( $log ) ) {
156		- $log = print_r( $log, true );
	155	+ if (!is_scalar($log)) {
	156	+ $log = print_r($log, true);
157	157	}
158	158
159	159	// Add title.
160		- if ( ! empty( $title ) ) {
161		- $log = $title . ' ' . trim( $log );
	160	+ if (!empty($title)) {
	161	+ $log = $title . ' ' . trim($log);
162	162	}
163	163
164	164	// Add the file to the label.
165		- if ( ! empty( $file ) ) {
	165	+ if (!empty($file)) {
166	166	$log .= ' in ' . $file;
167	167	}
168	168
169	169	// Add the line number to the label.
170		- if ( ! empty( $line ) ) {
	170	+ if (!empty($line)) {
171	171	$log .= ' on line ' . $line;
172	172	}
173	173
174	174	// Log the message.
175		- error_log( trim ( $log ) );
	175	+ error_log(trim($log));
176	176
177	177	// ... and a backtrace.
178		- if ( false !== $title && false !== $file ) {
179		- error_log( 'Backtrace ' . wp_debug_backtrace_summary() );
	178	+ if (false !== $title && false !== $file) {
	179	+ error_log('Backtrace ' . wp_debug_backtrace_summary());
180	180	}
181	181
182	182	}
183	183
184	184	// Maybe exit.
185		- if ( $exit ) {
	185	+ if ($exit) {
186	186	exit;
187	187	}
188	188

		@@ -12,88 +12,88 @@ discard block
		block discarded – undo
12	12	*/
13	13	class GetPaid_Reports_Report {
14	14
15		- /**
16		- * @var array
17		- */
18		- public $views;
	15	+ /**
	16	+ * @var array
	17	+ */
	18	+ public $views;
19	19
20		- /**
21		- * Class constructor.
22		- *
23		- */
24		- public function __construct() {
	20	+ /**
	21	+ * Class constructor.
	22	+ *
	23	+ */
	24	+ public function __construct() {
25	25
26		- $this->views = array(
	26	+ $this->views = array(
27	27
28	28	'items' => array(
29		- 'label' => __( 'Items', 'invoicing' ),
30		- 'class' => 'GetPaid_Reports_Report_Items',
31		- ),
	29	+ 'label' => __( 'Items', 'invoicing' ),
	30	+ 'class' => 'GetPaid_Reports_Report_Items',
	31	+ ),
32	32
33		- 'gateways' => array(
34		- 'label' => __( 'Payment Methods', 'invoicing' ),
35		- 'class' => 'GetPaid_Reports_Report_Gateways',
36		- ),
	33	+ 'gateways' => array(
	34	+ 'label' => __( 'Payment Methods', 'invoicing' ),
	35	+ 'class' => 'GetPaid_Reports_Report_Gateways',
	36	+ ),
37	37
38		- 'discounts' => array(
39		- 'label' => __( 'Discount Codes', 'invoicing' ),
40		- 'class' => 'GetPaid_Reports_Report_Discounts',
41		- ),
	38	+ 'discounts' => array(
	39	+ 'label' => __( 'Discount Codes', 'invoicing' ),
	40	+ 'class' => 'GetPaid_Reports_Report_Discounts',
	41	+ ),
42	42
43	43	);
44	44
45		- $this->views = apply_filters( 'wpinv_report_views', $this->views );
46		-
47		- }
48		-
49		- /**
50		- * Retrieves the current range.
51		- *
52		- */
53		- public function get_range() {
54		- $valid_ranges = $this->get_periods();
55		-
56		- if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
57		- return sanitize_key( $_GET['date_range'] );
58		- }
59		-
60		- return '7_days';
61		- }
62		-
63		- /**
64		- * Returns an array of date ranges.
65		- *
66		- * @return array
67		- */
68		- public function get_periods() {
69		-
70		- $periods = array(
71		- 'today' => __( 'Today', 'invoicing' ),
72		- 'yesterday' => __( 'Yesterday', 'invoicing' ),
73		- 'week' => __( 'This week', 'invoicing' ),
74		- 'last_week' => __( 'Last week', 'invoicing' ),
75		- '7_days' => __( 'Last 7 days', 'invoicing' ),
76		- 'month' => __( 'This month', 'invoicing' ),
77		- 'last_month' => __( 'Last month', 'invoicing' ),
78		- '30_days' => __( 'Last 30 days', 'invoicing' ),
79		- 'quarter' => __( 'This Quarter', 'invoicing' ),
80		- 'last_quarter' => __( 'Last Quarter', 'invoicing' ),
81		- 'year' => __( 'This year', 'invoicing' ),
82		- 'last_year' => __( 'Last Year', 'invoicing' ),
83		- 'custom' => __( 'Custom Date Range', 'invoicing' ),
84		- );
85		-
86		- return apply_filters( 'getpaid_earning_periods', $periods );
87		- }
88		-
89		- /**
90		- * Displays the range selector.
91		- *
92		- */
93		- public function display_range_selector() {
94		-
95		- $range = $this->get_range();
96		- ?>
	45	+ $this->views = apply_filters( 'wpinv_report_views', $this->views );
	46	+
	47	+ }
	48	+
	49	+ /**
	50	+ * Retrieves the current range.
	51	+ *
	52	+ */
	53	+ public function get_range() {
	54	+ $valid_ranges = $this->get_periods();
	55	+
	56	+ if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
	57	+ return sanitize_key( $_GET['date_range'] );
	58	+ }
	59	+
	60	+ return '7_days';
	61	+ }
	62	+
	63	+ /**
	64	+ * Returns an array of date ranges.
	65	+ *
	66	+ * @return array
	67	+ */
	68	+ public function get_periods() {
	69	+
	70	+ $periods = array(
	71	+ 'today' => __( 'Today', 'invoicing' ),
	72	+ 'yesterday' => __( 'Yesterday', 'invoicing' ),
	73	+ 'week' => __( 'This week', 'invoicing' ),
	74	+ 'last_week' => __( 'Last week', 'invoicing' ),
	75	+ '7_days' => __( 'Last 7 days', 'invoicing' ),
	76	+ 'month' => __( 'This month', 'invoicing' ),
	77	+ 'last_month' => __( 'Last month', 'invoicing' ),
	78	+ '30_days' => __( 'Last 30 days', 'invoicing' ),
	79	+ 'quarter' => __( 'This Quarter', 'invoicing' ),
	80	+ 'last_quarter' => __( 'Last Quarter', 'invoicing' ),
	81	+ 'year' => __( 'This year', 'invoicing' ),
	82	+ 'last_year' => __( 'Last Year', 'invoicing' ),
	83	+ 'custom' => __( 'Custom Date Range', 'invoicing' ),
	84	+ );
	85	+
	86	+ return apply_filters( 'getpaid_earning_periods', $periods );
	87	+ }
	88	+
	89	+ /**
	90	+ * Displays the range selector.
	91	+ *
	92	+ */
	93	+ public function display_range_selector() {
	94	+
	95	+ $range = $this->get_range();
	96	+ ?>
97	97
98	98	<form method="get" class="getpaid-filter-earnings float-right">
99	99	<?php getpaid_hidden_field( 'page', isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : 'wpinv-reports' ); ?>
		@@ -115,14 +115,14 @@ discard block
		block discarded – undo
115	115	</form>
116	116
117	117	<?php
118		- }
	118	+ }
119	119
120		- /**
121		- * Displays the reports tab.
122		- *
123		- */
124		- public function display() {
125		- ?>
	120	+ /**
	121	+ * Displays the reports tab.
	122	+ *
	123	+ */
	124	+ public function display() {
	125	+ ?>
126	126
127	127	<div class="mt-4">
128	128
		@@ -202,16 +202,16 @@ discard block
		block discarded – undo
202	202
203	203	<?php
204	204
205		- }
	205	+ }
206	206
207		- /**
208		- * Displays the left side.
209		- *
210		- */
211		- public function display_left() {
212		- $graphs = wpinv_get_report_graphs();
	207	+ /**
	208	+ * Displays the left side.
	209	+ *
	210	+ */
	211	+ public function display_left() {
	212	+ $graphs = wpinv_get_report_graphs();
213	213
214		- ?>
	214	+ ?>
215	215
216	216	<?php foreach ( $graphs as $key => $graph ) : ?>
217	217	<div class="row mb-4">
		@@ -230,35 +230,35 @@ discard block
		block discarded – undo
230	230
231	231	<?php
232	232
233		- }
234		-
235		- /**
236		- * Retrieves the download url.
237		- *
238		- */
239		- public function get_download_url( $graph, $file_type ) {
240		-
241		- return wp_nonce_url(
242		- add_query_arg(
243		- array(
244		- 'getpaid-admin-action' => 'download_graph',
245		- 'file_type' => urlencode( $file_type ),
246		- 'graph' => urlencode( $graph ),
247		- )
248		- ),
249		- 'getpaid-nonce',
250		- 'getpaid-nonce'
251		- );
	233	+ }
	234	+
	235	+ /**
	236	+ * Retrieves the download url.
	237	+ *
	238	+ */
	239	+ public function get_download_url( $graph, $file_type ) {
	240	+
	241	+ return wp_nonce_url(
	242	+ add_query_arg(
	243	+ array(
	244	+ 'getpaid-admin-action' => 'download_graph',
	245	+ 'file_type' => urlencode( $file_type ),
	246	+ 'graph' => urlencode( $graph ),
	247	+ )
	248	+ ),
	249	+ 'getpaid-nonce',
	250	+ 'getpaid-nonce'
	251	+ );
252	252
253		- }
	253	+ }
254	254
255		- /**
256		- * Displays the right side.
257		- *
258		- */
259		- public function display_right() {
	255	+ /**
	256	+ * Displays the right side.
	257	+ *
	258	+ */
	259	+ public function display_right() {
260	260
261		- ?>
	261	+ ?>
262	262
263	263	<?php foreach ( $this->views as $key => $view ) : ?>
264	264	<div class="row mb-4">
		@@ -287,10 +287,10 @@ discard block
		block discarded – undo
287	287	</div>
288	288	<div class="card-body">
289	289	<?php
290		- $class = $view['class'];
291		- $class = new $class();
292		- $class->display_stats();
293		- ?>
	290	+ $class = $view['class'];
	291	+ $class = new $class();
	292	+ $class->display_stats();
	293	+ ?>
294	294	</div>
295	295	</div>
296	296	</div>
		@@ -299,68 +299,68 @@ discard block
		block discarded – undo
299	299
300	300	<?php
301	301
302		- do_action( 'getpaid_reports_display_right', $this );
303		- }
304		-
305		- /**
306		- * Returns a list of report cards.
307		- *
308		- */
309		- public function get_cards() {
310		-
311		- $cards = array(
312		- 'total_sales' => array(
313		- 'description' => __( 'Gross sales in the period.', 'invoicing' ),
314		- 'label' => __( 'Gross Revenue', 'invoicing' ),
315		- ),
316		- 'net_sales' => array(
317		- 'description' => __( 'Net sales in the period.', 'invoicing' ),
318		- 'label' => __( 'Net Revenue', 'invoicing' ),
319		- ),
320		- 'average_sales' => array(
321		- 'description' => __( 'Average net daily/monthly sales.', 'invoicing' ),
322		- 'label' => __( 'Avg. Net Sales', 'invoicing' ),
323		- ),
324		- 'average_total_sales' => array(
325		- 'description' => __( 'Average gross daily/monthly sales.', 'invoicing' ),
326		- 'label' => __( 'Avg. Gross Sales', 'invoicing' ),
327		- ),
328		- 'total_invoices' => array(
329		- 'description' => __( 'Number of paid invoices.', 'invoicing' ),
330		- 'label' => __( 'Paid Invoices', 'invoicing' ),
331		- ),
332		- 'total_items' => array(
333		- 'description' => __( 'Number of items purchased.', 'invoicing' ),
334		- 'label' => __( 'Purchased Items', 'invoicing' ),
335		- ),
336		- 'refunded_items' => array(
337		- 'description' => __( 'Number of items refunded.', 'invoicing' ),
338		- 'label' => __( 'Refunded Items', 'invoicing' ),
339		- ),
340		- 'total_tax' => array(
341		- 'description' => __( 'Total charged for taxes.', 'invoicing' ),
342		- 'label' => __( 'Tax', 'invoicing' ),
343		- ),
344		- 'total_refunded_tax' => array(
345		- 'description' => __( 'Total refunded for taxes.', 'invoicing' ),
346		- 'label' => __( 'Refunded Tax', 'invoicing' ),
347		- ),
348		- 'total_fees' => array(
349		- 'description' => __( 'Total fees charged.', 'invoicing' ),
350		- 'label' => __( 'Fees', 'invoicing' ),
351		- ),
352		- 'total_refunds' => array(
353		- 'description' => __( 'Total of refunded invoices.', 'invoicing' ),
354		- 'label' => __( 'Refunded', 'invoicing' ),
355		- ),
356		- 'total_discount' => array(
357		- 'description' => __( 'Total of discounts used.', 'invoicing' ),
358		- 'label' => __( 'Discounted', 'invoicing' ),
359		- ),
360		- );
361		-
362		- return apply_filters( 'wpinv_report_cards', $cards );
363		- }
	302	+ do_action( 'getpaid_reports_display_right', $this );
	303	+ }
	304	+
	305	+ /**
	306	+ * Returns a list of report cards.
	307	+ *
	308	+ */
	309	+ public function get_cards() {
	310	+
	311	+ $cards = array(
	312	+ 'total_sales' => array(
	313	+ 'description' => __( 'Gross sales in the period.', 'invoicing' ),
	314	+ 'label' => __( 'Gross Revenue', 'invoicing' ),
	315	+ ),
	316	+ 'net_sales' => array(
	317	+ 'description' => __( 'Net sales in the period.', 'invoicing' ),
	318	+ 'label' => __( 'Net Revenue', 'invoicing' ),
	319	+ ),
	320	+ 'average_sales' => array(
	321	+ 'description' => __( 'Average net daily/monthly sales.', 'invoicing' ),
	322	+ 'label' => __( 'Avg. Net Sales', 'invoicing' ),
	323	+ ),
	324	+ 'average_total_sales' => array(
	325	+ 'description' => __( 'Average gross daily/monthly sales.', 'invoicing' ),
	326	+ 'label' => __( 'Avg. Gross Sales', 'invoicing' ),
	327	+ ),
	328	+ 'total_invoices' => array(
	329	+ 'description' => __( 'Number of paid invoices.', 'invoicing' ),
	330	+ 'label' => __( 'Paid Invoices', 'invoicing' ),
	331	+ ),
	332	+ 'total_items' => array(
	333	+ 'description' => __( 'Number of items purchased.', 'invoicing' ),
	334	+ 'label' => __( 'Purchased Items', 'invoicing' ),
	335	+ ),
	336	+ 'refunded_items' => array(
	337	+ 'description' => __( 'Number of items refunded.', 'invoicing' ),
	338	+ 'label' => __( 'Refunded Items', 'invoicing' ),
	339	+ ),
	340	+ 'total_tax' => array(
	341	+ 'description' => __( 'Total charged for taxes.', 'invoicing' ),
	342	+ 'label' => __( 'Tax', 'invoicing' ),
	343	+ ),
	344	+ 'total_refunded_tax' => array(
	345	+ 'description' => __( 'Total refunded for taxes.', 'invoicing' ),
	346	+ 'label' => __( 'Refunded Tax', 'invoicing' ),
	347	+ ),
	348	+ 'total_fees' => array(
	349	+ 'description' => __( 'Total fees charged.', 'invoicing' ),
	350	+ 'label' => __( 'Fees', 'invoicing' ),
	351	+ ),
	352	+ 'total_refunds' => array(
	353	+ 'description' => __( 'Total of refunded invoices.', 'invoicing' ),
	354	+ 'label' => __( 'Refunded', 'invoicing' ),
	355	+ ),
	356	+ 'total_discount' => array(
	357	+ 'description' => __( 'Total of discounts used.', 'invoicing' ),
	358	+ 'label' => __( 'Discounted', 'invoicing' ),
	359	+ ),
	360	+ );
	361	+
	362	+ return apply_filters( 'wpinv_report_cards', $cards );
	363	+ }
364	364
365	365
366	366

		@@ -13,9 +13,9 @@ discard block
		block discarded – undo
13	13
14	14
15	15	function wpinv_get_default_country() {
16		- $country = wpinv_get_option( 'default_country', 'UK' );
	16	+ $country = wpinv_get_option( 'default_country', 'UK' );
17	17
18		- return apply_filters( 'wpinv_default_country', $country );
	18	+ return apply_filters( 'wpinv_default_country', $country );
19	19	}
20	20
21	21	/**
		@@ -36,7 +36,7 @@ discard block
		block discarded – undo
36	36	*/
37	37	function wpinv_sanitize_country( $country ) {
38	38
39		- // Enure the country is specified
	39	+ // Enure the country is specified
40	40	if ( empty( $country ) ) {
41	41	$country = wpinv_get_default_country();
42	42	}
		@@ -66,9 +66,9 @@ discard block
		block discarded – undo
66	66	}
67	67
68	68	function wpinv_get_default_state() {
69		- $state = wpinv_get_option( 'default_state', '' );
	69	+ $state = wpinv_get_option( 'default_state', '' );
70	70
71		- return apply_filters( 'wpinv_default_state', $state );
	71	+ return apply_filters( 'wpinv_default_state', $state );
72	72	}
73	73
74	74	function wpinv_state_name( $state_code = '', $country_code = '' ) {
		@@ -308,11 +308,11 @@ discard block
		block discarded – undo
308	308
309	309	$country = wpinv_sanitize_country( $country );
310	310
311		- foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
312		- if ( false !== array_search( $country, $countries, true ) ) {
313		- return $continent_code;
314		- }
315		- }
	311	+ foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
	312	+ if ( false !== array_search( $country, $countries, true ) ) {
	313	+ return $continent_code;
	314	+ }
	315	+ }
316	316
317	317	return '';
318	318
		@@ -604,33 +604,33 @@ discard block
		block discarded – undo
604	604	}
605	605
606	606	function wpinv_get_states_field() {
607		- if( empty( $_POST['country'] ) ) {
608		- $_POST['country'] = wpinv_get_default_country();
609		- }
610		- $states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
	607	+ if( empty( $_POST['country'] ) ) {
	608	+ $_POST['country'] = wpinv_get_default_country();
	609	+ }
	610	+ $states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
611	611
612		- if( !empty( $states ) ) {
613		- $sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
	612	+ if( !empty( $states ) ) {
	613	+ $sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
614	614
615	615	$class = isset( $_POST['class'] ) ? esc_attr( sanitize_text_field( $_POST['class'] ) ) : '';
616	616	$class .= " $sanitized_field_name getpaid_js_field-state custom-select wpinv-select wpi_select2";
617	617
618	618	$args = array(
619		- 'name' => $sanitized_field_name,
620		- 'id' => $sanitized_field_name,
621		- 'class' => implode( ' ', array_unique( explode( ' ', $class ) ) ),
622		- 'options' => array_merge( array( '' => '' ), $states ),
623		- 'show_option_all' => false,
624		- 'show_option_none' => false
625		- );
626		-
627		- $response = wpinv_html_select( $args );
628		-
629		- } else {
630		- $response = 'nostates';
631		- }
	619	+ 'name' => $sanitized_field_name,
	620	+ 'id' => $sanitized_field_name,
	621	+ 'class' => implode( ' ', array_unique( explode( ' ', $class ) ) ),
	622	+ 'options' => array_merge( array( '' => '' ), $states ),
	623	+ 'show_option_all' => false,
	624	+ 'show_option_none' => false
	625	+ );
	626	+
	627	+ $response = wpinv_html_select( $args );
	628	+
	629	+ } else {
	630	+ $response = 'nostates';
	631	+ }
632	632
633		- return $response;
	633	+ return $response;
634	634	}
635	635
636	636	function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
		@@ -648,46 +648,46 @@ discard block
		block discarded – undo
648	648	*/
649	649	function wpinv_get_address_formats() {
650	650
651		- return apply_filters( 'wpinv_localisation_address_formats',
652		- array(
653		- 'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
654		- 'AU' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
655		- 'AT' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
656		- 'BE' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
657		- 'CA' => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
658		- 'CH' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
659		- 'CL' => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
660		- 'CN' => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
661		- 'CZ' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
662		- 'DE' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
663		- 'EE' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
664		- 'FI' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
665		- 'DK' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
666		- 'FR' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
667		- 'HK' => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
668		- 'HU' => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
669		- 'IN' => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
670		- 'IS' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
671		- 'IT' => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
672		- 'JP' => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
673		- 'TW' => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
674		- 'LI' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
675		- 'NL' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
676		- 'NZ' => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
677		- 'NO' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
678		- 'PL' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
679		- 'PT' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
680		- 'SK' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
681		- 'RS' => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
682		- 'SI' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
683		- 'ES' => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
684		- 'SE' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
685		- 'TR' => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
686		- 'UG' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
687		- 'US' => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
688		- 'VN' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
689		- )
690		- );
	651	+ return apply_filters( 'wpinv_localisation_address_formats',
	652	+ array(
	653	+ 'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
	654	+ 'AU' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
	655	+ 'AT' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	656	+ 'BE' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	657	+ 'CA' => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
	658	+ 'CH' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	659	+ 'CL' => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
	660	+ 'CN' => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
	661	+ 'CZ' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	662	+ 'DE' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	663	+ 'EE' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	664	+ 'FI' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	665	+ 'DK' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	666	+ 'FR' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
	667	+ 'HK' => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
	668	+ 'HU' => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
	669	+ 'IN' => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
	670	+ 'IS' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	671	+ 'IT' => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
	672	+ 'JP' => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
	673	+ 'TW' => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
	674	+ 'LI' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	675	+ 'NL' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	676	+ 'NZ' => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
	677	+ 'NO' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	678	+ 'PL' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	679	+ 'PT' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	680	+ 'SK' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	681	+ 'RS' => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	682	+ 'SI' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	683	+ 'ES' => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
	684	+ 'SE' => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
	685	+ 'TR' => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
	686	+ 'UG' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
	687	+ 'US' => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
	688	+ 'VN' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
	689	+ )
	690	+ );
691	691	}
692	692
693	693	/**
		@@ -704,21 +704,21 @@ discard block
		block discarded – undo
704	704	}
705	705
706	706	// Get all formats.
707		- $formats = wpinv_get_address_formats();
	707	+ $formats = wpinv_get_address_formats();
708	708
709		- // Get format for the specified country.
710		- $format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
	709	+ // Get format for the specified country.
	710	+ $format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
711	711
712	712	/**
713		- * Filters the address format to use on Invoices.
	713	+ * Filters the address format to use on Invoices.
714	714	*
715	715	* New lines will be replaced by a `br` element. Double new lines will be replaced by a paragraph. HTML tags are allowed.
716		- *
717		- * @since 1.0.13
718		- *
719		- * @param string $format The address format to use.
	716	+ *
	717	+ * @since 1.0.13
	718	+ *
	719	+ * @param string $format The address format to use.
720	720	* @param string $country The country who's address format is being retrieved.
721		- */
	721	+ */
722	722	return apply_filters( 'wpinv_get_full_address_format', $format, $country );
723	723	}
724	724
		@@ -739,8 +739,8 @@ discard block
		block discarded – undo
739	739	'country' => '',
740	740	'zip' => '',
741	741	'first_name' => '',
742		- 'last_name' => '',
743		- 'company' => '',
	742	+ 'last_name' => '',
	743	+ 'company' => '',
744	744	);
745	745
746	746	$args = map_deep( wp_parse_args( $billing_details, $default_args ), 'trim' );
		@@ -761,14 +761,14 @@ discard block
		block discarded – undo
761	761	$args['country_code']= $country;
762	762
763	763	/**
764		- * Filters the address format replacements to use on Invoices.
	764	+ * Filters the address format replacements to use on Invoices.
765	765	*
766		- *
767		- * @since 1.0.13
768		- *
769		- * @param array $replacements The address replacements to use.
	766	+ *
	767	+ * @since 1.0.13
	768	+ *
	769	+ * @param array $replacements The address replacements to use.
770	770	* @param array $billing_details The billing details to use.
771		- */
	771	+ */
772	772	$replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
773	773
774	774	$return = array();
		@@ -791,5 +791,5 @@ discard block
		block discarded – undo
791	791	* @return string
792	792	*/
793	793	function wpinv_trim_formatted_address_line( $line ) {
794		- return trim( $line, ', ' );
	794	+ return trim( $line, ', ' );
795	795	}
796	796	\ No newline at end of file

		@@ -6,7 +6,7 @@ discard block
		block discarded – undo
6	6	*
7	7	*/
8	8	if ( ! defined( 'ABSPATH' ) ) {
9		- exit;
	9	+ exit;
10	10	}
11	11
12	12	/**
		@@ -15,85 +15,85 @@ discard block
		block discarded – undo
15	15	class WPInv_Admin_Addons extends Ayecode_Addons {
16	16
17	17
18		- /**
19		- * Get the extensions page tabs.
20		- *
21		- * @return array of tabs.
22		- */
23		- public function get_tabs(){
24		- $tabs = array(
25		- 'addons' => __("Addons", "invoicing"),
	18	+ /**
	19	+ * Get the extensions page tabs.
	20	+ *
	21	+ * @return array of tabs.
	22	+ */
	23	+ public function get_tabs(){
	24	+ $tabs = array(
	25	+ 'addons' => __("Addons", "invoicing"),
26	26	'gateways' => __("Payment Gateways", "invoicing"),
27	27	'recommended_plugins' => __("Recommended plugins", "invoicing"),
28	28	'membership' => __("Membership", "invoicing"),
29		- );
30		-
31		- return $tabs;
32		- }
33		-
34		- /**
35		- * Get section content for the addons screen.
36		- *
37		- * @param string $section_id
38		- *
39		- * @return array
40		- */
41		- public function get_section_data( $section_id ) {
42		- $section = self::get_tab( $section_id );
43		- $api_url = "https://wpinvoicing.com/edd-api/v2/products/";
44		- $section_data = new stdClass();
45		-
46		- if($section_id=='recommended_plugins'){
47		- $section_data->products = self::get_recommend_wp_plugins_edd_formatted();
48		- }
49		- elseif ( ! empty( $section ) ) {
50		- if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
51		- //if ( 1==1) {
52		-
53		- $query_args = array( 'category' => $section_id, 'number' => 100);
54		- $query_args = apply_filters('wpeu_edd_api_query_args',$query_args,$api_url,$section_id);
55		-
56		- $raw_section = wp_safe_remote_get( esc_url_raw( add_query_arg($query_args ,$api_url) ), array( 'user-agent' => 'Invoicing Addons Page','timeout' => 15, ) );
57		-
58		- if ( ! is_wp_error( $raw_section ) ) {
59		- $section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
60		-
61		- if ( ! empty( $section_data->products ) ) {
62		- set_transient( 'wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS );
63		- }
64		- }
65		- }
66		-
67		- }
68		-
69		- $products = isset($section_data->products) ? $section_data->products : array();
70		- if ( 'addons' == $section_id ) {
71		-
72		- $quotes = new stdClass();
73		- $quotes->info = new stdClass();
74		- $quotes->info->id = '';
75		- $quotes->info->slug = 'invoicing-quotes';
76		- $quotes->info->title = __( 'Quotes', 'invoicing' );
77		- $quotes->info->excerpt = __( 'Create quotes and estimates', 'invoicing' );
78		- $quotes->info->link = 'https://wordpress.org/plugins/invoicing-quotes/';
79		- $quotes->info->thumbnail = 'https://wpgetpaid.com/wp-content/uploads/sites/13/edd/2019/11/Quotes-1-768x384.png';
80		-
81		- $products[] = $quotes;
82		- }
	29	+ );
	30	+
	31	+ return $tabs;
	32	+ }
	33	+
	34	+ /**
	35	+ * Get section content for the addons screen.
	36	+ *
	37	+ * @param string $section_id
	38	+ *
	39	+ * @return array
	40	+ */
	41	+ public function get_section_data( $section_id ) {
	42	+ $section = self::get_tab( $section_id );
	43	+ $api_url = "https://wpinvoicing.com/edd-api/v2/products/";
	44	+ $section_data = new stdClass();
	45	+
	46	+ if($section_id=='recommended_plugins'){
	47	+ $section_data->products = self::get_recommend_wp_plugins_edd_formatted();
	48	+ }
	49	+ elseif ( ! empty( $section ) ) {
	50	+ if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
	51	+ //if ( 1==1) {
	52	+
	53	+ $query_args = array( 'category' => $section_id, 'number' => 100);
	54	+ $query_args = apply_filters('wpeu_edd_api_query_args',$query_args,$api_url,$section_id);
	55	+
	56	+ $raw_section = wp_safe_remote_get( esc_url_raw( add_query_arg($query_args ,$api_url) ), array( 'user-agent' => 'Invoicing Addons Page','timeout' => 15, ) );
	57	+
	58	+ if ( ! is_wp_error( $raw_section ) ) {
	59	+ $section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
	60	+
	61	+ if ( ! empty( $section_data->products ) ) {
	62	+ set_transient( 'wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS );
	63	+ }
	64	+ }
	65	+ }
	66	+
	67	+ }
	68	+
	69	+ $products = isset($section_data->products) ? $section_data->products : array();
	70	+ if ( 'addons' == $section_id ) {
	71	+
	72	+ $quotes = new stdClass();
	73	+ $quotes->info = new stdClass();
	74	+ $quotes->info->id = '';
	75	+ $quotes->info->slug = 'invoicing-quotes';
	76	+ $quotes->info->title = __( 'Quotes', 'invoicing' );
	77	+ $quotes->info->excerpt = __( 'Create quotes and estimates', 'invoicing' );
	78	+ $quotes->info->link = 'https://wordpress.org/plugins/invoicing-quotes/';
	79	+ $quotes->info->thumbnail = 'https://wpgetpaid.com/wp-content/uploads/sites/13/edd/2019/11/Quotes-1-768x384.png';
	80	+
	81	+ $products[] = $quotes;
	82	+ }
83	83
84		- return apply_filters( 'wpi_addons_section_data', $products, $section_id );
85		- }
86		-
87		- /**
88		- * Outputs a button.
89		- *ccc
90		- * @param string $url
91		- * @param string $text
92		- * @param string $theme
93		- * @param string $plugin
94		- */
95		- public function output_button( $addon ) {
96		- $current_tab = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
	84	+ return apply_filters( 'wpi_addons_section_data', $products, $section_id );
	85	+ }
	86	+
	87	+ /**
	88	+ * Outputs a button.
	89	+ *ccc
	90	+ * @param string $url
	91	+ * @param string $text
	92	+ * @param string $theme
	93	+ * @param string $plugin
	94	+ */
	95	+ public function output_button( $addon ) {
	96	+ $current_tab = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
97	97	// $button_text = __('Free','invoicing');
98	98	// $licensing = false;
99	99	// $installed = false;
		@@ -105,123 +105,123 @@ discard block
		block discarded – undo
105	105	// $install_status = 'get';
106	106	// $onclick = '';
107	107
108		- $wp_org_themes = array('supreme-directory','directory-starter');
109		-
110		- $button_args = array(
111		- 'type' => ($current_tab == 'addons' \|\| $current_tab =='gateways') ? 'addons' : $current_tab,
112		- 'id' => isset($addon->info->id) ? absint($addon->info->id) : '',
113		- 'title' => isset($addon->info->title) ? $addon->info->title : '',
114		- 'button_text' => __('Free','invoicing'),
115		- 'price_text' => __('Free','invoicing'),
116		- 'link' => isset($addon->info->link) ? $addon->info->link : '', // link to product
117		- 'url' => isset($addon->info->link) ? $addon->info->link : '', // button url
118		- 'class' => 'button-primary',
119		- 'install_status' => 'get',
120		- 'installed' => false,
121		- 'price' => '',
122		- 'licensing' => isset($addon->licensing->enabled) && $addon->licensing->enabled ? true : false,
123		- 'license' => isset($addon->licensing->license) && $addon->licensing->license ? $addon->licensing->license : '',
124		- 'onclick' => '',
125		- 'slug' => isset($addon->info->slug) ? $addon->info->slug : '',
126		- 'active' => false,
127		- 'file' => '',
128		- 'update_url' => '',
129		- );
130		-
131		- if( 'invoicing-quotes' == $addon->info->slug \|\| 'getpaid-stripe-payments' == $addon->info->slug \|\| ( $current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug )){
132		- include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
133		- $status = install_plugin_install_status(array("slug"=>$button_args['slug'],"version"=>""));
134		- $button_args['install_status'] = isset($status['status']) ? $status['status'] : 'install';
135		- $button_args['file'] = isset($status['file']) ? $status['file'] : '';
136		- }elseif( ($current_tab == 'addons' \|\| $current_tab =='gateways') && isset($addon->info->id) && $addon->info->id){
137		- include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
138		- if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
139		- $status = self::install_plugin_install_status($addon);
140		- $button_args['file'] = isset($status['file']) ? $status['file'] : '';
141		- if(isset($status['status'])){$button_args['install_status'] = $status['status'];}
142		- $button_args['update_url'] = "https://wpinvoicing.com";
143		- }elseif($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
144		- if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
145		- $button_args['installed'] = self::is_theme_installed($addon);
146		- if(!in_array($button_args['slug'],$wp_org_themes)){
147		- $button_args['update_url'] = "https://wpinvoicing.com";
148		- }
149		- }
150		-
151		- // set price
152		- if(isset($addon->pricing) && !empty($addon->pricing)){
153		- if(is_object($addon->pricing)){
154		- $prices = (Array)$addon->pricing;
155		- $button_args['price'] = reset($prices);
156		- }elseif(isset($addon->pricing)){
157		- $button_args['price'] = $addon->pricing;
158		- }
159		- }
160		-
161		- // set price text
162		- if( $button_args['price'] && $button_args['price'] != '0.00' ){
163		- $button_args['price_text'] = sprintf( __('From: $%d', 'invoicing'), $button_args['price']);
164		- }
165		-
166		-
167		- // set if installed
168		- if(in_array($button_args['install_status'], array('installed','latest_installed','update_available','newer_installed'))){
169		- $button_args['installed'] = true;
170		- }
	108	+ $wp_org_themes = array('supreme-directory','directory-starter');
	109	+
	110	+ $button_args = array(
	111	+ 'type' => ($current_tab == 'addons' \|\| $current_tab =='gateways') ? 'addons' : $current_tab,
	112	+ 'id' => isset($addon->info->id) ? absint($addon->info->id) : '',
	113	+ 'title' => isset($addon->info->title) ? $addon->info->title : '',
	114	+ 'button_text' => __('Free','invoicing'),
	115	+ 'price_text' => __('Free','invoicing'),
	116	+ 'link' => isset($addon->info->link) ? $addon->info->link : '', // link to product
	117	+ 'url' => isset($addon->info->link) ? $addon->info->link : '', // button url
	118	+ 'class' => 'button-primary',
	119	+ 'install_status' => 'get',
	120	+ 'installed' => false,
	121	+ 'price' => '',
	122	+ 'licensing' => isset($addon->licensing->enabled) && $addon->licensing->enabled ? true : false,
	123	+ 'license' => isset($addon->licensing->license) && $addon->licensing->license ? $addon->licensing->license : '',
	124	+ 'onclick' => '',
	125	+ 'slug' => isset($addon->info->slug) ? $addon->info->slug : '',
	126	+ 'active' => false,
	127	+ 'file' => '',
	128	+ 'update_url' => '',
	129	+ );
	130	+
	131	+ if( 'invoicing-quotes' == $addon->info->slug \|\| 'getpaid-stripe-payments' == $addon->info->slug \|\| ( $current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug )){
	132	+ include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
	133	+ $status = install_plugin_install_status(array("slug"=>$button_args['slug'],"version"=>""));
	134	+ $button_args['install_status'] = isset($status['status']) ? $status['status'] : 'install';
	135	+ $button_args['file'] = isset($status['file']) ? $status['file'] : '';
	136	+ }elseif( ($current_tab == 'addons' \|\| $current_tab =='gateways') && isset($addon->info->id) && $addon->info->id){
	137	+ include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
	138	+ if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
	139	+ $status = self::install_plugin_install_status($addon);
	140	+ $button_args['file'] = isset($status['file']) ? $status['file'] : '';
	141	+ if(isset($status['status'])){$button_args['install_status'] = $status['status'];}
	142	+ $button_args['update_url'] = "https://wpinvoicing.com";
	143	+ }elseif($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
	144	+ if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
	145	+ $button_args['installed'] = self::is_theme_installed($addon);
	146	+ if(!in_array($button_args['slug'],$wp_org_themes)){
	147	+ $button_args['update_url'] = "https://wpinvoicing.com";
	148	+ }
	149	+ }
	150	+
	151	+ // set price
	152	+ if(isset($addon->pricing) && !empty($addon->pricing)){
	153	+ if(is_object($addon->pricing)){
	154	+ $prices = (Array)$addon->pricing;
	155	+ $button_args['price'] = reset($prices);
	156	+ }elseif(isset($addon->pricing)){
	157	+ $button_args['price'] = $addon->pricing;
	158	+ }
	159	+ }
	160	+
	161	+ // set price text
	162	+ if( $button_args['price'] && $button_args['price'] != '0.00' ){
	163	+ $button_args['price_text'] = sprintf( __('From: $%d', 'invoicing'), $button_args['price']);
	164	+ }
	165	+
	166	+
	167	+ // set if installed
	168	+ if(in_array($button_args['install_status'], array('installed','latest_installed','update_available','newer_installed'))){
	169	+ $button_args['installed'] = true;
	170	+ }
171	171
172	172	// print_r($button_args);
173		- // set if active
174		- if($button_args['installed'] && ($button_args['file'] \|\| $button_args['type'] == 'themes')){
175		- if($button_args['type'] != 'themes'){
176		- $button_args['active'] = is_plugin_active($button_args['file']);
177		- }else{
178		- $button_args['active'] = self::is_theme_active($addon);
179		- }
180		- }
181		-
182		- // set button text and class
183		- if($button_args['active']){
184		- $button_args['button_text'] = __('Active','invoicing');
185		- $button_args['class'] = ' button-secondary disabled ';
186		- }elseif($button_args['installed']){
187		- $button_args['button_text'] = __('Activate','invoicing');
188		-
189		- if($button_args['type'] != 'themes'){
190		- if ( current_user_can( 'manage_options' ) ) {
191		- $button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin='.$button_args['file']), 'activate-plugin_' . $button_args['file']);
192		- }else{
193		- $button_args['url'] = '#';
194		- }
195		- }else{
196		- if ( current_user_can( 'switch_themes' ) ) {
197		- $button_args['url'] = self::get_theme_activation_url($addon);
198		- }else{
199		- $button_args['url'] = '#';
200		- }
201		- }
202		-
203		- }else{
204		- if($button_args['type'] == 'recommended_plugins'){
205		- $button_args['button_text'] = __('Install','invoicing');
206		- }else{
207		- $button_args['button_text'] = __('Get it','invoicing');
208		-
209		- /*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
	173	+ // set if active
	174	+ if($button_args['installed'] && ($button_args['file'] \|\| $button_args['type'] == 'themes')){
	175	+ if($button_args['type'] != 'themes'){
	176	+ $button_args['active'] = is_plugin_active($button_args['file']);
	177	+ }else{
	178	+ $button_args['active'] = self::is_theme_active($addon);
	179	+ }
	180	+ }
	181	+
	182	+ // set button text and class
	183	+ if($button_args['active']){
	184	+ $button_args['button_text'] = __('Active','invoicing');
	185	+ $button_args['class'] = ' button-secondary disabled ';
	186	+ }elseif($button_args['installed']){
	187	+ $button_args['button_text'] = __('Activate','invoicing');
	188	+
	189	+ if($button_args['type'] != 'themes'){
	190	+ if ( current_user_can( 'manage_options' ) ) {
	191	+ $button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin='.$button_args['file']), 'activate-plugin_' . $button_args['file']);
	192	+ }else{
	193	+ $button_args['url'] = '#';
	194	+ }
	195	+ }else{
	196	+ if ( current_user_can( 'switch_themes' ) ) {
	197	+ $button_args['url'] = self::get_theme_activation_url($addon);
	198	+ }else{
	199	+ $button_args['url'] = '#';
	200	+ }
	201	+ }
	202	+
	203	+ }else{
	204	+ if($button_args['type'] == 'recommended_plugins'){
	205	+ $button_args['button_text'] = __('Install','invoicing');
	206	+ }else{
	207	+ $button_args['button_text'] = __('Get it','invoicing');
	208	+
	209	+ /*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
210	210	$button_args['button_text'] = __('Install','invoicing');
211	211	$button_args['url'] = self::get_theme_install_url($button_args['slug']);
212	212	$button_args['onclick'] = 'gd_set_button_installing(this);';
213	213	}*/
214	214
215		- }
216		- }
	215	+ }
	216	+ }
217	217
218	218
219		- // filter the button arguments
220		- $button_args = apply_filters('edd_api_button_args',$button_args);
	219	+ // filter the button arguments
	220	+ $button_args = apply_filters('edd_api_button_args',$button_args);
221	221	// print_r($button_args);
222		- // set price text
223		- if(isset($button_args['price_text'])){
224		- ?>
	222	+ // set price text
	223	+ if(isset($button_args['price_text'])){
	224	+ ?>
225	225	<a
226	226	target="_blank"
227	227	class="addons-price-text"
		@@ -229,9 +229,9 @@ discard block
		block discarded – undo
229	229	<?php echo esc_html( $button_args['price_text'] ); ?>
230	230	</a>
231	231	<?php
232		- }
	232	+ }
233	233
234		- ?>
	234	+ ?>
235	235	<a
236	236	data-licence="<?php echo esc_attr($button_args['license']);?>"
237	237	data-licensing="<?php echo $button_args['licensing'] ? 1 : 0;?>"
		@@ -253,33 +253,33 @@ discard block
		block discarded – undo
253	253	<?php
254	254
255	255
256		- }
257		-
258		-
259		- /**
260		- * Handles output of the addons page in admin.
261		- */
262		- public function output() {
263		- $tabs = self::get_tabs();
264		- $sections = self::get_sections();
265		- $theme = wp_get_theme();
266		- $section_keys = array_keys( $sections );
267		- $current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys );
268		- $current_tab = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
269		- include_once( WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php' );
270		- }
271		-
272		- /**
273		- * A list of recommended wp.org plugins.
274		- * @return array
275		- */
276		- public function get_recommend_wp_plugins(){
277		- $plugins = array(
	256	+ }
	257	+
	258	+
	259	+ /**
	260	+ * Handles output of the addons page in admin.
	261	+ */
	262	+ public function output() {
	263	+ $tabs = self::get_tabs();
	264	+ $sections = self::get_sections();
	265	+ $theme = wp_get_theme();
	266	+ $section_keys = array_keys( $sections );
	267	+ $current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys );
	268	+ $current_tab = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
	269	+ include_once( WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php' );
	270	+ }
	271	+
	272	+ /**
	273	+ * A list of recommended wp.org plugins.
	274	+ * @return array
	275	+ */
	276	+ public function get_recommend_wp_plugins(){
	277	+ $plugins = array(
278	278	'invoicing-quotes' => array(
279	279	'url' => 'https://wordpress.org/plugins/invoicing-quotes/',
280	280	'slug' => 'invoicing-quotes',
281		- 'name' => 'Quotes',
282		- 'thumbnail' => 'https://ps.w.org/invoicing-quotes/assets/banner-772x250.png',
	281	+ 'name' => 'Quotes',
	282	+ 'thumbnail' => 'https://ps.w.org/invoicing-quotes/assets/banner-772x250.png',
283	283	'desc' => __('Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.','invoicing'),
284	284	),
285	285	'geodirectory' => array(
		@@ -294,8 +294,8 @@ discard block
		block discarded – undo
294	294	'name' => 'UsersWP',
295	295	'desc' => __('Allow frontend user login and registration as well as have slick profile pages.','invoicing'),
296	296	),
297		- );
	297	+ );
298	298
299		- return $plugins;
300		- }
	299	+ return $plugins;
	300	+ }
301	301	}

		@@ -5,7 +5,7 @@ discard block
		block discarded – undo
5	5	* All Invoicing extensions screen related functions can be found here.
6	6	*
7	7	*/
8		-if ( ! defined( 'ABSPATH' ) ) {
	8	+if (!defined('ABSPATH')) {
9	9	exit;
10	10	}
11	11
		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	*
21	21	* @return array of tabs.
22	22	*/
23		- public function get_tabs(){
	23	+ public function get_tabs() {
24	24	$tabs = array(
25	25	'addons' => __("Addons", "invoicing"),
26	26	'gateways' => __("Payment Gateways", "invoicing"),
		@@ -38,28 +38,28 @@ discard block
		block discarded – undo
38	38	*
39	39	* @return array
40	40	*/
41		- public function get_section_data( $section_id ) {
42		- $section = self::get_tab( $section_id );
	41	+ public function get_section_data($section_id) {
	42	+ $section = self::get_tab($section_id);
43	43	$api_url = "https://wpinvoicing.com/edd-api/v2/products/";
44	44	$section_data = new stdClass();
45	45
46		- if($section_id=='recommended_plugins'){
	46	+ if ($section_id == 'recommended_plugins') {
47	47	$section_data->products = self::get_recommend_wp_plugins_edd_formatted();
48	48	}
49		- elseif ( ! empty( $section ) ) {
50		- if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
	49	+ elseif (!empty($section)) {
	50	+ if (false === ($section_data = get_transient('wpi_addons_section_' . $section_id))) { //@todo restore after testing
51	51	//if ( 1==1) {
52	52
53		- $query_args = array( 'category' => $section_id, 'number' => 100);
54		- $query_args = apply_filters('wpeu_edd_api_query_args',$query_args,$api_url,$section_id);
	53	+ $query_args = array('category' => $section_id, 'number' => 100);
	54	+ $query_args = apply_filters('wpeu_edd_api_query_args', $query_args, $api_url, $section_id);
55	55
56		- $raw_section = wp_safe_remote_get( esc_url_raw( add_query_arg($query_args ,$api_url) ), array( 'user-agent' => 'Invoicing Addons Page','timeout' => 15, ) );
	56	+ $raw_section = wp_safe_remote_get(esc_url_raw(add_query_arg($query_args, $api_url)), array('user-agent' => 'Invoicing Addons Page', 'timeout' => 15,));
57	57
58		- if ( ! is_wp_error( $raw_section ) ) {
59		- $section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
	58	+ if (!is_wp_error($raw_section)) {
	59	+ $section_data = json_decode(wp_remote_retrieve_body($raw_section));
60	60
61		- if ( ! empty( $section_data->products ) ) {
62		- set_transient( 'wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS );
	61	+ if (!empty($section_data->products)) {
	62	+ set_transient('wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS);
63	63	}
64	64	}
65	65	}
		@@ -67,21 +67,21 @@ discard block
		block discarded – undo
67	67	}
68	68
69	69	$products = isset($section_data->products) ? $section_data->products : array();
70		- if ( 'addons' == $section_id ) {
	70	+ if ('addons' == $section_id) {
71	71
72	72	$quotes = new stdClass();
73	73	$quotes->info = new stdClass();
74	74	$quotes->info->id = '';
75	75	$quotes->info->slug = 'invoicing-quotes';
76		- $quotes->info->title = __( 'Quotes', 'invoicing' );
77		- $quotes->info->excerpt = __( 'Create quotes and estimates', 'invoicing' );
	76	+ $quotes->info->title = __('Quotes', 'invoicing');
	77	+ $quotes->info->excerpt = __('Create quotes and estimates', 'invoicing');
78	78	$quotes->info->link = 'https://wordpress.org/plugins/invoicing-quotes/';
79	79	$quotes->info->thumbnail = 'https://wpgetpaid.com/wp-content/uploads/sites/13/edd/2019/11/Quotes-1-768x384.png';
80	80
81	81	$products[] = $quotes;
82	82	}
83	83
84		- return apply_filters( 'wpi_addons_section_data', $products, $section_id );
	84	+ return apply_filters('wpi_addons_section_data', $products, $section_id);
85	85	}
86	86
87	87	/**
		@@ -92,8 +92,8 @@ discard block
		block discarded – undo
92	92	* @param string $theme
93	93	* @param string $plugin
94	94	*/
95		- public function output_button( $addon ) {
96		- $current_tab = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
	95	+ public function output_button($addon) {
	96	+ $current_tab = empty($_GET['tab']) ? 'addons' : sanitize_title($_GET['tab']);
97	97	// $button_text = __('Free','invoicing');
98	98	// $licensing = false;
99	99	// $installed = false;
		@@ -105,14 +105,14 @@ discard block
		block discarded – undo
105	105	// $install_status = 'get';
106	106	// $onclick = '';
107	107
108		- $wp_org_themes = array('supreme-directory','directory-starter');
	108	+ $wp_org_themes = array('supreme-directory', 'directory-starter');
109	109
110	110	$button_args = array(
111		- 'type' => ($current_tab == 'addons' \|\| $current_tab =='gateways') ? 'addons' : $current_tab,
	111	+ 'type' => ($current_tab == 'addons' \|\| $current_tab == 'gateways') ? 'addons' : $current_tab,
112	112	'id' => isset($addon->info->id) ? absint($addon->info->id) : '',
113	113	'title' => isset($addon->info->title) ? $addon->info->title : '',
114		- 'button_text' => __('Free','invoicing'),
115		- 'price_text' => __('Free','invoicing'),
	114	+ 'button_text' => __('Free', 'invoicing'),
	115	+ 'price_text' => __('Free', 'invoicing'),
116	116	'link' => isset($addon->info->link) ? $addon->info->link : '', // link to product
117	117	'url' => isset($addon->info->link) ? $addon->info->link : '', // button url
118	118	'class' => 'button-primary',
		@@ -128,83 +128,83 @@ discard block
		block discarded – undo
128	128	'update_url' => '',
129	129	);
130	130
131		- if( 'invoicing-quotes' == $addon->info->slug \|\| 'getpaid-stripe-payments' == $addon->info->slug \|\| ( $current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug )){
132		- include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
133		- $status = install_plugin_install_status(array("slug"=>$button_args['slug'],"version"=>""));
	131	+ if ('invoicing-quotes' == $addon->info->slug \|\| 'getpaid-stripe-payments' == $addon->info->slug \|\| ($current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug)) {
	132	+ include_once(ABSPATH . 'wp-admin/includes/plugin-install.php'); //for plugins_api..
	133	+ $status = install_plugin_install_status(array("slug"=>$button_args['slug'], "version"=>""));
134	134	$button_args['install_status'] = isset($status['status']) ? $status['status'] : 'install';
135	135	$button_args['file'] = isset($status['file']) ? $status['file'] : '';
136		- }elseif( ($current_tab == 'addons' \|\| $current_tab =='gateways') && isset($addon->info->id) && $addon->info->id){
137		- include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
138		- if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
	136	+ }elseif (($current_tab == 'addons' \|\| $current_tab == 'gateways') && isset($addon->info->id) && $addon->info->id) {
	137	+ include_once(ABSPATH . 'wp-admin/includes/plugin-install.php'); //for plugins_api..
	138	+ if (!empty($addon->licensing->edd_slug)) {$button_args['slug'] = $addon->licensing->edd_slug; }
139	139	$status = self::install_plugin_install_status($addon);
140	140	$button_args['file'] = isset($status['file']) ? $status['file'] : '';
141		- if(isset($status['status'])){$button_args['install_status'] = $status['status'];}
	141	+ if (isset($status['status'])) {$button_args['install_status'] = $status['status']; }
142	142	$button_args['update_url'] = "https://wpinvoicing.com";
143		- }elseif($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
144		- if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
	143	+ }elseif ($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
	144	+ if (!empty($addon->licensing->edd_slug)) {$button_args['slug'] = $addon->licensing->edd_slug; }
145	145	$button_args['installed'] = self::is_theme_installed($addon);
146		- if(!in_array($button_args['slug'],$wp_org_themes)){
	146	+ if (!in_array($button_args['slug'], $wp_org_themes)) {
147	147	$button_args['update_url'] = "https://wpinvoicing.com";
148	148	}
149	149	}
150	150
151	151	// set price
152		- if(isset($addon->pricing) && !empty($addon->pricing)){
153		- if(is_object($addon->pricing)){
154		- $prices = (Array)$addon->pricing;
	152	+ if (isset($addon->pricing) && !empty($addon->pricing)) {
	153	+ if (is_object($addon->pricing)) {
	154	+ $prices = (Array) $addon->pricing;
155	155	$button_args['price'] = reset($prices);
156		- }elseif(isset($addon->pricing)){
	156	+ }elseif (isset($addon->pricing)) {
157	157	$button_args['price'] = $addon->pricing;
158	158	}
159	159	}
160	160
161	161	// set price text
162		- if( $button_args['price'] && $button_args['price'] != '0.00' ){
163		- $button_args['price_text'] = sprintf( __('From: $%d', 'invoicing'), $button_args['price']);
	162	+ if ($button_args['price'] && $button_args['price'] != '0.00') {
	163	+ $button_args['price_text'] = sprintf(__('From: $%d', 'invoicing'), $button_args['price']);
164	164	}
165	165
166	166
167	167	// set if installed
168		- if(in_array($button_args['install_status'], array('installed','latest_installed','update_available','newer_installed'))){
	168	+ if (in_array($button_args['install_status'], array('installed', 'latest_installed', 'update_available', 'newer_installed'))) {
169	169	$button_args['installed'] = true;
170	170	}
171	171
172	172	// print_r($button_args);
173	173	// set if active
174		- if($button_args['installed'] && ($button_args['file'] \|\| $button_args['type'] == 'themes')){
175		- if($button_args['type'] != 'themes'){
	174	+ if ($button_args['installed'] && ($button_args['file'] \|\| $button_args['type'] == 'themes')) {
	175	+ if ($button_args['type'] != 'themes') {
176	176	$button_args['active'] = is_plugin_active($button_args['file']);
177		- }else{
	177	+ } else {
178	178	$button_args['active'] = self::is_theme_active($addon);
179	179	}
180	180	}
181	181
182	182	// set button text and class
183		- if($button_args['active']){
184		- $button_args['button_text'] = __('Active','invoicing');
	183	+ if ($button_args['active']) {
	184	+ $button_args['button_text'] = __('Active', 'invoicing');
185	185	$button_args['class'] = ' button-secondary disabled ';
186		- }elseif($button_args['installed']){
187		- $button_args['button_text'] = __('Activate','invoicing');
	186	+ }elseif ($button_args['installed']) {
	187	+ $button_args['button_text'] = __('Activate', 'invoicing');
188	188
189		- if($button_args['type'] != 'themes'){
190		- if ( current_user_can( 'manage_options' ) ) {
191		- $button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin='.$button_args['file']), 'activate-plugin_' . $button_args['file']);
192		- }else{
	189	+ if ($button_args['type'] != 'themes') {
	190	+ if (current_user_can('manage_options')) {
	191	+ $button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin=' . $button_args['file']), 'activate-plugin_' . $button_args['file']);
	192	+ } else {
193	193	$button_args['url'] = '#';
194	194	}
195		- }else{
196		- if ( current_user_can( 'switch_themes' ) ) {
	195	+ } else {
	196	+ if (current_user_can('switch_themes')) {
197	197	$button_args['url'] = self::get_theme_activation_url($addon);
198		- }else{
	198	+ } else {
199	199	$button_args['url'] = '#';
200	200	}
201	201	}
202	202
203		- }else{
204		- if($button_args['type'] == 'recommended_plugins'){
205		- $button_args['button_text'] = __('Install','invoicing');
206		- }else{
207		- $button_args['button_text'] = __('Get it','invoicing');
	203	+ } else {
	204	+ if ($button_args['type'] == 'recommended_plugins') {
	205	+ $button_args['button_text'] = __('Install', 'invoicing');
	206	+ } else {
	207	+ $button_args['button_text'] = __('Get it', 'invoicing');
208	208
209	209	/*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
210	210	$button_args['button_text'] = __('Install','invoicing');
		@@ -217,38 +217,38 @@ discard block
		block discarded – undo
217	217
218	218
219	219	// filter the button arguments
220		- $button_args = apply_filters('edd_api_button_args',$button_args);
	220	+ $button_args = apply_filters('edd_api_button_args', $button_args);
221	221	// print_r($button_args);
222	222	// set price text
223		- if(isset($button_args['price_text'])){
	223	+ if (isset($button_args['price_text'])) {
224	224	?>
225	225	<a
226	226	target="_blank"
227	227	class="addons-price-text"
228		- href="<?php echo esc_url( $button_args['link'] ); ?>">
229		- <?php echo esc_html( $button_args['price_text'] ); ?>
	228	+ href="<?php echo esc_url($button_args['link']); ?>">
	229	+ <?php echo esc_html($button_args['price_text']); ?>
230	230	</a>
231	231	<?php
232	232	}
233	233
234	234	?>
235	235	<a
236		- data-licence="<?php echo esc_attr($button_args['license']);?>"
237		- data-licensing="<?php echo $button_args['licensing'] ? 1 : 0;?>"
238		- data-title="<?php echo esc_attr($button_args['title']);?>"
239		- data-type="<?php echo esc_attr($button_args['type']);?>"
240		- data-text-error-message="<?php _e('Something went wrong!','invoicing');?>"
241		- data-text-activate="<?php _e('Activate','invoicing');?>"
242		- data-text-activating="<?php _e('Activating','invoicing');?>"
243		- data-text-deactivate="<?php _e('Deactivate','invoicing');?>"
244		- data-text-installed="<?php _e('Installed','invoicing');?>"
245		- data-text-install="<?php _e('Install','invoicing');?>"
246		- data-text-installing="<?php _e('Installing','invoicing');?>"
247		- data-text-error="<?php _e('Error','invoicing');?>"
248		- <?php if(!empty($button_args['onclick'])){echo " onclick='".esc_attr( $button_args['onclick'] )."' ";}?>
249		- class="addons-button <?php echo esc_attr( $button_args['class'] ); ?>"
250		- href="<?php echo esc_url( $button_args['url'] ); ?>">
251		- <?php echo esc_html( $button_args['button_text'] ); ?>
	236	+ data-licence="<?php echo esc_attr($button_args['license']); ?>"
	237	+ data-licensing="<?php echo $button_args['licensing'] ? 1 : 0; ?>"
	238	+ data-title="<?php echo esc_attr($button_args['title']); ?>"
	239	+ data-type="<?php echo esc_attr($button_args['type']); ?>"
	240	+ data-text-error-message="<?php _e('Something went wrong!', 'invoicing'); ?>"
	241	+ data-text-activate="<?php _e('Activate', 'invoicing'); ?>"
	242	+ data-text-activating="<?php _e('Activating', 'invoicing'); ?>"
	243	+ data-text-deactivate="<?php _e('Deactivate', 'invoicing'); ?>"
	244	+ data-text-installed="<?php _e('Installed', 'invoicing'); ?>"
	245	+ data-text-install="<?php _e('Install', 'invoicing'); ?>"
	246	+ data-text-installing="<?php _e('Installing', 'invoicing'); ?>"
	247	+ data-text-error="<?php _e('Error', 'invoicing'); ?>"
	248	+ <?php if (!empty($button_args['onclick'])) {echo " onclick='" . esc_attr($button_args['onclick']) . "' "; }?>
	249	+ class="addons-button <?php echo esc_attr($button_args['class']); ?>"
	250	+ href="<?php echo esc_url($button_args['url']); ?>">
	251	+ <?php echo esc_html($button_args['button_text']); ?>
252	252	</a>
253	253	<?php
254	254
		@@ -263,36 +263,36 @@ discard block
		block discarded – undo
263	263	$tabs = self::get_tabs();
264	264	$sections = self::get_sections();
265	265	$theme = wp_get_theme();
266		- $section_keys = array_keys( $sections );
267		- $current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys );
268		- $current_tab = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
269		- include_once( WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php' );
	266	+ $section_keys = array_keys($sections);
	267	+ $current_section = isset($_GET['section']) ? sanitize_text_field($_GET['section']) : current($section_keys);
	268	+ $current_tab = empty($_GET['tab']) ? 'addons' : sanitize_title($_GET['tab']);
	269	+ include_once(WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php');
270	270	}
271	271
272	272	/**
273	273	* A list of recommended wp.org plugins.
274	274	* @return array
275	275	*/
276		- public function get_recommend_wp_plugins(){
	276	+ public function get_recommend_wp_plugins() {
277	277	$plugins = array(
278	278	'invoicing-quotes' => array(
279	279	'url' => 'https://wordpress.org/plugins/invoicing-quotes/',
280	280	'slug' => 'invoicing-quotes',
281	281	'name' => 'Quotes',
282	282	'thumbnail' => 'https://ps.w.org/invoicing-quotes/assets/banner-772x250.png',
283		- 'desc' => __('Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.','invoicing'),
	283	+ 'desc' => __('Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.', 'invoicing'),
284	284	),
285	285	'geodirectory' => array(
286	286	'url' => 'https://wordpress.org/plugins/geodirectory/',
287	287	'slug' => 'geodirectory',
288	288	'name' => 'GeoDirectory',
289		- 'desc' => __('Turn any WordPress theme into a global business directory portal.','invoicing'),
	289	+ 'desc' => __('Turn any WordPress theme into a global business directory portal.', 'invoicing'),
290	290	),
291	291	'userswp' => array(
292	292	'url' => 'https://wordpress.org/plugins/userswp/',
293	293	'slug' => 'userswp',
294	294	'name' => 'UsersWP',
295		- 'desc' => __('Allow frontend user login and registration as well as have slick profile pages.','invoicing'),
	295	+ 'desc' => __('Allow frontend user login and registration as well as have slick profile pages.', 'invoicing'),
296	296	),
297	297	);
298	298

AyeCode / invoicing

Push — master ( 02cd26...7c0663 )

Status

Category

Indentation +38 added lines, -38 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +346 added lines, -346 removed lines patch added patch discarded remove patch

Spacing +79 added lines, -79 removed lines patch added patch discarded remove patch

Spacing +39 added lines, -39 removed lines patch added patch discarded remove patch

Indentation +180 added lines, -180 removed lines patch added patch discarded remove patch

Spacing +77 added lines, -77 removed lines patch added patch discarded remove patch

Indentation +88 added lines, -88 removed lines patch added patch discarded remove patch

Spacing +145 added lines, -145 removed lines patch added patch discarded remove patch

Indentation +212 added lines, -212 removed lines patch added patch discarded remove patch

Spacing +88 added lines, -88 removed lines patch added patch discarded remove patch

Spacing +370 added lines, -370 removed lines patch added patch discarded remove patch

Indentation +454 added lines, -454 removed lines patch added patch discarded remove patch

Spacing +125 added lines, -125 removed lines patch added patch discarded remove patch

Spacing +93 added lines, -93 removed lines patch added patch discarded remove patch