Inspection of "load quotes image locally" - AyeCode/invoicing - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 330418...c4952f )

by Brian

created 2022-03-30 09:28 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 esc_html( $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 esc_html($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 esc_html( $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 esc_html($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/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 +78 added lines, -78 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 esc_attr( $key ); ?>" <?php selected( $key, $range ); ?>><?php echo esc_html( $label ); ?></option>
-					<?php endforeach;?>
+					<?php foreach ($this->get_periods() as $key => $label) :?>
+						<option value="<?php echo esc_attr($key); ?>" <?php selected($key, $range); ?>><?php echo esc_html($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 esc_html(  $card['label']  ); ?> Card -->
-								<div class="card p-0 m-0 shadow-none <?php echo sanitize_html_class( $key ); ?>">
+								<!-- <?php echo esc_html($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 esc_html( $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 esc_html($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 esc_html( $card['label'] ); ?> Card -->
+								<!-- <?php echo esc_html($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 esc_html( $graph ); ?></strong>
+								<strong><?php echo esc_html($graph); ?></strong>
 							</div>
 							<div class="card-body">
-								<canvas id="getpaid-chartjs-<?php echo esc_attr( $key ); ?>"></canvas>
+								<canvas id="getpaid-chartjs-<?php echo esc_attr($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'; ?>">
-										<strong><?php echo esc_html( $view['label'] ); ?></strong>
+									<div class="<?php echo empty($view['disable-downloads']) ? 'col-9' : 'col-12'; ?>">
+										<strong><?php echo esc_html($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-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/admin/class-getpaid-metaboxes.php 2 patches

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

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

Please login to merge, or discard this patch.

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

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Metaboxes Admin Class
@@ -25,35 +25,35 @@  discard block
 block discarded – undo
 	public static function init() {
 
 		// Register metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2);
 
 		// Remove metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30);
 
 		// Rename metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45);
 
 		// Save metaboxes.
-		add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
+		add_action('save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2);
 	}
 
 	/**
 	 * Register core metaboxes.
 	 */
-	public static function add_meta_boxes( $post_type, $post ) {
+	public static function add_meta_boxes($post_type, $post) {
 
 		// For invoices...
-		self::add_invoice_meta_boxes( $post_type, $post );
+		self::add_invoice_meta_boxes($post_type, $post);
 
 		// For payment forms.
-		self::add_payment_form_meta_boxes( $post_type, $post );
+		self::add_payment_form_meta_boxes($post_type, $post);
 
 		// For invoice items.
-		self::add_item_meta_boxes( $post_type );
+		self::add_item_meta_boxes($post_type);
 
 		// For invoice discounts.
-		if ( $post_type == 'wpi_discount' ) {
-			add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
+		if ($post_type == 'wpi_discount') {
+			add_meta_box('wpinv_discount_details', __('Discount Details', 'invoicing'), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high');
 		}
 
 	}
@@ -61,17 +61,17 @@  discard block
 block discarded – undo
 	/**
 	 * Register core metaboxes.
 	 */
-	protected static function add_payment_form_meta_boxes( $post_type, $post ) {
+	protected static function add_payment_form_meta_boxes($post_type, $post) {
 
 		// For payment forms.
-		if ( $post_type == 'wpi_payment_form' ) {
+		if ($post_type == 'wpi_payment_form') {
 
 			// Design payment form.
-			add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
+			add_meta_box('wpinv-payment-form-design', __('Payment Form', 'invoicing'), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal');
 
 			// Payment form information.
-			if ( $post->ID != wpinv_get_default_payment_form() ) {
-				add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
+			if ($post->ID != wpinv_get_default_payment_form()) {
+				add_meta_box('wpinv-payment-form-info', __('Details', 'invoicing'), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side');
 			}
 
 		}
@@ -81,20 +81,20 @@  discard block
 block discarded – undo
 	/**
 	 * Register core metaboxes.
 	 */
-	protected static function add_item_meta_boxes( $post_type ) {
+	protected static function add_item_meta_boxes($post_type) {
 
-		if ( $post_type == 'wpi_item' ) {
+		if ($post_type == 'wpi_item') {
 
 			// Item details.
-			add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
+			add_meta_box('wpinv_item_details', __('Item Details', 'invoicing'), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high');
 
 			// If taxes are enabled, register the tax metabox.
-			if ( wpinv_use_taxes() ) {
-				add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
+			if (wpinv_use_taxes()) {
+				add_meta_box('wpinv_item_vat', __('Tax', 'invoicing'), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high');
 			}
 
 			// Item info.
-			add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
+			add_meta_box('wpinv_field_item_info', __('Item info', 'invoicing'), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core');
 
 		}
 
@@ -103,20 +103,20 @@  discard block
 block discarded – undo
 	/**
 	 * Register invoice metaboxes.
 	 */
-	protected static function add_invoice_meta_boxes( $post_type, $post ) {
+	protected static function add_invoice_meta_boxes($post_type, $post) {
 
 		// For invoices...
-		if ( getpaid_is_invoice_post_type( $post_type ) ) {
-			$invoice = new WPInv_Invoice( $post );
+		if (getpaid_is_invoice_post_type($post_type)) {
+			$invoice = new WPInv_Invoice($post);
 
 			// Resend invoice.
-			if ( ! $invoice->is_draft() ) {
+			if (!$invoice->is_draft()) {
 
 				add_meta_box(
 					'wpinv-mb-resend-invoice',
 					sprintf(
-						__( 'Resend %s', 'invoicing' ),
-						ucfirst( $invoice->get_invoice_quote_type() )
+						__('Resend %s', 'invoicing'),
+						ucfirst($invoice->get_invoice_quote_type())
 					),
 					'GetPaid_Meta_Box_Resend_Invoice::output',
 					$post_type,
@@ -127,17 +127,17 @@  discard block
 block discarded – undo
 			}
 
 			// Subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-			if ( ! empty( $subscriptions ) ) {
+			$subscriptions = getpaid_get_invoice_subscriptions($invoice);
+			if (!empty($subscriptions)) {
 
-				if ( is_array( $subscriptions ) ) {
-					add_meta_box( 'wpinv-mb-subscriptions', __( 'Related Subscriptions', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced' );
+				if (is_array($subscriptions)) {
+					add_meta_box('wpinv-mb-subscriptions', __('Related Subscriptions', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced');
 				} else {
-					add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
+					add_meta_box('wpinv-mb-subscriptions', __('Subscription Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced');
 				}
 
-				if ( getpaid_count_subscription_invoices( $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id() ) > 1 ) {
-					add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
+				if (getpaid_count_subscription_invoices($invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id()) > 1) {
+					add_meta_box('wpinv-mb-subscription-invoices', __('Related Payments', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced');
 				}
 
 			}
@@ -146,8 +146,8 @@  discard block
 block discarded – undo
 			add_meta_box(
 				'wpinv-details',
 				sprintf(
-					__( '%s Details', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
+					__('%s Details', 'invoicing'),
+					ucfirst($invoice->get_invoice_quote_type())
 				),
 				'GetPaid_Meta_Box_Invoice_Details::output',
 				$post_type,
@@ -155,17 +155,17 @@  discard block
 block discarded – undo
 			);
 
 			// Payment details.
-			add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
+			add_meta_box('wpinv-payment-meta', __('Payment Meta', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default');
 
 			// Billing details.
-			add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
+			add_meta_box('wpinv-address', __('Billing Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high');
 			
 			// Invoice items.
 			add_meta_box(
 				'wpinv-items',
 				sprintf(
-					__( '%s Items', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
+					__('%s Items', 'invoicing'),
+					ucfirst($invoice->get_invoice_quote_type())
 				),
 				'GetPaid_Meta_Box_Invoice_Items::output',
 				$post_type,
@@ -177,8 +177,8 @@  discard block
 block discarded – undo
 			add_meta_box(
 				'wpinv-notes',
 				sprintf(
-					__( '%s Notes', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
+					__('%s Notes', 'invoicing'),
+					ucfirst($invoice->get_invoice_quote_type())
 				),
 				'WPInv_Meta_Box_Notes::output',
 				$post_type,
@@ -187,13 +187,13 @@  discard block
 block discarded – undo
 			);
 
 			// Shipping Address.
-			if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
-				add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
+			if (get_post_meta($invoice->get_id(), 'shipping_address', true)) {
+				add_meta_box('wpinv-invoice-shipping-details', __('Shipping Address', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high');
 			}
 
 			// Payment form information.
-			if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
-				add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
+			if (get_post_meta($invoice->get_id(), 'payment_form_data', true)) {
+				add_meta_box('wpinv-invoice-payment-form-details', __('Payment Form Details', 'invoicing'), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high');
 			}
 
 		}
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
 	 * Remove some metaboxes.
 	 */
 	public static function remove_meta_boxes() {
-		remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
+		remove_meta_box('wpseo_meta', 'wpi_invoice', 'normal');
 	}
 
 	/**
@@ -220,46 +220,46 @@  discard block
 block discarded – undo
 	 * @param  int    $post_id Post ID.
 	 * @param  object $post Post object.
 	 */
-	public static function save_meta_boxes( $post_id, $post ) {
-		$post_id = absint( $post_id );
-		$data    = wp_kses_post_deep( wp_unslash( $_POST ) );
+	public static function save_meta_boxes($post_id, $post) {
+		$post_id = absint($post_id);
+		$data    = wp_kses_post_deep(wp_unslash($_POST));
 
 		// Do not save for ajax requests.
-		if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+		if ((defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
 			return;
 		}
 
 		// $post_id and $post are required
-		if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
+		if (empty($post_id) || empty($post) || self::$saved_meta_boxes) {
 			return;
 		}
 
 		// Dont' save meta boxes for revisions or autosaves.
-		if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+		if ((defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) || is_int(wp_is_post_revision($post)) || is_int(wp_is_post_autosave($post))) {
 			return;
 		}
 
 		// Check the nonce.
-		if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
+		if (empty($data['getpaid_meta_nonce']) || !wp_verify_nonce($data['getpaid_meta_nonce'], 'getpaid_meta_nonce')) {
 			return;
 		}
 
 		// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
-		if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
+		if (empty($data['post_ID']) || absint($data['post_ID']) !== $post_id) {
 			return;
 		}
 
 		// Check user has permission to edit.
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+		if (!current_user_can('edit_post', $post_id)) {
 			return;
 		}
 
-		if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
+		if (getpaid_is_invoice_post_type($post->post_type)) {
 
 			// We need this save event to run once to avoid potential endless loops.
 			self::$saved_meta_boxes = true;
 
-			return GetPaid_Meta_Box_Invoice_Address::save( $post_id );
+			return GetPaid_Meta_Box_Invoice_Address::save($post_id);
 
 		}
 
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
 		);
 
 		// Is this our post type?
-		if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
+		if (!isset($post_types_map[$post->post_type])) {
 			return;
 		}
 
@@ -279,8 +279,8 @@  discard block
 block discarded – undo
 		self::$saved_meta_boxes = true;
 		
 		// Save the post.
-		$class = $post_types_map[ $post->post_type ];
-		$class::save( $post_id, wp_kses_post_deep( $_POST ), $post );
+		$class = $post_types_map[$post->post_type];
+		$class::save($post_id, wp_kses_post_deep($_POST), $post);
 
 	}
 

Please login to merge, or discard this patch.

includes/admin/class-getpaid-post-types-admin.php 2 patches

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

@@ -13,732 +13,732 @@  discard block
 block discarded – undo
 class GetPaid_Post_Types_Admin {
 
     /**
-	 * Hook in methods.
-	 */
-	public static function init() {
-
-		// Init metaboxes.
-		GetPaid_Metaboxes::init();
-
-		// Filter the post updated messages.
-		add_filter( 'post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages' );
-
-		// Filter post actions.
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2 );
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::filter_invoice_row_actions', 90, 2 );
-
-		// Invoice table columns.
-		add_filter( 'manage_wpi_invoice_posts_columns', array( __CLASS__, 'invoice_columns' ), 100 );
-		add_action( 'manage_wpi_invoice_posts_custom_column', array( __CLASS__, 'display_invoice_columns' ), 10, 2 );
-		add_filter( 'bulk_actions-edit-wpi_invoice', array( __CLASS__, 'invoice_bulk_actions' ) );
-		add_filter( 'handle_bulk_actions-edit-wpi_invoice', array( __CLASS__, 'handle_invoice_bulk_actions' ), 10, 3 );
-
-		// Items table columns.
-		add_filter( 'manage_wpi_item_posts_columns', array( __CLASS__, 'item_columns' ), 100 );
-		add_filter( 'manage_edit-wpi_item_sortable_columns', array( __CLASS__, 'sortable_item_columns' ), 20 );
-		add_action( 'manage_wpi_item_posts_custom_column', array( __CLASS__, 'display_item_columns' ), 10, 2 );
-		add_action( 'restrict_manage_posts', array( __CLASS__, 'add_item_filters' ), 100 );
-		add_action( 'parse_query', array( __CLASS__, 'filter_item_query' ), 100 );
-		add_action( 'request', array( __CLASS__, 'reorder_items' ), 100 );
-
-		// Payment forms columns.
-		add_filter( 'manage_wpi_payment_form_posts_columns', array( __CLASS__, 'payment_form_columns' ), 100 );
-		add_action( 'manage_wpi_payment_form_posts_custom_column', array( __CLASS__, 'display_payment_form_columns' ), 10, 2 );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_payment_form_state' ), 10, 2 );
-
-		// Discount table columns.
-		add_filter( 'manage_wpi_discount_posts_columns', array( __CLASS__, 'discount_columns' ), 100 );
-		add_filter( 'bulk_actions-edit-wpi_discount', '__return_empty_array', 100 );
-
-		// Deleting posts.
-		add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_discount_state' ), 10, 2 );
-
-		add_filter( 'display_post_states', array( __CLASS__, 'add_display_post_states' ), 10, 2 );
-	}
-
-	/**
-	 * Post updated messages.
-	 */
-	public static function post_updated_messages( $messages ) {
-		global $post;
-
-		$messages['wpi_discount'] = array(
-			0   => '',
-			1   => __( 'Discount updated.', 'invoicing' ),
-			2   => __( 'Custom field updated.', 'invoicing' ),
-			3   => __( 'Custom field deleted.', 'invoicing' ),
-			4   => __( 'Discount updated.', 'invoicing' ),
-			5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6   => __( 'Discount updated.', 'invoicing' ),
-			7   => __( 'Discount saved.', 'invoicing' ),
-			8   => __( 'Discount submitted.', 'invoicing' ),
-			9   => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10  => __( 'Discount draft updated.', 'invoicing' ),
-		);
-
-		$messages['wpi_payment_form'] = array(
-			0   => '',
-			1   => __( 'Payment Form updated.', 'invoicing' ),
-			2   => __( 'Custom field updated.', 'invoicing' ),
-			3   => __( 'Custom field deleted.', 'invoicing' ),
-			4   => __( 'Payment Form updated.', 'invoicing' ),
-			5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6   => __( 'Payment Form updated.', 'invoicing' ),
-			7   => __( 'Payment Form saved.', 'invoicing' ),
-			8   => __( 'Payment Form submitted.', 'invoicing' ),
-			9   => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10  => __( 'Payment Form draft updated.', 'invoicing' ),
-		);
-
-		return $messages;
-
-	}
-
-	/**
-	 * Post row actions.
-	 */
-	public static function post_row_actions( $actions, $post ) {
-
-		$post = get_post( $post );
-
-		// We do not want to edit the default payment form.
-		if ( 'wpi_payment_form' == $post->post_type ) {
-
-			if ( $post->ID == wpinv_get_default_payment_form() ) {
-				unset( $actions['trash'] );
-				unset( $actions['inline hide-if-no-js'] );
-			}
-
-			$actions['duplicate'] =  sprintf(
-				'<a href="%1$s">%2$s</a>',
-				esc_url(
-					wp_nonce_url(
-						add_query_arg(
-							array(
-								'getpaid-admin-action' => 'duplicate_form',
-								'form_id'              => $post->ID
-							)
-						),
-						'getpaid-nonce',
-						'getpaid-nonce'
-					)
-				),
-				esc_html( __( 'Duplicate', 'invoicing' ) )
-			);
-
-		}
-
-		// Link to item payment form.
-		if ( 'wpi_item' == $post->post_type ) {
-
-			if ( in_array( get_post_meta( $post->ID, '_wpinv_type', true ), array( '', 'fee', 'custom' ) ) ) {
-
-				$actions['buy'] =  sprintf(
-					'<a href="%1$s">%2$s</a>',
-					esc_url( getpaid_embed_url( false, $post->ID . '|0' ) ),
-					esc_html( __( 'Buy', 'invoicing' ) )
-				);
-
-			}
-
-		}
-
-		return $actions;
-	}
-
-	/**
+     * Hook in methods.
+     */
+    public static function init() {
+
+        // Init metaboxes.
+        GetPaid_Metaboxes::init();
+
+        // Filter the post updated messages.
+        add_filter( 'post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages' );
+
+        // Filter post actions.
+        add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2 );
+        add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::filter_invoice_row_actions', 90, 2 );
+
+        // Invoice table columns.
+        add_filter( 'manage_wpi_invoice_posts_columns', array( __CLASS__, 'invoice_columns' ), 100 );
+        add_action( 'manage_wpi_invoice_posts_custom_column', array( __CLASS__, 'display_invoice_columns' ), 10, 2 );
+        add_filter( 'bulk_actions-edit-wpi_invoice', array( __CLASS__, 'invoice_bulk_actions' ) );
+        add_filter( 'handle_bulk_actions-edit-wpi_invoice', array( __CLASS__, 'handle_invoice_bulk_actions' ), 10, 3 );
+
+        // Items table columns.
+        add_filter( 'manage_wpi_item_posts_columns', array( __CLASS__, 'item_columns' ), 100 );
+        add_filter( 'manage_edit-wpi_item_sortable_columns', array( __CLASS__, 'sortable_item_columns' ), 20 );
+        add_action( 'manage_wpi_item_posts_custom_column', array( __CLASS__, 'display_item_columns' ), 10, 2 );
+        add_action( 'restrict_manage_posts', array( __CLASS__, 'add_item_filters' ), 100 );
+        add_action( 'parse_query', array( __CLASS__, 'filter_item_query' ), 100 );
+        add_action( 'request', array( __CLASS__, 'reorder_items' ), 100 );
+
+        // Payment forms columns.
+        add_filter( 'manage_wpi_payment_form_posts_columns', array( __CLASS__, 'payment_form_columns' ), 100 );
+        add_action( 'manage_wpi_payment_form_posts_custom_column', array( __CLASS__, 'display_payment_form_columns' ), 10, 2 );
+        add_filter( 'display_post_states', array( __CLASS__, 'filter_payment_form_state' ), 10, 2 );
+
+        // Discount table columns.
+        add_filter( 'manage_wpi_discount_posts_columns', array( __CLASS__, 'discount_columns' ), 100 );
+        add_filter( 'bulk_actions-edit-wpi_discount', '__return_empty_array', 100 );
+
+        // Deleting posts.
+        add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
+        add_filter( 'display_post_states', array( __CLASS__, 'filter_discount_state' ), 10, 2 );
+
+        add_filter( 'display_post_states', array( __CLASS__, 'add_display_post_states' ), 10, 2 );
+    }
+
+    /**
+     * Post updated messages.
+     */
+    public static function post_updated_messages( $messages ) {
+        global $post;
+
+        $messages['wpi_discount'] = array(
+            0   => '',
+            1   => __( 'Discount updated.', 'invoicing' ),
+            2   => __( 'Custom field updated.', 'invoicing' ),
+            3   => __( 'Custom field deleted.', 'invoicing' ),
+            4   => __( 'Discount updated.', 'invoicing' ),
+            5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+            6   => __( 'Discount updated.', 'invoicing' ),
+            7   => __( 'Discount saved.', 'invoicing' ),
+            8   => __( 'Discount submitted.', 'invoicing' ),
+            9   => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
+            10  => __( 'Discount draft updated.', 'invoicing' ),
+        );
+
+        $messages['wpi_payment_form'] = array(
+            0   => '',
+            1   => __( 'Payment Form updated.', 'invoicing' ),
+            2   => __( 'Custom field updated.', 'invoicing' ),
+            3   => __( 'Custom field deleted.', 'invoicing' ),
+            4   => __( 'Payment Form updated.', 'invoicing' ),
+            5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+            6   => __( 'Payment Form updated.', 'invoicing' ),
+            7   => __( 'Payment Form saved.', 'invoicing' ),
+            8   => __( 'Payment Form submitted.', 'invoicing' ),
+            9   => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
+            10  => __( 'Payment Form draft updated.', 'invoicing' ),
+        );
+
+        return $messages;
+
+    }
+
+    /**
+     * Post row actions.
+     */
+    public static function post_row_actions( $actions, $post ) {
+
+        $post = get_post( $post );
+
+        // We do not want to edit the default payment form.
+        if ( 'wpi_payment_form' == $post->post_type ) {
+
+            if ( $post->ID == wpinv_get_default_payment_form() ) {
+                unset( $actions['trash'] );
+                unset( $actions['inline hide-if-no-js'] );
+            }
+
+            $actions['duplicate'] =  sprintf(
+                '<a href="%1$s">%2$s</a>',
+                esc_url(
+                    wp_nonce_url(
+                        add_query_arg(
+                            array(
+                                'getpaid-admin-action' => 'duplicate_form',
+                                'form_id'              => $post->ID
+                            )
+                        ),
+                        'getpaid-nonce',
+                        'getpaid-nonce'
+                    )
+                ),
+                esc_html( __( 'Duplicate', 'invoicing' ) )
+            );
+
+        }
+
+        // Link to item payment form.
+        if ( 'wpi_item' == $post->post_type ) {
+
+            if ( in_array( get_post_meta( $post->ID, '_wpinv_type', true ), array( '', 'fee', 'custom' ) ) ) {
+
+                $actions['buy'] =  sprintf(
+                    '<a href="%1$s">%2$s</a>',
+                    esc_url( getpaid_embed_url( false, $post->ID . '|0' ) ),
+                    esc_html( __( 'Buy', 'invoicing' ) )
+                );
+
+            }
+
+        }
+
+        return $actions;
+    }
+
+    /**
      * Remove bulk edit option from admin side quote listing
      *
      * @since    1.0.0
      * @param array $actions post actions
-	 * @param WP_Post $post
+     * @param WP_Post $post
      * @return array $actions actions without edit option
      */
     public static function filter_invoice_row_actions( $actions, $post ) {
 
         if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
 
-			$actions = array();
-			$invoice = new WPInv_Invoice( $post );
-
-			$actions['edit'] =  sprintf(
-				'<a href="%1$s">%2$s</a>',
-				esc_url( get_edit_post_link( $invoice->get_id() ) ),
-				esc_html( __( 'Edit', 'invoicing' ) )
-			);
-
-			if ( ! $invoice->is_draft() ) {
-
-				$actions['view'] =  sprintf(
-					'<a href="%1$s">%2$s</a>',
-					esc_url( $invoice->get_view_url() ),
-					sprintf(
-						esc_html( __( 'View %s', 'invoicing' ) ),
-						getpaid_get_post_type_label( $invoice->get_post_type(), false )
-					)
-				);
-
-				$actions['send'] =  sprintf(
-					'<a href="%1$s">%2$s</a>',
-					esc_url(
-						wp_nonce_url(
-							add_query_arg(
-								array(
-									'getpaid-admin-action' => 'send_invoice',
-									'invoice_id'           => $invoice->get_id()
-								)
-							),
-							'getpaid-nonce',
-							'getpaid-nonce'
-						)
-					),
-					esc_html( __( 'Send to Customer', 'invoicing' ) )
-				);
-
-			}
-
-			$actions['duplicate'] =  sprintf(
-				'<a href="%1$s">%2$s</a>',
-				esc_url(
-					wp_nonce_url(
-						add_query_arg(
-							array(
-								'getpaid-admin-action' => 'duplicate_invoice',
-								'invoice_id'           => $post->ID
-							)
-						),
-						'getpaid-nonce',
-						'getpaid-nonce'
-					)
-				),
-				esc_html( __( 'Duplicate', 'invoicing' ) )
-			);
+            $actions = array();
+            $invoice = new WPInv_Invoice( $post );
+
+            $actions['edit'] =  sprintf(
+                '<a href="%1$s">%2$s</a>',
+                esc_url( get_edit_post_link( $invoice->get_id() ) ),
+                esc_html( __( 'Edit', 'invoicing' ) )
+            );
+
+            if ( ! $invoice->is_draft() ) {
+
+                $actions['view'] =  sprintf(
+                    '<a href="%1$s">%2$s</a>',
+                    esc_url( $invoice->get_view_url() ),
+                    sprintf(
+                        esc_html( __( 'View %s', 'invoicing' ) ),
+                        getpaid_get_post_type_label( $invoice->get_post_type(), false )
+                    )
+                );
+
+                $actions['send'] =  sprintf(
+                    '<a href="%1$s">%2$s</a>',
+                    esc_url(
+                        wp_nonce_url(
+                            add_query_arg(
+                                array(
+                                    'getpaid-admin-action' => 'send_invoice',
+                                    'invoice_id'           => $invoice->get_id()
+                                )
+                            ),
+                            'getpaid-nonce',
+                            'getpaid-nonce'
+                        )
+                    ),
+                    esc_html( __( 'Send to Customer', 'invoicing' ) )
+                );
+
+            }
+
+            $actions['duplicate'] =  sprintf(
+                '<a href="%1$s">%2$s</a>',
+                esc_url(
+                    wp_nonce_url(
+                        add_query_arg(
+                            array(
+                                'getpaid-admin-action' => 'duplicate_invoice',
+                                'invoice_id'           => $post->ID
+                            )
+                        ),
+                        'getpaid-nonce',
+                        'getpaid-nonce'
+                    )
+                ),
+                esc_html( __( 'Duplicate', 'invoicing' ) )
+            );
 
         }
 
         return $actions;
-	}
-
-	/**
-	 * Returns an array of invoice table columns.
-	 */
-	public static function invoice_columns( $columns ) {
-
-		$columns = array(
-			'cb'                => $columns['cb'],
-			'number'            => __( 'Invoice', 'invoicing' ),
-			'customer'          => __( 'Customer', 'invoicing' ),
-			'invoice_date'      => __( 'Created', 'invoicing' ),
-			'payment_date'      => __( 'Completed', 'invoicing' ),
-			'amount'            => __( 'Amount', 'invoicing' ),
-			'recurring'         => __( 'Recurring', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
-		);
-
-		return apply_filters( 'wpi_invoice_table_columns', $columns );
-	}
-
-	/**
-	 * Displays invoice table columns.
-	 */
-	public static function display_invoice_columns( $column_name, $post_id ) {
-
-		$invoice = new WPInv_Invoice( $post_id );
-
-		switch ( $column_name ) {
-
-			case 'invoice_date' :
-				$date_time = esc_attr( $invoice->get_created_date() );
-				$date      = esc_html( getpaid_format_date_value( $date_time, "&mdash;", true ) );
-				echo "<span title='$date_time'>$date</span>";
-				break;
-
-			case 'payment_date' :
-
-				if ( $invoice->is_paid() ) {
-					$date_time = esc_attr( $invoice->get_completed_date() );
-					$date      = esc_html( getpaid_format_date_value( $date_time, "&mdash;", true ) );
-					echo "<span title='$date_time'>$date</span>";
-				} else {
-					echo "&mdash;";
-				}
+    }
+
+    /**
+     * Returns an array of invoice table columns.
+     */
+    public static function invoice_columns( $columns ) {
+
+        $columns = array(
+            'cb'                => $columns['cb'],
+            'number'            => __( 'Invoice', 'invoicing' ),
+            'customer'          => __( 'Customer', 'invoicing' ),
+            'invoice_date'      => __( 'Created', 'invoicing' ),
+            'payment_date'      => __( 'Completed', 'invoicing' ),
+            'amount'            => __( 'Amount', 'invoicing' ),
+            'recurring'         => __( 'Recurring', 'invoicing' ),
+            'status'            => __( 'Status', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpi_invoice_table_columns', $columns );
+    }
+
+    /**
+     * Displays invoice table columns.
+     */
+    public static function display_invoice_columns( $column_name, $post_id ) {
+
+        $invoice = new WPInv_Invoice( $post_id );
+
+        switch ( $column_name ) {
+
+            case 'invoice_date' :
+                $date_time = esc_attr( $invoice->get_created_date() );
+                $date      = esc_html( getpaid_format_date_value( $date_time, "&mdash;", true ) );
+                echo "<span title='$date_time'>$date</span>";
+                break;
+
+            case 'payment_date' :
+
+                if ( $invoice->is_paid() ) {
+                    $date_time = esc_attr( $invoice->get_completed_date() );
+                    $date      = esc_html( getpaid_format_date_value( $date_time, "&mdash;", true ) );
+                    echo "<span title='$date_time'>$date</span>";
+                } else {
+                    echo "&mdash;";
+                }
 				
-				break;
+                break;
 
-			case 'amount' :
+            case 'amount' :
 
-				$amount = $invoice->get_total();
-				$formated_amount = wp_kses_post( wpinv_price( $amount, $invoice->get_currency() ) );
+                $amount = $invoice->get_total();
+                $formated_amount = wp_kses_post( wpinv_price( $amount, $invoice->get_currency() ) );
 
-				if ( $invoice->is_refunded() ) {
-					$refunded_amount = wp_kses_post( wpinv_price( 0, $invoice->get_currency() ) );
-					echo "<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>";
-				} else {
+                if ( $invoice->is_refunded() ) {
+                    $refunded_amount = wp_kses_post( wpinv_price( 0, $invoice->get_currency() ) );
+                    echo "<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>";
+                } else {
 
-					$discount = $invoice->get_total_discount();
+                    $discount = $invoice->get_total_discount();
 
-					if ( ! empty( $discount ) ) {
-						$new_amount = wp_kses_post( wpinv_price( $amount + $discount, $invoice->get_currency() ) );
-						echo "<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>";
-					} else {
-						echo $formated_amount;
-					}
+                    if ( ! empty( $discount ) ) {
+                        $new_amount = wp_kses_post( wpinv_price( $amount + $discount, $invoice->get_currency() ) );
+                        echo "<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>";
+                    } else {
+                        echo $formated_amount;
+                    }
 
-				}
+                }
 
-				break;
+                break;
 
-			case 'status' :
-				$status       = esc_html( $invoice->get_status() );
-				$status_label = esc_html( $invoice->get_status_nicename() );
+            case 'status' :
+                $status       = esc_html( $invoice->get_status() );
+                $status_label = esc_html( $invoice->get_status_nicename() );
 
-				// If it is paid, show the gateway title.
-				if ( $invoice->is_paid() ) {
-					$gateway = esc_html( $invoice->get_gateway_title() );
-					$gateway = wp_sprintf( esc_attr__( 'Paid via %s', 'invoicing' ), esc_html( $gateway ) );
+                // If it is paid, show the gateway title.
+                if ( $invoice->is_paid() ) {
+                    $gateway = esc_html( $invoice->get_gateway_title() );
+                    $gateway = wp_sprintf( esc_attr__( 'Paid via %s', 'invoicing' ), esc_html( $gateway ) );
 
-					echo "<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>";
-				} else {
-					echo "<mark class='getpaid-invoice-status $status'><span>$status_label</span></mark>";
-				}
+                    echo "<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>";
+                } else {
+                    echo "<mark class='getpaid-invoice-status $status'><span>$status_label</span></mark>";
+                }
 
-				// If it is not paid, display the overdue and view status.
-				if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+                // If it is not paid, display the overdue and view status.
+                if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
 
-					// Invoice view status.
-					if ( wpinv_is_invoice_viewed( $invoice->get_id() ) ) {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="'. esc_attr__( 'Viewed by Customer', 'invoicing' ).'"></i>';
-					} else {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="'. esc_attr__( 'Not Viewed by Customer', 'invoicing' ).'"></i>';
-					}
+                    // Invoice view status.
+                    if ( wpinv_is_invoice_viewed( $invoice->get_id() ) ) {
+                        echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="'. esc_attr__( 'Viewed by Customer', 'invoicing' ).'"></i>';
+                    } else {
+                        echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="'. esc_attr__( 'Not Viewed by Customer', 'invoicing' ).'"></i>';
+                    }
 
-					// Display the overview status.
-					if ( wpinv_get_option( 'overdue_active' ) ) {
-						$due_date = $invoice->get_due_date();
-						$fomatted = getpaid_format_date( $due_date );
+                    // Display the overview status.
+                    if ( wpinv_get_option( 'overdue_active' ) ) {
+                        $due_date = $invoice->get_due_date();
+                        $fomatted = getpaid_format_date( $due_date );
 
-						if ( ! empty( $fomatted ) ) {
-							$date = wp_sprintf( __( 'Due %s', 'invoicing' ), $fomatted );
-							echo "<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>";
-						}
-					}
+                        if ( ! empty( $fomatted ) ) {
+                            $date = wp_sprintf( __( 'Due %s', 'invoicing' ), $fomatted );
+                            echo "<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>";
+                        }
+                    }
 
-				}
+                }
 
-				break;
+                break;
 
-			case 'recurring':
+            case 'recurring':
 
-				if ( $invoice->is_recurring() ) {
-					echo '<i class="fa fa-check" style="color:#43850a;"></i>';
-				} else {
-					echo '<i class="fa fa-times" style="color:#616161;"></i>';
-				}
-				break;
+                if ( $invoice->is_recurring() ) {
+                    echo '<i class="fa fa-check" style="color:#43850a;"></i>';
+                } else {
+                    echo '<i class="fa fa-times" style="color:#616161;"></i>';
+                }
+                break;
 
-			case 'number' :
+            case 'number' :
 
-				$edit_link       = esc_url( get_edit_post_link( $invoice->get_id() ) );
-				$invoice_number  = esc_html( $invoice->get_number() );
-				$invoice_details = esc_attr__( 'View Invoice Details', 'invoicing' );
+                $edit_link       = esc_url( get_edit_post_link( $invoice->get_id() ) );
+                $invoice_number  = esc_html( $invoice->get_number() );
+                $invoice_details = esc_attr__( 'View Invoice Details', 'invoicing' );
 
-				echo "<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>";
+                echo "<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>";
 
-				break;
+                break;
 
-			case 'customer' :
+            case 'customer' :
 	
-				$customer_name = $invoice->get_user_full_name();
+                $customer_name = $invoice->get_user_full_name();
 	
-				if ( empty( $customer_name ) ) {
-					$customer_name = $invoice->get_email();
-				}
+                if ( empty( $customer_name ) ) {
+                    $customer_name = $invoice->get_email();
+                }
 	
-				if ( ! empty( $customer_name ) ) {
-					$customer_details = esc_attr__( 'View Customer Details', 'invoicing' );
-					$view_link        = esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), admin_url( 'user-edit.php' ) ) );
-					echo "<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>";
-				} else {
-					echo '<div>&mdash;</div>';
-				}
+                if ( ! empty( $customer_name ) ) {
+                    $customer_details = esc_attr__( 'View Customer Details', 'invoicing' );
+                    $view_link        = esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), admin_url( 'user-edit.php' ) ) );
+                    echo "<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>";
+                } else {
+                    echo '<div>&mdash;</div>';
+                }
 
-				break;
+                break;
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Displays invoice bulk actions.
-	 */
-	public static function invoice_bulk_actions( $actions ) {
-		$actions['resend-invoice'] = __( 'Send to Customer', 'invoicing' );
-		return $actions;
-	}
+    /**
+     * Displays invoice bulk actions.
+     */
+    public static function invoice_bulk_actions( $actions ) {
+        $actions['resend-invoice'] = __( 'Send to Customer', 'invoicing' );
+        return $actions;
+    }
 
-	/**
-	 * Processes invoice bulk actions.
-	 */
-	public static function handle_invoice_bulk_actions( $redirect_url, $action, $post_ids ) {
+    /**
+     * Processes invoice bulk actions.
+     */
+    public static function handle_invoice_bulk_actions( $redirect_url, $action, $post_ids ) {
 
-		if ( $action == 'resend-invoice' ) {
-			foreach ( $post_ids as $post_id ) {
-				getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $post_id ), true );
-			}
-		}
+        if ( $action == 'resend-invoice' ) {
+            foreach ( $post_ids as $post_id ) {
+                getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $post_id ), true );
+            }
+        }
 
-		return $redirect_url;
+        return $redirect_url;
 
-	}
+    }
 
-	/**
-	 * Returns an array of payment forms table columns.
-	 */
-	public static function payment_form_columns( $columns ) {
+    /**
+     * Returns an array of payment forms table columns.
+     */
+    public static function payment_form_columns( $columns ) {
 
-		$columns = array(
-			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'shortcode'         => __( 'Shortcode', 'invoicing' ),
-			'earnings'          => __( 'Revenue', 'invoicing' ),
-			'refunds'           => __( 'Refunded', 'invoicing' ),
-			'items'             => __( 'Items', 'invoicing' ),
-			'date'              => __( 'Date', 'invoicing' ),
-		);
+        $columns = array(
+            'cb'                => $columns['cb'],
+            'title'             => __( 'Name', 'invoicing' ),
+            'shortcode'         => __( 'Shortcode', 'invoicing' ),
+            'earnings'          => __( 'Revenue', 'invoicing' ),
+            'refunds'           => __( 'Refunded', 'invoicing' ),
+            'items'             => __( 'Items', 'invoicing' ),
+            'date'              => __( 'Date', 'invoicing' ),
+        );
 
-		return apply_filters( 'wpi_payment_form_table_columns', $columns );
+        return apply_filters( 'wpi_payment_form_table_columns', $columns );
 
-	}
+    }
 
-	/**
-	 * Displays payment form table columns.
-	 */
-	public static function display_payment_form_columns( $column_name, $post_id ) {
+    /**
+     * Displays payment form table columns.
+     */
+    public static function display_payment_form_columns( $column_name, $post_id ) {
 
-		// Retrieve the payment form.
-		$form = new GetPaid_Payment_Form( $post_id );
+        // Retrieve the payment form.
+        $form = new GetPaid_Payment_Form( $post_id );
 
-		switch ( $column_name ) {
+        switch ( $column_name ) {
 
-			case 'earnings' :
-				echo wpinv_price( $form->get_earned() );
-				break;
+            case 'earnings' :
+                echo wpinv_price( $form->get_earned() );
+                break;
 
-			case 'refunds' :
-				echo wpinv_price( $form->get_refunded() );
-				break;
+            case 'refunds' :
+                echo wpinv_price( $form->get_refunded() );
+                break;
 
-			case 'refunds' :
-				echo wpinv_price( $form->get_refunded() );
-				break;
+            case 'refunds' :
+                echo wpinv_price( $form->get_refunded() );
+                break;
 
-			case 'shortcode' :
+            case 'shortcode' :
 
-				if ( $form->is_default() ) {
-					echo '&mdash;';
-				} else {
-					echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr( $form->get_id() ) . ']" style="width: 100%;" readonly/>';
-				}
+                if ( $form->is_default() ) {
+                    echo '&mdash;';
+                } else {
+                    echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr( $form->get_id() ) . ']" style="width: 100%;" readonly/>';
+                }
 
-				break;
+                break;
 
-			case 'items' :
+            case 'items' :
 
-				$items = $form->get_items();
+                $items = $form->get_items();
 
-				if ( $form->is_default() || empty( $items ) ) {
-					echo '&mdash;';
-					return;
-				}
+                if ( $form->is_default() || empty( $items ) ) {
+                    echo '&mdash;';
+                    return;
+                }
 
-				$_items = array();
+                $_items = array();
 
-				foreach ( $items as $item ) {
-					$url = $item->get_edit_url();
+                foreach ( $items as $item ) {
+                    $url = $item->get_edit_url();
 
-					if ( empty( $url ) ) {
-						$_items[] = esc_html( $item->get_name() );
-					} else {
-						$_items[] = sprintf(
-							'<a href="%s">%s</a>',
-							esc_url( $url ),
-							esc_html( $item->get_name() )
-						);
-					}
+                    if ( empty( $url ) ) {
+                        $_items[] = esc_html( $item->get_name() );
+                    } else {
+                        $_items[] = sprintf(
+                            '<a href="%s">%s</a>',
+                            esc_url( $url ),
+                            esc_html( $item->get_name() )
+                        );
+                    }
 
-				}
+                }
 
-				echo implode( '<br>', $_items );
+                echo implode( '<br>', $_items );
 
-				break;
+                break;
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Filters post states.
-	 */
-	public static function filter_payment_form_state( $post_states, $post ) {
+    /**
+     * Filters post states.
+     */
+    public static function filter_payment_form_state( $post_states, $post ) {
 
-		if ( 'wpi_payment_form' == $post->post_type && wpinv_get_default_payment_form() == $post->ID ) {
-			$post_states[ 'default_form' ] = __( 'Default Payment Form', 'invoicing' );
-		}
+        if ( 'wpi_payment_form' == $post->post_type && wpinv_get_default_payment_form() == $post->ID ) {
+            $post_states[ 'default_form' ] = __( 'Default Payment Form', 'invoicing' );
+        }
 	
-		return $post_states;
-
-	}
-
-	/**
-	 * Returns an array of coupon table columns.
-	 */
-	public static function discount_columns( $columns ) {
-
-		$columns = array(
-			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'code'              => __( 'Code', 'invoicing' ),
-			'amount'            => __( 'Amount', 'invoicing' ),
-			'usage'             => __( 'Usage / Limit', 'invoicing' ),
-			'start_date'        => __( 'Start Date', 'invoicing' ),
-			'expiry_date'       => __( 'Expiry Date', 'invoicing' ),
-		);
-
-		return apply_filters( 'wpi_discount_table_columns', $columns );
-	}
-
-	/**
-	 * Filters post states.
-	 */
-	public static function filter_discount_state( $post_states, $post ) {
-
-		if ( 'wpi_discount' == $post->post_type ) {
-
-			$discount = new WPInv_Discount( $post );
-
-			$status = $discount->is_expired() ? 'expired' : $discount->get_status();
-
-			if ( $status != 'publish' ) {
-				return array(
-					'discount_status' => wpinv_discount_status( $status ),
-				);
-			}
-
-			return array();
-
-		}
-
-		return $post_states;
-
-	}
-
-	/**
-	 * Returns an array of items table columns.
-	 */
-	public static function item_columns( $columns ) {
-
-		$columns = array(
-			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'price'             => __( 'Price', 'invoicing' ),
-			'vat_rule'          => __( 'VAT rule', 'invoicing' ),
-			'vat_class'         => __( 'VAT class', 'invoicing' ),
-			'type'              => __( 'Type', 'invoicing' ),
-			'shortcode'         => __( 'Shortcode', 'invoicing' ),
-		);
-
-		if ( ! wpinv_use_taxes() ) {
-			unset( $columns['vat_rule'] );
-			unset( $columns['vat_class'] );
-		}
-
-		return apply_filters( 'wpi_item_table_columns', $columns );
-	}
-
-	/**
-	 * Returns an array of sortable items table columns.
-	 */
-	public static function sortable_item_columns( $columns ) {
-
-		return array_merge(
-			$columns,
-			array(
-				'price'     => 'price',
-				'vat_rule'  => 'vat_rule',
-				'vat_class' => 'vat_class',
-				'type'      => 'type',
-			)
-		);
-
-	}
-
-	/**
-	 * Displays items table columns.
-	 */
-	public static function display_item_columns( $column_name, $post_id ) {
+        return $post_states;
+
+    }
+
+    /**
+     * Returns an array of coupon table columns.
+     */
+    public static function discount_columns( $columns ) {
+
+        $columns = array(
+            'cb'                => $columns['cb'],
+            'title'             => __( 'Name', 'invoicing' ),
+            'code'              => __( 'Code', 'invoicing' ),
+            'amount'            => __( 'Amount', 'invoicing' ),
+            'usage'             => __( 'Usage / Limit', 'invoicing' ),
+            'start_date'        => __( 'Start Date', 'invoicing' ),
+            'expiry_date'       => __( 'Expiry Date', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpi_discount_table_columns', $columns );
+    }
+
+    /**
+     * Filters post states.
+     */
+    public static function filter_discount_state( $post_states, $post ) {
+
+        if ( 'wpi_discount' == $post->post_type ) {
+
+            $discount = new WPInv_Discount( $post );
+
+            $status = $discount->is_expired() ? 'expired' : $discount->get_status();
+
+            if ( $status != 'publish' ) {
+                return array(
+                    'discount_status' => wpinv_discount_status( $status ),
+                );
+            }
+
+            return array();
+
+        }
+
+        return $post_states;
+
+    }
+
+    /**
+     * Returns an array of items table columns.
+     */
+    public static function item_columns( $columns ) {
+
+        $columns = array(
+            'cb'                => $columns['cb'],
+            'title'             => __( 'Name', 'invoicing' ),
+            'price'             => __( 'Price', 'invoicing' ),
+            'vat_rule'          => __( 'VAT rule', 'invoicing' ),
+            'vat_class'         => __( 'VAT class', 'invoicing' ),
+            'type'              => __( 'Type', 'invoicing' ),
+            'shortcode'         => __( 'Shortcode', 'invoicing' ),
+        );
+
+        if ( ! wpinv_use_taxes() ) {
+            unset( $columns['vat_rule'] );
+            unset( $columns['vat_class'] );
+        }
+
+        return apply_filters( 'wpi_item_table_columns', $columns );
+    }
+
+    /**
+     * Returns an array of sortable items table columns.
+     */
+    public static function sortable_item_columns( $columns ) {
+
+        return array_merge(
+            $columns,
+            array(
+                'price'     => 'price',
+                'vat_rule'  => 'vat_rule',
+                'vat_class' => 'vat_class',
+                'type'      => 'type',
+            )
+        );
+
+    }
+
+    /**
+     * Displays items table columns.
+     */
+    public static function display_item_columns( $column_name, $post_id ) {
  
-		$item = new WPInv_Item( $post_id );
+        $item = new WPInv_Item( $post_id );
 
-		switch ( $column_name ) {
+        switch ( $column_name ) {
 
-			case 'price' :
+            case 'price' :
 
-				if ( ! $item->is_recurring() ) {
-					echo $item->get_the_price();
-					break;
-				}
+                if ( ! $item->is_recurring() ) {
+                    echo $item->get_the_price();
+                    break;
+                }
 
-				$price = wp_sprintf(
-					__( '%s / %s', 'invoicing' ),
-					$item->get_the_price(),
-					getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' )
-				);
+                $price = wp_sprintf(
+                    __( '%s / %s', 'invoicing' ),
+                    $item->get_the_price(),
+                    getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' )
+                );
 
-				if ( $item->get_the_price() == $item->get_the_initial_price() ) {
-					echo $price;
-					break;
-				}
+                if ( $item->get_the_price() == $item->get_the_initial_price() ) {
+                    echo $price;
+                    break;
+                }
 
-				echo $item->get_the_initial_price();
+                echo $item->get_the_initial_price();
 
-				echo '<span class="meta">' . wp_sprintf( __( 'then %s', 'invoicing' ), $price )  .'</span>';
-				break;
+                echo '<span class="meta">' . wp_sprintf( __( 'then %s', 'invoicing' ), $price )  .'</span>';
+                break;
 
-			case 'vat_rule' :
-				echo getpaid_get_tax_rule_label( $item->get_vat_rule() );
-				break;
+            case 'vat_rule' :
+                echo getpaid_get_tax_rule_label( $item->get_vat_rule() );
+                break;
 
-			case 'vat_class' :
-				echo getpaid_get_tax_class_label( $item->get_vat_class() );
-				break;
+            case 'vat_class' :
+                echo getpaid_get_tax_class_label( $item->get_vat_class() );
+                break;
 
-			case 'shortcode' :
+            case 'shortcode' :
 
-				if ( $item->is_type( array( '', 'fee', 'custom' ) ) ) {
-					echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr( $item->get_id() ) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
-				} else {
-					echo "&mdash;";
-				}
+                if ( $item->is_type( array( '', 'fee', 'custom' ) ) ) {
+                    echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr( $item->get_id() ) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
+                } else {
+                    echo "&mdash;";
+                }
 				
-				break;
+                break;
 
-			case 'type' :
-				echo wpinv_item_type( $item->get_id() ) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>';
-				break;
+            case 'type' :
+                echo wpinv_item_type( $item->get_id() ) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>';
+                break;
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Lets users filter items using taxes.
-	 */
-	public static function add_item_filters( $post_type ) {
+    /**
+     * Lets users filter items using taxes.
+     */
+    public static function add_item_filters( $post_type ) {
 
-		// Abort if we're not dealing with items.
-		if ( $post_type != 'wpi_item' ) {
-			return;
-		}
+        // Abort if we're not dealing with items.
+        if ( $post_type != 'wpi_item' ) {
+            return;
+        }
 
-		// Filter by vat rules.
-		if ( wpinv_use_taxes() ) {
+        // Filter by vat rules.
+        if ( wpinv_use_taxes() ) {
 	
-			// Sanitize selected vat rule.
-			$vat_rule   = '';
-			$vat_rules  = getpaid_get_tax_rules();
-			if ( isset( $_GET['vat_rule'] ) ) {
-				$vat_rule   =  sanitize_text_field( $_GET['vat_rule'] );
-			}
-
-			// Filter by VAT rule.
-			echo wpinv_html_select(
-				array(
-					'options'          => array_merge(
-						array(
-							'' => __( 'All VAT rules', 'invoicing' )
-						),
-						$vat_rules
-					),
-					'name'             => 'vat_rule',
-					'id'               => 'vat_rule',
-					'selected'         => in_array( $vat_rule, array_keys( $vat_rules ) ) ? $vat_rule : '',
-					'show_option_all'  => false,
-					'show_option_none' => false,
-				)
-			);
-
-			// Filter by VAT class.
+            // Sanitize selected vat rule.
+            $vat_rule   = '';
+            $vat_rules  = getpaid_get_tax_rules();
+            if ( isset( $_GET['vat_rule'] ) ) {
+                $vat_rule   =  sanitize_text_field( $_GET['vat_rule'] );
+            }
+
+            // Filter by VAT rule.
+            echo wpinv_html_select(
+                array(
+                    'options'          => array_merge(
+                        array(
+                            '' => __( 'All VAT rules', 'invoicing' )
+                        ),
+                        $vat_rules
+                    ),
+                    'name'             => 'vat_rule',
+                    'id'               => 'vat_rule',
+                    'selected'         => in_array( $vat_rule, array_keys( $vat_rules ) ) ? $vat_rule : '',
+                    'show_option_all'  => false,
+                    'show_option_none' => false,
+                )
+            );
+
+            // Filter by VAT class.
 	
-			// Sanitize selected vat rule.
-			$vat_class   = '';
-			$vat_classes = getpaid_get_tax_classes();
-			if ( isset( $_GET['vat_class'] ) ) {
-				$vat_class   = sanitize_text_field( $_GET['vat_class'] );
-			}
-
-			echo wpinv_html_select(
-				array(
-					'options'          => array_merge(
-						array(
-							'' => __( 'All VAT classes', 'invoicing' )
-						),
-						$vat_classes
-					),
-					'name'             => 'vat_class',
-					'id'               => 'vat_class',
-					'selected'         => in_array( $vat_class, array_keys( $vat_classes ) ) ? $vat_class : '',
-					'show_option_all'  => false,
-					'show_option_none' => false,
-				)
-			);
-
-		}
-
-		// Filter by item type.
-		$type   = '';
-		if ( isset( $_GET['type'] ) ) {
-			$type   = sanitize_text_field( $_GET['type'] );
-		}
-
-		echo wpinv_html_select(
-			array(
-				'options'          => array_merge(
-					array(
-						'' => __( 'All item types', 'invoicing' )
-					),
-					wpinv_get_item_types()
-				),
-				'name'             => 'type',
-				'id'               => 'type',
-				'selected'         => in_array( $type, wpinv_item_types() ) ? $type : '',
-				'show_option_all'  => false,
-				'show_option_none' => false,
-			)
-		);
-
-	}
-
-	/**
-	 * Filters the item query.
-	 */
-	public static function filter_item_query( $query ) {
-
-		// modify the query only if it admin and main query.
-		if ( ! ( is_admin() && $query->is_main_query() ) ){ 
-			return $query;
-		}
-
-		// we want to modify the query for our items.
-		if ( empty( $query->query['post_type'] ) || 'wpi_item' != $query->query['post_type'] ){
-			return $query;
-		}
-
-		if ( empty( $query->query_vars['meta_query'] ) ) {
-			$query->query_vars['meta_query'] = array();
-		}
-
-		// Filter vat rule type
+            // Sanitize selected vat rule.
+            $vat_class   = '';
+            $vat_classes = getpaid_get_tax_classes();
+            if ( isset( $_GET['vat_class'] ) ) {
+                $vat_class   = sanitize_text_field( $_GET['vat_class'] );
+            }
+
+            echo wpinv_html_select(
+                array(
+                    'options'          => array_merge(
+                        array(
+                            '' => __( 'All VAT classes', 'invoicing' )
+                        ),
+                        $vat_classes
+                    ),
+                    'name'             => 'vat_class',
+                    'id'               => 'vat_class',
+                    'selected'         => in_array( $vat_class, array_keys( $vat_classes ) ) ? $vat_class : '',
+                    'show_option_all'  => false,
+                    'show_option_none' => false,
+                )
+            );
+
+        }
+
+        // Filter by item type.
+        $type   = '';
+        if ( isset( $_GET['type'] ) ) {
+            $type   = sanitize_text_field( $_GET['type'] );
+        }
+
+        echo wpinv_html_select(
+            array(
+                'options'          => array_merge(
+                    array(
+                        '' => __( 'All item types', 'invoicing' )
+                    ),
+                    wpinv_get_item_types()
+                ),
+                'name'             => 'type',
+                'id'               => 'type',
+                'selected'         => in_array( $type, wpinv_item_types() ) ? $type : '',
+                'show_option_all'  => false,
+                'show_option_none' => false,
+            )
+        );
+
+    }
+
+    /**
+     * Filters the item query.
+     */
+    public static function filter_item_query( $query ) {
+
+        // modify the query only if it admin and main query.
+        if ( ! ( is_admin() && $query->is_main_query() ) ){ 
+            return $query;
+        }
+
+        // we want to modify the query for our items.
+        if ( empty( $query->query['post_type'] ) || 'wpi_item' != $query->query['post_type'] ){
+            return $query;
+        }
+
+        if ( empty( $query->query_vars['meta_query'] ) ) {
+            $query->query_vars['meta_query'] = array();
+        }
+
+        // Filter vat rule type
         if ( ! empty( $_GET['vat_rule'] ) ) {
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_vat_rule',
@@ -763,97 +763,97 @@  discard block
 block discarded – undo
                 'value'   => sanitize_text_field( $_GET['type'] ),
                 'compare' => '='
             );
-		}
-
-	}
-
-	/**
-	 * Reorders items.
-	 */
-	public static function reorder_items( $vars ) {
-		global $typenow;
-
-		if ( 'wpi_item' !== $typenow || empty( $vars['orderby'] ) ) {
-			return $vars;
-		}
-
-		// By item type.
-		if ( 'type' == $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_type',
-					'orderby'  => 'meta_value'
-				)
-			);
-		}
-
-		// By vat class.
-		if ( 'vat_class' == $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_vat_class',
-					'orderby'  => 'meta_value'
-				)
-			);
-		}
-
-		// By vat rule.
-		if ( 'vat_rule' == $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_vat_rule',
-					'orderby'  => 'meta_value'
-				)
-			);
-		}
-
-		// By price.
-		if ( 'price' == $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_price',
-					'orderby'  => 'meta_value_num'
-				)
-			);
-		}
-
-		return $vars;
-
-	}
-
-	/**
-	 * Fired when deleting a post.
-	 */
-	public static function delete_post( $post_id ) {
-
-		switch ( get_post_type( $post_id ) ) {
-
-			case 'wpi_item' :
-				do_action( "getpaid_before_delete_item", new WPInv_Item( $post_id ) );
-				break;
-
-			case 'wpi_payment_form' :
-				do_action( "getpaid_before_delete_payment_form", new GetPaid_Payment_Form( $post_id ) );
-				break;
-
-			case 'wpi_discount' :
-				do_action( "getpaid_before_delete_discount", new WPInv_Discount( $post_id ) );
-				break;
-
-			case 'wpi_invoice' :
-				$invoice = new WPInv_Invoice( $post_id );
-				do_action( "getpaid_before_delete_invoice", $invoice );
-				$invoice->get_data_store()->delete_items( $invoice );
-				$invoice->get_data_store()->delete_special_fields( $invoice );
-				break;
-		}
-	}
-
-	/**
+        }
+
+    }
+
+    /**
+     * Reorders items.
+     */
+    public static function reorder_items( $vars ) {
+        global $typenow;
+
+        if ( 'wpi_item' !== $typenow || empty( $vars['orderby'] ) ) {
+            return $vars;
+        }
+
+        // By item type.
+        if ( 'type' == $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_type',
+                    'orderby'  => 'meta_value'
+                )
+            );
+        }
+
+        // By vat class.
+        if ( 'vat_class' == $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_vat_class',
+                    'orderby'  => 'meta_value'
+                )
+            );
+        }
+
+        // By vat rule.
+        if ( 'vat_rule' == $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_vat_rule',
+                    'orderby'  => 'meta_value'
+                )
+            );
+        }
+
+        // By price.
+        if ( 'price' == $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_price',
+                    'orderby'  => 'meta_value_num'
+                )
+            );
+        }
+
+        return $vars;
+
+    }
+
+    /**
+     * Fired when deleting a post.
+     */
+    public static function delete_post( $post_id ) {
+
+        switch ( get_post_type( $post_id ) ) {
+
+            case 'wpi_item' :
+                do_action( "getpaid_before_delete_item", new WPInv_Item( $post_id ) );
+                break;
+
+            case 'wpi_payment_form' :
+                do_action( "getpaid_before_delete_payment_form", new GetPaid_Payment_Form( $post_id ) );
+                break;
+
+            case 'wpi_discount' :
+                do_action( "getpaid_before_delete_discount", new WPInv_Discount( $post_id ) );
+                break;
+
+            case 'wpi_invoice' :
+                $invoice = new WPInv_Invoice( $post_id );
+                do_action( "getpaid_before_delete_invoice", $invoice );
+                $invoice->get_data_store()->delete_items( $invoice );
+                $invoice->get_data_store()->delete_special_fields( $invoice );
+                break;
+        }
+    }
+
+    /**
      * Add a post display state for special GetPaid pages in the page list table.
      *
      * @param array   $post_states An array of post display states.
@@ -867,22 +867,22 @@  discard block
 block discarded – undo
             $post_states['getpaid_success_page'] = __( 'GetPaid Receipt Page', 'invoicing' );
         }
 
-		foreach ( getpaid_get_invoice_post_types() as $post_type => $label ) {
+        foreach ( getpaid_get_invoice_post_types() as $post_type => $label ) {
 
-			if ( wpinv_get_option( "{$post_type}_history_page", 0 ) == $post->ID ) {
-				$post_states["getpaid_{$post_type}_history_page"] = sprintf(
-					__( 'GetPaid %s History Page', 'invoicing' ),
-					$label
-				);
-			}
+            if ( wpinv_get_option( "{$post_type}_history_page", 0 ) == $post->ID ) {
+                $post_states["getpaid_{$post_type}_history_page"] = sprintf(
+                    __( 'GetPaid %s History Page', 'invoicing' ),
+                    $label
+                );
+            }
 
-		}
+        }
 		
-		if ( wpinv_get_option( 'invoice_subscription_page', 0 ) == $post->ID ) {
+        if ( wpinv_get_option( 'invoice_subscription_page', 0 ) == $post->ID ) {
             $post_states['getpaid_invoice_subscription_page'] = __( 'GetPaid Subscription Page', 'invoicing' );
         }
 
-		if ( wpinv_get_option( 'checkout_page', 0 ) == $post->ID ) {
+        if ( wpinv_get_option( 'checkout_page', 0 ) == $post->ID ) {
             $post_states['getpaid_checkout_page'] = __( 'GetPaid Checkout Page', 'invoicing' );
         }
 

Please login to merge, or discard this patch.

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

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Post types Admin Class
@@ -21,74 +21,74 @@  discard block
 block discarded – undo
 		GetPaid_Metaboxes::init();
 
 		// Filter the post updated messages.
-		add_filter( 'post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages' );
+		add_filter('post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages');
 
 		// Filter post actions.
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2 );
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::filter_invoice_row_actions', 90, 2 );
+		add_filter('post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2);
+		add_filter('post_row_actions', 'GetPaid_Post_Types_Admin::filter_invoice_row_actions', 90, 2);
 
 		// Invoice table columns.
-		add_filter( 'manage_wpi_invoice_posts_columns', array( __CLASS__, 'invoice_columns' ), 100 );
-		add_action( 'manage_wpi_invoice_posts_custom_column', array( __CLASS__, 'display_invoice_columns' ), 10, 2 );
-		add_filter( 'bulk_actions-edit-wpi_invoice', array( __CLASS__, 'invoice_bulk_actions' ) );
-		add_filter( 'handle_bulk_actions-edit-wpi_invoice', array( __CLASS__, 'handle_invoice_bulk_actions' ), 10, 3 );
+		add_filter('manage_wpi_invoice_posts_columns', array(__CLASS__, 'invoice_columns'), 100);
+		add_action('manage_wpi_invoice_posts_custom_column', array(__CLASS__, 'display_invoice_columns'), 10, 2);
+		add_filter('bulk_actions-edit-wpi_invoice', array(__CLASS__, 'invoice_bulk_actions'));
+		add_filter('handle_bulk_actions-edit-wpi_invoice', array(__CLASS__, 'handle_invoice_bulk_actions'), 10, 3);
 
 		// Items table columns.
-		add_filter( 'manage_wpi_item_posts_columns', array( __CLASS__, 'item_columns' ), 100 );
-		add_filter( 'manage_edit-wpi_item_sortable_columns', array( __CLASS__, 'sortable_item_columns' ), 20 );
-		add_action( 'manage_wpi_item_posts_custom_column', array( __CLASS__, 'display_item_columns' ), 10, 2 );
-		add_action( 'restrict_manage_posts', array( __CLASS__, 'add_item_filters' ), 100 );
-		add_action( 'parse_query', array( __CLASS__, 'filter_item_query' ), 100 );
-		add_action( 'request', array( __CLASS__, 'reorder_items' ), 100 );
+		add_filter('manage_wpi_item_posts_columns', array(__CLASS__, 'item_columns'), 100);
+		add_filter('manage_edit-wpi_item_sortable_columns', array(__CLASS__, 'sortable_item_columns'), 20);
+		add_action('manage_wpi_item_posts_custom_column', array(__CLASS__, 'display_item_columns'), 10, 2);
+		add_action('restrict_manage_posts', array(__CLASS__, 'add_item_filters'), 100);
+		add_action('parse_query', array(__CLASS__, 'filter_item_query'), 100);
+		add_action('request', array(__CLASS__, 'reorder_items'), 100);
 
 		// Payment forms columns.
-		add_filter( 'manage_wpi_payment_form_posts_columns', array( __CLASS__, 'payment_form_columns' ), 100 );
-		add_action( 'manage_wpi_payment_form_posts_custom_column', array( __CLASS__, 'display_payment_form_columns' ), 10, 2 );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_payment_form_state' ), 10, 2 );
+		add_filter('manage_wpi_payment_form_posts_columns', array(__CLASS__, 'payment_form_columns'), 100);
+		add_action('manage_wpi_payment_form_posts_custom_column', array(__CLASS__, 'display_payment_form_columns'), 10, 2);
+		add_filter('display_post_states', array(__CLASS__, 'filter_payment_form_state'), 10, 2);
 
 		// Discount table columns.
-		add_filter( 'manage_wpi_discount_posts_columns', array( __CLASS__, 'discount_columns' ), 100 );
-		add_filter( 'bulk_actions-edit-wpi_discount', '__return_empty_array', 100 );
+		add_filter('manage_wpi_discount_posts_columns', array(__CLASS__, 'discount_columns'), 100);
+		add_filter('bulk_actions-edit-wpi_discount', '__return_empty_array', 100);
 
 		// Deleting posts.
-		add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_discount_state' ), 10, 2 );
+		add_action('delete_post', array(__CLASS__, 'delete_post'));
+		add_filter('display_post_states', array(__CLASS__, 'filter_discount_state'), 10, 2);
 
-		add_filter( 'display_post_states', array( __CLASS__, 'add_display_post_states' ), 10, 2 );
+		add_filter('display_post_states', array(__CLASS__, 'add_display_post_states'), 10, 2);
 	}
 
 	/**
 	 * Post updated messages.
 	 */
-	public static function post_updated_messages( $messages ) {
+	public static function post_updated_messages($messages) {
 		global $post;
 
 		$messages['wpi_discount'] = array(
 			0   => '',
-			1   => __( 'Discount updated.', 'invoicing' ),
-			2   => __( 'Custom field updated.', 'invoicing' ),
-			3   => __( 'Custom field deleted.', 'invoicing' ),
-			4   => __( 'Discount updated.', 'invoicing' ),
-			5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6   => __( 'Discount updated.', 'invoicing' ),
-			7   => __( 'Discount saved.', 'invoicing' ),
-			8   => __( 'Discount submitted.', 'invoicing' ),
-			9   => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10  => __( 'Discount draft updated.', 'invoicing' ),
+			1   => __('Discount updated.', 'invoicing'),
+			2   => __('Custom field updated.', 'invoicing'),
+			3   => __('Custom field deleted.', 'invoicing'),
+			4   => __('Discount updated.', 'invoicing'),
+			5   => isset($_GET['revision']) ? wp_sprintf(__('Discount restored to revision from %s', 'invoicing'), wp_post_revision_title((int) $_GET['revision'], false)) : false,
+			6   => __('Discount updated.', 'invoicing'),
+			7   => __('Discount saved.', 'invoicing'),
+			8   => __('Discount submitted.', 'invoicing'),
+			9   => wp_sprintf(__('Discount scheduled for: <strong>%1$s</strong>.', 'invoicing'), date_i18n(__('M j, Y @ G:i', 'invoicing'), strtotime($post->post_date))),
+			10  => __('Discount draft updated.', 'invoicing'),
 		);
 
 		$messages['wpi_payment_form'] = array(
 			0   => '',
-			1   => __( 'Payment Form updated.', 'invoicing' ),
-			2   => __( 'Custom field updated.', 'invoicing' ),
-			3   => __( 'Custom field deleted.', 'invoicing' ),
-			4   => __( 'Payment Form updated.', 'invoicing' ),
-			5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6   => __( 'Payment Form updated.', 'invoicing' ),
-			7   => __( 'Payment Form saved.', 'invoicing' ),
-			8   => __( 'Payment Form submitted.', 'invoicing' ),
-			9   => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10  => __( 'Payment Form draft updated.', 'invoicing' ),
+			1   => __('Payment Form updated.', 'invoicing'),
+			2   => __('Custom field updated.', 'invoicing'),
+			3   => __('Custom field deleted.', 'invoicing'),
+			4   => __('Payment Form updated.', 'invoicing'),
+			5   => isset($_GET['revision']) ? wp_sprintf(__('Payment Form restored to revision from %s', 'invoicing'), wp_post_revision_title((int) $_GET['revision'], false)) : false,
+			6   => __('Payment Form updated.', 'invoicing'),
+			7   => __('Payment Form saved.', 'invoicing'),
+			8   => __('Payment Form submitted.', 'invoicing'),
+			9   => wp_sprintf(__('Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing'), date_i18n(__('M j, Y @ G:i', 'invoicing'), strtotime($post->post_date))),
+			10  => __('Payment Form draft updated.', 'invoicing'),
 		);
 
 		return $messages;
@@ -98,19 +98,19 @@  discard block
 block discarded – undo
 	/**
 	 * Post row actions.
 	 */
-	public static function post_row_actions( $actions, $post ) {
+	public static function post_row_actions($actions, $post) {
 
-		$post = get_post( $post );
+		$post = get_post($post);
 
 		// We do not want to edit the default payment form.
-		if ( 'wpi_payment_form' == $post->post_type ) {
+		if ('wpi_payment_form' == $post->post_type) {
 
-			if ( $post->ID == wpinv_get_default_payment_form() ) {
-				unset( $actions['trash'] );
-				unset( $actions['inline hide-if-no-js'] );
+			if ($post->ID == wpinv_get_default_payment_form()) {
+				unset($actions['trash']);
+				unset($actions['inline hide-if-no-js']);
 			}
 
-			$actions['duplicate'] =  sprintf(
+			$actions['duplicate'] = sprintf(
 				'<a href="%1$s">%2$s</a>',
 				esc_url(
 					wp_nonce_url(
@@ -124,20 +124,20 @@  discard block
 block discarded – undo
 						'getpaid-nonce'
 					)
 				),
-				esc_html( __( 'Duplicate', 'invoicing' ) )
+				esc_html(__('Duplicate', 'invoicing'))
 			);
 
 		}
 
 		// Link to item payment form.
-		if ( 'wpi_item' == $post->post_type ) {
+		if ('wpi_item' == $post->post_type) {
 
-			if ( in_array( get_post_meta( $post->ID, '_wpinv_type', true ), array( '', 'fee', 'custom' ) ) ) {
+			if (in_array(get_post_meta($post->ID, '_wpinv_type', true), array('', 'fee', 'custom'))) {
 
-				$actions['buy'] =  sprintf(
+				$actions['buy'] = sprintf(
 					'<a href="%1$s">%2$s</a>',
-					esc_url( getpaid_embed_url( false, $post->ID . '|0' ) ),
-					esc_html( __( 'Buy', 'invoicing' ) )
+					esc_url(getpaid_embed_url(false, $post->ID . '|0')),
+					esc_html(__('Buy', 'invoicing'))
 				);
 
 			}
@@ -155,31 +155,31 @@  discard block
 block discarded – undo
 	 * @param WP_Post $post
      * @return array $actions actions without edit option
      */
-    public static function filter_invoice_row_actions( $actions, $post ) {
+    public static function filter_invoice_row_actions($actions, $post) {
 
-        if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
+        if (getpaid_is_invoice_post_type($post->post_type)) {
 
 			$actions = array();
-			$invoice = new WPInv_Invoice( $post );
+			$invoice = new WPInv_Invoice($post);
 
-			$actions['edit'] =  sprintf(
+			$actions['edit'] = sprintf(
 				'<a href="%1$s">%2$s</a>',
-				esc_url( get_edit_post_link( $invoice->get_id() ) ),
-				esc_html( __( 'Edit', 'invoicing' ) )
+				esc_url(get_edit_post_link($invoice->get_id())),
+				esc_html(__('Edit', 'invoicing'))
 			);
 
-			if ( ! $invoice->is_draft() ) {
+			if (!$invoice->is_draft()) {
 
-				$actions['view'] =  sprintf(
+				$actions['view'] = sprintf(
 					'<a href="%1$s">%2$s</a>',
-					esc_url( $invoice->get_view_url() ),
+					esc_url($invoice->get_view_url()),
 					sprintf(
-						esc_html( __( 'View %s', 'invoicing' ) ),
-						getpaid_get_post_type_label( $invoice->get_post_type(), false )
+						esc_html(__('View %s', 'invoicing')),
+						getpaid_get_post_type_label($invoice->get_post_type(), false)
 					)
 				);
 
-				$actions['send'] =  sprintf(
+				$actions['send'] = sprintf(
 					'<a href="%1$s">%2$s</a>',
 					esc_url(
 						wp_nonce_url(
@@ -193,12 +193,12 @@  discard block
 block discarded – undo
 							'getpaid-nonce'
 						)
 					),
-					esc_html( __( 'Send to Customer', 'invoicing' ) )
+					esc_html(__('Send to Customer', 'invoicing'))
 				);
 
 			}
 
-			$actions['duplicate'] =  sprintf(
+			$actions['duplicate'] = sprintf(
 				'<a href="%1$s">%2$s</a>',
 				esc_url(
 					wp_nonce_url(
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
 						'getpaid-nonce'
 					)
 				),
-				esc_html( __( 'Duplicate', 'invoicing' ) )
+				esc_html(__('Duplicate', 'invoicing'))
 			);
 
         }
@@ -223,42 +223,42 @@  discard block
 block discarded – undo
 	/**
 	 * Returns an array of invoice table columns.
 	 */
-	public static function invoice_columns( $columns ) {
+	public static function invoice_columns($columns) {
 
 		$columns = array(
 			'cb'                => $columns['cb'],
-			'number'            => __( 'Invoice', 'invoicing' ),
-			'customer'          => __( 'Customer', 'invoicing' ),
-			'invoice_date'      => __( 'Created', 'invoicing' ),
-			'payment_date'      => __( 'Completed', 'invoicing' ),
-			'amount'            => __( 'Amount', 'invoicing' ),
-			'recurring'         => __( 'Recurring', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
+			'number'            => __('Invoice', 'invoicing'),
+			'customer'          => __('Customer', 'invoicing'),
+			'invoice_date'      => __('Created', 'invoicing'),
+			'payment_date'      => __('Completed', 'invoicing'),
+			'amount'            => __('Amount', 'invoicing'),
+			'recurring'         => __('Recurring', 'invoicing'),
+			'status'            => __('Status', 'invoicing'),
 		);
 
-		return apply_filters( 'wpi_invoice_table_columns', $columns );
+		return apply_filters('wpi_invoice_table_columns', $columns);
 	}
 
 	/**
 	 * Displays invoice table columns.
 	 */
-	public static function display_invoice_columns( $column_name, $post_id ) {
+	public static function display_invoice_columns($column_name, $post_id) {
 
-		$invoice = new WPInv_Invoice( $post_id );
+		$invoice = new WPInv_Invoice($post_id);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'invoice_date' :
-				$date_time = esc_attr( $invoice->get_created_date() );
-				$date      = esc_html( getpaid_format_date_value( $date_time, "&mdash;", true ) );
+				$date_time = esc_attr($invoice->get_created_date());
+				$date      = esc_html(getpaid_format_date_value($date_time, "&mdash;", true));
 				echo "<span title='$date_time'>$date</span>";
 				break;
 
 			case 'payment_date' :
 
-				if ( $invoice->is_paid() ) {
-					$date_time = esc_attr( $invoice->get_completed_date() );
-					$date      = esc_html( getpaid_format_date_value( $date_time, "&mdash;", true ) );
+				if ($invoice->is_paid()) {
+					$date_time = esc_attr($invoice->get_completed_date());
+					$date      = esc_html(getpaid_format_date_value($date_time, "&mdash;", true));
 					echo "<span title='$date_time'>$date</span>";
 				} else {
 					echo "&mdash;";
@@ -269,17 +269,17 @@  discard block
 block discarded – undo
 			case 'amount' :
 
 				$amount = $invoice->get_total();
-				$formated_amount = wp_kses_post( wpinv_price( $amount, $invoice->get_currency() ) );
+				$formated_amount = wp_kses_post(wpinv_price($amount, $invoice->get_currency()));
 
-				if ( $invoice->is_refunded() ) {
-					$refunded_amount = wp_kses_post( wpinv_price( 0, $invoice->get_currency() ) );
+				if ($invoice->is_refunded()) {
+					$refunded_amount = wp_kses_post(wpinv_price(0, $invoice->get_currency()));
 					echo "<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>";
 				} else {
 
 					$discount = $invoice->get_total_discount();
 
-					if ( ! empty( $discount ) ) {
-						$new_amount = wp_kses_post( wpinv_price( $amount + $discount, $invoice->get_currency() ) );
+					if (!empty($discount)) {
+						$new_amount = wp_kses_post(wpinv_price($amount + $discount, $invoice->get_currency()));
 						echo "<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>";
 					} else {
 						echo $formated_amount;
@@ -290,13 +290,13 @@  discard block
 block discarded – undo
 				break;
 
 			case 'status' :
-				$status       = esc_html( $invoice->get_status() );
-				$status_label = esc_html( $invoice->get_status_nicename() );
+				$status       = esc_html($invoice->get_status());
+				$status_label = esc_html($invoice->get_status_nicename());
 
 				// If it is paid, show the gateway title.
-				if ( $invoice->is_paid() ) {
-					$gateway = esc_html( $invoice->get_gateway_title() );
-					$gateway = wp_sprintf( esc_attr__( 'Paid via %s', 'invoicing' ), esc_html( $gateway ) );
+				if ($invoice->is_paid()) {
+					$gateway = esc_html($invoice->get_gateway_title());
+					$gateway = wp_sprintf(esc_attr__('Paid via %s', 'invoicing'), esc_html($gateway));
 
 					echo "<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>";
 				} else {
@@ -304,22 +304,22 @@  discard block
 block discarded – undo
 				}
 
 				// If it is not paid, display the overdue and view status.
-				if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+				if (!$invoice->is_paid() && !$invoice->is_refunded()) {
 
 					// Invoice view status.
-					if ( wpinv_is_invoice_viewed( $invoice->get_id() ) ) {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="'. esc_attr__( 'Viewed by Customer', 'invoicing' ).'"></i>';
+					if (wpinv_is_invoice_viewed($invoice->get_id())) {
+						echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="' . esc_attr__('Viewed by Customer', 'invoicing') . '"></i>';
 					} else {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="'. esc_attr__( 'Not Viewed by Customer', 'invoicing' ).'"></i>';
+						echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="' . esc_attr__('Not Viewed by Customer', 'invoicing') . '"></i>';
 					}
 
 					// Display the overview status.
-					if ( wpinv_get_option( 'overdue_active' ) ) {
+					if (wpinv_get_option('overdue_active')) {
 						$due_date = $invoice->get_due_date();
-						$fomatted = getpaid_format_date( $due_date );
+						$fomatted = getpaid_format_date($due_date);
 
-						if ( ! empty( $fomatted ) ) {
-							$date = wp_sprintf( __( 'Due %s', 'invoicing' ), $fomatted );
+						if (!empty($fomatted)) {
+							$date = wp_sprintf(__('Due %s', 'invoicing'), $fomatted);
 							echo "<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>";
 						}
 					}
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
 
 			case 'recurring':
 
-				if ( $invoice->is_recurring() ) {
+				if ($invoice->is_recurring()) {
 					echo '<i class="fa fa-check" style="color:#43850a;"></i>';
 				} else {
 					echo '<i class="fa fa-times" style="color:#616161;"></i>';
@@ -339,9 +339,9 @@  discard block
 block discarded – undo
 
 			case 'number' :
 
-				$edit_link       = esc_url( get_edit_post_link( $invoice->get_id() ) );
-				$invoice_number  = esc_html( $invoice->get_number() );
-				$invoice_details = esc_attr__( 'View Invoice Details', 'invoicing' );
+				$edit_link       = esc_url(get_edit_post_link($invoice->get_id()));
+				$invoice_number  = esc_html($invoice->get_number());
+				$invoice_details = esc_attr__('View Invoice Details', 'invoicing');
 
 				echo "<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>";
 
@@ -351,13 +351,13 @@  discard block
 block discarded – undo
 	
 				$customer_name = $invoice->get_user_full_name();
 	
-				if ( empty( $customer_name ) ) {
+				if (empty($customer_name)) {
 					$customer_name = $invoice->get_email();
 				}
 	
-				if ( ! empty( $customer_name ) ) {
-					$customer_details = esc_attr__( 'View Customer Details', 'invoicing' );
-					$view_link        = esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), admin_url( 'user-edit.php' ) ) );
+				if (!empty($customer_name)) {
+					$customer_details = esc_attr__('View Customer Details', 'invoicing');
+					$view_link        = esc_url(add_query_arg('user_id', $invoice->get_user_id(), admin_url('user-edit.php')));
 					echo "<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>";
 				} else {
 					echo '<div>&mdash;</div>';
@@ -372,19 +372,19 @@  discard block
 block discarded – undo
 	/**
 	 * Displays invoice bulk actions.
 	 */
-	public static function invoice_bulk_actions( $actions ) {
-		$actions['resend-invoice'] = __( 'Send to Customer', 'invoicing' );
+	public static function invoice_bulk_actions($actions) {
+		$actions['resend-invoice'] = __('Send to Customer', 'invoicing');
 		return $actions;
 	}
 
 	/**
 	 * Processes invoice bulk actions.
 	 */
-	public static function handle_invoice_bulk_actions( $redirect_url, $action, $post_ids ) {
+	public static function handle_invoice_bulk_actions($redirect_url, $action, $post_ids) {
 
-		if ( $action == 'resend-invoice' ) {
-			foreach ( $post_ids as $post_id ) {
-				getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $post_id ), true );
+		if ($action == 'resend-invoice') {
+			foreach ($post_ids as $post_id) {
+				getpaid()->get('invoice_emails')->user_invoice(new WPInv_Invoice($post_id), true);
 			}
 		}
 
@@ -395,50 +395,50 @@  discard block
 block discarded – undo
 	/**
 	 * Returns an array of payment forms table columns.
 	 */
-	public static function payment_form_columns( $columns ) {
+	public static function payment_form_columns($columns) {
 
 		$columns = array(
 			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'shortcode'         => __( 'Shortcode', 'invoicing' ),
-			'earnings'          => __( 'Revenue', 'invoicing' ),
-			'refunds'           => __( 'Refunded', 'invoicing' ),
-			'items'             => __( 'Items', 'invoicing' ),
-			'date'              => __( 'Date', 'invoicing' ),
+			'title'             => __('Name', 'invoicing'),
+			'shortcode'         => __('Shortcode', 'invoicing'),
+			'earnings'          => __('Revenue', 'invoicing'),
+			'refunds'           => __('Refunded', 'invoicing'),
+			'items'             => __('Items', 'invoicing'),
+			'date'              => __('Date', 'invoicing'),
 		);
 
-		return apply_filters( 'wpi_payment_form_table_columns', $columns );
+		return apply_filters('wpi_payment_form_table_columns', $columns);
 
 	}
 
 	/**
 	 * Displays payment form table columns.
 	 */
-	public static function display_payment_form_columns( $column_name, $post_id ) {
+	public static function display_payment_form_columns($column_name, $post_id) {
 
 		// Retrieve the payment form.
-		$form = new GetPaid_Payment_Form( $post_id );
+		$form = new GetPaid_Payment_Form($post_id);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'earnings' :
-				echo wpinv_price( $form->get_earned() );
+				echo wpinv_price($form->get_earned());
 				break;
 
 			case 'refunds' :
-				echo wpinv_price( $form->get_refunded() );
+				echo wpinv_price($form->get_refunded());
 				break;
 
 			case 'refunds' :
-				echo wpinv_price( $form->get_refunded() );
+				echo wpinv_price($form->get_refunded());
 				break;
 
 			case 'shortcode' :
 
-				if ( $form->is_default() ) {
+				if ($form->is_default()) {
 					echo '&mdash;';
 				} else {
-					echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr( $form->get_id() ) . ']" style="width: 100%;" readonly/>';
+					echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr($form->get_id()) . ']" style="width: 100%;" readonly/>';
 				}
 
 				break;
@@ -447,29 +447,29 @@  discard block
 block discarded – undo
 
 				$items = $form->get_items();
 
-				if ( $form->is_default() || empty( $items ) ) {
+				if ($form->is_default() || empty($items)) {
 					echo '&mdash;';
 					return;
 				}
 
 				$_items = array();
 
-				foreach ( $items as $item ) {
+				foreach ($items as $item) {
 					$url = $item->get_edit_url();
 
-					if ( empty( $url ) ) {
-						$_items[] = esc_html( $item->get_name() );
+					if (empty($url)) {
+						$_items[] = esc_html($item->get_name());
 					} else {
 						$_items[] = sprintf(
 							'<a href="%s">%s</a>',
-							esc_url( $url ),
-							esc_html( $item->get_name() )
+							esc_url($url),
+							esc_html($item->get_name())
 						);
 					}
 
 				}
 
-				echo implode( '<br>', $_items );
+				echo implode('<br>', $_items);
 
 				break;
 
@@ -480,10 +480,10 @@  discard block
 block discarded – undo
 	/**
 	 * Filters post states.
 	 */
-	public static function filter_payment_form_state( $post_states, $post ) {
+	public static function filter_payment_form_state($post_states, $post) {
 
-		if ( 'wpi_payment_form' == $post->post_type && wpinv_get_default_payment_form() == $post->ID ) {
-			$post_states[ 'default_form' ] = __( 'Default Payment Form', 'invoicing' );
+		if ('wpi_payment_form' == $post->post_type && wpinv_get_default_payment_form() == $post->ID) {
+			$post_states['default_form'] = __('Default Payment Form', 'invoicing');
 		}
 	
 		return $post_states;
@@ -493,35 +493,35 @@  discard block
 block discarded – undo
 	/**
 	 * Returns an array of coupon table columns.
 	 */
-	public static function discount_columns( $columns ) {
+	public static function discount_columns($columns) {
 
 		$columns = array(
 			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'code'              => __( 'Code', 'invoicing' ),
-			'amount'            => __( 'Amount', 'invoicing' ),
-			'usage'             => __( 'Usage / Limit', 'invoicing' ),
-			'start_date'        => __( 'Start Date', 'invoicing' ),
-			'expiry_date'       => __( 'Expiry Date', 'invoicing' ),
+			'title'             => __('Name', 'invoicing'),
+			'code'              => __('Code', 'invoicing'),
+			'amount'            => __('Amount', 'invoicing'),
+			'usage'             => __('Usage / Limit', 'invoicing'),
+			'start_date'        => __('Start Date', 'invoicing'),
+			'expiry_date'       => __('Expiry Date', 'invoicing'),
 		);
 
-		return apply_filters( 'wpi_discount_table_columns', $columns );
+		return apply_filters('wpi_discount_table_columns', $columns);
 	}
 
 	/**
 	 * Filters post states.
 	 */
-	public static function filter_discount_state( $post_states, $post ) {
+	public static function filter_discount_state($post_states, $post) {
 
-		if ( 'wpi_discount' == $post->post_type ) {
+		if ('wpi_discount' == $post->post_type) {
 
-			$discount = new WPInv_Discount( $post );
+			$discount = new WPInv_Discount($post);
 
 			$status = $discount->is_expired() ? 'expired' : $discount->get_status();
 
-			if ( $status != 'publish' ) {
+			if ($status != 'publish') {
 				return array(
-					'discount_status' => wpinv_discount_status( $status ),
+					'discount_status' => wpinv_discount_status($status),
 				);
 			}
 
@@ -536,30 +536,30 @@  discard block
 block discarded – undo
 	/**
 	 * Returns an array of items table columns.
 	 */
-	public static function item_columns( $columns ) {
+	public static function item_columns($columns) {
 
 		$columns = array(
 			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'price'             => __( 'Price', 'invoicing' ),
-			'vat_rule'          => __( 'VAT rule', 'invoicing' ),
-			'vat_class'         => __( 'VAT class', 'invoicing' ),
-			'type'              => __( 'Type', 'invoicing' ),
-			'shortcode'         => __( 'Shortcode', 'invoicing' ),
+			'title'             => __('Name', 'invoicing'),
+			'price'             => __('Price', 'invoicing'),
+			'vat_rule'          => __('VAT rule', 'invoicing'),
+			'vat_class'         => __('VAT class', 'invoicing'),
+			'type'              => __('Type', 'invoicing'),
+			'shortcode'         => __('Shortcode', 'invoicing'),
 		);
 
-		if ( ! wpinv_use_taxes() ) {
-			unset( $columns['vat_rule'] );
-			unset( $columns['vat_class'] );
+		if (!wpinv_use_taxes()) {
+			unset($columns['vat_rule']);
+			unset($columns['vat_class']);
 		}
 
-		return apply_filters( 'wpi_item_table_columns', $columns );
+		return apply_filters('wpi_item_table_columns', $columns);
 	}
 
 	/**
 	 * Returns an array of sortable items table columns.
 	 */
-	public static function sortable_item_columns( $columns ) {
+	public static function sortable_item_columns($columns) {
 
 		return array_merge(
 			$columns,
@@ -576,47 +576,47 @@  discard block
 block discarded – undo
 	/**
 	 * Displays items table columns.
 	 */
-	public static function display_item_columns( $column_name, $post_id ) {
+	public static function display_item_columns($column_name, $post_id) {
  
-		$item = new WPInv_Item( $post_id );
+		$item = new WPInv_Item($post_id);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'price' :
 
-				if ( ! $item->is_recurring() ) {
+				if (!$item->is_recurring()) {
 					echo $item->get_the_price();
 					break;
 				}
 
 				$price = wp_sprintf(
-					__( '%s / %s', 'invoicing' ),
+					__('%s / %s', 'invoicing'),
 					$item->get_the_price(),
-					getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' )
+					getpaid_get_subscription_period_label($item->get_recurring_period(), $item->get_recurring_interval(), '')
 				);
 
-				if ( $item->get_the_price() == $item->get_the_initial_price() ) {
+				if ($item->get_the_price() == $item->get_the_initial_price()) {
 					echo $price;
 					break;
 				}
 
 				echo $item->get_the_initial_price();
 
-				echo '<span class="meta">' . wp_sprintf( __( 'then %s', 'invoicing' ), $price )  .'</span>';
+				echo '<span class="meta">' . wp_sprintf(__('then %s', 'invoicing'), $price) . '</span>';
 				break;
 
 			case 'vat_rule' :
-				echo getpaid_get_tax_rule_label( $item->get_vat_rule() );
+				echo getpaid_get_tax_rule_label($item->get_vat_rule());
 				break;
 
 			case 'vat_class' :
-				echo getpaid_get_tax_class_label( $item->get_vat_class() );
+				echo getpaid_get_tax_class_label($item->get_vat_class());
 				break;
 
 			case 'shortcode' :
 
-				if ( $item->is_type( array( '', 'fee', 'custom' ) ) ) {
-					echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr( $item->get_id() ) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
+				if ($item->is_type(array('', 'fee', 'custom'))) {
+					echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr($item->get_id()) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
 				} else {
 					echo "&mdash;";
 				}
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
 				break;
 
 			case 'type' :
-				echo wpinv_item_type( $item->get_id() ) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>';
+				echo wpinv_item_type($item->get_id()) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>';
 				break;
 
 		}
@@ -634,21 +634,21 @@  discard block
 block discarded – undo
 	/**
 	 * Lets users filter items using taxes.
 	 */
-	public static function add_item_filters( $post_type ) {
+	public static function add_item_filters($post_type) {
 
 		// Abort if we're not dealing with items.
-		if ( $post_type != 'wpi_item' ) {
+		if ($post_type != 'wpi_item') {
 			return;
 		}
 
 		// Filter by vat rules.
-		if ( wpinv_use_taxes() ) {
+		if (wpinv_use_taxes()) {
 	
 			// Sanitize selected vat rule.
 			$vat_rule   = '';
 			$vat_rules  = getpaid_get_tax_rules();
-			if ( isset( $_GET['vat_rule'] ) ) {
-				$vat_rule   =  sanitize_text_field( $_GET['vat_rule'] );
+			if (isset($_GET['vat_rule'])) {
+				$vat_rule = sanitize_text_field($_GET['vat_rule']);
 			}
 
 			// Filter by VAT rule.
@@ -656,13 +656,13 @@  discard block
 block discarded – undo
 				array(
 					'options'          => array_merge(
 						array(
-							'' => __( 'All VAT rules', 'invoicing' )
+							'' => __('All VAT rules', 'invoicing')
 						),
 						$vat_rules
 					),
 					'name'             => 'vat_rule',
 					'id'               => 'vat_rule',
-					'selected'         => in_array( $vat_rule, array_keys( $vat_rules ) ) ? $vat_rule : '',
+					'selected'         => in_array($vat_rule, array_keys($vat_rules)) ? $vat_rule : '',
 					'show_option_all'  => false,
 					'show_option_none' => false,
 				)
@@ -673,21 +673,21 @@  discard block
 block discarded – undo
 			// Sanitize selected vat rule.
 			$vat_class   = '';
 			$vat_classes = getpaid_get_tax_classes();
-			if ( isset( $_GET['vat_class'] ) ) {
-				$vat_class   = sanitize_text_field( $_GET['vat_class'] );
+			if (isset($_GET['vat_class'])) {
+				$vat_class = sanitize_text_field($_GET['vat_class']);
 			}
 
 			echo wpinv_html_select(
 				array(
 					'options'          => array_merge(
 						array(
-							'' => __( 'All VAT classes', 'invoicing' )
+							'' => __('All VAT classes', 'invoicing')
 						),
 						$vat_classes
 					),
 					'name'             => 'vat_class',
 					'id'               => 'vat_class',
-					'selected'         => in_array( $vat_class, array_keys( $vat_classes ) ) ? $vat_class : '',
+					'selected'         => in_array($vat_class, array_keys($vat_classes)) ? $vat_class : '',
 					'show_option_all'  => false,
 					'show_option_none' => false,
 				)
@@ -696,22 +696,22 @@  discard block
 block discarded – undo
 		}
 
 		// Filter by item type.
-		$type   = '';
-		if ( isset( $_GET['type'] ) ) {
-			$type   = sanitize_text_field( $_GET['type'] );
+		$type = '';
+		if (isset($_GET['type'])) {
+			$type = sanitize_text_field($_GET['type']);
 		}
 
 		echo wpinv_html_select(
 			array(
 				'options'          => array_merge(
 					array(
-						'' => __( 'All item types', 'invoicing' )
+						'' => __('All item types', 'invoicing')
 					),
 					wpinv_get_item_types()
 				),
 				'name'             => 'type',
 				'id'               => 'type',
-				'selected'         => in_array( $type, wpinv_item_types() ) ? $type : '',
+				'selected'         => in_array($type, wpinv_item_types()) ? $type : '',
 				'show_option_all'  => false,
 				'show_option_none' => false,
 			)
@@ -722,45 +722,45 @@  discard block
 block discarded – undo
 	/**
 	 * Filters the item query.
 	 */
-	public static function filter_item_query( $query ) {
+	public static function filter_item_query($query) {
 
 		// modify the query only if it admin and main query.
-		if ( ! ( is_admin() && $query->is_main_query() ) ){ 
+		if (!(is_admin() && $query->is_main_query())) { 
 			return $query;
 		}
 
 		// we want to modify the query for our items.
-		if ( empty( $query->query['post_type'] ) || 'wpi_item' != $query->query['post_type'] ){
+		if (empty($query->query['post_type']) || 'wpi_item' != $query->query['post_type']) {
 			return $query;
 		}
 
-		if ( empty( $query->query_vars['meta_query'] ) ) {
+		if (empty($query->query_vars['meta_query'])) {
 			$query->query_vars['meta_query'] = array();
 		}
 
 		// Filter vat rule type
-        if ( ! empty( $_GET['vat_rule'] ) ) {
+        if (!empty($_GET['vat_rule'])) {
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_vat_rule',
-                'value'   => sanitize_text_field( $_GET['vat_rule'] ),
+                'value'   => sanitize_text_field($_GET['vat_rule']),
                 'compare' => '='
             );
         }
 
         // Filter vat class
-        if ( ! empty( $_GET['vat_class'] ) ) {
+        if (!empty($_GET['vat_class'])) {
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_vat_class',
-                'value'   => sanitize_text_field( $_GET['vat_class'] ),
+                'value'   => sanitize_text_field($_GET['vat_class']),
                 'compare' => '='
             );
         }
 
         // Filter item type
-        if ( ! empty( $_GET['type'] ) ) {
+        if (!empty($_GET['type'])) {
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_type',
-                'value'   => sanitize_text_field( $_GET['type'] ),
+                'value'   => sanitize_text_field($_GET['type']),
                 'compare' => '='
             );
 		}
@@ -770,15 +770,15 @@  discard block
 block discarded – undo
 	/**
 	 * Reorders items.
 	 */
-	public static function reorder_items( $vars ) {
+	public static function reorder_items($vars) {
 		global $typenow;
 
-		if ( 'wpi_item' !== $typenow || empty( $vars['orderby'] ) ) {
+		if ('wpi_item' !== $typenow || empty($vars['orderby'])) {
 			return $vars;
 		}
 
 		// By item type.
-		if ( 'type' == $vars['orderby'] ) {
+		if ('type' == $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -789,7 +789,7 @@  discard block
 block discarded – undo
 		}
 
 		// By vat class.
-		if ( 'vat_class' == $vars['orderby'] ) {
+		if ('vat_class' == $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -800,7 +800,7 @@  discard block
 block discarded – undo
 		}
 
 		// By vat rule.
-		if ( 'vat_rule' == $vars['orderby'] ) {
+		if ('vat_rule' == $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -811,7 +811,7 @@  discard block
 block discarded – undo
 		}
 
 		// By price.
-		if ( 'price' == $vars['orderby'] ) {
+		if ('price' == $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -828,27 +828,27 @@  discard block
 block discarded – undo
 	/**
 	 * Fired when deleting a post.
 	 */
-	public static function delete_post( $post_id ) {
+	public static function delete_post($post_id) {
 
-		switch ( get_post_type( $post_id ) ) {
+		switch (get_post_type($post_id)) {
 
 			case 'wpi_item' :
-				do_action( "getpaid_before_delete_item", new WPInv_Item( $post_id ) );
+				do_action("getpaid_before_delete_item", new WPInv_Item($post_id));
 				break;
 
 			case 'wpi_payment_form' :
-				do_action( "getpaid_before_delete_payment_form", new GetPaid_Payment_Form( $post_id ) );
+				do_action("getpaid_before_delete_payment_form", new GetPaid_Payment_Form($post_id));
 				break;
 
 			case 'wpi_discount' :
-				do_action( "getpaid_before_delete_discount", new WPInv_Discount( $post_id ) );
+				do_action("getpaid_before_delete_discount", new WPInv_Discount($post_id));
 				break;
 
 			case 'wpi_invoice' :
-				$invoice = new WPInv_Invoice( $post_id );
-				do_action( "getpaid_before_delete_invoice", $invoice );
-				$invoice->get_data_store()->delete_items( $invoice );
-				$invoice->get_data_store()->delete_special_fields( $invoice );
+				$invoice = new WPInv_Invoice($post_id);
+				do_action("getpaid_before_delete_invoice", $invoice);
+				$invoice->get_data_store()->delete_items($invoice);
+				$invoice->get_data_store()->delete_special_fields($invoice);
 				break;
 		}
 	}
@@ -861,29 +861,29 @@  discard block
 block discarded – undo
      *
      * @return mixed
      */
-    public static function add_display_post_states( $post_states, $post ) {
+    public static function add_display_post_states($post_states, $post) {
 
-        if ( wpinv_get_option( 'success_page', 0 ) == $post->ID ) {
-            $post_states['getpaid_success_page'] = __( 'GetPaid Receipt Page', 'invoicing' );
+        if (wpinv_get_option('success_page', 0) == $post->ID) {
+            $post_states['getpaid_success_page'] = __('GetPaid Receipt Page', 'invoicing');
         }
 
-		foreach ( getpaid_get_invoice_post_types() as $post_type => $label ) {
+		foreach (getpaid_get_invoice_post_types() as $post_type => $label) {
 
-			if ( wpinv_get_option( "{$post_type}_history_page", 0 ) == $post->ID ) {
+			if (wpinv_get_option("{$post_type}_history_page", 0) == $post->ID) {
 				$post_states["getpaid_{$post_type}_history_page"] = sprintf(
-					__( 'GetPaid %s History Page', 'invoicing' ),
+					__('GetPaid %s History Page', 'invoicing'),
 					$label
 				);
 			}
 
 		}
 		
-		if ( wpinv_get_option( 'invoice_subscription_page', 0 ) == $post->ID ) {
-            $post_states['getpaid_invoice_subscription_page'] = __( 'GetPaid Subscription Page', 'invoicing' );
+		if (wpinv_get_option('invoice_subscription_page', 0) == $post->ID) {
+            $post_states['getpaid_invoice_subscription_page'] = __('GetPaid Subscription Page', 'invoicing');
         }
 
-		if ( wpinv_get_option( 'checkout_page', 0 ) == $post->ID ) {
-            $post_states['getpaid_checkout_page'] = __( 'GetPaid Checkout Page', 'invoicing' );
+		if (wpinv_get_option('checkout_page', 0) == $post->ID) {
+            $post_states['getpaid_checkout_page'] = __('GetPaid Checkout Page', 'invoicing');
         }
 
         return $post_states;

Please login to merge, or discard this patch.

includes/payments/class-getpaid-payment-form-submission.php 2 patches

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

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -10,200 +10,200 @@  discard block
 block discarded – undo
 class GetPaid_Payment_Form_Submission {
 
     /**
-	 * Submission ID
-	 *
-	 * @var string
-	 */
-	public $id = null;
-
-	/**
-	 * The raw submission data.
-	 *
-	 * @var array
-	 */
-	protected $data = null;
-
-	/**
-	 * Submission totals
-	 *
-	 * @var array
-	 */
-	protected $totals = array(
-
-		'subtotal'      => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'discount'      => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'fees'          => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'taxes'         => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'shipping'         => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-	);
-
-	/**
-	 * Sets the associated payment form.
-	 *
-	 * @var GetPaid_Payment_Form
-	 */
+     * Submission ID
+     *
+     * @var string
+     */
+    public $id = null;
+
+    /**
+     * The raw submission data.
+     *
+     * @var array
+     */
+    protected $data = null;
+
+    /**
+     * Submission totals
+     *
+     * @var array
+     */
+    protected $totals = array(
+
+        'subtotal'      => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'discount'      => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'fees'          => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'taxes'         => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'shipping'         => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+    );
+
+    /**
+     * Sets the associated payment form.
+     *
+     * @var GetPaid_Payment_Form
+     */
     protected $payment_form = null;
 
     /**
-	 * The country for the submission.
-	 *
-	 * @var string
-	 */
-	public $country = null;
-
-    /**
-	 * The state for the submission.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $state = null;
-
-	/**
-	 * The invoice associated with the submission.
-	 *
-	 * @var WPInv_Invoice
-	 */
-	protected $invoice = null;
-
-	/**
-	 * The recurring item for the submission.
-	 *
-	 * @var int
-	 */
-	public $has_recurring = 0;
-
-	/**
-	 * An array of fees for the submission.
-	 *
-	 * @var array
-	 */
-	protected $fees = array();
-
-	/**
-	 * An array of discounts for the submission.
-	 *
-	 * @var array
-	 */
-	protected $discounts = array();
-
-	/**
-	 * An array of taxes for the submission.
-	 *
-	 * @var array
-	 */
-	protected $taxes = array();
-
-	/**
-	 * An array of items for the submission.
-	 *
-	 * @var GetPaid_Form_Item[]
-	 */
-	protected $items = array();
-
-	/**
-	 * The last error.
-	 *
-	 * @var string
-	 */
-	public $last_error = null;
-
-	/**
-	 * The last error code.
-	 *
-	 * @var string
-	 */
-	public $last_error_code = null;
-
-    /**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
-
-		// Set the state and country to the default state and country.
-		$this->country = wpinv_default_billing_country();
-		$this->state   = wpinv_get_default_state();
-
-		// Do we have an actual submission?
-		if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
-			$this->load_data( wp_kses_post_deep( wp_unslash( $_POST ) ) );
-		}
-
-	}
-
-	/**
-	 * Loads submission data.
-	 *
-	 * @param array $data
-	 */
-	public function load_data( $data ) {
-
-		// Allow plugins to filter the data.
-		$data       = apply_filters( 'getpaid_submission_data', $data, $this );
-
-		// Cache it...
-		$this->data = $data;
-
-		// Then generate a unique id from the data.
-		$this->id   = md5( wp_json_encode( $data ) );
-
-		// Finally, process the submission.
-		try {
-
-			// Each process is passed an instance of the class (with reference)
-			// and should throw an Exception whenever it encounters one.
-			$processors = apply_filters(
-				'getpaid_payment_form_submission_processors',
-				array(
-					array( $this, 'process_payment_form' ),
-					array( $this, 'process_invoice' ),
-					array( $this, 'process_fees' ),
-					array( $this, 'process_items' ),
-					array( $this, 'process_discount' ),
-					array( $this, 'process_taxes' ),
-				),
-				$this		
-			);
-
-			foreach ( $processors as $processor ) {
-				call_user_func_array( $processor, array( &$this ) );
-			}
-
-		} catch( GetPaid_Payment_Exception $e ) {
-			$this->last_error      = $e->getMessage();
-			$this->last_error_code = $e->getErrorCode();
-		} catch ( Exception $e ) {
-			$this->last_error      = $e->getMessage();
-			$this->last_error_code = $e->getCode();
-		}
-
-		// Fired when we are done processing a submission.
-		do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
-
-	}
-
-	/*
+     * The country for the submission.
+     *
+     * @var string
+     */
+    public $country = null;
+
+    /**
+     * The state for the submission.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $state = null;
+
+    /**
+     * The invoice associated with the submission.
+     *
+     * @var WPInv_Invoice
+     */
+    protected $invoice = null;
+
+    /**
+     * The recurring item for the submission.
+     *
+     * @var int
+     */
+    public $has_recurring = 0;
+
+    /**
+     * An array of fees for the submission.
+     *
+     * @var array
+     */
+    protected $fees = array();
+
+    /**
+     * An array of discounts for the submission.
+     *
+     * @var array
+     */
+    protected $discounts = array();
+
+    /**
+     * An array of taxes for the submission.
+     *
+     * @var array
+     */
+    protected $taxes = array();
+
+    /**
+     * An array of items for the submission.
+     *
+     * @var GetPaid_Form_Item[]
+     */
+    protected $items = array();
+
+    /**
+     * The last error.
+     *
+     * @var string
+     */
+    public $last_error = null;
+
+    /**
+     * The last error code.
+     *
+     * @var string
+     */
+    public $last_error_code = null;
+
+    /**
+     * Class constructor.
+     *
+     */
+    public function __construct() {
+
+        // Set the state and country to the default state and country.
+        $this->country = wpinv_default_billing_country();
+        $this->state   = wpinv_get_default_state();
+
+        // Do we have an actual submission?
+        if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
+            $this->load_data( wp_kses_post_deep( wp_unslash( $_POST ) ) );
+        }
+
+    }
+
+    /**
+     * Loads submission data.
+     *
+     * @param array $data
+     */
+    public function load_data( $data ) {
+
+        // Allow plugins to filter the data.
+        $data       = apply_filters( 'getpaid_submission_data', $data, $this );
+
+        // Cache it...
+        $this->data = $data;
+
+        // Then generate a unique id from the data.
+        $this->id   = md5( wp_json_encode( $data ) );
+
+        // Finally, process the submission.
+        try {
+
+            // Each process is passed an instance of the class (with reference)
+            // and should throw an Exception whenever it encounters one.
+            $processors = apply_filters(
+                'getpaid_payment_form_submission_processors',
+                array(
+                    array( $this, 'process_payment_form' ),
+                    array( $this, 'process_invoice' ),
+                    array( $this, 'process_fees' ),
+                    array( $this, 'process_items' ),
+                    array( $this, 'process_discount' ),
+                    array( $this, 'process_taxes' ),
+                ),
+                $this		
+            );
+
+            foreach ( $processors as $processor ) {
+                call_user_func_array( $processor, array( &$this ) );
+            }
+
+        } catch( GetPaid_Payment_Exception $e ) {
+            $this->last_error      = $e->getMessage();
+            $this->last_error_code = $e->getErrorCode();
+        } catch ( Exception $e ) {
+            $this->last_error      = $e->getMessage();
+            $this->last_error_code = $e->getCode();
+        }
+
+        // Fired when we are done processing a submission.
+        do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
+
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Payment Forms.
 	|--------------------------------------------------------------------------
@@ -212,39 +212,39 @@  discard block
 block discarded – undo
 	| submission has an active payment form etc.
     */
 
-	/**
-	 * Prepares the submission's payment form.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_payment_form() {
+    /**
+     * Prepares the submission's payment form.
+     *
+     * @since 1.0.19
+     */
+    public function process_payment_form() {
 
-		// Every submission needs an active payment form.
-		if ( empty( $this->data['form_id'] ) ) {
-			throw new Exception( __( 'Missing payment form', 'invoicing' ) );
-		}
+        // Every submission needs an active payment form.
+        if ( empty( $this->data['form_id'] ) ) {
+            throw new Exception( __( 'Missing payment form', 'invoicing' ) );
+        }
 
-		// Fetch the payment form.
-		$this->payment_form = new GetPaid_Payment_Form( $this->data['form_id'] );
+        // Fetch the payment form.
+        $this->payment_form = new GetPaid_Payment_Form( $this->data['form_id'] );
 
-		if ( ! $this->payment_form->is_active() ) {
-			throw new Exception( __( 'Payment form not active', 'invoicing' ) );
-		}
+        if ( ! $this->payment_form->is_active() ) {
+            throw new Exception( __( 'Payment form not active', 'invoicing' ) );
+        }
 
-		do_action_ref_array( 'getpaid_submissions_process_payment_form', array( &$this ) );
-	}
+        do_action_ref_array( 'getpaid_submissions_process_payment_form', array( &$this ) );
+    }
 
     /**
-	 * Returns the payment form.
-	 *
-	 * @since 1.0.19
-	 * @return GetPaid_Payment_Form
-	 */
-	public function get_payment_form() {
-		return $this->payment_form;
-	}
+     * Returns the payment form.
+     *
+     * @since 1.0.19
+     * @return GetPaid_Payment_Form
+     */
+    public function get_payment_form() {
+        return $this->payment_form;
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Invoices.
 	|--------------------------------------------------------------------------
@@ -253,84 +253,84 @@  discard block
 block discarded – undo
 	| might be for an existing invoice.
 	*/
 
-	/**
-	 * Prepares the submission's invoice.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_invoice() {
+    /**
+     * Prepares the submission's invoice.
+     *
+     * @since 1.0.19
+     */
+    public function process_invoice() {
 
-		// Abort if there is no invoice.
-		if ( empty( $this->data['invoice_id'] ) ) {
-			return;
-		}
+        // Abort if there is no invoice.
+        if ( empty( $this->data['invoice_id'] ) ) {
+            return;
+        }
 
-		// If the submission is for an existing invoice, ensure that it exists
-		// and that it is not paid for.
-		$invoice = wpinv_get_invoice( $this->data['invoice_id'] );
+        // If the submission is for an existing invoice, ensure that it exists
+        // and that it is not paid for.
+        $invoice = wpinv_get_invoice( $this->data['invoice_id'] );
 
         if ( empty( $invoice ) ) {
-			throw new Exception( __( 'Invalid invoice', 'invoicing' ) );
-		}
+            throw new Exception( __( 'Invalid invoice', 'invoicing' ) );
+        }
 
-		if ( $invoice->is_paid() ) {
-			throw new Exception( __( 'This invoice is already paid for.', 'invoicing' ) );
-		}
+        if ( $invoice->is_paid() ) {
+            throw new Exception( __( 'This invoice is already paid for.', 'invoicing' ) );
+        }
 
-		$this->payment_form->invoice = $invoice;
-		if ( ! $this->payment_form->is_default() ) {
+        $this->payment_form->invoice = $invoice;
+        if ( ! $this->payment_form->is_default() ) {
 
-			$items    = array();
-			$item_ids = array();
+            $items    = array();
+            $item_ids = array();
 	
-			foreach ( $invoice->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
-					$item_ids[] = $item->get_id();
-					$items[]    = $item;
-				}
-			}
+            foreach ( $invoice->get_items() as $item ) {
+                if ( ! in_array( $item->get_id(), $item_ids ) ) {
+                    $item_ids[] = $item->get_id();
+                    $items[]    = $item;
+                }
+            }
 	
-			foreach ( $this->payment_form->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
-					$item_ids[] = $item->get_id();
-					$items[]    = $item;
-				}
-			}
+            foreach ( $this->payment_form->get_items() as $item ) {
+                if ( ! in_array( $item->get_id(), $item_ids ) ) {
+                    $item_ids[] = $item->get_id();
+                    $items[]    = $item;
+                }
+            }
 	
-			$this->payment_form->set_items( $items );
+            $this->payment_form->set_items( $items );
 	
-		} else {
-			$this->payment_form->set_items( $invoice->get_items() );
-		}
-
-		$this->country = $invoice->get_country();
-		$this->state   = $invoice->get_state();
-		$this->invoice = $invoice;
-
-		do_action_ref_array( 'getpaid_submissions_process_invoice', array( &$this ) );
-	}
-
-	/**
-	 * Returns the associated invoice.
-	 *
-	 * @since 1.0.19
-	 * @return WPInv_Invoice
-	 */
-	public function get_invoice() {
-		return $this->invoice;
-	}
-
-	/**
-	 * Checks whether there is an invoice associated with this submission.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_invoice() {
-		return ! empty( $this->invoice );
-	}
-
-	/*
+        } else {
+            $this->payment_form->set_items( $invoice->get_items() );
+        }
+
+        $this->country = $invoice->get_country();
+        $this->state   = $invoice->get_state();
+        $this->invoice = $invoice;
+
+        do_action_ref_array( 'getpaid_submissions_process_invoice', array( &$this ) );
+    }
+
+    /**
+     * Returns the associated invoice.
+     *
+     * @since 1.0.19
+     * @return WPInv_Invoice
+     */
+    public function get_invoice() {
+        return $this->invoice;
+    }
+
+    /**
+     * Checks whether there is an invoice associated with this submission.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_invoice() {
+        return ! empty( $this->invoice );
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Items.
 	|--------------------------------------------------------------------------
@@ -339,129 +339,129 @@  discard block
 block discarded – undo
 	| recurring item. But can have an unlimited number of non-recurring items.
 	*/
 
-	/**
-	 * Prepares the submission's items.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_items() {
-
-		$processor = new GetPaid_Payment_Form_Submission_Items( $this );
-
-		foreach ( $processor->items as $item ) {
-			$this->add_item( $item );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_items', array( &$this ) );
-	}
-
-	/**
-	 * Adds an item to the submission.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Form_Item $item
-	 */
-	public function add_item( $item ) {
-
-		// Make sure that it is available for purchase.
-		if ( ! $item->can_purchase() || isset( $this->items[ $item->get_id() ] ) ) {
-			return;
-		}
-
-		// Each submission can only contain one recurring item.
-		if ( $item->is_recurring() ) {
-			$this->has_recurring = $item->get_id();
-		}
-
-		// Update the items and totals.
-		$this->items[ $item->get_id() ]         = $item;
-		$this->totals['subtotal']['initial']   += $item->get_sub_total();
-		$this->totals['subtotal']['recurring'] += $item->get_recurring_sub_total();
-
-	}
-
-	/**
-	 * Removes a specific item.
-	 * 
-	 * You should not call this method after the discounts and taxes
-	 * have been calculated.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_item( $item_id ) {
-
-		if ( isset( $this->items[ $item_id ] ) ) {
-			$this->totals['subtotal']['initial']   -= $this->items[ $item_id ]->get_sub_total();
-			$this->totals['subtotal']['recurring'] -= $this->items[ $item_id ]->get_recurring_sub_total();
-
-			if ( $this->items[ $item_id ]->is_recurring() ) {
-				$this->has_recurring = 0;
-			}
-
-			unset( $this->items[ $item_id ] );
-		}
-
-	}
-
-	/**
-	 * Returns the subtotal.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_subtotal() {
-
-		if ( wpinv_prices_include_tax() ) {
-			return $this->totals['subtotal']['initial'] - $this->totals['taxes']['initial'];
-		}
-
-		return $this->totals['subtotal']['initial'];
-	}
-
-	/**
-	 * Returns the recurring subtotal.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_subtotal() {
-
-		if ( wpinv_prices_include_tax() ) {
-			return $this->totals['subtotal']['recurring'] - $this->totals['taxes']['recurring'];
-		}
-
-		return $this->totals['subtotal']['recurring'];
-	}
-
-	/**
-	 * Returns all items.
-	 *
-	 * @since 1.0.19
-	 * @return GetPaid_Form_Item[]
-	 */
-	public function get_items() {
-		return $this->items;
-	}
-
-	/**
-	 * Checks if there's a single subscription group in the submission.
-	 *
-	 * @since 2.3.0
-	 * @return bool
-	 */
-	public function has_subscription_group() {
-		return $this->has_recurring && getpaid_should_group_subscriptions( $this ) && 1 == count( getpaid_get_subscription_groups( $this ) );
-	}
-
-	/**
-	 * Checks if there are multipe subscription groups in the submission.
-	 *
-	 * @since 2.3.0
-	 * @return bool
-	 */
-	public function has_multiple_subscription_groups() {
-		return $this->has_recurring && 1 < count( getpaid_get_subscription_groups( $this ) );
-	}
-
-	/*
+    /**
+     * Prepares the submission's items.
+     *
+     * @since 1.0.19
+     */
+    public function process_items() {
+
+        $processor = new GetPaid_Payment_Form_Submission_Items( $this );
+
+        foreach ( $processor->items as $item ) {
+            $this->add_item( $item );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_items', array( &$this ) );
+    }
+
+    /**
+     * Adds an item to the submission.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Form_Item $item
+     */
+    public function add_item( $item ) {
+
+        // Make sure that it is available for purchase.
+        if ( ! $item->can_purchase() || isset( $this->items[ $item->get_id() ] ) ) {
+            return;
+        }
+
+        // Each submission can only contain one recurring item.
+        if ( $item->is_recurring() ) {
+            $this->has_recurring = $item->get_id();
+        }
+
+        // Update the items and totals.
+        $this->items[ $item->get_id() ]         = $item;
+        $this->totals['subtotal']['initial']   += $item->get_sub_total();
+        $this->totals['subtotal']['recurring'] += $item->get_recurring_sub_total();
+
+    }
+
+    /**
+     * Removes a specific item.
+     * 
+     * You should not call this method after the discounts and taxes
+     * have been calculated.
+     *
+     * @since 1.0.19
+     */
+    public function remove_item( $item_id ) {
+
+        if ( isset( $this->items[ $item_id ] ) ) {
+            $this->totals['subtotal']['initial']   -= $this->items[ $item_id ]->get_sub_total();
+            $this->totals['subtotal']['recurring'] -= $this->items[ $item_id ]->get_recurring_sub_total();
+
+            if ( $this->items[ $item_id ]->is_recurring() ) {
+                $this->has_recurring = 0;
+            }
+
+            unset( $this->items[ $item_id ] );
+        }
+
+    }
+
+    /**
+     * Returns the subtotal.
+     *
+     * @since 1.0.19
+     */
+    public function get_subtotal() {
+
+        if ( wpinv_prices_include_tax() ) {
+            return $this->totals['subtotal']['initial'] - $this->totals['taxes']['initial'];
+        }
+
+        return $this->totals['subtotal']['initial'];
+    }
+
+    /**
+     * Returns the recurring subtotal.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_subtotal() {
+
+        if ( wpinv_prices_include_tax() ) {
+            return $this->totals['subtotal']['recurring'] - $this->totals['taxes']['recurring'];
+        }
+
+        return $this->totals['subtotal']['recurring'];
+    }
+
+    /**
+     * Returns all items.
+     *
+     * @since 1.0.19
+     * @return GetPaid_Form_Item[]
+     */
+    public function get_items() {
+        return $this->items;
+    }
+
+    /**
+     * Checks if there's a single subscription group in the submission.
+     *
+     * @since 2.3.0
+     * @return bool
+     */
+    public function has_subscription_group() {
+        return $this->has_recurring && getpaid_should_group_subscriptions( $this ) && 1 == count( getpaid_get_subscription_groups( $this ) );
+    }
+
+    /**
+     * Checks if there are multipe subscription groups in the submission.
+     *
+     * @since 2.3.0
+     * @return bool
+     */
+    public function has_multiple_subscription_groups() {
+        return $this->has_recurring && 1 < count( getpaid_get_subscription_groups( $this ) );
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Taxes
 	|--------------------------------------------------------------------------
@@ -470,128 +470,128 @@  discard block
 block discarded – undo
 	| or only one-time.
     */
 
-	/**
-	 * Prepares the submission's taxes.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_taxes() {
-
-		// Abort if we're not using taxes.
-		if ( ! $this->use_taxes() ) {
-			return;
-		}
-
-		// If a custom country && state has been passed in, use it to calculate taxes.
-		$country = $this->get_field( 'wpinv_country', 'billing' );
-		if ( ! empty( $country ) ) {
-			$this->country = $country;
-		}
-
-		$state = $this->get_field( 'wpinv_state', 'billing' );
-		if ( ! empty( $state ) ) {
-			$this->state = $state;
-		}
-
-		// Confirm if the provided country and the ip country are similar.
-		$address_confirmed = $this->get_field( 'confirm-address' );
-		if ( isset( $_POST['billing']['country'] ) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty( $address_confirmed ) ) {
-			throw new Exception( __( 'The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing' ) );
-		}
-
-		// Abort if the country is not taxable.
-		if ( ! wpinv_is_country_taxable( $this->country ) ) {
-			return;
-		}
-
-		$processor = new GetPaid_Payment_Form_Submission_Taxes( $this );
-
-		foreach ( $processor->taxes as $tax ) {
-			$this->add_tax( $tax );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_taxes', array( &$this ) );
-	}
-
-	/**
-	 * Adds a tax to the submission.
-	 *
-	 * @param array $tax An array of tax details. name, initial_tax, and recurring_tax are required.
-	 * @since 1.0.19
-	 */
-	public function add_tax( $tax ) {
-
-		if ( wpinv_round_tax_per_tax_rate() ) {
-			$tax['initial_tax']   = wpinv_round_amount( $tax['initial_tax'] );
-			$tax['recurring_tax'] = wpinv_round_amount( $tax['recurring_tax'] );
-		}
-
-		$this->taxes[ $tax['name'] ]         = $tax;
-		$this->totals['taxes']['initial']   += wpinv_sanitize_amount( $tax['initial_tax'] );
-		$this->totals['taxes']['recurring'] += wpinv_sanitize_amount( $tax['recurring_tax'] );
-
-	}
-
-	/**
-	 * Removes a specific tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_tax( $tax_name ) {
-
-		if ( isset( $this->taxes[ $tax_name ] ) ) {
-			$this->totals['taxes']['initial']   -= $this->taxes[ $tax_name ]['initial_tax'];
-			$this->totals['taxes']['recurring'] -= $this->taxes[ $tax_name ]['recurring_tax'];
-			unset( $this->taxes[ $tax_name ] );
-		}
-
-	}
-
-	/**
-	 * Whether or not we'll use taxes for the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function use_taxes() {
-
-		$use_taxes = wpinv_use_taxes();
-
-		if ( $this->has_invoice() && ! $this->invoice->is_taxable() ) {
-			$use_taxes = false;
-		}
-
-		return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
-
-	}
-
-	/**
-	 * Returns the tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_tax() {
-		return $this->totals['taxes']['initial'];
-	}
-
-	/**
-	 * Returns the recurring tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_tax() {
-		return $this->totals['taxes']['recurring'];
-	}
-
-	/**
-	 * Returns all taxes.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_taxes() {
-		return $this->taxes;
-	}
-
-	/*
+    /**
+     * Prepares the submission's taxes.
+     *
+     * @since 1.0.19
+     */
+    public function process_taxes() {
+
+        // Abort if we're not using taxes.
+        if ( ! $this->use_taxes() ) {
+            return;
+        }
+
+        // If a custom country && state has been passed in, use it to calculate taxes.
+        $country = $this->get_field( 'wpinv_country', 'billing' );
+        if ( ! empty( $country ) ) {
+            $this->country = $country;
+        }
+
+        $state = $this->get_field( 'wpinv_state', 'billing' );
+        if ( ! empty( $state ) ) {
+            $this->state = $state;
+        }
+
+        // Confirm if the provided country and the ip country are similar.
+        $address_confirmed = $this->get_field( 'confirm-address' );
+        if ( isset( $_POST['billing']['country'] ) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty( $address_confirmed ) ) {
+            throw new Exception( __( 'The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing' ) );
+        }
+
+        // Abort if the country is not taxable.
+        if ( ! wpinv_is_country_taxable( $this->country ) ) {
+            return;
+        }
+
+        $processor = new GetPaid_Payment_Form_Submission_Taxes( $this );
+
+        foreach ( $processor->taxes as $tax ) {
+            $this->add_tax( $tax );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_taxes', array( &$this ) );
+    }
+
+    /**
+     * Adds a tax to the submission.
+     *
+     * @param array $tax An array of tax details. name, initial_tax, and recurring_tax are required.
+     * @since 1.0.19
+     */
+    public function add_tax( $tax ) {
+
+        if ( wpinv_round_tax_per_tax_rate() ) {
+            $tax['initial_tax']   = wpinv_round_amount( $tax['initial_tax'] );
+            $tax['recurring_tax'] = wpinv_round_amount( $tax['recurring_tax'] );
+        }
+
+        $this->taxes[ $tax['name'] ]         = $tax;
+        $this->totals['taxes']['initial']   += wpinv_sanitize_amount( $tax['initial_tax'] );
+        $this->totals['taxes']['recurring'] += wpinv_sanitize_amount( $tax['recurring_tax'] );
+
+    }
+
+    /**
+     * Removes a specific tax.
+     *
+     * @since 1.0.19
+     */
+    public function remove_tax( $tax_name ) {
+
+        if ( isset( $this->taxes[ $tax_name ] ) ) {
+            $this->totals['taxes']['initial']   -= $this->taxes[ $tax_name ]['initial_tax'];
+            $this->totals['taxes']['recurring'] -= $this->taxes[ $tax_name ]['recurring_tax'];
+            unset( $this->taxes[ $tax_name ] );
+        }
+
+    }
+
+    /**
+     * Whether or not we'll use taxes for the submission.
+     *
+     * @since 1.0.19
+     */
+    public function use_taxes() {
+
+        $use_taxes = wpinv_use_taxes();
+
+        if ( $this->has_invoice() && ! $this->invoice->is_taxable() ) {
+            $use_taxes = false;
+        }
+
+        return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
+
+    }
+
+    /**
+     * Returns the tax.
+     *
+     * @since 1.0.19
+     */
+    public function get_tax() {
+        return $this->totals['taxes']['initial'];
+    }
+
+    /**
+     * Returns the recurring tax.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_tax() {
+        return $this->totals['taxes']['recurring'];
+    }
+
+    /**
+     * Returns all taxes.
+     *
+     * @since 1.0.19
+     */
+    public function get_taxes() {
+        return $this->taxes;
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Discounts
 	|--------------------------------------------------------------------------
@@ -600,99 +600,99 @@  discard block
 block discarded – undo
 	| or only one-time. They also do not have to come from a discount code.
     */
 
-	/**
-	 * Prepares the submission's discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_discount() {
-
-		$initial_total    = $this->get_subtotal() + $this->get_fee() + $this->get_tax();
-		$recurring_total  = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax();
-		$processor        = new GetPaid_Payment_Form_Submission_Discount( $this, $initial_total, $recurring_total );
-
-		foreach ( $processor->discounts as $discount ) {
-			$this->add_discount( $discount );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_discounts', array( &$this ) );
-	}
-
-	/**
-	 * Adds a discount to the submission.
-	 *
-	 * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
-	 * @since 1.0.19
-	 */
-	public function add_discount( $discount ) {
-		$this->discounts[ $discount['name'] ]   = $discount;
-		$this->totals['discount']['initial']   += wpinv_sanitize_amount( $discount['initial_discount'] );
-		$this->totals['discount']['recurring'] += wpinv_sanitize_amount( $discount['recurring_discount'] );
-	}
-
-	/**
-	 * Removes a discount from the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_discount( $name ) {
-
-		if ( isset( $this->discounts[ $name ] ) ) {
-			$this->totals['discount']['initial']   -= $this->discounts[ $name ]['initial_discount'];
-			$this->totals['discount']['recurring'] -= $this->discounts[ $name ]['recurring_discount'];
-			unset( $this->discounts[ $name ] );
-		}
-
-	}
-
-	/**
-	 * Checks whether there is a discount code associated with this submission.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_discount_code() {
-		return ! empty( $this->discounts['discount_code'] );
-	}
-
-	/**
-	 * Returns the discount code.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_discount_code() {
-		return $this->has_discount_code() ? $this->discounts['discount_code']['discount_code'] : '';
-	}
-
-	/**
-	 * Returns the discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_discount() {
-		return $this->totals['discount']['initial'];
-	}
-
-	/**
-	 * Returns the recurring discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_discount() {
-		return $this->totals['discount']['recurring'];
-	}
-
-	/**
-	 * Returns all discounts.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_discounts() {
-		return $this->discounts;
-	}
-
-	/*
+    /**
+     * Prepares the submission's discount.
+     *
+     * @since 1.0.19
+     */
+    public function process_discount() {
+
+        $initial_total    = $this->get_subtotal() + $this->get_fee() + $this->get_tax();
+        $recurring_total  = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax();
+        $processor        = new GetPaid_Payment_Form_Submission_Discount( $this, $initial_total, $recurring_total );
+
+        foreach ( $processor->discounts as $discount ) {
+            $this->add_discount( $discount );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_discounts', array( &$this ) );
+    }
+
+    /**
+     * Adds a discount to the submission.
+     *
+     * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
+     * @since 1.0.19
+     */
+    public function add_discount( $discount ) {
+        $this->discounts[ $discount['name'] ]   = $discount;
+        $this->totals['discount']['initial']   += wpinv_sanitize_amount( $discount['initial_discount'] );
+        $this->totals['discount']['recurring'] += wpinv_sanitize_amount( $discount['recurring_discount'] );
+    }
+
+    /**
+     * Removes a discount from the submission.
+     *
+     * @since 1.0.19
+     */
+    public function remove_discount( $name ) {
+
+        if ( isset( $this->discounts[ $name ] ) ) {
+            $this->totals['discount']['initial']   -= $this->discounts[ $name ]['initial_discount'];
+            $this->totals['discount']['recurring'] -= $this->discounts[ $name ]['recurring_discount'];
+            unset( $this->discounts[ $name ] );
+        }
+
+    }
+
+    /**
+     * Checks whether there is a discount code associated with this submission.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_discount_code() {
+        return ! empty( $this->discounts['discount_code'] );
+    }
+
+    /**
+     * Returns the discount code.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_discount_code() {
+        return $this->has_discount_code() ? $this->discounts['discount_code']['discount_code'] : '';
+    }
+
+    /**
+     * Returns the discount.
+     *
+     * @since 1.0.19
+     */
+    public function get_discount() {
+        return $this->totals['discount']['initial'];
+    }
+
+    /**
+     * Returns the recurring discount.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_discount() {
+        return $this->totals['discount']['recurring'];
+    }
+
+    /**
+     * Returns all discounts.
+     *
+     * @since 1.0.19
+     */
+    public function get_discounts() {
+        return $this->discounts;
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Fees
 	|--------------------------------------------------------------------------
@@ -702,100 +702,100 @@  discard block
 block discarded – undo
 	| fees.
     */
 
-	/**
-	 * Prepares the submission's fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_fees() {
-
-		$fees_processor = new GetPaid_Payment_Form_Submission_Fees( $this );
-
-		foreach ( $fees_processor->fees as $fee ) {
-			$this->add_fee( $fee );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_fees', array( &$this ) );
-	}
-
-	/**
-	 * Adds a fee to the submission.
-	 *
-	 * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
-	 * @since 1.0.19
-	 */
-	public function add_fee( $fee ) {
-
-		if ( $fee['name'] == 'shipping' ) {
-			$this->totals['shipping']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-			$this->totals['shipping']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
-			return;
-		}
-
-		$this->fees[ $fee['name'] ]         = $fee;
-		$this->totals['fees']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-		$this->totals['fees']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
-
-	}
-
-	/**
-	 * Removes a fee from the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_fee( $name ) {
-
-		if ( isset( $this->fees[ $name ] ) ) {
-			$this->totals['fees']['initial']   -= $this->fees[ $name ]['initial_fee'];
-			$this->totals['fees']['recurring'] -= $this->fees[ $name ]['recurring_fee'];
-			unset( $this->fees[ $name ] );
-		}
-
-		if ( 'shipping' == $name ) {
-			$this->totals['shipping']['initial']   = 0;
-			$this->totals['shipping']['recurring'] = 0;
-		}
-
-	}
-
-	/**
-	 * Returns the fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_fee() {
-		return $this->totals['fees']['initial'];
-	}
-
-	/**
-	 * Returns the recurring fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_fee() {
-		return $this->totals['fees']['recurring'];
-	}
-
-	/**
-	 * Returns all fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_fees() {
-		return $this->fees;
-	}
-
-	/**
-	 * Checks if there are any fees for the form.
-	 *
-	 * @return bool
-	 * @since 1.0.19
-	 */
-	public function has_fees() {
-		return count( $this->fees ) !== 0;
-	}
-
-	/*
+    /**
+     * Prepares the submission's fees.
+     *
+     * @since 1.0.19
+     */
+    public function process_fees() {
+
+        $fees_processor = new GetPaid_Payment_Form_Submission_Fees( $this );
+
+        foreach ( $fees_processor->fees as $fee ) {
+            $this->add_fee( $fee );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_fees', array( &$this ) );
+    }
+
+    /**
+     * Adds a fee to the submission.
+     *
+     * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
+     * @since 1.0.19
+     */
+    public function add_fee( $fee ) {
+
+        if ( $fee['name'] == 'shipping' ) {
+            $this->totals['shipping']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
+            $this->totals['shipping']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+            return;
+        }
+
+        $this->fees[ $fee['name'] ]         = $fee;
+        $this->totals['fees']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
+        $this->totals['fees']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+
+    }
+
+    /**
+     * Removes a fee from the submission.
+     *
+     * @since 1.0.19
+     */
+    public function remove_fee( $name ) {
+
+        if ( isset( $this->fees[ $name ] ) ) {
+            $this->totals['fees']['initial']   -= $this->fees[ $name ]['initial_fee'];
+            $this->totals['fees']['recurring'] -= $this->fees[ $name ]['recurring_fee'];
+            unset( $this->fees[ $name ] );
+        }
+
+        if ( 'shipping' == $name ) {
+            $this->totals['shipping']['initial']   = 0;
+            $this->totals['shipping']['recurring'] = 0;
+        }
+
+    }
+
+    /**
+     * Returns the fees.
+     *
+     * @since 1.0.19
+     */
+    public function get_fee() {
+        return $this->totals['fees']['initial'];
+    }
+
+    /**
+     * Returns the recurring fees.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_fee() {
+        return $this->totals['fees']['recurring'];
+    }
+
+    /**
+     * Returns all fees.
+     *
+     * @since 1.0.19
+     */
+    public function get_fees() {
+        return $this->fees;
+    }
+
+    /**
+     * Checks if there are any fees for the form.
+     *
+     * @return bool
+     * @since 1.0.19
+     */
+    public function has_fees() {
+        return count( $this->fees ) !== 0;
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| MISC
 	|--------------------------------------------------------------------------
@@ -803,147 +803,147 @@  discard block
 block discarded – undo
 	| Extra submission functions.
     */
 
-	/**
-	 * Returns the shipping amount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_shipping() {
-		return $this->totals['shipping']['initial'];
-	}
-
-	/**
-	 * Returns the recurring shipping.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_shipping() {
-		return $this->totals['shipping']['recurring'];
-	}
-
-	/**
-	 * Checks if there are any shipping fees for the form.
-	 *
-	 * @return bool
-	 * @since 1.0.19
-	 */
-	public function has_shipping() {
-		return apply_filters( 'getpaid_payment_form_has_shipping', false, $this );
-	}
-
-	/**
-	 * Checks if this is the initial fetch.
-	 *
-	 * @return bool
-	 * @since 1.0.19
-	 */
-	public function is_initial_fetch() {
-		return empty( $this->data['initial_state'] );
-	}
-
-	/**
-	 * Returns the total amount to collect for this submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_total() {
-		$total = $this->get_subtotal() + $this->get_fee() + $this->get_tax() + $this->get_shipping() - $this->get_discount();
-		return max( $total, 0 );
-	}
-
-	/**
-	 * Returns the recurring total amount to collect for this submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_total() {
-		$total = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax() + $this->get_recurring_shipping() - $this->get_recurring_discount();
-		return max( $total, 0 );
-	}
-
-	/**
-	 * Whether payment details should be collected for this submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function should_collect_payment_details() {
-		$initial   = $this->get_total();
-		$recurring = $this->get_recurring_total();
-
-		if ( $this->has_recurring == 0 ) {
-			$recurring = 0;
-		}
-
-		$collect = $initial > 0 || $recurring > 0;
-		return apply_filters( 'getpaid_submission_should_collect_payment_details', $collect, $this  );
-	}
-
-	/**
-	 * Returns the billing email of the user.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_billing_email() {
-		return apply_filters( 'getpaid_get_submission_billing_email', $this->get_field( 'billing_email' ), $this  );
-	}
-
-	/**
-	 * Checks if the submitter has a billing email.
-	 *
-	 * @since 1.0.19
-	 */
-	public function has_billing_email() {
-		$billing_email = $this->get_billing_email();
-		return ! empty( $billing_email ) && is_email( $billing_email );
-	}
-
-	/**
-	 * Returns the appropriate currency for the submission.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_currency() {
-		return $this->has_invoice() ? $this->invoice->get_currency() : wpinv_get_currency();
-    }
-
-    /**
-	 * Returns the raw submission data.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function get_data() {
-		return $this->data;
-	}
-
-	/**
-	 * Returns a field from the submission data
-	 *
-	 * @param string $field
-	 * @since 1.0.19
-	 * @return mixed|null
-	 */
-	public function get_field( $field, $sub_array_key = null ) {
-		return getpaid_get_array_field( $this->data, $field, $sub_array_key );
-	}
-
-	/**
-	 * Checks if a required field is set.
-	 *
-	 * @since 1.0.19
-	 */
-	public function is_required_field_set( $field ) {
-		return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
-	}
-
-	/**
-	 * Formats an amount
-	 *
-	 * @since 1.0.19
-	 */
-	public function format_amount( $amount ) {
-		return wpinv_price( $amount, $this->get_currency() );
-	}
+    /**
+     * Returns the shipping amount.
+     *
+     * @since 1.0.19
+     */
+    public function get_shipping() {
+        return $this->totals['shipping']['initial'];
+    }
+
+    /**
+     * Returns the recurring shipping.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_shipping() {
+        return $this->totals['shipping']['recurring'];
+    }
+
+    /**
+     * Checks if there are any shipping fees for the form.
+     *
+     * @return bool
+     * @since 1.0.19
+     */
+    public function has_shipping() {
+        return apply_filters( 'getpaid_payment_form_has_shipping', false, $this );
+    }
+
+    /**
+     * Checks if this is the initial fetch.
+     *
+     * @return bool
+     * @since 1.0.19
+     */
+    public function is_initial_fetch() {
+        return empty( $this->data['initial_state'] );
+    }
+
+    /**
+     * Returns the total amount to collect for this submission.
+     *
+     * @since 1.0.19
+     */
+    public function get_total() {
+        $total = $this->get_subtotal() + $this->get_fee() + $this->get_tax() + $this->get_shipping() - $this->get_discount();
+        return max( $total, 0 );
+    }
+
+    /**
+     * Returns the recurring total amount to collect for this submission.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_total() {
+        $total = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax() + $this->get_recurring_shipping() - $this->get_recurring_discount();
+        return max( $total, 0 );
+    }
+
+    /**
+     * Whether payment details should be collected for this submission.
+     *
+     * @since 1.0.19
+     */
+    public function should_collect_payment_details() {
+        $initial   = $this->get_total();
+        $recurring = $this->get_recurring_total();
+
+        if ( $this->has_recurring == 0 ) {
+            $recurring = 0;
+        }
+
+        $collect = $initial > 0 || $recurring > 0;
+        return apply_filters( 'getpaid_submission_should_collect_payment_details', $collect, $this  );
+    }
+
+    /**
+     * Returns the billing email of the user.
+     *
+     * @since 1.0.19
+     */
+    public function get_billing_email() {
+        return apply_filters( 'getpaid_get_submission_billing_email', $this->get_field( 'billing_email' ), $this  );
+    }
+
+    /**
+     * Checks if the submitter has a billing email.
+     *
+     * @since 1.0.19
+     */
+    public function has_billing_email() {
+        $billing_email = $this->get_billing_email();
+        return ! empty( $billing_email ) && is_email( $billing_email );
+    }
+
+    /**
+     * Returns the appropriate currency for the submission.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_currency() {
+        return $this->has_invoice() ? $this->invoice->get_currency() : wpinv_get_currency();
+    }
+
+    /**
+     * Returns the raw submission data.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function get_data() {
+        return $this->data;
+    }
+
+    /**
+     * Returns a field from the submission data
+     *
+     * @param string $field
+     * @since 1.0.19
+     * @return mixed|null
+     */
+    public function get_field( $field, $sub_array_key = null ) {
+        return getpaid_get_array_field( $this->data, $field, $sub_array_key );
+    }
+
+    /**
+     * Checks if a required field is set.
+     *
+     * @since 1.0.19
+     */
+    public function is_required_field_set( $field ) {
+        return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
+    }
+
+    /**
+     * Formats an amount
+     *
+     * @since 1.0.19
+     */
+    public function format_amount( $amount ) {
+        return wpinv_price( $amount, $this->get_currency() );
+    }
 
 }

Please login to merge, or discard this patch.

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

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -146,8 +146,8 @@  discard block
 block discarded – undo
 		$this->state   = wpinv_get_default_state();
 
 		// Do we have an actual submission?
-		if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
-			$this->load_data( wp_kses_post_deep( wp_unslash( $_POST ) ) );
+		if (isset($_POST['getpaid_payment_form_submission'])) {
+			$this->load_data(wp_kses_post_deep(wp_unslash($_POST)));
 		}
 
 	}
@@ -157,16 +157,16 @@  discard block
 block discarded – undo
 	 *
 	 * @param array $data
 	 */
-	public function load_data( $data ) {
+	public function load_data($data) {
 
 		// Allow plugins to filter the data.
-		$data       = apply_filters( 'getpaid_submission_data', $data, $this );
+		$data       = apply_filters('getpaid_submission_data', $data, $this);
 
 		// Cache it...
 		$this->data = $data;
 
 		// Then generate a unique id from the data.
-		$this->id   = md5( wp_json_encode( $data ) );
+		$this->id   = md5(wp_json_encode($data));
 
 		// Finally, process the submission.
 		try {
@@ -176,30 +176,30 @@  discard block
 block discarded – undo
 			$processors = apply_filters(
 				'getpaid_payment_form_submission_processors',
 				array(
-					array( $this, 'process_payment_form' ),
-					array( $this, 'process_invoice' ),
-					array( $this, 'process_fees' ),
-					array( $this, 'process_items' ),
-					array( $this, 'process_discount' ),
-					array( $this, 'process_taxes' ),
+					array($this, 'process_payment_form'),
+					array($this, 'process_invoice'),
+					array($this, 'process_fees'),
+					array($this, 'process_items'),
+					array($this, 'process_discount'),
+					array($this, 'process_taxes'),
 				),
 				$this		
 			);
 
-			foreach ( $processors as $processor ) {
-				call_user_func_array( $processor, array( &$this ) );
+			foreach ($processors as $processor) {
+				call_user_func_array($processor, array(&$this));
 			}
 
-		} catch( GetPaid_Payment_Exception $e ) {
+		} catch (GetPaid_Payment_Exception $e) {
 			$this->last_error      = $e->getMessage();
 			$this->last_error_code = $e->getErrorCode();
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			$this->last_error      = $e->getMessage();
 			$this->last_error_code = $e->getCode();
 		}
 
 		// Fired when we are done processing a submission.
-		do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
+		do_action_ref_array('getpaid_process_submission', array(&$this));
 
 	}
 
@@ -220,18 +220,18 @@  discard block
 block discarded – undo
 	public function process_payment_form() {
 
 		// Every submission needs an active payment form.
-		if ( empty( $this->data['form_id'] ) ) {
-			throw new Exception( __( 'Missing payment form', 'invoicing' ) );
+		if (empty($this->data['form_id'])) {
+			throw new Exception(__('Missing payment form', 'invoicing'));
 		}
 
 		// Fetch the payment form.
-		$this->payment_form = new GetPaid_Payment_Form( $this->data['form_id'] );
+		$this->payment_form = new GetPaid_Payment_Form($this->data['form_id']);
 
-		if ( ! $this->payment_form->is_active() ) {
-			throw new Exception( __( 'Payment form not active', 'invoicing' ) );
+		if (!$this->payment_form->is_active()) {
+			throw new Exception(__('Payment form not active', 'invoicing'));
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_payment_form', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_payment_form', array(&$this));
 	}
 
     /**
@@ -261,53 +261,53 @@  discard block
 block discarded – undo
 	public function process_invoice() {
 
 		// Abort if there is no invoice.
-		if ( empty( $this->data['invoice_id'] ) ) {
+		if (empty($this->data['invoice_id'])) {
 			return;
 		}
 
 		// If the submission is for an existing invoice, ensure that it exists
 		// and that it is not paid for.
-		$invoice = wpinv_get_invoice( $this->data['invoice_id'] );
+		$invoice = wpinv_get_invoice($this->data['invoice_id']);
 
-        if ( empty( $invoice ) ) {
-			throw new Exception( __( 'Invalid invoice', 'invoicing' ) );
+        if (empty($invoice)) {
+			throw new Exception(__('Invalid invoice', 'invoicing'));
 		}
 
-		if ( $invoice->is_paid() ) {
-			throw new Exception( __( 'This invoice is already paid for.', 'invoicing' ) );
+		if ($invoice->is_paid()) {
+			throw new Exception(__('This invoice is already paid for.', 'invoicing'));
 		}
 
 		$this->payment_form->invoice = $invoice;
-		if ( ! $this->payment_form->is_default() ) {
+		if (!$this->payment_form->is_default()) {
 
 			$items    = array();
 			$item_ids = array();
 	
-			foreach ( $invoice->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
+			foreach ($invoice->get_items() as $item) {
+				if (!in_array($item->get_id(), $item_ids)) {
 					$item_ids[] = $item->get_id();
 					$items[]    = $item;
 				}
 			}
 	
-			foreach ( $this->payment_form->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
+			foreach ($this->payment_form->get_items() as $item) {
+				if (!in_array($item->get_id(), $item_ids)) {
 					$item_ids[] = $item->get_id();
 					$items[]    = $item;
 				}
 			}
 	
-			$this->payment_form->set_items( $items );
+			$this->payment_form->set_items($items);
 	
 		} else {
-			$this->payment_form->set_items( $invoice->get_items() );
+			$this->payment_form->set_items($invoice->get_items());
 		}
 
 		$this->country = $invoice->get_country();
 		$this->state   = $invoice->get_state();
 		$this->invoice = $invoice;
 
-		do_action_ref_array( 'getpaid_submissions_process_invoice', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_invoice', array(&$this));
 	}
 
 	/**
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
 	 * @return bool
 	 */
 	public function has_invoice() {
-		return ! empty( $this->invoice );
+		return !empty($this->invoice);
 	}
 
 	/*
@@ -346,13 +346,13 @@  discard block
 block discarded – undo
 	 */
 	public function process_items() {
 
-		$processor = new GetPaid_Payment_Form_Submission_Items( $this );
+		$processor = new GetPaid_Payment_Form_Submission_Items($this);
 
-		foreach ( $processor->items as $item ) {
-			$this->add_item( $item );
+		foreach ($processor->items as $item) {
+			$this->add_item($item);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_items', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_items', array(&$this));
 	}
 
 	/**
@@ -361,20 +361,20 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 * @param GetPaid_Form_Item $item
 	 */
-	public function add_item( $item ) {
+	public function add_item($item) {
 
 		// Make sure that it is available for purchase.
-		if ( ! $item->can_purchase() || isset( $this->items[ $item->get_id() ] ) ) {
+		if (!$item->can_purchase() || isset($this->items[$item->get_id()])) {
 			return;
 		}
 
 		// Each submission can only contain one recurring item.
-		if ( $item->is_recurring() ) {
+		if ($item->is_recurring()) {
 			$this->has_recurring = $item->get_id();
 		}
 
 		// Update the items and totals.
-		$this->items[ $item->get_id() ]         = $item;
+		$this->items[$item->get_id()]         = $item;
 		$this->totals['subtotal']['initial']   += $item->get_sub_total();
 		$this->totals['subtotal']['recurring'] += $item->get_recurring_sub_total();
 
@@ -388,17 +388,17 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_item( $item_id ) {
+	public function remove_item($item_id) {
 
-		if ( isset( $this->items[ $item_id ] ) ) {
-			$this->totals['subtotal']['initial']   -= $this->items[ $item_id ]->get_sub_total();
-			$this->totals['subtotal']['recurring'] -= $this->items[ $item_id ]->get_recurring_sub_total();
+		if (isset($this->items[$item_id])) {
+			$this->totals['subtotal']['initial']   -= $this->items[$item_id]->get_sub_total();
+			$this->totals['subtotal']['recurring'] -= $this->items[$item_id]->get_recurring_sub_total();
 
-			if ( $this->items[ $item_id ]->is_recurring() ) {
+			if ($this->items[$item_id]->is_recurring()) {
 				$this->has_recurring = 0;
 			}
 
-			unset( $this->items[ $item_id ] );
+			unset($this->items[$item_id]);
 		}
 
 	}
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
 	 */
 	public function get_subtotal() {
 
-		if ( wpinv_prices_include_tax() ) {
+		if (wpinv_prices_include_tax()) {
 			return $this->totals['subtotal']['initial'] - $this->totals['taxes']['initial'];
 		}
 
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
 	 */
 	public function get_recurring_subtotal() {
 
-		if ( wpinv_prices_include_tax() ) {
+		if (wpinv_prices_include_tax()) {
 			return $this->totals['subtotal']['recurring'] - $this->totals['taxes']['recurring'];
 		}
 
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
 	 * @return bool
 	 */
 	public function has_subscription_group() {
-		return $this->has_recurring && getpaid_should_group_subscriptions( $this ) && 1 == count( getpaid_get_subscription_groups( $this ) );
+		return $this->has_recurring && getpaid_should_group_subscriptions($this) && 1 == count(getpaid_get_subscription_groups($this));
 	}
 
 	/**
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
 	 * @return bool
 	 */
 	public function has_multiple_subscription_groups() {
-		return $this->has_recurring && 1 < count( getpaid_get_subscription_groups( $this ) );
+		return $this->has_recurring && 1 < count(getpaid_get_subscription_groups($this));
 	}
 
 	/*
@@ -478,39 +478,39 @@  discard block
 block discarded – undo
 	public function process_taxes() {
 
 		// Abort if we're not using taxes.
-		if ( ! $this->use_taxes() ) {
+		if (!$this->use_taxes()) {
 			return;
 		}
 
 		// If a custom country && state has been passed in, use it to calculate taxes.
-		$country = $this->get_field( 'wpinv_country', 'billing' );
-		if ( ! empty( $country ) ) {
+		$country = $this->get_field('wpinv_country', 'billing');
+		if (!empty($country)) {
 			$this->country = $country;
 		}
 
-		$state = $this->get_field( 'wpinv_state', 'billing' );
-		if ( ! empty( $state ) ) {
+		$state = $this->get_field('wpinv_state', 'billing');
+		if (!empty($state)) {
 			$this->state = $state;
 		}
 
 		// Confirm if the provided country and the ip country are similar.
-		$address_confirmed = $this->get_field( 'confirm-address' );
-		if ( isset( $_POST['billing']['country'] ) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty( $address_confirmed ) ) {
-			throw new Exception( __( 'The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing' ) );
+		$address_confirmed = $this->get_field('confirm-address');
+		if (isset($_POST['billing']['country']) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty($address_confirmed)) {
+			throw new Exception(__('The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing'));
 		}
 
 		// Abort if the country is not taxable.
-		if ( ! wpinv_is_country_taxable( $this->country ) ) {
+		if (!wpinv_is_country_taxable($this->country)) {
 			return;
 		}
 
-		$processor = new GetPaid_Payment_Form_Submission_Taxes( $this );
+		$processor = new GetPaid_Payment_Form_Submission_Taxes($this);
 
-		foreach ( $processor->taxes as $tax ) {
-			$this->add_tax( $tax );
+		foreach ($processor->taxes as $tax) {
+			$this->add_tax($tax);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_taxes', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_taxes', array(&$this));
 	}
 
 	/**
@@ -519,16 +519,16 @@  discard block
 block discarded – undo
 	 * @param array $tax An array of tax details. name, initial_tax, and recurring_tax are required.
 	 * @since 1.0.19
 	 */
-	public function add_tax( $tax ) {
+	public function add_tax($tax) {
 
-		if ( wpinv_round_tax_per_tax_rate() ) {
-			$tax['initial_tax']   = wpinv_round_amount( $tax['initial_tax'] );
-			$tax['recurring_tax'] = wpinv_round_amount( $tax['recurring_tax'] );
+		if (wpinv_round_tax_per_tax_rate()) {
+			$tax['initial_tax']   = wpinv_round_amount($tax['initial_tax']);
+			$tax['recurring_tax'] = wpinv_round_amount($tax['recurring_tax']);
 		}
 
-		$this->taxes[ $tax['name'] ]         = $tax;
-		$this->totals['taxes']['initial']   += wpinv_sanitize_amount( $tax['initial_tax'] );
-		$this->totals['taxes']['recurring'] += wpinv_sanitize_amount( $tax['recurring_tax'] );
+		$this->taxes[$tax['name']]         = $tax;
+		$this->totals['taxes']['initial']   += wpinv_sanitize_amount($tax['initial_tax']);
+		$this->totals['taxes']['recurring'] += wpinv_sanitize_amount($tax['recurring_tax']);
 
 	}
 
@@ -537,12 +537,12 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_tax( $tax_name ) {
+	public function remove_tax($tax_name) {
 
-		if ( isset( $this->taxes[ $tax_name ] ) ) {
-			$this->totals['taxes']['initial']   -= $this->taxes[ $tax_name ]['initial_tax'];
-			$this->totals['taxes']['recurring'] -= $this->taxes[ $tax_name ]['recurring_tax'];
-			unset( $this->taxes[ $tax_name ] );
+		if (isset($this->taxes[$tax_name])) {
+			$this->totals['taxes']['initial']   -= $this->taxes[$tax_name]['initial_tax'];
+			$this->totals['taxes']['recurring'] -= $this->taxes[$tax_name]['recurring_tax'];
+			unset($this->taxes[$tax_name]);
 		}
 
 	}
@@ -556,11 +556,11 @@  discard block
 block discarded – undo
 
 		$use_taxes = wpinv_use_taxes();
 
-		if ( $this->has_invoice() && ! $this->invoice->is_taxable() ) {
+		if ($this->has_invoice() && !$this->invoice->is_taxable()) {
 			$use_taxes = false;
 		}
 
-		return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
+		return apply_filters('getpaid_submission_use_taxes', $use_taxes, $this);
 
 	}
 
@@ -609,13 +609,13 @@  discard block
 block discarded – undo
 
 		$initial_total    = $this->get_subtotal() + $this->get_fee() + $this->get_tax();
 		$recurring_total  = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax();
-		$processor        = new GetPaid_Payment_Form_Submission_Discount( $this, $initial_total, $recurring_total );
+		$processor        = new GetPaid_Payment_Form_Submission_Discount($this, $initial_total, $recurring_total);
 
-		foreach ( $processor->discounts as $discount ) {
-			$this->add_discount( $discount );
+		foreach ($processor->discounts as $discount) {
+			$this->add_discount($discount);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_discounts', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_discounts', array(&$this));
 	}
 
 	/**
@@ -624,10 +624,10 @@  discard block
 block discarded – undo
 	 * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
 	 * @since 1.0.19
 	 */
-	public function add_discount( $discount ) {
-		$this->discounts[ $discount['name'] ]   = $discount;
-		$this->totals['discount']['initial']   += wpinv_sanitize_amount( $discount['initial_discount'] );
-		$this->totals['discount']['recurring'] += wpinv_sanitize_amount( $discount['recurring_discount'] );
+	public function add_discount($discount) {
+		$this->discounts[$discount['name']]   = $discount;
+		$this->totals['discount']['initial']   += wpinv_sanitize_amount($discount['initial_discount']);
+		$this->totals['discount']['recurring'] += wpinv_sanitize_amount($discount['recurring_discount']);
 	}
 
 	/**
@@ -635,12 +635,12 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_discount( $name ) {
+	public function remove_discount($name) {
 
-		if ( isset( $this->discounts[ $name ] ) ) {
-			$this->totals['discount']['initial']   -= $this->discounts[ $name ]['initial_discount'];
-			$this->totals['discount']['recurring'] -= $this->discounts[ $name ]['recurring_discount'];
-			unset( $this->discounts[ $name ] );
+		if (isset($this->discounts[$name])) {
+			$this->totals['discount']['initial']   -= $this->discounts[$name]['initial_discount'];
+			$this->totals['discount']['recurring'] -= $this->discounts[$name]['recurring_discount'];
+			unset($this->discounts[$name]);
 		}
 
 	}
@@ -652,7 +652,7 @@  discard block
 block discarded – undo
 	 * @return bool
 	 */
 	public function has_discount_code() {
-		return ! empty( $this->discounts['discount_code'] );
+		return !empty($this->discounts['discount_code']);
 	}
 
 	/**
@@ -709,13 +709,13 @@  discard block
 block discarded – undo
 	 */
 	public function process_fees() {
 
-		$fees_processor = new GetPaid_Payment_Form_Submission_Fees( $this );
+		$fees_processor = new GetPaid_Payment_Form_Submission_Fees($this);
 
-		foreach ( $fees_processor->fees as $fee ) {
-			$this->add_fee( $fee );
+		foreach ($fees_processor->fees as $fee) {
+			$this->add_fee($fee);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_fees', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_fees', array(&$this));
 	}
 
 	/**
@@ -724,17 +724,17 @@  discard block
 block discarded – undo
 	 * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
 	 * @since 1.0.19
 	 */
-	public function add_fee( $fee ) {
+	public function add_fee($fee) {
 
-		if ( $fee['name'] == 'shipping' ) {
-			$this->totals['shipping']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-			$this->totals['shipping']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+		if ($fee['name'] == 'shipping') {
+			$this->totals['shipping']['initial']   += wpinv_sanitize_amount($fee['initial_fee']);
+			$this->totals['shipping']['recurring'] += wpinv_sanitize_amount($fee['recurring_fee']);
 			return;
 		}
 
-		$this->fees[ $fee['name'] ]         = $fee;
-		$this->totals['fees']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-		$this->totals['fees']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+		$this->fees[$fee['name']]         = $fee;
+		$this->totals['fees']['initial']   += wpinv_sanitize_amount($fee['initial_fee']);
+		$this->totals['fees']['recurring'] += wpinv_sanitize_amount($fee['recurring_fee']);
 
 	}
 
@@ -743,15 +743,15 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_fee( $name ) {
+	public function remove_fee($name) {
 
-		if ( isset( $this->fees[ $name ] ) ) {
-			$this->totals['fees']['initial']   -= $this->fees[ $name ]['initial_fee'];
-			$this->totals['fees']['recurring'] -= $this->fees[ $name ]['recurring_fee'];
-			unset( $this->fees[ $name ] );
+		if (isset($this->fees[$name])) {
+			$this->totals['fees']['initial']   -= $this->fees[$name]['initial_fee'];
+			$this->totals['fees']['recurring'] -= $this->fees[$name]['recurring_fee'];
+			unset($this->fees[$name]);
 		}
 
-		if ( 'shipping' == $name ) {
+		if ('shipping' == $name) {
 			$this->totals['shipping']['initial']   = 0;
 			$this->totals['shipping']['recurring'] = 0;
 		}
@@ -792,7 +792,7 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 */
 	public function has_fees() {
-		return count( $this->fees ) !== 0;
+		return count($this->fees) !== 0;
 	}
 
 	/*
@@ -828,7 +828,7 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 */
 	public function has_shipping() {
-		return apply_filters( 'getpaid_payment_form_has_shipping', false, $this );
+		return apply_filters('getpaid_payment_form_has_shipping', false, $this);
 	}
 
 	/**
@@ -838,7 +838,7 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 */
 	public function is_initial_fetch() {
-		return empty( $this->data['initial_state'] );
+		return empty($this->data['initial_state']);
 	}
 
 	/**
@@ -848,7 +848,7 @@  discard block
 block discarded – undo
 	 */
 	public function get_total() {
 		$total = $this->get_subtotal() + $this->get_fee() + $this->get_tax() + $this->get_shipping() - $this->get_discount();
-		return max( $total, 0 );
+		return max($total, 0);
 	}
 
 	/**
@@ -858,7 +858,7 @@  discard block
 block discarded – undo
 	 */
 	public function get_recurring_total() {
 		$total = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax() + $this->get_recurring_shipping() - $this->get_recurring_discount();
-		return max( $total, 0 );
+		return max($total, 0);
 	}
 
 	/**
@@ -870,12 +870,12 @@  discard block
 block discarded – undo
 		$initial   = $this->get_total();
 		$recurring = $this->get_recurring_total();
 
-		if ( $this->has_recurring == 0 ) {
+		if ($this->has_recurring == 0) {
 			$recurring = 0;
 		}
 
 		$collect = $initial > 0 || $recurring > 0;
-		return apply_filters( 'getpaid_submission_should_collect_payment_details', $collect, $this  );
+		return apply_filters('getpaid_submission_should_collect_payment_details', $collect, $this);
 	}
 
 	/**
@@ -884,7 +884,7 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 */
 	public function get_billing_email() {
-		return apply_filters( 'getpaid_get_submission_billing_email', $this->get_field( 'billing_email' ), $this  );
+		return apply_filters('getpaid_get_submission_billing_email', $this->get_field('billing_email'), $this);
 	}
 
 	/**
@@ -894,7 +894,7 @@  discard block
 block discarded – undo
 	 */
 	public function has_billing_email() {
 		$billing_email = $this->get_billing_email();
-		return ! empty( $billing_email ) && is_email( $billing_email );
+		return !empty($billing_email) && is_email($billing_email);
 	}
 
 	/**
@@ -924,8 +924,8 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 * @return mixed|null
 	 */
-	public function get_field( $field, $sub_array_key = null ) {
-		return getpaid_get_array_field( $this->data, $field, $sub_array_key );
+	public function get_field($field, $sub_array_key = null) {
+		return getpaid_get_array_field($this->data, $field, $sub_array_key);
 	}
 
 	/**
@@ -933,8 +933,8 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.0.19
 	 */
-	public function is_required_field_set( $field ) {
-		return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
+	public function is_required_field_set($field) {
+		return empty($field['required']) || !empty($this->data[$field['id']]);
 	}
 
 	/**
@@ -942,8 +942,8 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.0.19
 	 */
-	public function format_amount( $amount ) {
-		return wpinv_price( $amount, $this->get_currency() );
+	public function format_amount($amount) {
+		return wpinv_price($amount, $this->get_currency());
 	}
 
 }

Please login to merge, or discard this patch.

includes/class-wpinv-ajax.php 2 patches

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

@@ -14,70 +14,70 @@  discard block
 block discarded – undo
 class WPInv_Ajax {
 
     /**
-	 * Hook in ajax handlers.
-	 */
-	public static function init() {
-		add_action( 'init', array( __CLASS__, 'define_ajax' ), 0 );
-		add_action( 'template_redirect', array( __CLASS__, 'do_wpinv_ajax' ), 0 );
-		self::add_ajax_events();
+     * Hook in ajax handlers.
+     */
+    public static function init() {
+        add_action( 'init', array( __CLASS__, 'define_ajax' ), 0 );
+        add_action( 'template_redirect', array( __CLASS__, 'do_wpinv_ajax' ), 0 );
+        self::add_ajax_events();
     }
 
     /**
-	 * Set GetPaid AJAX constant and headers.
-	 */
-	public static function define_ajax() {
-
-		if ( ! empty( $_GET['wpinv-ajax'] ) ) {
-			getpaid_maybe_define_constant( 'DOING_AJAX', true );
-			getpaid_maybe_define_constant( 'WPInv_DOING_AJAX', true );
-			if ( ! WP_DEBUG || ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
-				/** @scrutinizer ignore-unhandled */ @ini_set( 'display_errors', 0 );
-			}
-			$GLOBALS['wpdb']->hide_errors();
-		}
+     * Set GetPaid AJAX constant and headers.
+     */
+    public static function define_ajax() {
+
+        if ( ! empty( $_GET['wpinv-ajax'] ) ) {
+            getpaid_maybe_define_constant( 'DOING_AJAX', true );
+            getpaid_maybe_define_constant( 'WPInv_DOING_AJAX', true );
+            if ( ! WP_DEBUG || ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
+                /** @scrutinizer ignore-unhandled */ @ini_set( 'display_errors', 0 );
+            }
+            $GLOBALS['wpdb']->hide_errors();
+        }
 
     }
     
     /**
-	 * Send headers for GetPaid Ajax Requests.
-	 *
-	 * @since 1.0.18
-	 */
-	private static function wpinv_ajax_headers() {
-		if ( ! headers_sent() ) {
-			send_origin_headers();
-			send_nosniff_header();
-			nocache_headers();
-			header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-			header( 'X-Robots-Tag: noindex' );
-			status_header( 200 );
-		}
+     * Send headers for GetPaid Ajax Requests.
+     *
+     * @since 1.0.18
+     */
+    private static function wpinv_ajax_headers() {
+        if ( ! headers_sent() ) {
+            send_origin_headers();
+            send_nosniff_header();
+            nocache_headers();
+            header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+            header( 'X-Robots-Tag: noindex' );
+            status_header( 200 );
+        }
     }
     
     /**
-	 * Check for GetPaid Ajax request and fire action.
-	 */
-	public static function do_wpinv_ajax() {
-		global $wp_query;
+     * Check for GetPaid Ajax request and fire action.
+     */
+    public static function do_wpinv_ajax() {
+        global $wp_query;
 
-		if ( ! empty( $_GET['wpinv-ajax'] ) ) {
-			$wp_query->set( 'wpinv-ajax', sanitize_text_field( wp_unslash( $_GET['wpinv-ajax'] ) ) );
-		}
+        if ( ! empty( $_GET['wpinv-ajax'] ) ) {
+            $wp_query->set( 'wpinv-ajax', sanitize_text_field( wp_unslash( $_GET['wpinv-ajax'] ) ) );
+        }
 
-		$action = $wp_query->get( 'wpinv-ajax' );
+        $action = $wp_query->get( 'wpinv-ajax' );
 
-		if ( $action ) {
-			self::wpinv_ajax_headers();
-			$action = sanitize_text_field( $action );
-			do_action( 'wpinv_ajax_' . $action );
-			wp_die();
-		}
+        if ( $action ) {
+            self::wpinv_ajax_headers();
+            $action = sanitize_text_field( $action );
+            do_action( 'wpinv_ajax_' . $action );
+            wp_die();
+        }
 
     }
 
     /**
-	 * Hook in ajax methods.
-	 */
+     * Hook in ajax methods.
+     */
     public static function add_ajax_events() {
 
         // array( 'event' => is_frontend )
@@ -261,18 +261,18 @@  discard block
 block discarded – undo
         check_ajax_referer( 'getpaid_form_nonce' );
 
         // Is the request set up correctly?
-		if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) && empty( $_GET['invoice'] ) ) {
-			echo aui()->alert(
-				array(
-					'type'    => 'warning',
-					'content' => __( 'No payment form or item provided', 'invoicing' ),
-				)
+        if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) && empty( $_GET['invoice'] ) ) {
+            echo aui()->alert(
+                array(
+                    'type'    => 'warning',
+                    'content' => __( 'No payment form or item provided', 'invoicing' ),
+                )
             );
             exit;
         }
 
         // Payment form or button?
-		if ( ! empty( $_GET['form'] ) ) {
+        if ( ! empty( $_GET['form'] ) ) {
             $form = sanitize_text_field( urldecode( $_GET['form'] ) );
 
             if ( false !== strpos( $form, '|' ) ) {
@@ -326,11 +326,11 @@  discard block
 block discarded – undo
                 getpaid_display_payment_form( $form );
             }
 
-		} else if( ! empty( $_GET['invoice'] ) ) {
-		    getpaid_display_invoice_payment_form( (int) urldecode( $_GET['invoice'] ) );
+        } else if( ! empty( $_GET['invoice'] ) ) {
+            getpaid_display_invoice_payment_form( (int) urldecode( $_GET['invoice'] ) );
         } else {
-			$items = getpaid_convert_items_to_array( sanitize_text_field( urldecode( $_GET['item'] ) ) );
-		    getpaid_display_item_payment_form( $items );
+            $items = getpaid_convert_items_to_array( sanitize_text_field( urldecode( $_GET['item'] ) ) );
+            getpaid_display_item_payment_form( $items );
         }
 
         exit;
@@ -651,7 +651,7 @@  discard block
 block discarded – undo
         if ( is_wp_error( $error ) ) {
             $alert = $error->get_error_message();
             wp_send_json_success( compact( 'alert' ) );
-         }
+            }
 
         // Update totals.
         $invoice->recalculate_total();
@@ -1089,12 +1089,12 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * Handles file uploads.
-	 *
-	 * @since       1.0.0
-	 * @return      void
-	 */
-	public static function file_upload() {
+     * Handles file uploads.
+     *
+     * @since       1.0.0
+     * @return      void
+     */
+    public static function file_upload() {
 
         // Check nonce.
         check_ajax_referer( 'getpaid_form_nonce' );
@@ -1155,7 +1155,7 @@  discard block
 block discarded – undo
 
         wp_send_json_success( $response );
 
-	}
+    }
 
 }
 

Please login to merge, or discard this patch.

Spacing +326 added lines, -326 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;
 
 /**
  * WPInv_Ajax class.
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
 	 * Hook in ajax handlers.
 	 */
 	public static function init() {
-		add_action( 'init', array( __CLASS__, 'define_ajax' ), 0 );
-		add_action( 'template_redirect', array( __CLASS__, 'do_wpinv_ajax' ), 0 );
+		add_action('init', array(__CLASS__, 'define_ajax'), 0);
+		add_action('template_redirect', array(__CLASS__, 'do_wpinv_ajax'), 0);
 		self::add_ajax_events();
     }
 
@@ -27,11 +27,11 @@  discard block
 block discarded – undo
 	 */
 	public static function define_ajax() {
 
-		if ( ! empty( $_GET['wpinv-ajax'] ) ) {
-			getpaid_maybe_define_constant( 'DOING_AJAX', true );
-			getpaid_maybe_define_constant( 'WPInv_DOING_AJAX', true );
-			if ( ! WP_DEBUG || ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
-				/** @scrutinizer ignore-unhandled */ @ini_set( 'display_errors', 0 );
+		if (!empty($_GET['wpinv-ajax'])) {
+			getpaid_maybe_define_constant('DOING_AJAX', true);
+			getpaid_maybe_define_constant('WPInv_DOING_AJAX', true);
+			if (!WP_DEBUG || (WP_DEBUG && !WP_DEBUG_DISPLAY)) {
+				/** @scrutinizer ignore-unhandled */ @ini_set('display_errors', 0);
 			}
 			$GLOBALS['wpdb']->hide_errors();
 		}
@@ -44,13 +44,13 @@  discard block
 block discarded – undo
 	 * @since 1.0.18
 	 */
 	private static function wpinv_ajax_headers() {
-		if ( ! headers_sent() ) {
+		if (!headers_sent()) {
 			send_origin_headers();
 			send_nosniff_header();
 			nocache_headers();
-			header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-			header( 'X-Robots-Tag: noindex' );
-			status_header( 200 );
+			header('Content-Type: text/html; charset=' . get_option('blog_charset'));
+			header('X-Robots-Tag: noindex');
+			status_header(200);
 		}
     }
     
@@ -60,16 +60,16 @@  discard block
 block discarded – undo
 	public static function do_wpinv_ajax() {
 		global $wp_query;
 
-		if ( ! empty( $_GET['wpinv-ajax'] ) ) {
-			$wp_query->set( 'wpinv-ajax', sanitize_text_field( wp_unslash( $_GET['wpinv-ajax'] ) ) );
+		if (!empty($_GET['wpinv-ajax'])) {
+			$wp_query->set('wpinv-ajax', sanitize_text_field(wp_unslash($_GET['wpinv-ajax'])));
 		}
 
-		$action = $wp_query->get( 'wpinv-ajax' );
+		$action = $wp_query->get('wpinv-ajax');
 
-		if ( $action ) {
+		if ($action) {
 			self::wpinv_ajax_headers();
-			$action = sanitize_text_field( $action );
-			do_action( 'wpinv_ajax_' . $action );
+			$action = sanitize_text_field($action);
+			do_action('wpinv_ajax_' . $action);
 			wp_die();
 		}
 
@@ -106,36 +106,36 @@  discard block
 block discarded – undo
             'file_upload'                 => true,
         );
 
-        foreach ( $ajax_events as $ajax_event => $nopriv ) {
-            add_action( 'wp_ajax_wpinv_' . $ajax_event, array( __CLASS__, $ajax_event ) );
-            add_action( 'wp_ajax_getpaid_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+        foreach ($ajax_events as $ajax_event => $nopriv) {
+            add_action('wp_ajax_wpinv_' . $ajax_event, array(__CLASS__, $ajax_event));
+            add_action('wp_ajax_getpaid_' . $ajax_event, array(__CLASS__, $ajax_event));
 
-            if ( $nopriv ) {
-                add_action( 'wp_ajax_nopriv_wpinv_' . $ajax_event, array( __CLASS__, $ajax_event ) );
-                add_action( 'wp_ajax_nopriv_getpaid_' . $ajax_event, array( __CLASS__, $ajax_event ) );
-                add_action( 'wpinv_ajax_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+            if ($nopriv) {
+                add_action('wp_ajax_nopriv_wpinv_' . $ajax_event, array(__CLASS__, $ajax_event));
+                add_action('wp_ajax_nopriv_getpaid_' . $ajax_event, array(__CLASS__, $ajax_event));
+                add_action('wpinv_ajax_' . $ajax_event, array(__CLASS__, $ajax_event));
             }
         }
     }
     
     public static function add_note() {
-        check_ajax_referer( 'add-invoice-note', '_nonce' );
+        check_ajax_referer('add-invoice-note', '_nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
 
-        $post_id   = absint( $_POST['post_id'] );
-        $note      = wp_kses_post( trim( stripslashes( $_POST['note'] ) ) );
-        $note_type = sanitize_text_field( $_POST['note_type'] );
+        $post_id   = absint($_POST['post_id']);
+        $note      = wp_kses_post(trim(stripslashes($_POST['note'])));
+        $note_type = sanitize_text_field($_POST['note_type']);
 
         $is_customer_note = $note_type == 'customer' ? 1 : 0;
 
-        if ( $post_id > 0 ) {
-            $note_id = wpinv_insert_payment_note( $post_id, $note, $is_customer_note );
+        if ($post_id > 0) {
+            $note_id = wpinv_insert_payment_note($post_id, $note, $is_customer_note);
 
-            if ( $note_id > 0 && !is_wp_error( $note_id ) ) {
-                wpinv_get_invoice_note_line_item( $note_id );
+            if ($note_id > 0 && !is_wp_error($note_id)) {
+                wpinv_get_invoice_note_line_item($note_id);
             }
         }
 
@@ -143,16 +143,16 @@  discard block
 block discarded – undo
     }
 
     public static function delete_note() {
-        check_ajax_referer( 'delete-invoice-note', '_nonce' );
+        check_ajax_referer('delete-invoice-note', '_nonce');
 
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
 
-        $note_id = (int)$_POST['note_id'];
+        $note_id = (int) $_POST['note_id'];
 
-        if ( $note_id > 0 ) {
-            wp_delete_comment( $note_id, true );
+        if ($note_id > 0) {
+            wp_delete_comment($note_id, true);
         }
 
         die();
@@ -170,34 +170,34 @@  discard block
 block discarded – undo
     public static function get_billing_details() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
 
         // Do we have a user id?
         $user_id = (int) $_GET['user_id'];
 
-        if ( empty( $user_id ) || ! is_numeric( $user_id ) ) {
+        if (empty($user_id) || !is_numeric($user_id)) {
             die(-1);
         }
 
         // Fetch the billing details.
-        $billing_details    = wpinv_get_user_address( $user_id );
-        $billing_details    = apply_filters( 'wpinv_ajax_billing_details', $billing_details, $user_id );
+        $billing_details    = wpinv_get_user_address($user_id);
+        $billing_details    = apply_filters('wpinv_ajax_billing_details', $billing_details, $user_id);
 
         // unset the user id and email.
-        $to_ignore = array( 'user_id', 'email' );
+        $to_ignore = array('user_id', 'email');
 
-        foreach ( $to_ignore as $key ) {
-            if ( isset( $billing_details[ $key ] ) ) {
-                unset( $billing_details[ $key ] );
+        foreach ($to_ignore as $key) {
+            if (isset($billing_details[$key])) {
+                unset($billing_details[$key]);
             }
         }
 
-        wp_send_json_success( $billing_details );
+        wp_send_json_success($billing_details);
 
     }
 
@@ -207,47 +207,47 @@  discard block
 block discarded – undo
     public static function check_new_user_email() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
 
         // We need an email address.
-        if ( empty( $_GET['email'] ) ) {
-            _e( "Provide the new user's email address", 'invoicing' );
+        if (empty($_GET['email'])) {
+            _e("Provide the new user's email address", 'invoicing');
             exit;
         }
 
         // Ensure the email is valid.
-        $email = sanitize_email( $_GET['email'] );
-        if ( ! is_email( $email ) ) {
-            _e( 'Invalid email address', 'invoicing' );
+        $email = sanitize_email($_GET['email']);
+        if (!is_email($email)) {
+            _e('Invalid email address', 'invoicing');
             exit;
         }
 
         // And it does not exist.
-        $id = email_exists( $email );
-        if ( $id ) {
-            wp_send_json_success( compact( 'id' ) );
+        $id = email_exists($email);
+        if ($id) {
+            wp_send_json_success(compact('id'));
         }
 
-        wp_send_json_success( true );
+        wp_send_json_success(true);
     }
     
     public static function run_tool() {
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
-        if ( !wpinv_current_user_can_manage_invoicing() ) {
+        check_ajax_referer('wpinv-nonce', '_nonce');
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die(-1);
         }
         
-        $tool = sanitize_text_field( $_POST['tool'] );
+        $tool = sanitize_text_field($_POST['tool']);
         
-        do_action( 'wpinv_run_tool' );
+        do_action('wpinv_run_tool');
         
-        if ( !empty( $tool ) ) {
-            do_action( 'wpinv_tool_' . $tool );
+        if (!empty($tool)) {
+            do_action('wpinv_tool_' . $tool);
         }
     }
 
@@ -258,43 +258,43 @@  discard block
 block discarded – undo
         global $getpaid_force_checkbox;
 
         // Check nonce.
-        check_ajax_referer( 'getpaid_form_nonce' );
+        check_ajax_referer('getpaid_form_nonce');
 
         // Is the request set up correctly?
-		if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) && empty( $_GET['invoice'] ) ) {
+		if (empty($_GET['form']) && empty($_GET['item']) && empty($_GET['invoice'])) {
 			echo aui()->alert(
 				array(
 					'type'    => 'warning',
-					'content' => __( 'No payment form or item provided', 'invoicing' ),
+					'content' => __('No payment form or item provided', 'invoicing'),
 				)
             );
             exit;
         }
 
         // Payment form or button?
-		if ( ! empty( $_GET['form'] ) ) {
-            $form = sanitize_text_field( urldecode( $_GET['form'] ) );
+		if (!empty($_GET['form'])) {
+            $form = sanitize_text_field(urldecode($_GET['form']));
 
-            if ( false !== strpos( $form, '|' ) ) {
-                $form_pos = strpos( $form, '|' );
-                $_items   = getpaid_convert_items_to_array( substr( $form, $form_pos + 1 ) );
-                $form     = substr( $form, 0, $form_pos );
+            if (false !== strpos($form, '|')) {
+                $form_pos = strpos($form, '|');
+                $_items   = getpaid_convert_items_to_array(substr($form, $form_pos + 1));
+                $form     = substr($form, 0, $form_pos);
 
                 // Retrieve appropriate payment form.
-                $payment_form = new GetPaid_Payment_Form( $form );
-                $payment_form = $payment_form->exists() ? $payment_form : new GetPaid_Payment_Form( wpinv_get_default_payment_form() );
+                $payment_form = new GetPaid_Payment_Form($form);
+                $payment_form = $payment_form->exists() ? $payment_form : new GetPaid_Payment_Form(wpinv_get_default_payment_form());
 
                 $items    = array();
                 $item_ids = array();
 
-                foreach ( $_items as $item_id => $qty ) {
-                    if ( ! in_array( $item_id, $item_ids ) ) {
-                        $item = new GetPaid_Form_Item( $item_id );
-                        $item->set_quantity( $qty );
+                foreach ($_items as $item_id => $qty) {
+                    if (!in_array($item_id, $item_ids)) {
+                        $item = new GetPaid_Form_Item($item_id);
+                        $item->set_quantity($qty);
 
-                        if ( 0 == $qty ) {
-                            $item->set_allow_quantities( true );
-                            $item->set_is_required( false );
+                        if (0 == $qty) {
+                            $item->set_allow_quantities(true);
+                            $item->set_is_required(false);
                             $getpaid_force_checkbox = true;
                         }
 
@@ -303,10 +303,10 @@  discard block
 block discarded – undo
                     }
                 }
 
-                if ( ! $payment_form->is_default() ) {
+                if (!$payment_form->is_default()) {
 
-                    foreach ( $payment_form->get_items() as $item ) {
-                        if ( ! in_array( $item->get_id(), $item_ids ) ) {
+                    foreach ($payment_form->get_items() as $item) {
+                        if (!in_array($item->get_id(), $item_ids)) {
                             $item_ids[] = $item->get_id();
                             $items[]    = $item;
                         }
@@ -314,23 +314,23 @@  discard block
 block discarded – undo
 
                 }
 
-                $payment_form->set_items( $items );
-                $extra_items     = esc_attr( getpaid_convert_items_to_string( $_items ) );
-                $extra_items_key = md5( NONCE_KEY . AUTH_KEY . $extra_items );
+                $payment_form->set_items($items);
+                $extra_items     = esc_attr(getpaid_convert_items_to_string($_items));
+                $extra_items_key = md5(NONCE_KEY . AUTH_KEY . $extra_items);
                 $extra_items     = "<input type='hidden' name='getpaid-form-items' value='$extra_items' />";
                 $extra_items    .= "<input type='hidden' name='getpaid-form-items-key' value='$extra_items_key' />";
-                $payment_form->display( $extra_items );
+                $payment_form->display($extra_items);
                 $getpaid_force_checkbox = false;
 
             } else {
-                getpaid_display_payment_form( $form );
+                getpaid_display_payment_form($form);
             }
 
-		} else if( ! empty( $_GET['invoice'] ) ) {
-		    getpaid_display_invoice_payment_form( (int) urldecode( $_GET['invoice'] ) );
+		} else if (!empty($_GET['invoice'])) {
+		    getpaid_display_invoice_payment_form((int) urldecode($_GET['invoice']));
         } else {
-			$items = getpaid_convert_items_to_array( sanitize_text_field( urldecode( $_GET['item'] ) ) );
-		    getpaid_display_item_payment_form( $items );
+			$items = getpaid_convert_items_to_array(sanitize_text_field(urldecode($_GET['item'])));
+		    getpaid_display_item_payment_form($items);
         }
 
         exit;
@@ -345,17 +345,17 @@  discard block
 block discarded – undo
     public static function payment_form() {
 
         // Check nonce.
-        check_ajax_referer( 'getpaid_form_nonce' );
+        check_ajax_referer('getpaid_form_nonce');
 
         // ... form fields...
-        if ( empty( $_POST['getpaid_payment_form_submission'] ) ) {
-            _e( 'Error: Reload the page and try again.', 'invoicing' );
+        if (empty($_POST['getpaid_payment_form_submission'])) {
+            _e('Error: Reload the page and try again.', 'invoicing');
             exit;
         }
 
         // Process the payment form.
-        $checkout_class = apply_filters( 'getpaid_checkout_class', 'GetPaid_Checkout' );
-        $checkout       = new $checkout_class( new GetPaid_Payment_Form_Submission() );
+        $checkout_class = apply_filters('getpaid_checkout_class', 'GetPaid_Checkout');
+        $checkout       = new $checkout_class(new GetPaid_Payment_Form_Submission());
         $checkout->process_checkout();
 
         exit;
@@ -368,55 +368,55 @@  discard block
 block discarded – undo
      */
     public static function get_payment_form_states_field() {
 
-        if ( empty( $_GET['country'] ) || empty( $_GET['form'] ) ) {
+        if (empty($_GET['country']) || empty($_GET['form'])) {
             exit;
         }
 
-        $elements = getpaid_get_payment_form_elements( (int) $_GET['form'] );
+        $elements = getpaid_get_payment_form_elements((int) $_GET['form']);
 
-        if ( empty( $elements ) ) {
+        if (empty($elements)) {
             exit;
         }
 
         $address_fields = array();
-        foreach ( $elements as $element ) {
-            if ( 'address' === $element['type'] ) {
+        foreach ($elements as $element) {
+            if ('address' === $element['type']) {
                 $address_fields = $element;
                 break;
             }
         }
 
-        if ( empty( $address_fields ) ) {
+        if (empty($address_fields)) {
             exit;
         }
 
-        foreach ( $address_fields['fields'] as $address_field ) {
+        foreach ($address_fields['fields'] as $address_field) {
 
-            if ( 'wpinv_state' == $address_field['name'] ) {
+            if ('wpinv_state' == $address_field['name']) {
 
-                $wrap_class  = getpaid_get_form_element_grid_class( $address_field );
-                $wrap_class  = esc_attr( "$wrap_class getpaid-address-field-wrapper" );
-                $placeholder = empty( $address_field['placeholder'] ) ? '' : esc_attr( $address_field['placeholder'] );
-                $description = empty( $address_field['description'] ) ? '' : wp_kses_post( $address_field['description'] );
-                $value       = is_user_logged_in() ? get_user_meta( get_current_user_id(), '_wpinv_state', true ) : '';
-                $label       = empty( $address_field['label'] ) ? '' : wp_kses_post( $address_field['label'] );
+                $wrap_class  = getpaid_get_form_element_grid_class($address_field);
+                $wrap_class  = esc_attr("$wrap_class getpaid-address-field-wrapper");
+                $placeholder = empty($address_field['placeholder']) ? '' : esc_attr($address_field['placeholder']);
+                $description = empty($address_field['description']) ? '' : wp_kses_post($address_field['description']);
+                $value       = is_user_logged_in() ? get_user_meta(get_current_user_id(), '_wpinv_state', true) : '';
+                $label       = empty($address_field['label']) ? '' : wp_kses_post($address_field['label']);
 
-                if ( ! empty( $address_field['required'] ) ) {
+                if (!empty($address_field['required'])) {
                     $label .= "<span class='text-danger'> *</span>";
                 }
 
-                $html = getpaid_get_states_select_markup (
-                    sanitize_text_field( $_GET['country'] ),
+                $html = getpaid_get_states_select_markup(
+                    sanitize_text_field($_GET['country']),
                     $value,
                     $placeholder,
                     $label,
                     $description,
-                    ! empty( $address_field['required'] ),
+                    !empty($address_field['required']),
                     $wrap_class,
-                    sanitize_text_field( $_GET['name'] )
+                    sanitize_text_field($_GET['name'])
                 );
 
-                wp_send_json_success( $html );
+                wp_send_json_success($html);
                 exit;
 
             }
@@ -432,66 +432,66 @@  discard block
 block discarded – undo
     public static function recalculate_invoice_totals() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice.
-        if ( empty( $_POST['post_id'] ) ) {
+        if (empty($_POST['post_id'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( intval( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(intval($_POST['post_id']));
 
         // Ensure it exists.
-        if ( ! $invoice->get_id() ) {
+        if (!$invoice->get_id()) {
             exit;
         }
 
         // Maybe set the country, state, currency.
-        foreach ( array( 'country', 'state', 'currency', 'vat_number', 'discount_code' ) as $key ) {
-            if ( isset( $_POST[ $key ] ) ) {
+        foreach (array('country', 'state', 'currency', 'vat_number', 'discount_code') as $key) {
+            if (isset($_POST[$key])) {
                 $method = "set_$key";
-                $invoice->$method( sanitize_text_field( $_POST[ $key ] ) );
+                $invoice->$method(sanitize_text_field($_POST[$key]));
             }
         }
 
         // Maybe disable taxes.
-        $invoice->set_disable_taxes( ! empty( $_POST['taxes'] ) );
+        $invoice->set_disable_taxes(!empty($_POST['taxes']));
 
         // Discount code.
-        if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
-            $discount = new WPInv_Discount( $invoice->get_discount_code() );
-            if ( $discount->exists() ) {
-                $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+        if (!$invoice->is_paid() && !$invoice->is_refunded()) {
+            $discount = new WPInv_Discount($invoice->get_discount_code());
+            if ($discount->exists()) {
+                $invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
             } else {
-                $invoice->remove_discount( 'discount_code' );
+                $invoice->remove_discount('discount_code');
             }
         }
 
         // Recalculate totals.
         $invoice->recalculate_total();
 
-        $total        = wpinv_price( $invoice->get_total(), $invoice->get_currency() );
-        $suscriptions = getpaid_get_invoice_subscriptions( $invoice );
-        if ( is_a( $suscriptions, 'WPInv_Subscription' ) && $invoice->is_recurring() && $invoice->is_parent() && $invoice->get_total() != $invoice->get_recurring_total() ) {
-            $recurring_total = wpinv_price( $invoice->get_recurring_total(), $invoice->get_currency() );
-            $total          .= '<small class="form-text text-muted">' . sprintf( __( 'Recurring Price: %s', 'invoicing' ), $recurring_total ) . '</small>';
+        $total        = wpinv_price($invoice->get_total(), $invoice->get_currency());
+        $suscriptions = getpaid_get_invoice_subscriptions($invoice);
+        if (is_a($suscriptions, 'WPInv_Subscription') && $invoice->is_recurring() && $invoice->is_parent() && $invoice->get_total() != $invoice->get_recurring_total()) {
+            $recurring_total = wpinv_price($invoice->get_recurring_total(), $invoice->get_currency());
+            $total          .= '<small class="form-text text-muted">' . sprintf(__('Recurring Price: %s', 'invoicing'), $recurring_total) . '</small>';
         }
 
         $totals = array(
-            'subtotal' => wpinv_price( $invoice->get_subtotal(), $invoice->get_currency() ),
-            'discount' => wpinv_price( $invoice->get_total_discount(), $invoice->get_currency() ),
-            'tax'      => wpinv_price( $invoice->get_total_tax(), $invoice->get_currency() ),
+            'subtotal' => wpinv_price($invoice->get_subtotal(), $invoice->get_currency()),
+            'discount' => wpinv_price($invoice->get_total_discount(), $invoice->get_currency()),
+            'tax'      => wpinv_price($invoice->get_total_tax(), $invoice->get_currency()),
             'total'    => $total,
         );
 
-        $totals = apply_filters( 'getpaid_invoice_totals', $totals, $invoice );
+        $totals = apply_filters('getpaid_invoice_totals', $totals, $invoice);
 
-        wp_send_json_success( compact( 'totals' ) );
+        wp_send_json_success(compact('totals'));
     }
 
     /**
@@ -500,33 +500,33 @@  discard block
 block discarded – undo
     public static function get_invoice_items() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice and items.
-        if ( empty( $_POST['post_id'] ) ) {
+        if (empty($_POST['post_id'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( intval( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(intval($_POST['post_id']));
 
         // Ensure it exists.
-        if ( ! $invoice->get_id() ) {
+        if (!$invoice->get_id()) {
             exit;
         }
 
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item ) {
-            $items[] = $item->prepare_data_for_invoice_edit_ajax(  $invoice->get_currency(), $invoice->is_renewal()  );
+        foreach ($invoice->get_items() as $item) {
+            $items[] = $item->prepare_data_for_invoice_edit_ajax($invoice->get_currency(), $invoice->is_renewal());
         }
 
-        wp_send_json_success( compact( 'items' ) );
+        wp_send_json_success(compact('items'));
     }
 
     /**
@@ -535,50 +535,50 @@  discard block
 block discarded – undo
     public static function edit_invoice_item() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice and item details.
-        if ( empty( $_POST['post_id'] ) || empty( $_POST['data'] ) ) {
+        if (empty($_POST['post_id']) || empty($_POST['data'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( intval( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(intval($_POST['post_id']));
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Format the data.
-        $data = wp_kses_post_deep( wp_unslash( wp_list_pluck( $_POST['data'], 'value', 'field' ) ) );
+        $data = wp_kses_post_deep(wp_unslash(wp_list_pluck($_POST['data'], 'value', 'field')));
 
         // Ensure that we have an item id.
-        if ( empty( $data['id'] ) ) {
+        if (empty($data['id'])) {
             exit;
         }
 
         // Abort if the invoice does not have the specified item.
-        $item = $invoice->get_item( (int) $data['id'] );
+        $item = $invoice->get_item((int) $data['id']);
 
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             exit;
         }
 
         // Update the item.
-        $item->set_price( getpaid_standardize_amount( $data['price'] ) );
-        $item->set_name( sanitize_text_field( $data['name'] ) );
-        $item->set_description( wp_kses_post( $data['description'] ) );
-        $item->set_quantity( floatval( $data['quantity'] ) );
+        $item->set_price(getpaid_standardize_amount($data['price']));
+        $item->set_name(sanitize_text_field($data['name']));
+        $item->set_description(wp_kses_post($data['description']));
+        $item->set_quantity(floatval($data['quantity']));
 
         // Add it to the invoice.
-        $error = $invoice->add_item( $item );
+        $error = $invoice->add_item($item);
         $alert = false;
-        if ( is_wp_error( $error ) ) {
+        if (is_wp_error($error)) {
             $alert = $error->get_error_message();
         }
 
@@ -591,11 +591,11 @@  discard block
 block discarded – undo
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item ) {
-            $items[] = $item->prepare_data_for_invoice_edit_ajax(  $invoice->get_currency()  );
+        foreach ($invoice->get_items() as $item) {
+            $items[] = $item->prepare_data_for_invoice_edit_ajax($invoice->get_currency());
         }
 
-        wp_send_json_success( compact( 'items', 'alert' ) );
+        wp_send_json_success(compact('items', 'alert'));
     }
 
     /**
@@ -604,53 +604,53 @@  discard block
 block discarded – undo
     public static function create_invoice_item() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice and item details.
-        if ( empty( $_POST['invoice_id'] ) || empty( $_POST['_wpinv_quick'] ) ) {
+        if (empty($_POST['invoice_id']) || empty($_POST['_wpinv_quick'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( intval( $_POST['invoice_id'] ) );
+        $invoice = new WPInv_Invoice(intval($_POST['invoice_id']));
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Format the data.
-        $data = wp_kses_post_deep( wp_unslash( $_POST['_wpinv_quick'] ) );
+        $data = wp_kses_post_deep(wp_unslash($_POST['_wpinv_quick']));
 
         $item = new WPInv_Item();
-        $item->set_price( getpaid_standardize_amount( $data['price'] ) );
-        $item->set_name( sanitize_text_field( $data['name'] ) );
-        $item->set_description( wp_kses_post( $data['description'] ) );
-        $item->set_type( sanitize_text_field( $data['type'] ) );
-        $item->set_vat_rule( sanitize_text_field( $data['vat_rule'] ) );
-        $item->set_vat_class( sanitize_text_field( $data['vat_class'] ) );
-        $item->set_status( 'publish' );
+        $item->set_price(getpaid_standardize_amount($data['price']));
+        $item->set_name(sanitize_text_field($data['name']));
+        $item->set_description(wp_kses_post($data['description']));
+        $item->set_type(sanitize_text_field($data['type']));
+        $item->set_vat_rule(sanitize_text_field($data['vat_rule']));
+        $item->set_vat_class(sanitize_text_field($data['vat_class']));
+        $item->set_status('publish');
         $item->save();
 
-        if ( ! $item->exists() ) {
-            $alert = __( 'Could not create invoice item. Please try again.', 'invoicing' );
-            wp_send_json_success( compact( 'alert' ) );
+        if (!$item->exists()) {
+            $alert = __('Could not create invoice item. Please try again.', 'invoicing');
+            wp_send_json_success(compact('alert'));
         }
 
-        $item = new GetPaid_Form_Item( $item->get_id() );
-        $item->set_quantity( floatval( $data['qty'] ) );
+        $item = new GetPaid_Form_Item($item->get_id());
+        $item->set_quantity(floatval($data['qty']));
 
         // Add it to the invoice.
-        $error = $invoice->add_item( $item );
+        $error = $invoice->add_item($item);
         $alert = false;
 
-        if ( is_wp_error( $error ) ) {
+        if (is_wp_error($error)) {
             $alert = $error->get_error_message();
-            wp_send_json_success( compact( 'alert' ) );
+            wp_send_json_success(compact('alert'));
          }
 
         // Update totals.
@@ -663,9 +663,9 @@  discard block
 block discarded – undo
         $invoice->recalculate_total();
         $invoice->save();
         ob_start();
-        GetPaid_Meta_Box_Invoice_Items::output_row( GetPaid_Meta_Box_Invoice_Items::get_columns( $invoice ), $item, $invoice );
+        GetPaid_Meta_Box_Invoice_Items::output_row(GetPaid_Meta_Box_Invoice_Items::get_columns($invoice), $item, $invoice);
         $row = ob_get_clean();
-        wp_send_json_success( compact( 'row' ) );
+        wp_send_json_success(compact('row'));
     }
 
     /**
@@ -674,33 +674,33 @@  discard block
 block discarded – undo
     public static function remove_invoice_item() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice and an item.
-        if ( empty( $_POST['post_id'] ) || empty( $_POST['item_id'] ) ) {
+        if (empty($_POST['post_id']) || empty($_POST['item_id'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( intval( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(intval($_POST['post_id']));
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Abort if the invoice does not have the specified item.
-        $item = $invoice->get_item( (int) $_POST['item_id'] );
+        $item = $invoice->get_item((int) $_POST['item_id']);
 
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             exit;
         }
 
-        $invoice->remove_item( (int) $_POST['item_id'] );
+        $invoice->remove_item((int) $_POST['item_id']);
 
         // Update totals.
         $invoice->recalculate_total();
@@ -711,11 +711,11 @@  discard block
 block discarded – undo
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item ) {
-            $items[] = $item->prepare_data_for_invoice_edit_ajax(  $invoice->get_currency()  );
+        foreach ($invoice->get_items() as $item) {
+            $items[] = $item->prepare_data_for_invoice_edit_ajax($invoice->get_currency());
         }
 
-        wp_send_json_success( compact( 'items' ) );
+        wp_send_json_success(compact('items'));
     }
 
     /**
@@ -724,69 +724,69 @@  discard block
 block discarded – undo
     public static function recalculate_full_prices() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice and item.
-        if ( empty( $_POST['post_id'] ) ) {
+        if (empty($_POST['post_id'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( intval( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(intval($_POST['post_id']));
         $alert   = false;
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
-        $invoice->set_items( array() );
+        $invoice->set_items(array());
 
-        if ( ! empty( $_POST['getpaid_items'] ) ) {
+        if (!empty($_POST['getpaid_items'])) {
 
-            foreach ( wp_kses_post_deep( $_POST['getpaid_items'] ) as $item_id => $args ) {
-                $item = new GetPaid_Form_Item( $item_id );
+            foreach (wp_kses_post_deep($_POST['getpaid_items']) as $item_id => $args) {
+                $item = new GetPaid_Form_Item($item_id);
 
-                if ( $item->exists() ) {
-                    $item->set_price( getpaid_standardize_amount( $args['price'] ) );
-                    $item->set_quantity( floatval( $args['quantity'] ) );
-                    $item->set_name( sanitize_text_field( $args['name'] ) );
-                    $item->set_description( wp_kses_post( $args['description'] ) );
-                    $invoice->add_item( $item );
+                if ($item->exists()) {
+                    $item->set_price(getpaid_standardize_amount($args['price']));
+                    $item->set_quantity(floatval($args['quantity']));
+                    $item->set_name(sanitize_text_field($args['name']));
+                    $item->set_description(wp_kses_post($args['description']));
+                    $invoice->add_item($item);
                 }
             }
 
         }
 
-        $invoice->set_disable_taxes( ! empty( $_POST['disable_taxes'] ) );
+        $invoice->set_disable_taxes(!empty($_POST['disable_taxes']));
 
         // Maybe set the country, state, currency.
-        foreach ( array( 'wpinv_country', 'wpinv_state', 'wpinv_currency', 'wpinv_vat_number', 'wpinv_discount_code' ) as $key ) {
-            if ( isset( $_POST[ $key ] ) ) {
-                $_key   = str_replace( 'wpinv_', '', $key );
+        foreach (array('wpinv_country', 'wpinv_state', 'wpinv_currency', 'wpinv_vat_number', 'wpinv_discount_code') as $key) {
+            if (isset($_POST[$key])) {
+                $_key   = str_replace('wpinv_', '', $key);
                 $method = "set_$_key";
-                $invoice->$method( sanitize_text_field( $_POST[ $key ] ) );
+                $invoice->$method(sanitize_text_field($_POST[$key]));
             }
         }
 
-        $discount = new WPInv_Discount( $invoice->get_discount_code() );
-        if ( $discount->exists() ) {
-            $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+        $discount = new WPInv_Discount($invoice->get_discount_code());
+        if ($discount->exists()) {
+            $invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
         } else {
-            $invoice->remove_discount( 'discount_code' );
+            $invoice->remove_discount('discount_code');
         }
 
         // Save the invoice.
         $invoice->recalculate_total();
         $invoice->save();
         ob_start();
-        GetPaid_Meta_Box_Invoice_Items::output( get_post( $invoice->get_id() ), $invoice );
+        GetPaid_Meta_Box_Invoice_Items::output(get_post($invoice->get_id()), $invoice);
         $table = ob_get_clean();
-        wp_send_json_success( compact( 'table' ) );
+        wp_send_json_success(compact('table'));
     }
 
     /**
@@ -795,42 +795,42 @@  discard block
 block discarded – undo
     public static function admin_add_invoice_item() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice and item.
-        if ( empty( $_POST['post_id'] ) || empty( $_POST['item_id'] ) ) {
+        if (empty($_POST['post_id']) || empty($_POST['item_id'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( intval( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(intval($_POST['post_id']));
         $alert   = false;
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Add the item.
-        $item  = new GetPaid_Form_Item( (int) $_POST['item_id'] );
-        $error = $invoice->add_item( $item );
+        $item  = new GetPaid_Form_Item((int) $_POST['item_id']);
+        $error = $invoice->add_item($item);
 
-        if ( is_wp_error( $error ) ) {
+        if (is_wp_error($error)) {
             $alert = $error->get_error_message();
-            wp_send_json_success( compact( 'alert' ) );
+            wp_send_json_success(compact('alert'));
         }
 
         // Save the invoice.
         $invoice->recalculate_total();
         $invoice->save();
         ob_start();
-        GetPaid_Meta_Box_Invoice_Items::output_row( GetPaid_Meta_Box_Invoice_Items::get_columns( $invoice ), $item, $invoice );
+        GetPaid_Meta_Box_Invoice_Items::output_row(GetPaid_Meta_Box_Invoice_Items::get_columns($invoice), $item, $invoice);
         $row = ob_get_clean();
-        wp_send_json_success( compact( 'row' ) );
+        wp_send_json_success(compact('row'));
     }
 
     /**
@@ -839,39 +839,39 @@  discard block
 block discarded – undo
     public static function add_invoice_items() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need an invoice and items.
-        if ( empty( $_POST['post_id'] ) || empty( $_POST['items'] ) ) {
+        if (empty($_POST['post_id']) || empty($_POST['items'])) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( intval( $_POST['post_id'] ) );
+        $invoice = new WPInv_Invoice(intval($_POST['post_id']));
         $alert   = false;
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Add the items.
-        foreach ( wp_kses_post_deep( wp_unslash( $_POST['items'] ) ) as $data ) {
+        foreach (wp_kses_post_deep(wp_unslash($_POST['items'])) as $data) {
 
-            $item = new GetPaid_Form_Item( (int) $data[ 'id' ] );
+            $item = new GetPaid_Form_Item((int) $data['id']);
 
-            if ( is_numeric( $data[ 'qty' ] ) && (float) $data[ 'qty' ] > 0 ) {
-                $item->set_quantity( floatval( $data[ 'qty' ] ) );
+            if (is_numeric($data['qty']) && (float) $data['qty'] > 0) {
+                $item->set_quantity(floatval($data['qty']));
             }
 
-            if ( $item->get_id() > 0 ) {
-                $error = $invoice->add_item( $item );
+            if ($item->get_id() > 0) {
+                $error = $invoice->add_item($item);
 
-                if ( is_wp_error( $error ) ) {
+                if (is_wp_error($error)) {
                     $alert = $error->get_error_message();
                 }
 
@@ -886,11 +886,11 @@  discard block
 block discarded – undo
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item ) {
-            $items[] = $item->prepare_data_for_invoice_edit_ajax( $invoice->get_currency() );
+        foreach ($invoice->get_items() as $item) {
+            $items[] = $item->prepare_data_for_invoice_edit_ajax($invoice->get_currency());
         }
 
-        wp_send_json_success( compact( 'items', 'alert' ) );
+        wp_send_json_success(compact('items', 'alert'));
     }
 
     /**
@@ -899,15 +899,15 @@  discard block
 block discarded – undo
     public static function get_invoicing_items() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need a search term.
-        if ( empty( $_GET['search'] ) ) {
-            wp_send_json_success( array() );
+        if (empty($_GET['search'])) {
+            wp_send_json_success(array());
         }
 
         // Retrieve items.
@@ -916,8 +916,8 @@  discard block
 block discarded – undo
             'orderby'        => 'title',
             'order'          => 'ASC',
             'posts_per_page' => -1,
-            'post_status'    => array( 'publish' ),
-            's'              => sanitize_text_field( urldecode( $_GET['search'] ) ),
+            'post_status'    => array('publish'),
+            's'              => sanitize_text_field(urldecode($_GET['search'])),
             'meta_query'     => array(
                 array(
                     'key'       => '_wpinv_type',
@@ -927,25 +927,25 @@  discard block
 block discarded – undo
             )
         );
 
-        if ( ! empty( $_GET['ignore'] ) ) {
-            $item_args['exclude'] = wp_parse_id_list( sanitize_text_field( $_GET['ignore'] ) );
+        if (!empty($_GET['ignore'])) {
+            $item_args['exclude'] = wp_parse_id_list(sanitize_text_field($_GET['ignore']));
         }
 
-        $items = get_posts( apply_filters( 'getpaid_ajax_invoice_items_query_args', $item_args ) );
+        $items = get_posts(apply_filters('getpaid_ajax_invoice_items_query_args', $item_args));
         $data  = array();
 
-        $is_payment_form = ( ! empty( $_GET['post_id'] ) && 'wpi_payment_form' == get_post_type( (int) $_GET['post_id'] ) );
+        $is_payment_form = (!empty($_GET['post_id']) && 'wpi_payment_form' == get_post_type((int) $_GET['post_id']));
 
-        foreach ( $items as $item ) {
-            $item      = new GetPaid_Form_Item( $item );
+        foreach ($items as $item) {
+            $item = new GetPaid_Form_Item($item);
             $data[] = array(
                 'id'        => (int) $item->get_id(),
-                'text'      => strip_tags( $item->get_name() ),
-                'form_data' => $is_payment_form ? $item->prepare_data_for_use( false ) : '',
+                'text'      => strip_tags($item->get_name()),
+                'form_data' => $is_payment_form ? $item->prepare_data_for_use(false) : '',
             );
         }
 
-        wp_send_json_success( $data );
+        wp_send_json_success($data);
 
     }
 
@@ -955,37 +955,37 @@  discard block
 block discarded – undo
     public static function get_customers() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             exit;
         }
 
         // We need a search term.
-        if ( empty( $_GET['search'] ) ) {
-            wp_send_json_success( array() );
+        if (empty($_GET['search'])) {
+            wp_send_json_success(array());
         }
 
         // Retrieve customers.
     
         $customer_args = array(
-            'fields'         => array( 'ID', 'user_email', 'display_name' ),
+            'fields'         => array('ID', 'user_email', 'display_name'),
             'orderby'        => 'display_name',
-            'search'         => '*' . sanitize_text_field( $_GET['search'] ) . '*',
-            'search_columns' => array( 'user_login', 'user_email', 'display_name' ),
+            'search'         => '*' . sanitize_text_field($_GET['search']) . '*',
+            'search_columns' => array('user_login', 'user_email', 'display_name'),
         );
 
-        $customers = get_users( apply_filters( 'getpaid_ajax_invoice_customers_query_args', $customer_args ) );
+        $customers = get_users(apply_filters('getpaid_ajax_invoice_customers_query_args', $customer_args));
         $data      = array();
 
-        foreach ( $customers as $customer ) {
+        foreach ($customers as $customer) {
             $data[] = array(
                 'id'        => (int) $customer->ID,
-                'text'      => strip_tags( sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email ) ),
+                'text'      => strip_tags(sprintf(_x('%1$s (%2$s)', 'user dropdown', 'invoicing'), $customer->display_name, $customer->user_email)),
             );
         }
 
-        wp_send_json_success( $data );
+        wp_send_json_success($data);
 
     }
 
@@ -995,28 +995,28 @@  discard block
 block discarded – undo
     public static function get_aui_states_field() {
 
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // We need a country.
-        if ( empty( $_GET['country'] ) ) {
+        if (empty($_GET['country'])) {
             exit;
         }
 
-        $states = wpinv_get_country_states( sanitize_text_field( $_GET['country'] ) );
-        $state  = isset( $_GET['state'] ) ? sanitize_text_field( $_GET['state'] ) : wpinv_get_default_state();
-        $name   = isset( $_GET['name'] ) ? sanitize_text_field( $_GET['name'] ) : 'wpinv_state';
-        $class  = isset( $_GET['class'] ) ? sanitize_text_field( $_GET['class'] ) : 'form-control-sm';
+        $states = wpinv_get_country_states(sanitize_text_field($_GET['country']));
+        $state  = isset($_GET['state']) ? sanitize_text_field($_GET['state']) : wpinv_get_default_state();
+        $name   = isset($_GET['name']) ? sanitize_text_field($_GET['name']) : 'wpinv_state';
+        $class  = isset($_GET['class']) ? sanitize_text_field($_GET['class']) : 'form-control-sm';
 
-        if ( empty( $states ) ) {
+        if (empty($states)) {
 
             $html = aui()->input(
                 array(
                     'type'        => 'text',
                     'id'          => 'wpinv_state',
                     'name'        => $name,
-                    'label'       => __( 'State', 'invoicing' ),
+                    'label'       => __('State', 'invoicing'),
                     'label_type'  => 'vertical',
-                    'placeholder' => __( 'State', 'invoicing' ),
+                    'placeholder' => __('State', 'invoicing'),
                     'class'       => $class,
                     'value'       => $state,
                 )
@@ -1028,9 +1028,9 @@  discard block
 block discarded – undo
                 array(
                     'id'          => 'wpinv_state',
                     'name'        => $name,
-                    'label'       => __( 'State', 'invoicing' ),
+                    'label'       => __('State', 'invoicing'),
                     'label_type'  => 'vertical',
-                    'placeholder' => __( 'Select a state', 'invoicing' ),
+                    'placeholder' => __('Select a state', 'invoicing'),
                     'class'       => $class,
                     'value'       => $state,
                     'options'     => $states,
@@ -1044,7 +1044,7 @@  discard block
 block discarded – undo
         wp_send_json_success(
             array(
                 'html'   => $html,
-                'select' => ! empty ( $states )
+                'select' => !empty ($states)
             )
         );
 
@@ -1058,11 +1058,11 @@  discard block
 block discarded – undo
     public static function payment_form_refresh_prices() {
 
         // Check nonce.
-        check_ajax_referer( 'getpaid_form_nonce' );
+        check_ajax_referer('getpaid_form_nonce');
 
         // ... form fields...
-        if ( empty( $_POST['getpaid_payment_form_submission'] ) ) {
-            _e( 'Error: Reload the page and try again.', 'invoicing' );
+        if (empty($_POST['getpaid_payment_form_submission'])) {
+            _e('Error: Reload the page and try again.', 'invoicing');
             exit;
         }
 
@@ -1070,7 +1070,7 @@  discard block
 block discarded – undo
         $submission = new GetPaid_Payment_Form_Submission();
 
         // Do we have an error?
-        if ( ! empty( $submission->last_error ) ) {
+        if (!empty($submission->last_error)) {
             wp_send_json_error(
                 array(
                     'code'  => $submission->last_error_code,
@@ -1080,12 +1080,12 @@  discard block
 block discarded – undo
         }
 
         // Prepare the response.
-        $response = new GetPaid_Payment_Form_Submission_Refresh_Prices( $submission );
+        $response = new GetPaid_Payment_Form_Submission_Refresh_Prices($submission);
 
         // Filter the response.
-        $response = apply_filters( 'getpaid_payment_form_ajax_refresh_prices', $response->response, $submission );
+        $response = apply_filters('getpaid_payment_form_ajax_refresh_prices', $response->response, $submission);
 
-        wp_send_json_success( $response );
+        wp_send_json_success($response);
     }
 
     /**
@@ -1097,63 +1097,63 @@  discard block
 block discarded – undo
 	public static function file_upload() {
 
         // Check nonce.
-        check_ajax_referer( 'getpaid_form_nonce' );
+        check_ajax_referer('getpaid_form_nonce');
 
-        if ( empty( $_POST['form_id'] ) || empty( $_POST['field_name'] ) || empty( $_FILES['file'] ) ) {
-            wp_die( __( 'Bad Request', 'invoicing' ), 400 );
+        if (empty($_POST['form_id']) || empty($_POST['field_name']) || empty($_FILES['file'])) {
+            wp_die(__('Bad Request', 'invoicing'), 400);
         }
 
         // Fetch form.
-        $form = new GetPaid_Payment_Form( intval( $_POST['form_id'] ) );
+        $form = new GetPaid_Payment_Form(intval($_POST['form_id']));
 
-        if ( ! $form->is_active() ) {
-            wp_send_json_error( __( 'Payment form not active', 'invoicing' ) );
+        if (!$form->is_active()) {
+            wp_send_json_error(__('Payment form not active', 'invoicing'));
         }
 
         // Fetch appropriate field.
-        $upload_field = current( wp_list_filter( $form->get_elements(), array( 'id' => sanitize_text_field( $_POST['field_name'] ) ) ) );
-        if ( empty( $upload_field ) ) {
-            wp_send_json_error( __( 'Invalid upload field.', 'invoicing' ) );
+        $upload_field = current(wp_list_filter($form->get_elements(), array('id' => sanitize_text_field($_POST['field_name']))));
+        if (empty($upload_field)) {
+            wp_send_json_error(__('Invalid upload field.', 'invoicing'));
         }
 
         // Prepare allowed file types.
-        $file_types = isset( $upload_field['file_types'] ) ? $upload_field['file_types'] : array( 'jpg|jpeg|jpe', 'gif', 'png' );
+        $file_types = isset($upload_field['file_types']) ? $upload_field['file_types'] : array('jpg|jpeg|jpe', 'gif', 'png');
         $all_types  = getpaid_get_allowed_mime_types();
         $mime_types = array();
 
-        foreach ( $file_types as $file_type ) {
-            if ( isset( $all_types[ $file_type ] ) ) {
-                $mime_types[] = $all_types[ $file_type ];
+        foreach ($file_types as $file_type) {
+            if (isset($all_types[$file_type])) {
+                $mime_types[] = $all_types[$file_type];
             }
         }
 
-        if ( ! in_array( $_FILES['file']['type'], $mime_types ) ) {
-            wp_send_json_error( __( 'Unsupported file type.', 'invoicing' ) );
+        if (!in_array($_FILES['file']['type'], $mime_types)) {
+            wp_send_json_error(__('Unsupported file type.', 'invoicing'));
         }
 
         // Upload file.
-        $file_name = explode( '.', strtolower( $_FILES['file']['name'] ) );
-        $file_name = uniqid( 'getpaid-' ) . '.' . array_pop( $file_name );
+        $file_name = explode('.', strtolower($_FILES['file']['name']));
+        $file_name = uniqid('getpaid-') . '.' . array_pop($file_name);
 
         $uploaded = wp_upload_bits(
             $file_name,
             null,
-            file_get_contents( $_FILES["file"]["tmp_name"] )
+            file_get_contents($_FILES["file"]["tmp_name"])
         );
 
-        if ( ! empty( $uploaded['error'] ) ) {
-            wp_send_json_error( $uploaded['error'] );
+        if (!empty($uploaded['error'])) {
+            wp_send_json_error($uploaded['error']);
         }
 
         // Retrieve response.
         $response = sprintf(
             '<input type="hidden" name="%s[%s]" value="%s" />',
-            esc_attr( sanitize_text_field( $_POST['field_name'] ) ),
-            esc_url( $uploaded['url'] ),
-            esc_attr( sanitize_text_field( strtolower( $_FILES['file']['name'] ) ) )
+            esc_attr(sanitize_text_field($_POST['field_name'])),
+            esc_url($uploaded['url']),
+            esc_attr(sanitize_text_field(strtolower($_FILES['file']['name'])))
         );
 
-        wp_send_json_success( $response );
+        wp_send_json_success($response);
 
 	}
 

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 esc_html( $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 esc_html($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 esc_html( $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 esc_html($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	);

		@@ -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

		@@ -12,276 +12,276 @@
		block discarded – undo
12	12	*/
13	13	class GetPaid_Metaboxes {
14	14
15		- /**
16		- * Only save metaboxes once.
17		- *
18		- * @var boolean
19		- */
20		- private static $saved_meta_boxes = false;
21		-
22	15	/**
23		- * Hook in methods.
24		- */
25		- public static function init() {
26		-
27		- // Register metaboxes.
28		- add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
29		-
30		- // Remove metaboxes.
31		- add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
32		-
33		- // Rename metaboxes.
34		- add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
35		-
36		- // Save metaboxes.
37		- add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
38		- }
39		-
40		- /**
41		- * Register core metaboxes.
42		- */
43		- public static function add_meta_boxes( $post_type, $post ) {
44		-
45		- // For invoices...
46		- self::add_invoice_meta_boxes( $post_type, $post );
47		-
48		- // For payment forms.
49		- self::add_payment_form_meta_boxes( $post_type, $post );
50		-
51		- // For invoice items.
52		- self::add_item_meta_boxes( $post_type );
53		-
54		- // For invoice discounts.
55		- if ( $post_type == 'wpi_discount' ) {
56		- add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
57		- }
58		-
59		- }
	16	+ * Only save metaboxes once.
	17	+ *
	18	+ * @var boolean
	19	+ */
	20	+ private static $saved_meta_boxes = false;
60	21
61		- /**
62		- * Register core metaboxes.
63		- */
64		- protected static function add_payment_form_meta_boxes( $post_type, $post ) {
	22	+ /**
	23	+ * Hook in methods.
	24	+ */
	25	+ public static function init() {
65	26
66		- // For payment forms.
67		- if ( $post_type == 'wpi_payment_form' ) {
	27	+ // Register metaboxes.
	28	+ add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
68	29
69		- // Design payment form.
70		- add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
	30	+ // Remove metaboxes.
	31	+ add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
71	32
72		- // Payment form information.
73		- if ( $post->ID != wpinv_get_default_payment_form() ) {
74		- add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
75		- }
	33	+ // Rename metaboxes.
	34	+ add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
76	35
77		- }
	36	+ // Save metaboxes.
	37	+ add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
	38	+ }
78	39
79		- }
	40	+ /**
	41	+ * Register core metaboxes.
	42	+ */
	43	+ public static function add_meta_boxes( $post_type, $post ) {
80	44
81		- /**
82		- * Register core metaboxes.
83		- */
84		- protected static function add_item_meta_boxes( $post_type ) {
	45	+ // For invoices...
	46	+ self::add_invoice_meta_boxes( $post_type, $post );
85	47
86		- if ( $post_type == 'wpi_item' ) {
	48	+ // For payment forms.
	49	+ self::add_payment_form_meta_boxes( $post_type, $post );
87	50
88		- // Item details.
89		- add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
	51	+ // For invoice items.
	52	+ self::add_item_meta_boxes( $post_type );
90	53
91		- // If taxes are enabled, register the tax metabox.
92		- if ( wpinv_use_taxes() ) {
93		- add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
94		- }
	54	+ // For invoice discounts.
	55	+ if ( $post_type == 'wpi_discount' ) {
	56	+ add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
	57	+ }
95	58
96		- // Item info.
97		- add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
	59	+ }
98	60
99		- }
	61	+ /**
	62	+ * Register core metaboxes.
	63	+ */
	64	+ protected static function add_payment_form_meta_boxes( $post_type, $post ) {
100	65
101		- }
	66	+ // For payment forms.
	67	+ if ( $post_type == 'wpi_payment_form' ) {
102	68
103		- /**
104		- * Register invoice metaboxes.
105		- */
106		- protected static function add_invoice_meta_boxes( $post_type, $post ) {
	69	+ // Design payment form.
	70	+ add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
107	71
108		- // For invoices...
109		- if ( getpaid_is_invoice_post_type( $post_type ) ) {
110		- $invoice = new WPInv_Invoice( $post );
	72	+ // Payment form information.
	73	+ if ( $post->ID != wpinv_get_default_payment_form() ) {
	74	+ add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
	75	+ }
111	76
112		- // Resend invoice.
113		- if ( ! $invoice->is_draft() ) {
	77	+ }
114	78
115		- add_meta_box(
116		- 'wpinv-mb-resend-invoice',
117		- sprintf(
118		- __( 'Resend %s', 'invoicing' ),
119		- ucfirst( $invoice->get_invoice_quote_type() )
120		- ),
121		- 'GetPaid_Meta_Box_Resend_Invoice::output',
122		- $post_type,
123		- 'side',
124		- 'low'
125		- );
	79	+ }
126	80
127		- }
	81	+ /**
	82	+ * Register core metaboxes.
	83	+ */
	84	+ protected static function add_item_meta_boxes( $post_type ) {
128	85
129		- // Subscriptions.
130		- $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
131		- if ( ! empty( $subscriptions ) ) {
	86	+ if ( $post_type == 'wpi_item' ) {
132	87
133		- if ( is_array( $subscriptions ) ) {
134		- add_meta_box( 'wpinv-mb-subscriptions', __( 'Related Subscriptions', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced' );
135		- } else {
136		- add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
137		- }
	88	+ // Item details.
	89	+ add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
138	90
139		- if ( getpaid_count_subscription_invoices( $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id() ) > 1 ) {
140		- add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
141		- }
	91	+ // If taxes are enabled, register the tax metabox.
	92	+ if ( wpinv_use_taxes() ) {
	93	+ add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
	94	+ }
142	95
143		- }
	96	+ // Item info.
	97	+ add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
144	98
145		- // Invoice details.
146		- add_meta_box(
147		- 'wpinv-details',
148		- sprintf(
149		- __( '%s Details', 'invoicing' ),
150		- ucfirst( $invoice->get_invoice_quote_type() )
151		- ),
152		- 'GetPaid_Meta_Box_Invoice_Details::output',
153		- $post_type,
154		- 'side'
155		- );
	99	+ }
156	100
157		- // Payment details.
158		- add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
	101	+ }
159	102
160		- // Billing details.
161		- add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
	103	+ /**
	104	+ * Register invoice metaboxes.
	105	+ */
	106	+ protected static function add_invoice_meta_boxes( $post_type, $post ) {
	107	+
	108	+ // For invoices...
	109	+ if ( getpaid_is_invoice_post_type( $post_type ) ) {
	110	+ $invoice = new WPInv_Invoice( $post );
	111	+
	112	+ // Resend invoice.
	113	+ if ( ! $invoice->is_draft() ) {
	114	+
	115	+ add_meta_box(
	116	+ 'wpinv-mb-resend-invoice',
	117	+ sprintf(
	118	+ __( 'Resend %s', 'invoicing' ),
	119	+ ucfirst( $invoice->get_invoice_quote_type() )
	120	+ ),
	121	+ 'GetPaid_Meta_Box_Resend_Invoice::output',
	122	+ $post_type,
	123	+ 'side',
	124	+ 'low'
	125	+ );
	126	+
	127	+ }
	128	+
	129	+ // Subscriptions.
	130	+ $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
	131	+ if ( ! empty( $subscriptions ) ) {
	132	+
	133	+ if ( is_array( $subscriptions ) ) {
	134	+ add_meta_box( 'wpinv-mb-subscriptions', __( 'Related Subscriptions', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced' );
	135	+ } else {
	136	+ add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
	137	+ }
	138	+
	139	+ if ( getpaid_count_subscription_invoices( $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id() ) > 1 ) {
	140	+ add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
	141	+ }
	142	+
	143	+ }
	144	+
	145	+ // Invoice details.
	146	+ add_meta_box(
	147	+ 'wpinv-details',
	148	+ sprintf(
	149	+ __( '%s Details', 'invoicing' ),
	150	+ ucfirst( $invoice->get_invoice_quote_type() )
	151	+ ),
	152	+ 'GetPaid_Meta_Box_Invoice_Details::output',
	153	+ $post_type,
	154	+ 'side'
	155	+ );
	156	+
	157	+ // Payment details.
	158	+ add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
	159	+
	160	+ // Billing details.
	161	+ add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
162	162
163		- // Invoice items.
164		- add_meta_box(
165		- 'wpinv-items',
166		- sprintf(
167		- __( '%s Items', 'invoicing' ),
168		- ucfirst( $invoice->get_invoice_quote_type() )
169		- ),
170		- 'GetPaid_Meta_Box_Invoice_Items::output',
171		- $post_type,
172		- 'normal',
173		- 'high'
174		- );
	163	+ // Invoice items.
	164	+ add_meta_box(
	165	+ 'wpinv-items',
	166	+ sprintf(
	167	+ __( '%s Items', 'invoicing' ),
	168	+ ucfirst( $invoice->get_invoice_quote_type() )
	169	+ ),
	170	+ 'GetPaid_Meta_Box_Invoice_Items::output',
	171	+ $post_type,
	172	+ 'normal',
	173	+ 'high'
	174	+ );
175	175
176		- // Invoice notes.
177		- add_meta_box(
178		- 'wpinv-notes',
179		- sprintf(
180		- __( '%s Notes', 'invoicing' ),
181		- ucfirst( $invoice->get_invoice_quote_type() )
182		- ),
183		- 'WPInv_Meta_Box_Notes::output',
184		- $post_type,
185		- 'side',
186		- 'low'
187		- );
188		-
189		- // Shipping Address.
190		- if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
191		- add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
192		- }
193		-
194		- // Payment form information.
195		- if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
196		- add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
197		- }
198		-
199		- }
200		-
201		- }
202		-
203		- /**
204		- * Remove some metaboxes.
205		- */
206		- public static function remove_meta_boxes() {
207		- remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
208		- }
209		-
210		- /**
211		- * Rename other metaboxes.
212		- */
213		- public static function rename_meta_boxes() {
	176	+ // Invoice notes.
	177	+ add_meta_box(
	178	+ 'wpinv-notes',
	179	+ sprintf(
	180	+ __( '%s Notes', 'invoicing' ),
	181	+ ucfirst( $invoice->get_invoice_quote_type() )
	182	+ ),
	183	+ 'WPInv_Meta_Box_Notes::output',
	184	+ $post_type,
	185	+ 'side',
	186	+ 'low'
	187	+ );
	188	+
	189	+ // Shipping Address.
	190	+ if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
	191	+ add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
	192	+ }
	193	+
	194	+ // Payment form information.
	195	+ if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
	196	+ add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
	197	+ }
	198	+
	199	+ }
	200	+
	201	+ }
	202	+
	203	+ /**
	204	+ * Remove some metaboxes.
	205	+ */
	206	+ public static function remove_meta_boxes() {
	207	+ remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
	208	+ }
	209	+
	210	+ /**
	211	+ * Rename other metaboxes.
	212	+ */
	213	+ public static function rename_meta_boxes() {
214	214
215		- }
216		-
217		- /**
218		- * Check if we're saving, then trigger an action based on the post type.
219		- *
220		- * @param int $post_id Post ID.
221		- * @param object $post Post object.
222		- */
223		- public static function save_meta_boxes( $post_id, $post ) {
224		- $post_id = absint( $post_id );
225		- $data = wp_kses_post_deep( wp_unslash( $_POST ) );
226		-
227		- // Do not save for ajax requests.
228		- if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) \|\| isset( $_REQUEST['bulk_edit'] ) ) {
229		- return;
230		- }
231		-
232		- // $post_id and $post are required
233		- if ( empty( $post_id ) \|\| empty( $post ) \|\| self::$saved_meta_boxes ) {
234		- return;
235		- }
236		-
237		- // Dont' save meta boxes for revisions or autosaves.
238		- if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) \|\| is_int( wp_is_post_revision( $post ) ) \|\| is_int( wp_is_post_autosave( $post ) ) ) {
239		- return;
240		- }
241		-
242		- // Check the nonce.
243		- if ( empty( $data['getpaid_meta_nonce'] ) \|\| ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
244		- return;
245		- }
246		-
247		- // Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
248		- if ( empty( $data['post_ID'] ) \|\| absint( $data['post_ID'] ) !== $post_id ) {
249		- return;
250		- }
251		-
252		- // Check user has permission to edit.
253		- if ( ! current_user_can( 'edit_post', $post_id ) ) {
254		- return;
255		- }
256		-
257		- if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
258		-
259		- // We need this save event to run once to avoid potential endless loops.
260		- self::$saved_meta_boxes = true;
261		-
262		- return GetPaid_Meta_Box_Invoice_Address::save( $post_id );
263		-
264		- }
265		-
266		- // Ensure this is our post type.
267		- $post_types_map = array(
268		- 'wpi_item' => 'GetPaid_Meta_Box_Item_Details',
269		- 'wpi_payment_form' => 'GetPaid_Meta_Box_Payment_Form',
270		- 'wpi_discount' => 'GetPaid_Meta_Box_Discount_Details',
271		- );
272		-
273		- // Is this our post type?
274		- if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
275		- return;
276		- }
277		-
278		- // We need this save event to run once to avoid potential endless loops.
279		- self::$saved_meta_boxes = true;
	215	+ }
	216	+
	217	+ /**
	218	+ * Check if we're saving, then trigger an action based on the post type.
	219	+ *
	220	+ * @param int $post_id Post ID.
	221	+ * @param object $post Post object.
	222	+ */
	223	+ public static function save_meta_boxes( $post_id, $post ) {
	224	+ $post_id = absint( $post_id );
	225	+ $data = wp_kses_post_deep( wp_unslash( $_POST ) );
	226	+
	227	+ // Do not save for ajax requests.
	228	+ if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) \|\| isset( $_REQUEST['bulk_edit'] ) ) {
	229	+ return;
	230	+ }
	231	+
	232	+ // $post_id and $post are required
	233	+ if ( empty( $post_id ) \|\| empty( $post ) \|\| self::$saved_meta_boxes ) {
	234	+ return;
	235	+ }
	236	+
	237	+ // Dont' save meta boxes for revisions or autosaves.
	238	+ if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) \|\| is_int( wp_is_post_revision( $post ) ) \|\| is_int( wp_is_post_autosave( $post ) ) ) {
	239	+ return;
	240	+ }
	241	+
	242	+ // Check the nonce.
	243	+ if ( empty( $data['getpaid_meta_nonce'] ) \|\| ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
	244	+ return;
	245	+ }
	246	+
	247	+ // Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
	248	+ if ( empty( $data['post_ID'] ) \|\| absint( $data['post_ID'] ) !== $post_id ) {
	249	+ return;
	250	+ }
	251	+
	252	+ // Check user has permission to edit.
	253	+ if ( ! current_user_can( 'edit_post', $post_id ) ) {
	254	+ return;
	255	+ }
	256	+
	257	+ if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
	258	+
	259	+ // We need this save event to run once to avoid potential endless loops.
	260	+ self::$saved_meta_boxes = true;
	261	+
	262	+ return GetPaid_Meta_Box_Invoice_Address::save( $post_id );
	263	+
	264	+ }
	265	+
	266	+ // Ensure this is our post type.
	267	+ $post_types_map = array(
	268	+ 'wpi_item' => 'GetPaid_Meta_Box_Item_Details',
	269	+ 'wpi_payment_form' => 'GetPaid_Meta_Box_Payment_Form',
	270	+ 'wpi_discount' => 'GetPaid_Meta_Box_Discount_Details',
	271	+ );
	272	+
	273	+ // Is this our post type?
	274	+ if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
	275	+ return;
	276	+ }
	277	+
	278	+ // We need this save event to run once to avoid potential endless loops.
	279	+ self::$saved_meta_boxes = true;
280	280
281		- // Save the post.
282		- $class = $post_types_map[ $post->post_type ];
283		- $class::save( $post_id, wp_kses_post_deep( $_POST ), $post );
	281	+ // Save the post.
	282	+ $class = $post_types_map[ $post->post_type ];
	283	+ $class::save( $post_id, wp_kses_post_deep( $_POST ), $post );
284	284
285		- }
	285	+ }
286	286
287	287	}

		@@ -4,7 +4,7 @@ discard block
		block discarded – undo
4	4	*
5	5	*/
6	6
7		-defined( 'ABSPATH' ) \|\| exit;
	7	+defined('ABSPATH') \|\| exit;
8	8
9	9	/**
10	10	* Metaboxes Admin Class
		@@ -25,35 +25,35 @@ discard block
		block discarded – undo
25	25	public static function init() {
26	26
27	27	// Register metaboxes.
28		- add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
	28	+ add_action('add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2);
29	29
30	30	// Remove metaboxes.
31		- add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
	31	+ add_action('add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30);
32	32
33	33	// Rename metaboxes.
34		- add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
	34	+ add_action('add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45);
35	35
36	36	// Save metaboxes.
37		- add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
	37	+ add_action('save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2);
38	38	}
39	39
40	40	/**
41	41	* Register core metaboxes.
42	42	*/
43		- public static function add_meta_boxes( $post_type, $post ) {
	43	+ public static function add_meta_boxes($post_type, $post) {
44	44
45	45	// For invoices...
46		- self::add_invoice_meta_boxes( $post_type, $post );
	46	+ self::add_invoice_meta_boxes($post_type, $post);
47	47
48	48	// For payment forms.
49		- self::add_payment_form_meta_boxes( $post_type, $post );
	49	+ self::add_payment_form_meta_boxes($post_type, $post);
50	50
51	51	// For invoice items.
52		- self::add_item_meta_boxes( $post_type );
	52	+ self::add_item_meta_boxes($post_type);
53	53
54	54	// For invoice discounts.
55		- if ( $post_type == 'wpi_discount' ) {
56		- add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
	55	+ if ($post_type == 'wpi_discount') {
	56	+ add_meta_box('wpinv_discount_details', __('Discount Details', 'invoicing'), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high');
57	57	}
58	58
59	59	}
		@@ -61,17 +61,17 @@ discard block
		block discarded – undo
61	61	/**
62	62	* Register core metaboxes.
63	63	*/
64		- protected static function add_payment_form_meta_boxes( $post_type, $post ) {
	64	+ protected static function add_payment_form_meta_boxes($post_type, $post) {
65	65
66	66	// For payment forms.
67		- if ( $post_type == 'wpi_payment_form' ) {
	67	+ if ($post_type == 'wpi_payment_form') {
68	68
69	69	// Design payment form.
70		- add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
	70	+ add_meta_box('wpinv-payment-form-design', __('Payment Form', 'invoicing'), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal');
71	71
72	72	// Payment form information.
73		- if ( $post->ID != wpinv_get_default_payment_form() ) {
74		- add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
	73	+ if ($post->ID != wpinv_get_default_payment_form()) {
	74	+ add_meta_box('wpinv-payment-form-info', __('Details', 'invoicing'), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side');
75	75	}
76	76
77	77	}
		@@ -81,20 +81,20 @@ discard block
		block discarded – undo
81	81	/**
82	82	* Register core metaboxes.
83	83	*/
84		- protected static function add_item_meta_boxes( $post_type ) {
	84	+ protected static function add_item_meta_boxes($post_type) {
85	85
86		- if ( $post_type == 'wpi_item' ) {
	86	+ if ($post_type == 'wpi_item') {
87	87
88	88	// Item details.
89		- add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
	89	+ add_meta_box('wpinv_item_details', __('Item Details', 'invoicing'), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high');
90	90
91	91	// If taxes are enabled, register the tax metabox.
92		- if ( wpinv_use_taxes() ) {
93		- add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
	92	+ if (wpinv_use_taxes()) {
	93	+ add_meta_box('wpinv_item_vat', __('Tax', 'invoicing'), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high');
94	94	}
95	95
96	96	// Item info.
97		- add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
	97	+ add_meta_box('wpinv_field_item_info', __('Item info', 'invoicing'), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core');
98	98
99	99	}
100	100
		@@ -103,20 +103,20 @@ discard block
		block discarded – undo
103	103	/**
104	104	* Register invoice metaboxes.
105	105	*/
106		- protected static function add_invoice_meta_boxes( $post_type, $post ) {
	106	+ protected static function add_invoice_meta_boxes($post_type, $post) {
107	107
108	108	// For invoices...
109		- if ( getpaid_is_invoice_post_type( $post_type ) ) {
110		- $invoice = new WPInv_Invoice( $post );
	109	+ if (getpaid_is_invoice_post_type($post_type)) {
	110	+ $invoice = new WPInv_Invoice($post);
111	111
112	112	// Resend invoice.
113		- if ( ! $invoice->is_draft() ) {
	113	+ if (!$invoice->is_draft()) {
114	114
115	115	add_meta_box(
116	116	'wpinv-mb-resend-invoice',
117	117	sprintf(
118		- __( 'Resend %s', 'invoicing' ),
119		- ucfirst( $invoice->get_invoice_quote_type() )
	118	+ __('Resend %s', 'invoicing'),
	119	+ ucfirst($invoice->get_invoice_quote_type())
120	120	),
121	121	'GetPaid_Meta_Box_Resend_Invoice::output',
122	122	$post_type,
		@@ -127,17 +127,17 @@ discard block
		block discarded – undo
127	127	}
128	128
129	129	// Subscriptions.
130		- $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
131		- if ( ! empty( $subscriptions ) ) {
	130	+ $subscriptions = getpaid_get_invoice_subscriptions($invoice);
	131	+ if (!empty($subscriptions)) {
132	132
133		- if ( is_array( $subscriptions ) ) {
134		- add_meta_box( 'wpinv-mb-subscriptions', __( 'Related Subscriptions', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced' );
	133	+ if (is_array($subscriptions)) {
	134	+ add_meta_box('wpinv-mb-subscriptions', __('Related Subscriptions', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced');
135	135	} else {
136		- add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
	136	+ add_meta_box('wpinv-mb-subscriptions', __('Subscription Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced');
137	137	}
138	138
139		- if ( getpaid_count_subscription_invoices( $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id() ) > 1 ) {
140		- add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
	139	+ if (getpaid_count_subscription_invoices($invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id()) > 1) {
	140	+ add_meta_box('wpinv-mb-subscription-invoices', __('Related Payments', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced');
141	141	}
142	142
143	143	}
		@@ -146,8 +146,8 @@ discard block
		block discarded – undo
146	146	add_meta_box(
147	147	'wpinv-details',
148	148	sprintf(
149		- __( '%s Details', 'invoicing' ),
150		- ucfirst( $invoice->get_invoice_quote_type() )
	149	+ __('%s Details', 'invoicing'),
	150	+ ucfirst($invoice->get_invoice_quote_type())
151	151	),
152	152	'GetPaid_Meta_Box_Invoice_Details::output',
153	153	$post_type,
		@@ -155,17 +155,17 @@ discard block
		block discarded – undo
155	155	);
156	156
157	157	// Payment details.
158		- add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
	158	+ add_meta_box('wpinv-payment-meta', __('Payment Meta', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default');
159	159
160	160	// Billing details.
161		- add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
	161	+ add_meta_box('wpinv-address', __('Billing Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high');
162	162
163	163	// Invoice items.
164	164	add_meta_box(
165	165	'wpinv-items',
166	166	sprintf(
167		- __( '%s Items', 'invoicing' ),
168		- ucfirst( $invoice->get_invoice_quote_type() )
	167	+ __('%s Items', 'invoicing'),
	168	+ ucfirst($invoice->get_invoice_quote_type())
169	169	),
170	170	'GetPaid_Meta_Box_Invoice_Items::output',
171	171	$post_type,
		@@ -177,8 +177,8 @@ discard block
		block discarded – undo
177	177	add_meta_box(
178	178	'wpinv-notes',
179	179	sprintf(
180		- __( '%s Notes', 'invoicing' ),
181		- ucfirst( $invoice->get_invoice_quote_type() )
	180	+ __('%s Notes', 'invoicing'),
	181	+ ucfirst($invoice->get_invoice_quote_type())
182	182	),
183	183	'WPInv_Meta_Box_Notes::output',
184	184	$post_type,
		@@ -187,13 +187,13 @@ discard block
		block discarded – undo
187	187	);
188	188
189	189	// Shipping Address.
190		- if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
191		- add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
	190	+ if (get_post_meta($invoice->get_id(), 'shipping_address', true)) {
	191	+ add_meta_box('wpinv-invoice-shipping-details', __('Shipping Address', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high');
192	192	}
193	193
194	194	// Payment form information.
195		- if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
196		- add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
	195	+ if (get_post_meta($invoice->get_id(), 'payment_form_data', true)) {
	196	+ add_meta_box('wpinv-invoice-payment-form-details', __('Payment Form Details', 'invoicing'), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high');
197	197	}
198	198
199	199	}
		@@ -204,7 +204,7 @@ discard block
		block discarded – undo
204	204	* Remove some metaboxes.
205	205	*/
206	206	public static function remove_meta_boxes() {
207		- remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
	207	+ remove_meta_box('wpseo_meta', 'wpi_invoice', 'normal');
208	208	}
209	209
210	210	/**
		@@ -220,46 +220,46 @@ discard block
		block discarded – undo
220	220	* @param int $post_id Post ID.
221	221	* @param object $post Post object.
222	222	*/
223		- public static function save_meta_boxes( $post_id, $post ) {
224		- $post_id = absint( $post_id );
225		- $data = wp_kses_post_deep( wp_unslash( $_POST ) );
	223	+ public static function save_meta_boxes($post_id, $post) {
	224	+ $post_id = absint($post_id);
	225	+ $data = wp_kses_post_deep(wp_unslash($_POST));
226	226
227	227	// Do not save for ajax requests.
228		- if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) \|\| isset( $_REQUEST['bulk_edit'] ) ) {
	228	+ if ((defined('DOING_AJAX') && DOING_AJAX) \|\| isset($_REQUEST['bulk_edit'])) {
229	229	return;
230	230	}
231	231
232	232	// $post_id and $post are required
233		- if ( empty( $post_id ) \|\| empty( $post ) \|\| self::$saved_meta_boxes ) {
	233	+ if (empty($post_id) \|\| empty($post) \|\| self::$saved_meta_boxes) {
234	234	return;
235	235	}
236	236
237	237	// Dont' save meta boxes for revisions or autosaves.
238		- if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) \|\| is_int( wp_is_post_revision( $post ) ) \|\| is_int( wp_is_post_autosave( $post ) ) ) {
	238	+ if ((defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) \|\| is_int(wp_is_post_revision($post)) \|\| is_int(wp_is_post_autosave($post))) {
239	239	return;
240	240	}
241	241
242	242	// Check the nonce.
243		- if ( empty( $data['getpaid_meta_nonce'] ) \|\| ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
	243	+ if (empty($data['getpaid_meta_nonce']) \|\| !wp_verify_nonce($data['getpaid_meta_nonce'], 'getpaid_meta_nonce')) {
244	244	return;
245	245	}
246	246
247	247	// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
248		- if ( empty( $data['post_ID'] ) \|\| absint( $data['post_ID'] ) !== $post_id ) {
	248	+ if (empty($data['post_ID']) \|\| absint($data['post_ID']) !== $post_id) {
249	249	return;
250	250	}
251	251
252	252	// Check user has permission to edit.
253		- if ( ! current_user_can( 'edit_post', $post_id ) ) {
	253	+ if (!current_user_can('edit_post', $post_id)) {
254	254	return;
255	255	}
256	256
257		- if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
	257	+ if (getpaid_is_invoice_post_type($post->post_type)) {
258	258
259	259	// We need this save event to run once to avoid potential endless loops.
260	260	self::$saved_meta_boxes = true;
261	261
262		- return GetPaid_Meta_Box_Invoice_Address::save( $post_id );
	262	+ return GetPaid_Meta_Box_Invoice_Address::save($post_id);
263	263
264	264	}
265	265
		@@ -271,7 +271,7 @@ discard block
		block discarded – undo
271	271	);
272	272
273	273	// Is this our post type?
274		- if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
	274	+ if (!isset($post_types_map[$post->post_type])) {
275	275	return;
276	276	}
277	277
		@@ -279,8 +279,8 @@ discard block
		block discarded – undo
279	279	self::$saved_meta_boxes = true;
280	280
281	281	// Save the post.
282		- $class = $post_types_map[ $post->post_type ];
283		- $class::save( $post_id, wp_kses_post_deep( $_POST ), $post );
	282	+ $class = $post_types_map[$post->post_type];
	283	+ $class::save($post_id, wp_kses_post_deep($_POST), $post);
284	284
285	285	}
286	286

		@@ -14,70 +14,70 @@ discard block
		block discarded – undo
14	14	class WPInv_Ajax {
15	15
16	16	/**
17		- * Hook in ajax handlers.
18		- */
19		- public static function init() {
20		- add_action( 'init', array( __CLASS__, 'define_ajax' ), 0 );
21		- add_action( 'template_redirect', array( __CLASS__, 'do_wpinv_ajax' ), 0 );
22		- self::add_ajax_events();
	17	+ * Hook in ajax handlers.
	18	+ */
	19	+ public static function init() {
	20	+ add_action( 'init', array( __CLASS__, 'define_ajax' ), 0 );
	21	+ add_action( 'template_redirect', array( __CLASS__, 'do_wpinv_ajax' ), 0 );
	22	+ self::add_ajax_events();
23	23	}
24	24
25	25	/**
26		- * Set GetPaid AJAX constant and headers.
27		- */
28		- public static function define_ajax() {
29		-
30		- if ( ! empty( $_GET['wpinv-ajax'] ) ) {
31		- getpaid_maybe_define_constant( 'DOING_AJAX', true );
32		- getpaid_maybe_define_constant( 'WPInv_DOING_AJAX', true );
33		- if ( ! WP_DEBUG \|\| ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
34		- /** @scrutinizer ignore-unhandled */ @ini_set( 'display_errors', 0 );
35		- }
36		- $GLOBALS['wpdb']->hide_errors();
37		- }
	26	+ * Set GetPaid AJAX constant and headers.
	27	+ */
	28	+ public static function define_ajax() {
	29	+
	30	+ if ( ! empty( $_GET['wpinv-ajax'] ) ) {
	31	+ getpaid_maybe_define_constant( 'DOING_AJAX', true );
	32	+ getpaid_maybe_define_constant( 'WPInv_DOING_AJAX', true );
	33	+ if ( ! WP_DEBUG \|\| ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
	34	+ /** @scrutinizer ignore-unhandled */ @ini_set( 'display_errors', 0 );
	35	+ }
	36	+ $GLOBALS['wpdb']->hide_errors();
	37	+ }
38	38
39	39	}
40	40
41	41	/**
42		- * Send headers for GetPaid Ajax Requests.
43		- *
44		- * @since 1.0.18
45		- */
46		- private static function wpinv_ajax_headers() {
47		- if ( ! headers_sent() ) {
48		- send_origin_headers();
49		- send_nosniff_header();
50		- nocache_headers();
51		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
52		- header( 'X-Robots-Tag: noindex' );
53		- status_header( 200 );
54		- }
	42	+ * Send headers for GetPaid Ajax Requests.
	43	+ *
	44	+ * @since 1.0.18
	45	+ */
	46	+ private static function wpinv_ajax_headers() {
	47	+ if ( ! headers_sent() ) {
	48	+ send_origin_headers();
	49	+ send_nosniff_header();
	50	+ nocache_headers();
	51	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	52	+ header( 'X-Robots-Tag: noindex' );
	53	+ status_header( 200 );
	54	+ }
55	55	}
56	56
57	57	/**
58		- * Check for GetPaid Ajax request and fire action.
59		- */
60		- public static function do_wpinv_ajax() {
61		- global $wp_query;
	58	+ * Check for GetPaid Ajax request and fire action.
	59	+ */
	60	+ public static function do_wpinv_ajax() {
	61	+ global $wp_query;
62	62
63		- if ( ! empty( $_GET['wpinv-ajax'] ) ) {
64		- $wp_query->set( 'wpinv-ajax', sanitize_text_field( wp_unslash( $_GET['wpinv-ajax'] ) ) );
65		- }
	63	+ if ( ! empty( $_GET['wpinv-ajax'] ) ) {
	64	+ $wp_query->set( 'wpinv-ajax', sanitize_text_field( wp_unslash( $_GET['wpinv-ajax'] ) ) );
	65	+ }
66	66
67		- $action = $wp_query->get( 'wpinv-ajax' );
	67	+ $action = $wp_query->get( 'wpinv-ajax' );
68	68
69		- if ( $action ) {
70		- self::wpinv_ajax_headers();
71		- $action = sanitize_text_field( $action );
72		- do_action( 'wpinv_ajax_' . $action );
73		- wp_die();
74		- }
	69	+ if ( $action ) {
	70	+ self::wpinv_ajax_headers();
	71	+ $action = sanitize_text_field( $action );
	72	+ do_action( 'wpinv_ajax_' . $action );
	73	+ wp_die();
	74	+ }
75	75
76	76	}
77	77
78	78	/**
79		- * Hook in ajax methods.
80		- */
	79	+ * Hook in ajax methods.
	80	+ */
81	81	public static function add_ajax_events() {
82	82
83	83	// array( 'event' => is_frontend )
		@@ -261,18 +261,18 @@ discard block
		block discarded – undo
261	261	check_ajax_referer( 'getpaid_form_nonce' );
262	262
263	263	// Is the request set up correctly?
264		- if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) && empty( $_GET['invoice'] ) ) {
265		- echo aui()->alert(
266		- array(
267		- 'type' => 'warning',
268		- 'content' => __( 'No payment form or item provided', 'invoicing' ),
269		- )
	264	+ if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) && empty( $_GET['invoice'] ) ) {
	265	+ echo aui()->alert(
	266	+ array(
	267	+ 'type' => 'warning',
	268	+ 'content' => __( 'No payment form or item provided', 'invoicing' ),
	269	+ )
270	270	);
271	271	exit;
272	272	}
273	273
274	274	// Payment form or button?
275		- if ( ! empty( $_GET['form'] ) ) {
	275	+ if ( ! empty( $_GET['form'] ) ) {
276	276	$form = sanitize_text_field( urldecode( $_GET['form'] ) );
277	277
278	278	if ( false !== strpos( $form, '\|' ) ) {
		@@ -326,11 +326,11 @@ discard block
		block discarded – undo
326	326	getpaid_display_payment_form( $form );
327	327	}
328	328
329		- } else if( ! empty( $_GET['invoice'] ) ) {
330		- getpaid_display_invoice_payment_form( (int) urldecode( $_GET['invoice'] ) );
	329	+ } else if( ! empty( $_GET['invoice'] ) ) {
	330	+ getpaid_display_invoice_payment_form( (int) urldecode( $_GET['invoice'] ) );
331	331	} else {
332		- $items = getpaid_convert_items_to_array( sanitize_text_field( urldecode( $_GET['item'] ) ) );
333		- getpaid_display_item_payment_form( $items );
	332	+ $items = getpaid_convert_items_to_array( sanitize_text_field( urldecode( $_GET['item'] ) ) );
	333	+ getpaid_display_item_payment_form( $items );
334	334	}
335	335
336	336	exit;
		@@ -651,7 +651,7 @@ discard block
		block discarded – undo
651	651	if ( is_wp_error( $error ) ) {
652	652	$alert = $error->get_error_message();
653	653	wp_send_json_success( compact( 'alert' ) );
654		- }
	654	+ }
655	655
656	656	// Update totals.
657	657	$invoice->recalculate_total();
		@@ -1089,12 +1089,12 @@ discard block
		block discarded – undo
1089	1089	}
1090	1090
1091	1091	/**
1092		- * Handles file uploads.
1093		- *
1094		- * @since 1.0.0
1095		- * @return void
1096		- */
1097		- public static function file_upload() {
	1092	+ * Handles file uploads.
	1093	+ *
	1094	+ * @since 1.0.0
	1095	+ * @return void
	1096	+ */
	1097	+ public static function file_upload() {
1098	1098
1099	1099	// Check nonce.
1100	1100	check_ajax_referer( 'getpaid_form_nonce' );
		@@ -1155,7 +1155,7 @@ discard block
		block discarded – undo
1155	1155
1156	1156	wp_send_json_success( $response );
1157	1157
1158		- }
	1158	+ }
1159	1159
1160	1160	}
1161	1161

AyeCode / invoicing

Push — master ( 330418...c4952f )

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

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

Spacing +78 added lines, -78 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 +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

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

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

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

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

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

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

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

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