AyeCode / invoicing

includes/wpinv-discount-functions.php

Spacing +44 added lines, -44 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
  
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Returns an array of discount type.
@@ -17,8 +17,8 @@ 
     return apply_filters(
         'wpinv_discount_types',
         array(
-            'percent'   => __( 'Percentage', 'invoicing' ),
-            'flat'     => __( 'Flat Amount', 'invoicing' ),
+            'percent'   => __('Percentage', 'invoicing'),
+            'flat'     => __('Flat Amount', 'invoicing'),
         )
     );
 }
@@ -28,46 +28,46 @@ 
  * 
  * @return string
  */
-function wpinv_get_discount_type_name( $type = '' ) {
+function wpinv_get_discount_type_name($type = '') {
     $types = wpinv_get_discount_types();
-    return isset( $types[ $type ] ) ? $types[ $type ] : $type;
+    return isset($types[$type]) ? $types[$type] : $type;
 }
 
 /**
  * Deletes a discount via the admin page.
  * 
  */
-function wpinv_delete_discount( $data ) {
+function wpinv_delete_discount($data) {
 
-    $discount = new WPInv_Discount( absint( $data['discount'] ) );
-    $discount->delete( true );
+    $discount = new WPInv_Discount(absint($data['discount']));
+    $discount->delete(true);
 
 }
-add_action( 'getpaid_authenticated_admin_action_delete_discount', 'wpinv_delete_discount' );
+add_action('getpaid_authenticated_admin_action_delete_discount', 'wpinv_delete_discount');
 
 /**
  * Deactivates a discount via the admin page.
  */
-function wpinv_activate_discount( $data ) {
+function wpinv_activate_discount($data) {
 
-    $discount = new WPInv_Discount( absint( $data['discount'] ) );
-    $discount->set_status( 'publish' );
+    $discount = new WPInv_Discount(absint($data['discount']));
+    $discount->set_status('publish');
     $discount->save();
 
 }
-add_action( 'getpaid_authenticated_admin_action_activate_discount', 'wpinv_activate_discount' );
+add_action('getpaid_authenticated_admin_action_activate_discount', 'wpinv_activate_discount');
 
 /**
  * Activates a discount via the admin page.
  */
-function wpinv_deactivate_discount( $data ) {
+function wpinv_deactivate_discount($data) {
 
-    $discount = new WPInv_Discount( absint( $data['discount'] ) );
-    $discount->set_status( 'pending' );
+    $discount = new WPInv_Discount(absint($data['discount']));
+    $discount->set_status('pending');
     $discount->save();
 
 }
-add_action( 'getpaid_authenticated_admin_action_deactivate_discount', 'wpinv_deactivate_discount' );
+add_action('getpaid_authenticated_admin_action_deactivate_discount', 'wpinv_deactivate_discount');
 
 /**
  * Fetches a discount object.
@@ -76,8 +76,8 @@ 
  * @since 1.0.15
  * @return WPInv_Discount
  */
-function wpinv_get_discount( $discount ) {
-    return new WPInv_Discount( $discount );
+function wpinv_get_discount($discount) {
+    return new WPInv_Discount($discount);
 }
 
 /**
@@ -87,8 +87,8 @@ 
  * @since 1.0.15
  * @return WPInv_Discount
  */
-function wpinv_get_discount_obj( $discount = 0 ) {
-    return new WPInv_Discount( $discount );
+function wpinv_get_discount_obj($discount = 0) {
+    return new WPInv_Discount($discount);
 }
 
 /**
@@ -98,10 +98,10 @@ 
  * @param string|int $value The field value
  * @return bool|WPInv_Discount
  */
-function wpinv_get_discount_by( $deprecated = null, $value = '' ) {
-    $discount = new WPInv_Discount( $value );
+function wpinv_get_discount_by($deprecated = null, $value = '') {
+    $discount = new WPInv_Discount($value);
 
-    if ( $discount->get_id() != 0 ) {
+    if ($discount->get_id() != 0) {
         return $discount;
     }
 
@@ -116,9 +116,9 @@ 
 function wpinv_get_discount_statuses() {
 
     return array(
-        'expired'  => __( 'Expired', 'invoicing' ),
-        'publish'  => __( 'Active', 'invoicing' ),
-        'inactive' => __( 'Inactive', 'invoicing' ),
+        'expired'  => __('Expired', 'invoicing'),
+        'publish'  => __('Active', 'invoicing'),
+        'inactive' => __('Inactive', 'invoicing'),
     );
 
 }
@@ -126,9 +126,9 @@ 
 /**
  * Retrieves an invoice status label.
  */
-function wpinv_discount_status( $status ) {
+function wpinv_discount_status($status) {
     $statuses = wpinv_get_discount_statuses();
-    return isset( $statuses[ $status ] ) ? $statuses[ $status ] : __( 'Inactive', 'invoicing' );
+    return isset($statuses[$status]) ? $statuses[$status] : __('Inactive', 'invoicing');
 }
 
 /**
@@ -138,12 +138,12 @@ 
  * @param int|array|string|WPInv_Discount $code discount data, object, ID or code.
  * @return bool
  */
-function wpinv_discount_is_recurring( $discount = 0, $code = 0 ) {
+function wpinv_discount_is_recurring($discount = 0, $code = 0) {
 
-    if( ! empty( $discount ) ) {
-        $discount    = wpinv_get_discount_obj( $discount );
+    if (!empty($discount)) {
+        $discount    = wpinv_get_discount_obj($discount);
     } else {
-        $discount    = wpinv_get_discount_obj( $code );
+        $discount    = wpinv_get_discount_obj($code);
     }
 
     return $discount->get_is_recurring();
@@ -158,35 +158,35 @@ 
  * @param WPInv_Discount $discount
  * @return array
  */
-function getpaid_calculate_invoice_discount( $invoice, $discount ) {
+function getpaid_calculate_invoice_discount($invoice, $discount) {
 
 	$initial_discount   = 0;
 	$recurring_discount = 0;
 
-	foreach ( $invoice->get_items() as $item ) {
+	foreach ($invoice->get_items() as $item) {
 
 		// Abort if it is not valid for this item.
-		if ( ! $discount->is_valid_for_items( array( $item->get_id() ) ) ) {
+		if (!$discount->is_valid_for_items(array($item->get_id()))) {
 			continue;
 		}
 
 		// Calculate the initial amount...
-		$item_discount           = $discount->get_discounted_amount( $item->get_sub_total() );
+		$item_discount           = $discount->get_discounted_amount($item->get_sub_total());
 		$recurring_item_discount = 0;
 
 		// ... and maybe the recurring amount.
-		if ( $item->is_recurring() && $discount->is_recurring() ) {
-			$recurring_item_discount = $discount->get_discounted_amount( $item->get_recurring_sub_total() );
+		if ($item->is_recurring() && $discount->is_recurring()) {
+			$recurring_item_discount = $discount->get_discounted_amount($item->get_recurring_sub_total());
 		}
 
 		// Discount should not exceed discounted amount.
-		if ( ! $discount->is_type( 'percent' ) ) {
+		if (!$discount->is_type('percent')) {
 
-			if ( ( $initial_discount + $item_discount ) > $discount->get_amount() ) {
+			if (($initial_discount + $item_discount) > $discount->get_amount()) {
 				$item_discount = $discount->get_amount() - $initial_discount;
 			}
 
-			if ( ( $recurring_discount + $recurring_item_discount ) > $discount->get_amount() ) {
+			if (($recurring_discount + $recurring_item_discount) > $discount->get_amount()) {
 				$recurring_item_discount = $discount->get_amount() - $recurring_discount;
 			}
 
@@ -219,10 +219,10 @@ 
         array(
             'post_type'   => 'wpi_discount',
             'numberposts' => 1,
-            'fields'      => array( 'ids' ),
+            'fields'      => array('ids'),
         )
     );
 
-    return ! empty( $discounts );
+    return !empty($discounts);
 
 }

Indentation +34 added lines, -34 removed lines

@@ -160,51 +160,51 @@
  */
 function getpaid_calculate_invoice_discount( $invoice, $discount ) {
 
-	$initial_discount   = 0;
-	$recurring_discount = 0;
+    $initial_discount   = 0;
+    $recurring_discount = 0;
 
-	foreach ( $invoice->get_items() as $item ) {
+    foreach ( $invoice->get_items() as $item ) {
 
-		// Abort if it is not valid for this item.
-		if ( ! $discount->is_valid_for_items( array( $item->get_id() ) ) ) {
-			continue;
-		}
+        // Abort if it is not valid for this item.
+        if ( ! $discount->is_valid_for_items( array( $item->get_id() ) ) ) {
+            continue;
+        }
 
-		// Calculate the initial amount...
-		$item_discount           = $discount->get_discounted_amount( $item->get_sub_total() );
-		$recurring_item_discount = 0;
+        // Calculate the initial amount...
+        $item_discount           = $discount->get_discounted_amount( $item->get_sub_total() );
+        $recurring_item_discount = 0;
 
-		// ... and maybe the recurring amount.
-		if ( $item->is_recurring() && $discount->is_recurring() ) {
-			$recurring_item_discount = $discount->get_discounted_amount( $item->get_recurring_sub_total() );
-		}
+        // ... and maybe the recurring amount.
+        if ( $item->is_recurring() && $discount->is_recurring() ) {
+            $recurring_item_discount = $discount->get_discounted_amount( $item->get_recurring_sub_total() );
+        }
 
-		// Discount should not exceed discounted amount.
-		if ( ! $discount->is_type( 'percent' ) ) {
+        // Discount should not exceed discounted amount.
+        if ( ! $discount->is_type( 'percent' ) ) {
 
-			if ( ( $initial_discount + $item_discount ) > $discount->get_amount() ) {
-				$item_discount = $discount->get_amount() - $initial_discount;
-			}
+            if ( ( $initial_discount + $item_discount ) > $discount->get_amount() ) {
+                $item_discount = $discount->get_amount() - $initial_discount;
+            }
 
-			if ( ( $recurring_discount + $recurring_item_discount ) > $discount->get_amount() ) {
-				$recurring_item_discount = $discount->get_amount() - $recurring_discount;
-			}
+            if ( ( $recurring_discount + $recurring_item_discount ) > $discount->get_amount() ) {
+                $recurring_item_discount = $discount->get_amount() - $recurring_discount;
+            }
 
-		}
+        }
 
-		$initial_discount             += $item_discount;
-		$recurring_discount           += $recurring_item_discount;
-		$item->item_discount           = $item_discount;
-		$item->recurring_item_discount = $recurring_item_discount;
+        $initial_discount             += $item_discount;
+        $recurring_discount           += $recurring_item_discount;
+        $item->item_discount           = $item_discount;
+        $item->recurring_item_discount = $recurring_item_discount;
 
-	}
+    }
 
-	return array(
-		'name'               => 'discount_code',
-		'discount_code'      => $discount->get_code(),
-		'initial_discount'   => $initial_discount,
-		'recurring_discount' => $recurring_discount,
-	);
+    return array(
+        'name'               => 'discount_code',
+        'discount_code'      => $discount->get_code(),
+        'initial_discount'   => $initial_discount,
+        'recurring_discount' => $recurring_discount,
+    );
 
 }
 

includes/class-wpinv-notes.php

Indentation +192 added lines, -192 removed lines

@@ -12,202 +12,202 @@
  */
 class WPInv_Notes {
 
-	/**
-	 * Class constructor.
-	 */
-	public function __construct() {
-
-		// Filter inovice notes.
-		add_action( 'pre_get_comments', array( $this, 'set_invoice_note_type' ), 11, 1 );
-		add_action( 'comment_feed_where', array( $this, 'wpinv_comment_feed_where' ), 10, 1 );
-
-		// Delete comments count cache whenever there is a new comment or a comment status changes.
-		add_action( 'wp_insert_comment', array( $this, 'delete_comments_count_cache' ) );
-		add_action( 'wp_set_comment_status', array( $this, 'delete_comments_count_cache' ) );
-
-		// Count comments.
-		add_filter( 'wp_count_comments', array( $this, 'wp_count_comments' ), 100, 2 );
-
-		// Fires after notes are loaded.
-		do_action( 'wpinv_notes_init', $this );
-	}
-
-	/**
-	 * Filters invoice notes query to only include our notes.
-	 *
-	 * @param WP_Comment_Query $query
-	 */
-	public function set_invoice_note_type( $query ) {
-		$post_id = ! empty( $query->query_vars['post_ID'] ) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
-
-		if ( $post_id && getpaid_is_invoice_post_type( get_post_type( $post_id ) ) ) {
-			$query->query_vars['type'] = 'wpinv_note';
-		} else {
-
-			if ( empty( $query->query_vars['type__not_in'] ) ) {
-				$query->query_vars['type__not_in'] = array();
-			}
-
-			$query->query_vars['type__not_in'] = wpinv_parse_list( $query->query_vars['type__not_in'] );
-			$query->query_vars['type__not_in'] = array_merge( array( 'wpinv_note' ), $query->query_vars['type__not_in'] );
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Exclude notes from the comments feed.
-	 */
-	function wpinv_comment_feed_where( $where ){
-		return $where . ( $where ? ' AND ' : '' ) . " comment_type != 'wpinv_note' ";
-	}
-
-	/**
-	 * Delete comments count cache whenever there is
-	 * new comment or the status of a comment changes. Cache
-	 * will be regenerated next time WPInv_Notes::wp_count_comments()
-	 * is called.
-	 */
-	public function delete_comments_count_cache() {
-		delete_transient( 'getpaid_count_comments' );
-	}
-
-	/**
-	 * Remove invoice notes from wp_count_comments().
-	 *
-	 * @since  2.2
-	 * @param  object $stats   Comment stats.
-	 * @param  int    $post_id Post ID.
-	 * @return object
-	 */
-	public function wp_count_comments( $stats, $post_id ) {
-		global $wpdb;
-
-		if ( empty( $post_id ) ) {
-			$stats = get_transient( 'getpaid_count_comments' );
-
-			if ( ! $stats ) {
-				$stats = array(
-					'total_comments' => 0,
-					'all'            => 0,
-				);
-
-				$count = $wpdb->get_results(
-					"
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
+
+        // Filter inovice notes.
+        add_action( 'pre_get_comments', array( $this, 'set_invoice_note_type' ), 11, 1 );
+        add_action( 'comment_feed_where', array( $this, 'wpinv_comment_feed_where' ), 10, 1 );
+
+        // Delete comments count cache whenever there is a new comment or a comment status changes.
+        add_action( 'wp_insert_comment', array( $this, 'delete_comments_count_cache' ) );
+        add_action( 'wp_set_comment_status', array( $this, 'delete_comments_count_cache' ) );
+
+        // Count comments.
+        add_filter( 'wp_count_comments', array( $this, 'wp_count_comments' ), 100, 2 );
+
+        // Fires after notes are loaded.
+        do_action( 'wpinv_notes_init', $this );
+    }
+
+    /**
+     * Filters invoice notes query to only include our notes.
+     *
+     * @param WP_Comment_Query $query
+     */
+    public function set_invoice_note_type( $query ) {
+        $post_id = ! empty( $query->query_vars['post_ID'] ) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
+
+        if ( $post_id && getpaid_is_invoice_post_type( get_post_type( $post_id ) ) ) {
+            $query->query_vars['type'] = 'wpinv_note';
+        } else {
+
+            if ( empty( $query->query_vars['type__not_in'] ) ) {
+                $query->query_vars['type__not_in'] = array();
+            }
+
+            $query->query_vars['type__not_in'] = wpinv_parse_list( $query->query_vars['type__not_in'] );
+            $query->query_vars['type__not_in'] = array_merge( array( 'wpinv_note' ), $query->query_vars['type__not_in'] );
+        }
+
+        return $query;
+    }
+
+    /**
+     * Exclude notes from the comments feed.
+     */
+    function wpinv_comment_feed_where( $where ){
+        return $where . ( $where ? ' AND ' : '' ) . " comment_type != 'wpinv_note' ";
+    }
+
+    /**
+     * Delete comments count cache whenever there is
+     * new comment or the status of a comment changes. Cache
+     * will be regenerated next time WPInv_Notes::wp_count_comments()
+     * is called.
+     */
+    public function delete_comments_count_cache() {
+        delete_transient( 'getpaid_count_comments' );
+    }
+
+    /**
+     * Remove invoice notes from wp_count_comments().
+     *
+     * @since  2.2
+     * @param  object $stats   Comment stats.
+     * @param  int    $post_id Post ID.
+     * @return object
+     */
+    public function wp_count_comments( $stats, $post_id ) {
+        global $wpdb;
+
+        if ( empty( $post_id ) ) {
+            $stats = get_transient( 'getpaid_count_comments' );
+
+            if ( ! $stats ) {
+                $stats = array(
+                    'total_comments' => 0,
+                    'all'            => 0,
+                );
+
+                $count = $wpdb->get_results(
+                    "
 					SELECT comment_approved, COUNT(*) AS num_comments
 					FROM {$wpdb->comments}
 					WHERE comment_type NOT IN ('action_log', 'order_note', 'webhook_delivery', 'wpinv_note')
 					GROUP BY comment_approved
 					",
-					ARRAY_A
-				);
-
-				$approved = array(
-					'0'            => 'moderated',
-					'1'            => 'approved',
-					'spam'         => 'spam',
-					'trash'        => 'trash',
-					'post-trashed' => 'post-trashed',
-				);
-
-				foreach ( (array) $count as $row ) {
-					// Don't count post-trashed toward totals.
-					if ( ! in_array( $row['comment_approved'], array( 'post-trashed', 'trash', 'spam' ), true ) ) {
-						$stats['all']            += $row['num_comments'];
-						$stats['total_comments'] += $row['num_comments'];
-					} elseif ( ! in_array( $row['comment_approved'], array( 'post-trashed', 'trash' ), true ) ) {
-						$stats['total_comments'] += $row['num_comments'];
-					}
-					if ( isset( $approved[ $row['comment_approved'] ] ) ) {
-						$stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
-					}
-				}
-
-				foreach ( $approved as $key ) {
-					if ( empty( $stats[ $key ] ) ) {
-						$stats[ $key ] = 0;
-					}
-				}
-
-				$stats = (object) $stats;
-				set_transient( 'getpaid_count_comments', $stats );
-			}
-
-		}
-
-		return $stats;
-	}
-
-	/**
-	 * Returns an array of invoice notes.
-	 *
-	 * @param int $invoice_id The invoice ID whose notes to retrieve.
-	 * @param string $type Optional. Pass in customer to only return customer notes.
-	 * @return WP_Comment[]
-	 */
-	public function get_invoice_notes( $invoice_id = 0, $type = 'all' ) {
-
-		// Default comment args.
-		$args = array(
-			'post_id'   => $invoice_id,
-			'orderby'   => 'comment_ID',
-			'order'     => 'ASC',
-		);
-
-		// Maybe only show customer comments.
-		if ( $type == 'customer' ) {
-			$args['meta_key']   = '_wpi_customer_note';
-			$args['meta_value'] = 1;
-		}
-
-		$args = apply_filters( 'wpinv_invoice_notes_args', $args, $this, $invoice_id, $type );
-
-		return get_comments( $args );
-	}
-
-	/**
-	 * Saves an invoice comment.
-	 * 
-	 * @param WPInv_Invoice $invoice The invoice to add the comment to.
-	 * @param string $note The note content.
-	 * @param string $note_author The name of the author of the note.
-	 * @param bool $for_customer Whether or not this comment is meant to be sent to the customer.
-	 * @return int|false The new note's ID on success, false on failure.
-	 */
-	function add_invoice_note( $invoice, $note, $note_author, $author_email, $for_customer = false ){
-
-		do_action( 'wpinv_pre_insert_invoice_note', $invoice->get_id(), $note, $for_customer );
-
-		/**
-		 * Insert the comment.
-		 */
-		$note_id = wp_insert_comment(
-			wp_filter_comment(
-				array(
-					'comment_post_ID'      => $invoice->get_id(),
-					'comment_content'      => $note,
-					'comment_agent'        => 'Invoicing',
-					'user_id'              => get_current_user_id(),
-					'comment_author'       => $note_author,
-					'comment_author_IP'    => wpinv_get_ip(),
-					'comment_author_email' => $author_email,
-					'comment_author_url'   => $invoice->get_view_url(),
-					'comment_type'         => 'wpinv_note',
-				)
-			)
-		);
-
-		do_action( 'wpinv_insert_payment_note', $note_id, $invoice->get_id(), $note, $for_customer );
-
-		// Are we notifying the customer?
-		if ( empty( $note_id ) || empty( $for_customer ) ) {
-			return $note_id;
-		}
-
-		add_comment_meta( $note_id, '_wpi_customer_note', 1 );
-		do_action( 'wpinv_new_customer_note', array( 'invoice_id' => $invoice->get_id(), 'user_note' => $note ) );
-		do_action( 'getpaid_new_customer_note', $invoice, $note );
-		return $note_id;
-	}
+                    ARRAY_A
+                );
+
+                $approved = array(
+                    '0'            => 'moderated',
+                    '1'            => 'approved',
+                    'spam'         => 'spam',
+                    'trash'        => 'trash',
+                    'post-trashed' => 'post-trashed',
+                );
+
+                foreach ( (array) $count as $row ) {
+                    // Don't count post-trashed toward totals.
+                    if ( ! in_array( $row['comment_approved'], array( 'post-trashed', 'trash', 'spam' ), true ) ) {
+                        $stats['all']            += $row['num_comments'];
+                        $stats['total_comments'] += $row['num_comments'];
+                    } elseif ( ! in_array( $row['comment_approved'], array( 'post-trashed', 'trash' ), true ) ) {
+                        $stats['total_comments'] += $row['num_comments'];
+                    }
+                    if ( isset( $approved[ $row['comment_approved'] ] ) ) {
+                        $stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
+                    }
+                }
+
+                foreach ( $approved as $key ) {
+                    if ( empty( $stats[ $key ] ) ) {
+                        $stats[ $key ] = 0;
+                    }
+                }
+
+                $stats = (object) $stats;
+                set_transient( 'getpaid_count_comments', $stats );
+            }
+
+        }
+
+        return $stats;
+    }
+
+    /**
+     * Returns an array of invoice notes.
+     *
+     * @param int $invoice_id The invoice ID whose notes to retrieve.
+     * @param string $type Optional. Pass in customer to only return customer notes.
+     * @return WP_Comment[]
+     */
+    public function get_invoice_notes( $invoice_id = 0, $type = 'all' ) {
+
+        // Default comment args.
+        $args = array(
+            'post_id'   => $invoice_id,
+            'orderby'   => 'comment_ID',
+            'order'     => 'ASC',
+        );
+
+        // Maybe only show customer comments.
+        if ( $type == 'customer' ) {
+            $args['meta_key']   = '_wpi_customer_note';
+            $args['meta_value'] = 1;
+        }
+
+        $args = apply_filters( 'wpinv_invoice_notes_args', $args, $this, $invoice_id, $type );
+
+        return get_comments( $args );
+    }
+
+    /**
+     * Saves an invoice comment.
+     * 
+     * @param WPInv_Invoice $invoice The invoice to add the comment to.
+     * @param string $note The note content.
+     * @param string $note_author The name of the author of the note.
+     * @param bool $for_customer Whether or not this comment is meant to be sent to the customer.
+     * @return int|false The new note's ID on success, false on failure.
+     */
+    function add_invoice_note( $invoice, $note, $note_author, $author_email, $for_customer = false ){
+
+        do_action( 'wpinv_pre_insert_invoice_note', $invoice->get_id(), $note, $for_customer );
+
+        /**
+         * Insert the comment.
+         */
+        $note_id = wp_insert_comment(
+            wp_filter_comment(
+                array(
+                    'comment_post_ID'      => $invoice->get_id(),
+                    'comment_content'      => $note,
+                    'comment_agent'        => 'Invoicing',
+                    'user_id'              => get_current_user_id(),
+                    'comment_author'       => $note_author,
+                    'comment_author_IP'    => wpinv_get_ip(),
+                    'comment_author_email' => $author_email,
+                    'comment_author_url'   => $invoice->get_view_url(),
+                    'comment_type'         => 'wpinv_note',
+                )
+            )
+        );
+
+        do_action( 'wpinv_insert_payment_note', $note_id, $invoice->get_id(), $note, $for_customer );
+
+        // Are we notifying the customer?
+        if ( empty( $note_id ) || empty( $for_customer ) ) {
+            return $note_id;
+        }
+
+        add_comment_meta( $note_id, '_wpi_customer_note', 1 );
+        do_action( 'wpinv_new_customer_note', array( 'invoice_id' => $invoice->get_id(), 'user_note' => $note ) );
+        do_action( 'getpaid_new_customer_note', $invoice, $note );
+        return $note_id;
+    }
 
 }

Spacing +40 added lines, -40 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Handles invoice notes.
@@ -18,18 +18,18 @@ 
 	public function __construct() {
 
 		// Filter inovice notes.
-		add_action( 'pre_get_comments', array( $this, 'set_invoice_note_type' ), 11, 1 );
-		add_action( 'comment_feed_where', array( $this, 'wpinv_comment_feed_where' ), 10, 1 );
+		add_action('pre_get_comments', array($this, 'set_invoice_note_type'), 11, 1);
+		add_action('comment_feed_where', array($this, 'wpinv_comment_feed_where'), 10, 1);
 
 		// Delete comments count cache whenever there is a new comment or a comment status changes.
-		add_action( 'wp_insert_comment', array( $this, 'delete_comments_count_cache' ) );
-		add_action( 'wp_set_comment_status', array( $this, 'delete_comments_count_cache' ) );
+		add_action('wp_insert_comment', array($this, 'delete_comments_count_cache'));
+		add_action('wp_set_comment_status', array($this, 'delete_comments_count_cache'));
 
 		// Count comments.
-		add_filter( 'wp_count_comments', array( $this, 'wp_count_comments' ), 100, 2 );
+		add_filter('wp_count_comments', array($this, 'wp_count_comments'), 100, 2);
 
 		// Fires after notes are loaded.
-		do_action( 'wpinv_notes_init', $this );
+		do_action('wpinv_notes_init', $this);
 	}
 
 	/**
@@ -37,19 +37,19 @@ 
 	 *
 	 * @param WP_Comment_Query $query
 	 */
-	public function set_invoice_note_type( $query ) {
-		$post_id = ! empty( $query->query_vars['post_ID'] ) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
+	public function set_invoice_note_type($query) {
+		$post_id = !empty($query->query_vars['post_ID']) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
 
-		if ( $post_id && getpaid_is_invoice_post_type( get_post_type( $post_id ) ) ) {
+		if ($post_id && getpaid_is_invoice_post_type(get_post_type($post_id))) {
 			$query->query_vars['type'] = 'wpinv_note';
 		} else {
 
-			if ( empty( $query->query_vars['type__not_in'] ) ) {
+			if (empty($query->query_vars['type__not_in'])) {
 				$query->query_vars['type__not_in'] = array();
 			}
 
-			$query->query_vars['type__not_in'] = wpinv_parse_list( $query->query_vars['type__not_in'] );
-			$query->query_vars['type__not_in'] = array_merge( array( 'wpinv_note' ), $query->query_vars['type__not_in'] );
+			$query->query_vars['type__not_in'] = wpinv_parse_list($query->query_vars['type__not_in']);
+			$query->query_vars['type__not_in'] = array_merge(array('wpinv_note'), $query->query_vars['type__not_in']);
 		}
 
 		return $query;
@@ -58,8 +58,8 @@ 
 	/**
 	 * Exclude notes from the comments feed.
 	 */
-	function wpinv_comment_feed_where( $where ){
-		return $where . ( $where ? ' AND ' : '' ) . " comment_type != 'wpinv_note' ";
+	function wpinv_comment_feed_where($where) {
+		return $where . ($where ? ' AND ' : '') . " comment_type != 'wpinv_note' ";
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	 * is called.
 	 */
 	public function delete_comments_count_cache() {
-		delete_transient( 'getpaid_count_comments' );
+		delete_transient('getpaid_count_comments');
 	}
 
 	/**
@@ -80,13 +80,13 @@ 
 	 * @param  int    $post_id Post ID.
 	 * @return object
 	 */
-	public function wp_count_comments( $stats, $post_id ) {
+	public function wp_count_comments($stats, $post_id) {
 		global $wpdb;
 
-		if ( empty( $post_id ) ) {
-			$stats = get_transient( 'getpaid_count_comments' );
+		if (empty($post_id)) {
+			$stats = get_transient('getpaid_count_comments');
 
-			if ( ! $stats ) {
+			if (!$stats) {
 				$stats = array(
 					'total_comments' => 0,
 					'all'            => 0,
@@ -110,27 +110,27 @@ 
 					'post-trashed' => 'post-trashed',
 				);
 
-				foreach ( (array) $count as $row ) {
+				foreach ((array) $count as $row) {
 					// Don't count post-trashed toward totals.
-					if ( ! in_array( $row['comment_approved'], array( 'post-trashed', 'trash', 'spam' ), true ) ) {
+					if (!in_array($row['comment_approved'], array('post-trashed', 'trash', 'spam'), true)) {
 						$stats['all']            += $row['num_comments'];
 						$stats['total_comments'] += $row['num_comments'];
-					} elseif ( ! in_array( $row['comment_approved'], array( 'post-trashed', 'trash' ), true ) ) {
+					} elseif (!in_array($row['comment_approved'], array('post-trashed', 'trash'), true)) {
 						$stats['total_comments'] += $row['num_comments'];
 					}
-					if ( isset( $approved[ $row['comment_approved'] ] ) ) {
-						$stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
+					if (isset($approved[$row['comment_approved']])) {
+						$stats[$approved[$row['comment_approved']]] = $row['num_comments'];
 					}
 				}
 
-				foreach ( $approved as $key ) {
-					if ( empty( $stats[ $key ] ) ) {
-						$stats[ $key ] = 0;
+				foreach ($approved as $key) {
+					if (empty($stats[$key])) {
+						$stats[$key] = 0;
 					}
 				}
 
 				$stats = (object) $stats;
-				set_transient( 'getpaid_count_comments', $stats );
+				set_transient('getpaid_count_comments', $stats);
 			}
 
 		}
@@ -145,7 +145,7 @@ 
 	 * @param string $type Optional. Pass in customer to only return customer notes.
 	 * @return WP_Comment[]
 	 */
-	public function get_invoice_notes( $invoice_id = 0, $type = 'all' ) {
+	public function get_invoice_notes($invoice_id = 0, $type = 'all') {
 
 		// Default comment args.
 		$args = array(
@@ -155,14 +155,14 @@ 
 		);
 
 		// Maybe only show customer comments.
-		if ( $type == 'customer' ) {
+		if ($type == 'customer') {
 			$args['meta_key']   = '_wpi_customer_note';
 			$args['meta_value'] = 1;
 		}
 
-		$args = apply_filters( 'wpinv_invoice_notes_args', $args, $this, $invoice_id, $type );
+		$args = apply_filters('wpinv_invoice_notes_args', $args, $this, $invoice_id, $type);
 
-		return get_comments( $args );
+		return get_comments($args);
 	}
 
 	/**
@@ -174,9 +174,9 @@ 
 	 * @param bool $for_customer Whether or not this comment is meant to be sent to the customer.
 	 * @return int|false The new note's ID on success, false on failure.
 	 */
-	function add_invoice_note( $invoice, $note, $note_author, $author_email, $for_customer = false ){
+	function add_invoice_note($invoice, $note, $note_author, $author_email, $for_customer = false) {
 
-		do_action( 'wpinv_pre_insert_invoice_note', $invoice->get_id(), $note, $for_customer );
+		do_action('wpinv_pre_insert_invoice_note', $invoice->get_id(), $note, $for_customer);
 
 		/**
 		 * Insert the comment.
@@ -197,16 +197,16 @@ 
 			)
 		);
 
-		do_action( 'wpinv_insert_payment_note', $note_id, $invoice->get_id(), $note, $for_customer );
+		do_action('wpinv_insert_payment_note', $note_id, $invoice->get_id(), $note, $for_customer);
 
 		// Are we notifying the customer?
-		if ( empty( $note_id ) || empty( $for_customer ) ) {
+		if (empty($note_id) || empty($for_customer)) {
 			return $note_id;
 		}
 
-		add_comment_meta( $note_id, '_wpi_customer_note', 1 );
-		do_action( 'wpinv_new_customer_note', array( 'invoice_id' => $invoice->get_id(), 'user_note' => $note ) );
-		do_action( 'getpaid_new_customer_note', $invoice, $note );
+		add_comment_meta($note_id, '_wpi_customer_note', 1);
+		do_action('wpinv_new_customer_note', array('invoice_id' => $invoice->get_id(), 'user_note' => $note));
+		do_action('getpaid_new_customer_note', $invoice, $note);
 		return $note_id;
 	}
 

includes/admin/meta-boxes/class-getpaid-meta-box-payment-form.php

Indentation +15 added lines, -15 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -16,10 +16,10 @@ 
 class GetPaid_Meta_Box_Payment_Form {
 
     /**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
     public static function output( $post ) {
         ?>
         <style>
@@ -102,11 +102,11 @@ 
     }
 
     /**
-	 * Save meta box data.
-	 *
-	 * @param int $post_id
-	 */
-	public static function save( $post_id ) {
+     * Save meta box data.
+     *
+     * @param int $post_id
+     */
+    public static function save( $post_id ) {
 
         // Prepare the form.
         $form = new GetPaid_Payment_Form( $post_id );
@@ -137,11 +137,11 @@ 
     }
 
     /**
-	 * Converts an array fo form items to objects.
-	 *
-	 * @param array $items
-	 */
-	public static function item_to_objects( $items ) {
+     * Converts an array fo form items to objects.
+     *
+     * @param array $items
+     */
+    public static function item_to_objects( $items ) {
 
         $objects = array();
 

Spacing +29 added lines, -29 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -20,7 +20,7 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output( $post ) {
+    public static function output($post) {
         ?>
         <style>
             .wpinv-form-builder-edit-field-wrapper label.d-block > span:first-child{
@@ -33,7 +33,7 @@ 
                 <div class="col-sm-4">
 
                     <!-- Builder tabs -->
-                    <button class="button button-primary" v-if="active_tab!='new_item'" @click.prevent="active_tab='new_item'"><?php _e( 'Go Back', 'invoicing' ); ?></button>
+                    <button class="button button-primary" v-if="active_tab!='new_item'" @click.prevent="active_tab='new_item'"><?php _e('Go Back', 'invoicing'); ?></button>
 
                     <!-- Builder tab content -->
                     <div class="mt-4">
@@ -41,7 +41,7 @@ 
                         <!-- Available builder elements -->
                         <div class="wpinv-form-builder-tab-pane" v-if="active_tab=='new_item'">
                             <div class="wpinv-form-builder-add-field-types">
-                                <small class='form-text text-muted'><?php _e( 'Add an element by dragging it to the payment form.', 'invoicing' ); ?></small>
+                                <small class='form-text text-muted'><?php _e('Add an element by dragging it to the payment form.', 'invoicing'); ?></small>
                                 <draggable class="section mt-2" style="display: flex; flex-flow: wrap; justify-content: space-between;" v-model="elements" :group="{ name: 'fields', pull: 'clone', put: false }" :sort="false" :clone="addDraggedField" tag="ul" filter=".wpinv-undraggable">
                                     <li v-for="element in elements" class= "wpinv-payment-form-left-fields-field" @click.prevent="addField(element)" :class="{ 'd-none': element.defaults.premade }">
                                         <button class="button btn text-dark">
@@ -56,18 +56,18 @@ 
                         <!-- Edit an element -->
                         <div class="wpinv-form-builder-tab-pane" v-if="active_tab=='edit_item'" style="font-size: 14px;">
                             <div class="wpinv-form-builder-edit-field-wrapper">
-                                <?php do_action( 'wpinv_payment_form_edit_element_template', 'active_form_element', $post ); ?>
-                                <?php do_action( 'getpaid_payment_form_edit_element_template', $post ); ?>
+                                <?php do_action('wpinv_payment_form_edit_element_template', 'active_form_element', $post); ?>
+                                <?php do_action('getpaid_payment_form_edit_element_template', $post); ?>
                                 <div class='form-group'>
-                                    <label :for="active_form_element.id + '_grid_width'"><?php esc_html_e( 'Width', 'invoicing' ) ?></label>
+                                    <label :for="active_form_element.id + '_grid_width'"><?php esc_html_e('Width', 'invoicing') ?></label>
                                     <select class='form-control custom-select' :id="active_form_element.id + '_grid_width'" v-model='gridWidth'>
-                                        <option value='full'><?php esc_html_e( 'Full Width', 'invoicing' ); ?></option>
-                                        <option value='half'><?php esc_html_e( 'Half Width', 'invoicing' ); ?></option>
-                                        <option value='third'><?php esc_html_e( '1/3 Width', 'invoicing' ); ?></option>
+                                        <option value='full'><?php esc_html_e('Full Width', 'invoicing'); ?></option>
+                                        <option value='half'><?php esc_html_e('Half Width', 'invoicing'); ?></option>
+                                        <option value='third'><?php esc_html_e('1/3 Width', 'invoicing'); ?></option>
                                     </select>
                                 </div>
                                 <div>
-                                    <button type="button" class="button button-link button-link-delete" @click.prevent="removeField(active_form_element)" v-show="! active_form_element.premade"><?php _e( 'Delete Element', 'invoicing' ); ?></button>
+                                    <button type="button" class="button button-link button-link-delete" @click.prevent="removeField(active_form_element)" v-show="! active_form_element.premade"><?php _e('Delete Element', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>
@@ -76,15 +76,15 @@ 
 
                 </div>
                 <div class="col-sm-8 border-left">
-                    <small class='form-text text-muted' v-if='form_elements.length'><?php _e( 'Click on any element to edit or delete it.', 'invoicing' ); ?></small>
-                    <p class='form-text text-muted' v-if='! form_elements.length'><?php _e( 'This form is empty. Add new elements by dragging them from the right.', 'invoicing' ); ?></p>
+                    <small class='form-text text-muted' v-if='form_elements.length'><?php _e('Click on any element to edit or delete it.', 'invoicing'); ?></small>
+                    <p class='form-text text-muted' v-if='! form_elements.length'><?php _e('This form is empty. Add new elements by dragging them from the right.', 'invoicing'); ?></p>
 
                     <div class="container-fluid">
                         <draggable class="section row" v-model="form_elements" @add="highlightLastDroppedField" group="fields" tag="div" style="min-height: 100%; font-size: 14px;">
                             <div v-for="form_element in form_elements" class="wpinv-form-builder-element-preview" :class="[{ active: active_form_element==form_element &&  active_tab=='edit_item' }, form_element.type, grid_class( form_element ) ]" @click="active_tab = 'edit_item'; active_form_element = form_element">
                                 <div class="wpinv-form-builder-element-preview-inner">
                                     <div class="wpinv-payment-form-field-preview-overlay"></div>
-                                    <?php do_action( 'wpinv_payment_form_render_element_template', 'form_element', $post ); ?>
+                                    <?php do_action('wpinv_payment_form_render_element_template', 'form_element', $post); ?>
                                 </div>
                             </div>
                         </draggable>
@@ -103,7 +103,7 @@ 
         </script>
         <?php
 
-        wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+        wp_nonce_field('getpaid_meta_nonce', 'getpaid_meta_nonce');
     }
 
     /**
@@ -111,33 +111,33 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public static function save( $post_id ) {
+	public static function save($post_id) {
 
         // Prepare the form.
-        $form = new GetPaid_Payment_Form( $post_id );
+        $form = new GetPaid_Payment_Form($post_id);
 
         // Fetch form items.
-        $form_items = json_decode( wp_unslash( $_POST['wpinv_form_items'] ), true );
+        $form_items = json_decode(wp_unslash($_POST['wpinv_form_items']), true);
 
         // Ensure that we have an array...
-        if ( empty( $form_items ) ) {
+        if (empty($form_items)) {
             $form_items = array();
         }
 
         // Add it to the form.
-        $form->set_items( self::item_to_objects( wp_kses_post_deep( $form_items ) ) );
+        $form->set_items(self::item_to_objects(wp_kses_post_deep($form_items)));
 
         // Save form elements.
-        $form_elements = json_decode( wp_unslash( $_POST['wpinv_form_elements'] ), true );
-        if ( empty( $form_elements ) ) {
+        $form_elements = json_decode(wp_unslash($_POST['wpinv_form_elements']), true);
+        if (empty($form_elements)) {
             $form_elements = array();
         }
 
-        $form->set_elements( wp_kses_post_deep( $form_elements ) );
+        $form->set_elements(wp_kses_post_deep($form_elements));
 
         // Persist data to the datastore.
         $form->save();
-        do_action( 'getpaid_payment_form_metabox_save', $post_id, $form );
+        do_action('getpaid_payment_form_metabox_save', $post_id, $form);
 
     }
 
@@ -146,14 +146,14 @@ 
 	 *
 	 * @param array $items
 	 */
-	public static function item_to_objects( $items ) {
+	public static function item_to_objects($items) {
 
         $objects = array();
 
-        foreach ( $items as $item ) {
-            $_item = new GetPaid_Form_Item( $item['id'] );
-            $_item->set_allow_quantities( (bool) $item['allow_quantities'] );
-            $_item->set_is_required( (bool) $item['required'] );
+        foreach ($items as $item) {
+            $_item = new GetPaid_Form_Item($item['id']);
+            $_item->set_allow_quantities((bool) $item['allow_quantities']);
+            $_item->set_is_required((bool) $item['required']);
             $objects[] = $_item;
         }
 

includes/class-getpaid-tax.php

Indentation +163 added lines, -163 removed lines

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

Spacing +36 added lines, -36 removed lines

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

includes/deprecated-functions.php

Indentation +3 added lines, -3 removed lines

@@ -246,7 +246,7 @@ 
  * @deprecated
  */
 function wpinv_get_payment_key( $invoice = 0 ) {
-	$invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice( $invoice );
     return $invoice->get_key();
 }
 
@@ -424,7 +424,7 @@ 
  * @deprecated
  */
 function wpinv_get_checkout_session() {
-	return false;
+    return false;
 }
 
 /**
@@ -1273,5 +1273,5 @@ 
  * @deprecated
  */
 function wpinv_get_subscription( $invoice ) {
-	return wpinv_get_invoice_subscription( $invoice );
+    return wpinv_get_invoice_subscription( $invoice );
 }

Spacing +93 added lines, -93 removed lines

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

includes/data-stores/class-getpaid-subscription-data-store.php

Indentation +182 added lines, -182 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -15,198 +15,198 @@ 
  */
 class GetPaid_Subscription_Data_Store {
 
-	/**
-	 * A map of database fields to data types.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $database_fields_to_data_type = array(
-		'id'                => '%d',
-		'customer_id'       => '%d',
-		'frequency'         => '%d',
-		'period'            => '%s',
-		'initial_amount'    => '%s',
-		'recurring_amount'  => '%s',
-		'bill_times'        => '%d',
-		'transaction_id'    => '%s',
-		'parent_payment_id' => '%d',
-		'product_id'        => '%d',
-		'created'           => '%s',
-		'expiration'        => '%s',
-		'trial_period'      => '%s',
-		'status'            => '%s',
-		'profile_id'        => '%s',
-	);
-
-	/*
+    /**
+     * A map of database fields to data types.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $database_fields_to_data_type = array(
+        'id'                => '%d',
+        'customer_id'       => '%d',
+        'frequency'         => '%d',
+        'period'            => '%s',
+        'initial_amount'    => '%s',
+        'recurring_amount'  => '%s',
+        'bill_times'        => '%d',
+        'transaction_id'    => '%s',
+        'parent_payment_id' => '%d',
+        'product_id'        => '%d',
+        'created'           => '%s',
+        'expiration'        => '%s',
+        'trial_period'      => '%s',
+        'status'            => '%s',
+        'profile_id'        => '%s',
+    );
+
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Method to create a new subscription in the database.
-	 *
-	 * @param WPInv_Subscription $subscription Subscription object.
-	 */
-	public function create( &$subscription ) {
-		global $wpdb;
-
-		$values  = array();
-		$formats = array();
-
-		$fields = $this->database_fields_to_data_type;
-		unset( $fields['id'] );
-
-		foreach ( $fields as $key => $format ) {
-			$method       = "get_$key";
-			$values[$key] = $subscription->$method( 'edit' );
-			$formats[]    = $format;
-		}
-
-		$result = $wpdb->insert( $wpdb->prefix . 'wpinv_subscriptions', $values, $formats );
-
-		if ( $result ) {
-			$subscription->set_id( $wpdb->insert_id );
-			$subscription->apply_changes();
-			$subscription->clear_cache();
-			update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id() );
-			do_action( 'getpaid_new_subscription', $subscription );
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Method to read a subscription from the database.
-	 *
-	 * @param WPInv_Subscription $subscription Subscription object.
-	 *
-	 */
-	public function read( &$subscription ) {
-		global $wpdb;
-
-		$subscription->set_defaults();
-
-		if ( ! $subscription->get_id() ) {
-			$subscription->last_error = __( 'Invalid subscription ID.', 'invoicing' );
-			$subscription->set_id( 0 );
-			return false;
-		}
-
-		// Maybe retrieve from the cache.
-		$raw_subscription = wp_cache_get( $subscription->get_id(), 'getpaid_subscriptions' );
-
-		// If not found, retrieve from the db.
-		if ( false === $raw_subscription ) {
-
-			$raw_subscription = $wpdb->get_row(
-				$wpdb->prepare(
-					"SELECT * FROM {$wpdb->prefix}wpinv_subscriptions WHERE id = %d",
-					$subscription->get_id()
-				)
-			);
-
-			// Update the cache with our data
-			wp_cache_set( $subscription->get_id(), $raw_subscription, 'getpaid_subscriptions' );
-
-		}
-
-		if ( ! $raw_subscription ) {
-			$subscription->set_id( 0 );
-			$subscription->last_error = __( 'Invalid subscription ID.', 'invoicing' );
-			return false;
-		}
-
-		foreach ( array_keys( $this->database_fields_to_data_type ) as $key ) {
-			$method     = "set_$key";
-			$subscription->$method( $raw_subscription->$key );
-		}
-
-		$subscription->set_object_read( true );
-		do_action( 'getpaid_read_subscription', $subscription );
-
-	}
-
-	/**
-	 * Method to update a subscription in the database.
-	 *
-	 * @param WPInv_Subscription $subscription Subscription object.
-	 */
-	public function update( &$subscription ) {
-		global $wpdb;
-
-		$changes = $subscription->get_changes();
-		$values  = array();
-		$formats = array();
-
-		foreach ( $this->database_fields_to_data_type as $key => $format ) {
-			if ( array_key_exists( $key, $changes ) ) {
-				$method       = "get_$key";
-				$values[$key] = $subscription->$method( 'edit' );
-				$formats[]    = $format;
-			}
-		}
-
-		if ( empty( $values ) ) {
-			return;
-		}
-
-		$wpdb->update(
-			$wpdb->prefix . 'wpinv_subscriptions',
-			$values,
-			array(
-				'id' => $subscription->get_id(),
-			),
-			$formats,
-			'%d'
-		);
-
-		// Apply the changes.
-		$subscription->apply_changes();
-
-		// Delete cache.
-		$subscription->clear_cache();
-
-		update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id', $subscription->get_profile_id() );
-		update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id() );
-
-		// Fire a hook.
-		do_action( 'getpaid_update_subscription', $subscription );
-
-	}
-
-	/**
-	 * Method to delete a subscription from the database.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function delete( &$subscription ) {
-		global $wpdb;
-
-		$wpdb->query(
-			$wpdb->prepare(
-				"DELETE FROM {$wpdb->prefix}wpinv_subscriptions
+    /**
+     * Method to create a new subscription in the database.
+     *
+     * @param WPInv_Subscription $subscription Subscription object.
+     */
+    public function create( &$subscription ) {
+        global $wpdb;
+
+        $values  = array();
+        $formats = array();
+
+        $fields = $this->database_fields_to_data_type;
+        unset( $fields['id'] );
+
+        foreach ( $fields as $key => $format ) {
+            $method       = "get_$key";
+            $values[$key] = $subscription->$method( 'edit' );
+            $formats[]    = $format;
+        }
+
+        $result = $wpdb->insert( $wpdb->prefix . 'wpinv_subscriptions', $values, $formats );
+
+        if ( $result ) {
+            $subscription->set_id( $wpdb->insert_id );
+            $subscription->apply_changes();
+            $subscription->clear_cache();
+            update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id() );
+            do_action( 'getpaid_new_subscription', $subscription );
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Method to read a subscription from the database.
+     *
+     * @param WPInv_Subscription $subscription Subscription object.
+     *
+     */
+    public function read( &$subscription ) {
+        global $wpdb;
+
+        $subscription->set_defaults();
+
+        if ( ! $subscription->get_id() ) {
+            $subscription->last_error = __( 'Invalid subscription ID.', 'invoicing' );
+            $subscription->set_id( 0 );
+            return false;
+        }
+
+        // Maybe retrieve from the cache.
+        $raw_subscription = wp_cache_get( $subscription->get_id(), 'getpaid_subscriptions' );
+
+        // If not found, retrieve from the db.
+        if ( false === $raw_subscription ) {
+
+            $raw_subscription = $wpdb->get_row(
+                $wpdb->prepare(
+                    "SELECT * FROM {$wpdb->prefix}wpinv_subscriptions WHERE id = %d",
+                    $subscription->get_id()
+                )
+            );
+
+            // Update the cache with our data
+            wp_cache_set( $subscription->get_id(), $raw_subscription, 'getpaid_subscriptions' );
+
+        }
+
+        if ( ! $raw_subscription ) {
+            $subscription->set_id( 0 );
+            $subscription->last_error = __( 'Invalid subscription ID.', 'invoicing' );
+            return false;
+        }
+
+        foreach ( array_keys( $this->database_fields_to_data_type ) as $key ) {
+            $method     = "set_$key";
+            $subscription->$method( $raw_subscription->$key );
+        }
+
+        $subscription->set_object_read( true );
+        do_action( 'getpaid_read_subscription', $subscription );
+
+    }
+
+    /**
+     * Method to update a subscription in the database.
+     *
+     * @param WPInv_Subscription $subscription Subscription object.
+     */
+    public function update( &$subscription ) {
+        global $wpdb;
+
+        $changes = $subscription->get_changes();
+        $values  = array();
+        $formats = array();
+
+        foreach ( $this->database_fields_to_data_type as $key => $format ) {
+            if ( array_key_exists( $key, $changes ) ) {
+                $method       = "get_$key";
+                $values[$key] = $subscription->$method( 'edit' );
+                $formats[]    = $format;
+            }
+        }
+
+        if ( empty( $values ) ) {
+            return;
+        }
+
+        $wpdb->update(
+            $wpdb->prefix . 'wpinv_subscriptions',
+            $values,
+            array(
+                'id' => $subscription->get_id(),
+            ),
+            $formats,
+            '%d'
+        );
+
+        // Apply the changes.
+        $subscription->apply_changes();
+
+        // Delete cache.
+        $subscription->clear_cache();
+
+        update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id', $subscription->get_profile_id() );
+        update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id() );
+
+        // Fire a hook.
+        do_action( 'getpaid_update_subscription', $subscription );
+
+    }
+
+    /**
+     * Method to delete a subscription from the database.
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function delete( &$subscription ) {
+        global $wpdb;
+
+        $wpdb->query(
+            $wpdb->prepare(
+                "DELETE FROM {$wpdb->prefix}wpinv_subscriptions
 				WHERE id = %d",
-				$subscription->get_id()
-			)
-		);
+                $subscription->get_id()
+            )
+        );
 
-		delete_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id' );
-		delete_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id' );
+        delete_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id' );
+        delete_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id' );
 
-		// Delete cache.
-		$subscription->clear_cache();
+        // Delete cache.
+        $subscription->clear_cache();
 
-		// Fire a hook.
-		do_action( 'getpaid_delete_subscription', $subscription );
+        // Fire a hook.
+        do_action( 'getpaid_delete_subscription', $subscription );
 
-		$subscription->set_id( 0 );
-	}
+        $subscription->set_id( 0 );
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Additional Methods
 	|--------------------------------------------------------------------------

Spacing +38 added lines, -38 removed lines

@@ -4,7 +4,7 @@ 
  * GetPaid_Subscription_Data_Store class file.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -50,29 +50,29 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription Subscription object.
 	 */
-	public function create( &$subscription ) {
+	public function create(&$subscription) {
 		global $wpdb;
 
 		$values  = array();
 		$formats = array();
 
 		$fields = $this->database_fields_to_data_type;
-		unset( $fields['id'] );
+		unset($fields['id']);
 
-		foreach ( $fields as $key => $format ) {
+		foreach ($fields as $key => $format) {
 			$method       = "get_$key";
-			$values[$key] = $subscription->$method( 'edit' );
+			$values[$key] = $subscription->$method('edit');
 			$formats[]    = $format;
 		}
 
-		$result = $wpdb->insert( $wpdb->prefix . 'wpinv_subscriptions', $values, $formats );
+		$result = $wpdb->insert($wpdb->prefix . 'wpinv_subscriptions', $values, $formats);
 
-		if ( $result ) {
-			$subscription->set_id( $wpdb->insert_id );
+		if ($result) {
+			$subscription->set_id($wpdb->insert_id);
 			$subscription->apply_changes();
 			$subscription->clear_cache();
-			update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id() );
-			do_action( 'getpaid_new_subscription', $subscription );
+			update_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id());
+			do_action('getpaid_new_subscription', $subscription);
 			return true;
 		}
 
@@ -85,22 +85,22 @@ 
 	 * @param WPInv_Subscription $subscription Subscription object.
 	 *
 	 */
-	public function read( &$subscription ) {
+	public function read(&$subscription) {
 		global $wpdb;
 
 		$subscription->set_defaults();
 
-		if ( ! $subscription->get_id() ) {
-			$subscription->last_error = __( 'Invalid subscription ID.', 'invoicing' );
-			$subscription->set_id( 0 );
+		if (!$subscription->get_id()) {
+			$subscription->last_error = __('Invalid subscription ID.', 'invoicing');
+			$subscription->set_id(0);
 			return false;
 		}
 
 		// Maybe retrieve from the cache.
-		$raw_subscription = wp_cache_get( $subscription->get_id(), 'getpaid_subscriptions' );
+		$raw_subscription = wp_cache_get($subscription->get_id(), 'getpaid_subscriptions');
 
 		// If not found, retrieve from the db.
-		if ( false === $raw_subscription ) {
+		if (false === $raw_subscription) {
 
 			$raw_subscription = $wpdb->get_row(
 				$wpdb->prepare(
@@ -110,23 +110,23 @@ 
 			);
 
 			// Update the cache with our data
-			wp_cache_set( $subscription->get_id(), $raw_subscription, 'getpaid_subscriptions' );
+			wp_cache_set($subscription->get_id(), $raw_subscription, 'getpaid_subscriptions');
 
 		}
 
-		if ( ! $raw_subscription ) {
-			$subscription->set_id( 0 );
-			$subscription->last_error = __( 'Invalid subscription ID.', 'invoicing' );
+		if (!$raw_subscription) {
+			$subscription->set_id(0);
+			$subscription->last_error = __('Invalid subscription ID.', 'invoicing');
 			return false;
 		}
 
-		foreach ( array_keys( $this->database_fields_to_data_type ) as $key ) {
-			$method     = "set_$key";
-			$subscription->$method( $raw_subscription->$key );
+		foreach (array_keys($this->database_fields_to_data_type) as $key) {
+			$method = "set_$key";
+			$subscription->$method($raw_subscription->$key);
 		}
 
-		$subscription->set_object_read( true );
-		do_action( 'getpaid_read_subscription', $subscription );
+		$subscription->set_object_read(true);
+		do_action('getpaid_read_subscription', $subscription);
 
 	}
 
@@ -135,22 +135,22 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription Subscription object.
 	 */
-	public function update( &$subscription ) {
+	public function update(&$subscription) {
 		global $wpdb;
 
 		$changes = $subscription->get_changes();
 		$values  = array();
 		$formats = array();
 
-		foreach ( $this->database_fields_to_data_type as $key => $format ) {
-			if ( array_key_exists( $key, $changes ) ) {
+		foreach ($this->database_fields_to_data_type as $key => $format) {
+			if (array_key_exists($key, $changes)) {
 				$method       = "get_$key";
-				$values[$key] = $subscription->$method( 'edit' );
+				$values[$key] = $subscription->$method('edit');
 				$formats[]    = $format;
 			}
 		}
 
-		if ( empty( $values ) ) {
+		if (empty($values)) {
 			return;
 		}
 
@@ -170,11 +170,11 @@ 
 		// Delete cache.
 		$subscription->clear_cache();
 
-		update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id', $subscription->get_profile_id() );
-		update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id() );
+		update_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id', $subscription->get_profile_id());
+		update_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id());
 
 		// Fire a hook.
-		do_action( 'getpaid_update_subscription', $subscription );
+		do_action('getpaid_update_subscription', $subscription);
 
 	}
 
@@ -183,7 +183,7 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function delete( &$subscription ) {
+	public function delete(&$subscription) {
 		global $wpdb;
 
 		$wpdb->query(
@@ -194,16 +194,16 @@ 
 			)
 		);
 
-		delete_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id' );
-		delete_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id' );
+		delete_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id');
+		delete_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscription_id');
 
 		// Delete cache.
 		$subscription->clear_cache();
 
 		// Fire a hook.
-		do_action( 'getpaid_delete_subscription', $subscription );
+		do_action('getpaid_delete_subscription', $subscription);
 
-		$subscription->set_id( 0 );
+		$subscription->set_id(0);
 	}
 
 	/*

includes/admin/meta-boxes/class-getpaid-meta-box-invoice-subscription.php

Indentation +13 added lines, -13 removed lines

@@ -6,7 +6,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -15,10 +15,10 @@ 
 class GetPaid_Meta_Box_Invoice_Subscription {
 
     /**
-	 * Output the subscription metabox.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the subscription metabox.
+     *
+     * @param WP_Post $post
+     */
     public static function output( $post ) {
 
         // Fetch the invoice.
@@ -34,10 +34,10 @@ 
     }
 
     /**
-	 * Output the subscription invoices.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the subscription invoices.
+     *
+     * @param WP_Post $post
+     */
     public static function output_invoices( $post ) {
 
         // Fetch the invoice.
@@ -53,10 +53,10 @@ 
     }
 
     /**
-	 * Outputs related subscriptions.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Outputs related subscriptions.
+     *
+     * @param WP_Post $post
+     */
     public static function output_related( $post ) {
 
         // Fetch the invoice.

Spacing +13 added lines, -13 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -19,16 +19,16 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output( $post ) {
+    public static function output($post) {
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Fetch the subscription.
-        $subscription = getpaid_get_invoice_subscription( $invoice );
+        $subscription = getpaid_get_invoice_subscription($invoice);
 
         echo '<div class="bsui">';
-        getpaid_admin_subscription_details_metabox( /** @scrutinizer ignore-type */$subscription );
+        getpaid_admin_subscription_details_metabox(/** @scrutinizer ignore-type */$subscription);
         echo '</div>';
 
     }
@@ -38,16 +38,16 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output_invoices( $post ) {
+    public static function output_invoices($post) {
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Fetch the subscription.
-        $subscription = getpaid_get_invoice_subscription( $invoice );
+        $subscription = getpaid_get_invoice_subscription($invoice);
 
         echo '<div class="bsui">';
-        getpaid_admin_subscription_invoice_details_metabox( /** @scrutinizer ignore-type */$subscription, false );
+        getpaid_admin_subscription_invoice_details_metabox(/** @scrutinizer ignore-type */$subscription, false);
         echo '</div>';
 
     }
@@ -57,16 +57,16 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output_related( $post ) {
+    public static function output_related($post) {
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Fetch the subscription.
-        $subscription = getpaid_get_invoice_subscription( $invoice );
+        $subscription = getpaid_get_invoice_subscription($invoice);
 
         echo '<div class="bsui">';
-        getpaid_admin_subscription_related_subscriptions_metabox( /** @scrutinizer ignore-type */$subscription, false );
+        getpaid_admin_subscription_related_subscriptions_metabox(/** @scrutinizer ignore-type */$subscription, false);
         echo '</div>';
 
     }

includes/class-wpinv-subscriptions.php

Indentation +4 added lines, -4 removed lines

@@ -12,8 +12,8 @@ 
 class WPInv_Subscriptions {
 
     /**
-	 * Class constructor.
-	 */
+     * Class constructor.
+     */
     public function __construct(){
 
         // Fire gateway specific hooks when a subscription changes.
@@ -89,12 +89,12 @@ 
     }
 
     /**
-	 * Processes subscription status changes.
+     * Processes subscription status changes.
      *
      * @param WPInv_Subscription $subscription
      * @param string $from
      * @param string $to
-	 */
+     */
     public function process_subscription_status_change( $subscription, $from, $to ) {
 
         $gateway = $subscription->get_gateway();

Spacing +171 added lines, -171 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 /**
  * Main Subscriptions class.
  *
@@ -14,31 +14,31 @@ 
     /**
 	 * Class constructor.
 	 */
-    public function __construct(){
+    public function __construct() {
 
         // Fire gateway specific hooks when a subscription changes.
-        add_action( 'getpaid_subscription_status_changed', array( $this, 'process_subscription_status_change' ), 10, 3 );
+        add_action('getpaid_subscription_status_changed', array($this, 'process_subscription_status_change'), 10, 3);
 
         // De-activate a subscription whenever the invoice changes payment statuses.
-        add_action( 'getpaid_invoice_status_wpi-refunded', array( $this, 'maybe_deactivate_invoice_subscription' ), 20 );
-        add_action( 'getpaid_invoice_status_wpi-failed', array( $this, 'maybe_deactivate_invoice_subscription' ), 20 );
-        add_action( 'getpaid_invoice_status_wpi-cancelled', array( $this, 'maybe_deactivate_invoice_subscription' ), 20 );
-        add_action( 'getpaid_invoice_status_wpi-pending', array( $this, 'maybe_deactivate_invoice_subscription' ), 20 );
+        add_action('getpaid_invoice_status_wpi-refunded', array($this, 'maybe_deactivate_invoice_subscription'), 20);
+        add_action('getpaid_invoice_status_wpi-failed', array($this, 'maybe_deactivate_invoice_subscription'), 20);
+        add_action('getpaid_invoice_status_wpi-cancelled', array($this, 'maybe_deactivate_invoice_subscription'), 20);
+        add_action('getpaid_invoice_status_wpi-pending', array($this, 'maybe_deactivate_invoice_subscription'), 20);
 
         // Handles subscription cancelations.
-        add_action( 'getpaid_authenticated_action_subscription_cancel', array( $this, 'user_cancel_single_subscription' ) );
+        add_action('getpaid_authenticated_action_subscription_cancel', array($this, 'user_cancel_single_subscription'));
 
         // Create a subscription whenever an invoice is created, (and update it when it is updated).
-        add_action( 'getpaid_new_invoice', array( $this, 'maybe_create_invoice_subscription' ), 5 );
-        add_action( 'getpaid_update_invoice', array( $this, 'maybe_update_invoice_subscription' ), 5 );
+        add_action('getpaid_new_invoice', array($this, 'maybe_create_invoice_subscription'), 5);
+        add_action('getpaid_update_invoice', array($this, 'maybe_update_invoice_subscription'), 5);
 
         // Handles admin subscription update actions.
-        add_action( 'getpaid_authenticated_admin_action_update_single_subscription', array( $this, 'admin_update_single_subscription' ) );
-        add_action( 'getpaid_authenticated_admin_action_subscription_manual_renew', array( $this, 'admin_renew_single_subscription' ) );
-        add_action( 'getpaid_authenticated_admin_action_subscription_manual_delete', array( $this, 'admin_delete_single_subscription' ) );
+        add_action('getpaid_authenticated_admin_action_update_single_subscription', array($this, 'admin_update_single_subscription'));
+        add_action('getpaid_authenticated_admin_action_subscription_manual_renew', array($this, 'admin_renew_single_subscription'));
+        add_action('getpaid_authenticated_admin_action_subscription_manual_delete', array($this, 'admin_delete_single_subscription'));
 
         // Filter invoice item row actions.
-        add_action( 'getpaid-invoice-page-line-item-actions', array( $this, 'filter_invoice_line_item_actions' ), 10, 3 );
+        add_action('getpaid-invoice-page-line-item-actions', array($this, 'filter_invoice_line_item_actions'), 10, 3);
     }
 
     /**
@@ -47,19 +47,19 @@ 
      * @param WPInv_Invoice $invoice
      * @return WPInv_Subscription|bool
      */
-    public function get_invoice_subscription( $invoice ) {
+    public function get_invoice_subscription($invoice) {
         $subscription_id = $invoice->get_subscription_id();
 
         // Fallback to the parent invoice if the child invoice has no subscription id.
-        if ( empty( $subscription_id ) && $invoice->is_renewal() ) {
+        if (empty($subscription_id) && $invoice->is_renewal()) {
             $subscription_id = $invoice->get_parent_payment()->get_subscription_id();
         }
 
         // Fetch the subscription.
-        $subscription = new WPInv_Subscription( $subscription_id );
+        $subscription = new WPInv_Subscription($subscription_id);
 
         // Return subscription or use a fallback for backwards compatibility.
-        return $subscription->exists() ? $subscription : wpinv_get_invoice_subscription( $invoice );
+        return $subscription->exists() ? $subscription : wpinv_get_invoice_subscription($invoice);
     }
 
     /**
@@ -67,21 +67,21 @@ 
      *
      * @param WPInv_Invoice $invoice
      */
-    public function maybe_deactivate_invoice_subscription( $invoice ) {
+    public function maybe_deactivate_invoice_subscription($invoice) {
 
-        $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+        $subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
-        if ( empty( $subscriptions ) ) {
+        if (empty($subscriptions)) {
             return;
         }
 
-        if ( ! is_array( $subscriptions ) ) {
-            $subscriptions = array( $subscriptions );
+        if (!is_array($subscriptions)) {
+            $subscriptions = array($subscriptions);
         }
 
-        foreach ( $subscriptions as $subscription ) {
-            if ( $subscription->is_active() ) {
-                $subscription->set_status( 'pending' );
+        foreach ($subscriptions as $subscription) {
+            if ($subscription->is_active()) {
+                $subscription->set_status('pending');
                 $subscription->save();
             }
         }
@@ -95,15 +95,15 @@ 
      * @param string $from
      * @param string $to
 	 */
-    public function process_subscription_status_change( $subscription, $from, $to ) {
+    public function process_subscription_status_change($subscription, $from, $to) {
 
         $gateway = $subscription->get_gateway();
 
-        if ( ! empty( $gateway ) ) {
-            $gateway = sanitize_key( $gateway );
-            $from    = sanitize_key( $from );
-            $to      = sanitize_key( $to );
-            do_action( "getpaid_{$gateway}_subscription_$to", $subscription, $from );
+        if (!empty($gateway)) {
+            $gateway = sanitize_key($gateway);
+            $from    = sanitize_key($from);
+            $to      = sanitize_key($to);
+            do_action("getpaid_{$gateway}_subscription_$to", $subscription, $from);
         }
 
     }
@@ -116,8 +116,8 @@ 
      * @deprecated
      * @return mixed|string|void
      */
-    public static function wpinv_get_pretty_subscription_frequency( $period, $frequency_count = 1 ) {
-        return getpaid_get_subscription_period_label( $period, $frequency_count );
+    public static function wpinv_get_pretty_subscription_frequency($period, $frequency_count = 1) {
+        return getpaid_get_subscription_period_label($period, $frequency_count);
     }
 
     /**
@@ -127,33 +127,33 @@ 
      * @since       1.0.0
      * @return      void
      */
-    public function user_cancel_single_subscription( $data ) {
+    public function user_cancel_single_subscription($data) {
 
         // Ensure there is a subscription to cancel.
-        if ( empty( $data['subscription'] ) ) {
+        if (empty($data['subscription'])) {
             return;
         }
 
-        $subscription = new WPInv_Subscription( (int) $data['subscription'] );
+        $subscription = new WPInv_Subscription((int) $data['subscription']);
 
         // Ensure that it exists and that it belongs to the current user.
-        if ( ! $subscription->exists() || $subscription->get_customer_id() != get_current_user_id() ) {
-            wpinv_set_error( 'invalid_subscription', __( 'You do not have permission to cancel this subscription', 'invoicing' ) );
+        if (!$subscription->exists() || $subscription->get_customer_id() != get_current_user_id()) {
+            wpinv_set_error('invalid_subscription', __('You do not have permission to cancel this subscription', 'invoicing'));
 
         // Can it be cancelled.
-        } else if ( ! $subscription->can_cancel() ) {
-            wpinv_set_error( 'cannot_cancel', __( 'This subscription cannot be cancelled as it is not active.', 'invoicing' ) );
+        } else if (!$subscription->can_cancel()) {
+            wpinv_set_error('cannot_cancel', __('This subscription cannot be cancelled as it is not active.', 'invoicing'));
 
         // Cancel it.
         } else {
 
             $subscription->cancel();
-            wpinv_set_error( 'cancelled', __( 'This subscription has been cancelled.', 'invoicing' ), 'info' );
+            wpinv_set_error('cancelled', __('This subscription has been cancelled.', 'invoicing'), 'info');
         }
 
-        $redirect = remove_query_arg( array( 'getpaid-action', 'getpaid-nonce' ) );
+        $redirect = remove_query_arg(array('getpaid-action', 'getpaid-nonce'));
 
-        wp_safe_redirect( $redirect );
+        wp_safe_redirect($redirect);
         exit;
 
     }
@@ -165,41 +165,41 @@ 
      * @param       WPInv_Invoice $invoice
      * @since       1.0.0
      */
-    public function maybe_create_invoice_subscription( $invoice ) {
+    public function maybe_create_invoice_subscription($invoice) {
         global $getpaid_subscriptions_skip_invoice_update;
 
         // Abort if it is not recurring.
-        if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_free() || ! $invoice->is_recurring() || $invoice->is_renewal() ) {
+        if (!$invoice->is_type('invoice') || $invoice->is_free() || !$invoice->is_recurring() || $invoice->is_renewal()) {
             return;
         }
 
         // Either group the subscriptions or only process a single suscription.
-        if ( getpaid_should_group_subscriptions( $invoice ) ) {
+        if (getpaid_should_group_subscriptions($invoice)) {
 
             $subscription_groups = array();
             $is_first            = true;
 
-            foreach ( getpaid_calculate_subscription_totals( $invoice ) as $group_key => $totals ) {
-                $subscription_groups[ $group_key ] = $this->create_invoice_subscription_group( $totals, $invoice, 0, $is_first );
+            foreach (getpaid_calculate_subscription_totals($invoice) as $group_key => $totals) {
+                $subscription_groups[$group_key] = $this->create_invoice_subscription_group($totals, $invoice, 0, $is_first);
 
-                if ( $is_first ) {
+                if ($is_first) {
                     $getpaid_subscriptions_skip_invoice_update = true;
-                    $invoice->set_subscription_id( $subscription_groups[ $group_key ]['subscription_id'] );
+                    $invoice->set_subscription_id($subscription_groups[$group_key]['subscription_id']);
                     $invoice->save();
                     $getpaid_subscriptions_skip_invoice_update = false;
                 }
 
-                $is_first                          = false;
+                $is_first = false;
             }
 
             // Cache subscription groups.
-            update_post_meta( $invoice->get_id(), 'getpaid_subscription_groups', $subscription_groups );
+            update_post_meta($invoice->get_id(), 'getpaid_subscription_groups', $subscription_groups);
             return true;
 
         }
 
         $subscription = new WPInv_Subscription();
-        return $this->update_invoice_subscription( $subscription, $invoice );
+        return $this->update_invoice_subscription($subscription, $invoice);
 
     }
 
@@ -214,47 +214,47 @@ 
      *
      * @since       2.3.0
      */
-    public function create_invoice_subscription_group( $totals, $invoice, $subscription_id = 0, $is_first = false ) {
+    public function create_invoice_subscription_group($totals, $invoice, $subscription_id = 0, $is_first = false) {
 
-        $subscription  = new WPInv_Subscription( (int) $subscription_id );
+        $subscription  = new WPInv_Subscription((int) $subscription_id);
         $initial_amt   = $totals['initial_total'];
         $recurring_amt = $totals['recurring_total'];
         $fees          = array();
 
         // Maybe add recurring fees.
-        if ( $is_first ) {
+        if ($is_first) {
 
-            foreach ( $invoice->get_fees() as $i => $fee ) {
-                if ( ! empty( $fee['recurring_fee'] ) ) {
-                    $initial_amt   += wpinv_sanitize_amount( $fee['initial_fee'] );
-                    $recurring_amt += wpinv_sanitize_amount( $fee['recurring_fee'] );
+            foreach ($invoice->get_fees() as $i => $fee) {
+                if (!empty($fee['recurring_fee'])) {
+                    $initial_amt   += wpinv_sanitize_amount($fee['initial_fee']);
+                    $recurring_amt += wpinv_sanitize_amount($fee['recurring_fee']);
                     $fees[$i]       = $fee;
                 }
             }
 
         }
 
-        $subscription->set_customer_id( $invoice->get_customer_id() );
-        $subscription->set_parent_invoice_id( $invoice->get_id() );
-        $subscription->set_initial_amount( $initial_amt );
-        $subscription->set_recurring_amount( $recurring_amt );
-        $subscription->set_date_created( current_time( 'mysql' ) );
-        $subscription->set_status( $invoice->is_paid() ? 'active' : 'pending' );
-        $subscription->set_product_id( $totals['item_id'] );
-        $subscription->set_period( $totals['period'] );
-        $subscription->set_frequency( $totals['interval'] );
-        $subscription->set_bill_times( $totals['recurring_limit'] );
-        $subscription->set_next_renewal_date( $totals['renews_on'] );
+        $subscription->set_customer_id($invoice->get_customer_id());
+        $subscription->set_parent_invoice_id($invoice->get_id());
+        $subscription->set_initial_amount($initial_amt);
+        $subscription->set_recurring_amount($recurring_amt);
+        $subscription->set_date_created(current_time('mysql'));
+        $subscription->set_status($invoice->is_paid() ? 'active' : 'pending');
+        $subscription->set_product_id($totals['item_id']);
+        $subscription->set_period($totals['period']);
+        $subscription->set_frequency($totals['interval']);
+        $subscription->set_bill_times($totals['recurring_limit']);
+        $subscription->set_next_renewal_date($totals['renews_on']);
 
         // Trial periods.
-        if ( ! empty( $totals['trialling'] ) ) {
-            $subscription->set_trial_period( $totals['trialling'] );
-            $subscription->set_status( 'trialling' );
+        if (!empty($totals['trialling'])) {
+            $subscription->set_trial_period($totals['trialling']);
+            $subscription->set_status('trialling');
 
         // If initial amount is free, treat it as a free trial even if the subscription item does not have a free trial.
-        } else if ( empty( $initial_amt ) ) {
-            $subscription->set_trial_period( $totals['interval'] . ' ' . $totals['period'] );
-            $subscription->set_status( 'trialling' );
+        } else if (empty($initial_amt)) {
+            $subscription->set_trial_period($totals['interval'] . ' ' . $totals['period']);
+            $subscription->set_status('trialling');
         }
 
         $subscription->save();
@@ -272,87 +272,87 @@ 
      * @param       WPInv_Invoice $invoice
      * @since       1.0.19
      */
-    public function maybe_update_invoice_subscription( $invoice ) {
+    public function maybe_update_invoice_subscription($invoice) {
         global $getpaid_subscriptions_skip_invoice_update;
 
         // Avoid infinite loops.
-        if ( ! empty( $getpaid_subscriptions_skip_invoice_update ) ) {
+        if (!empty($getpaid_subscriptions_skip_invoice_update)) {
             return;
         }
 
         // Do not process renewals.
-        if ( $invoice->is_renewal() ) {
+        if ($invoice->is_renewal()) {
             return;
         }
 
         // Delete existing subscriptions if available and the invoice is not recurring.
-        if ( ! $invoice->is_recurring() ) {
-            $this->delete_invoice_subscriptions( $invoice );
+        if (!$invoice->is_recurring()) {
+            $this->delete_invoice_subscriptions($invoice);
             return;
         }
 
         // Fetch existing subscriptions.
-        $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+        $subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
         // Create new ones if no existing subscriptions.
-        if ( empty( $subscriptions ) ) {
-            return $this->maybe_create_invoice_subscription( $invoice );
+        if (empty($subscriptions)) {
+            return $this->maybe_create_invoice_subscription($invoice);
         }
 
         // Abort if an invoice is paid and already has a subscription.
-        if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+        if ($invoice->is_paid() || $invoice->is_refunded()) {
             return;
         }
 
-        $is_grouped   = is_array( $subscriptions );
-        $should_group = getpaid_should_group_subscriptions( $invoice );
+        $is_grouped   = is_array($subscriptions);
+        $should_group = getpaid_should_group_subscriptions($invoice);
 
         // Ensure that the subscriptions are only grouped if there are more than 1 recurring items.
-        if ( $is_grouped != $should_group ) {
-            $this->delete_invoice_subscriptions( $invoice );
-            delete_post_meta( $invoice->get_id(), 'getpaid_subscription_groups' );
-            return $this->maybe_create_invoice_subscription( $invoice );
+        if ($is_grouped != $should_group) {
+            $this->delete_invoice_subscriptions($invoice);
+            delete_post_meta($invoice->get_id(), 'getpaid_subscription_groups');
+            return $this->maybe_create_invoice_subscription($invoice);
         }
 
         // If there is only one recurring item...
-        if ( ! $is_grouped ) {
-            return $this->update_invoice_subscription( $subscriptions, $invoice );
+        if (!$is_grouped) {
+            return $this->update_invoice_subscription($subscriptions, $invoice);
         }
 
         // Process subscription groups.
-        $current_groups      = getpaid_get_invoice_subscription_groups( $invoice->get_id() );
+        $current_groups      = getpaid_get_invoice_subscription_groups($invoice->get_id());
         $subscription_groups = array();
         $is_first            = true;
 
         // Create new subscription groups.
-        foreach ( getpaid_calculate_subscription_totals( $invoice ) as $group_key => $totals ) {
-            $subscription_id                   = isset( $current_groups[ $group_key ] ) ? $current_groups[ $group_key ]['subscription_id'] : 0;
-            $subscription_groups[ $group_key ] = $this->create_invoice_subscription_group( $totals, $invoice, $subscription_id, $is_first );
+        foreach (getpaid_calculate_subscription_totals($invoice) as $group_key => $totals) {
+            $subscription_id                   = isset($current_groups[$group_key]) ? $current_groups[$group_key]['subscription_id'] : 0;
+            $subscription_groups[$group_key] = $this->create_invoice_subscription_group($totals, $invoice, $subscription_id, $is_first);
 
-            if ( $is_first && $invoice->get_subscription_id() !== $subscription_groups[ $group_key ]['subscription_id'] ) {
+            if ($is_first && $invoice->get_subscription_id() !== $subscription_groups[$group_key]['subscription_id']) {
                 $getpaid_subscriptions_skip_invoice_update = true;
-                $invoice->set_subscription_id( $subscription_groups[ $group_key ]['subscription_id'] );
+                $invoice->set_subscription_id($subscription_groups[$group_key]['subscription_id']);
                 $invoice->save();
                 $getpaid_subscriptions_skip_invoice_update = false;
             }
 
-            $is_first                          = false;
+            $is_first = false;
         }
 
         // Delete non-existent subscription groups.
-        foreach ( $current_groups as $group_key => $data ) {
-            if ( ! isset( $subscription_groups[ $group_key ] ) ) {
-                $subscription = new WPInv_Subscription( (int) $data['subscription_id'] );
+        foreach ($current_groups as $group_key => $data) {
+            if (!isset($subscription_groups[$group_key])) {
+                $subscription = new WPInv_Subscription((int) $data['subscription_id']);
 
-                if ( $subscription->exists() ) {
-                    $subscription->delete( true );
+                if ($subscription->exists()) {
+                    $subscription->delete(true);
                 }
 
             }
         }
 
         // Cache subscription groups.
-        update_post_meta( $invoice->get_id(), 'getpaid_subscription_groups', $subscription_groups );
+        update_post_meta($invoice->get_id(), 'getpaid_subscription_groups', $subscription_groups);
         return true;
 
     }
@@ -362,20 +362,20 @@ 
      *
      * @param WPInv_Invoice $invoice
      */
-    public function delete_invoice_subscriptions( $invoice ) {
+    public function delete_invoice_subscriptions($invoice) {
 
-        $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+        $subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
-        if ( empty( $subscriptions ) ) {
+        if (empty($subscriptions)) {
             return;
         }
 
-        if ( ! is_array( $subscriptions ) ) {
-            $subscriptions = array( $subscriptions );
+        if (!is_array($subscriptions)) {
+            $subscriptions = array($subscriptions);
         }
 
-        foreach ( $subscriptions as $subscription ) {
-            $subscription->delete( true );
+        foreach ($subscriptions as $subscription) {
+            $subscription->delete(true);
         }
 
     }
@@ -388,57 +388,57 @@ 
      * @param       WPInv_Invoice $invoice
      * @since       1.0.19
      */
-    public function update_invoice_subscription( $subscription, $invoice ) {
+    public function update_invoice_subscription($subscription, $invoice) {
 
         // Delete the subscription if an invoice is free or nolonger recurring.
-        if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_free() || ! $invoice->is_recurring() ) {
+        if (!$invoice->is_type('invoice') || $invoice->is_free() || !$invoice->is_recurring()) {
             return $subscription->delete();
         }
 
-        $subscription->set_customer_id( $invoice->get_customer_id() );
-        $subscription->set_parent_invoice_id( $invoice->get_id() );
-        $subscription->set_initial_amount( $invoice->get_initial_total() );
-        $subscription->set_recurring_amount( $invoice->get_recurring_total() );
-        $subscription->set_date_created( current_time( 'mysql' ) );
-        $subscription->set_status( $invoice->is_paid() ? 'active' : 'pending' );
+        $subscription->set_customer_id($invoice->get_customer_id());
+        $subscription->set_parent_invoice_id($invoice->get_id());
+        $subscription->set_initial_amount($invoice->get_initial_total());
+        $subscription->set_recurring_amount($invoice->get_recurring_total());
+        $subscription->set_date_created(current_time('mysql'));
+        $subscription->set_status($invoice->is_paid() ? 'active' : 'pending');
 
         // Get the recurring item and abort if it does not exist.
-        $subscription_item = $invoice->get_recurring( true );
-        if ( ! $subscription_item->get_id() ) {
+        $subscription_item = $invoice->get_recurring(true);
+        if (!$subscription_item->get_id()) {
             $invoice->set_subscription_id(0);
             $invoice->save();
             return $subscription->delete();
         }
 
-        $subscription->set_product_id( $subscription_item->get_id() );
-        $subscription->set_period( $subscription_item->get_recurring_period( true ) );
-        $subscription->set_frequency( $subscription_item->get_recurring_interval() );
-        $subscription->set_bill_times( $subscription_item->get_recurring_limit() );
+        $subscription->set_product_id($subscription_item->get_id());
+        $subscription->set_period($subscription_item->get_recurring_period(true));
+        $subscription->set_frequency($subscription_item->get_recurring_interval());
+        $subscription->set_bill_times($subscription_item->get_recurring_limit());
 
         // Calculate the next renewal date.
-        $period       = $subscription_item->get_recurring_period( true );
+        $period       = $subscription_item->get_recurring_period(true);
         $interval     = $subscription_item->get_recurring_interval();
 
         // If the subscription item has a trial period...
-        if ( $subscription_item->has_free_trial() ) {
-            $period   = $subscription_item->get_trial_period( true );
+        if ($subscription_item->has_free_trial()) {
+            $period   = $subscription_item->get_trial_period(true);
             $interval = $subscription_item->get_trial_interval();
-            $subscription->set_trial_period( $interval . ' ' . $period );
-            $subscription->set_status( 'trialling' );
+            $subscription->set_trial_period($interval . ' ' . $period);
+            $subscription->set_status('trialling');
         }
 
         // If initial amount is free, treat it as a free trial even if the subscription item does not have a free trial.
-        if ( $invoice->has_free_trial() ) {
-            $subscription->set_trial_period( $interval . ' ' . $period );
-            $subscription->set_status( 'trialling' );
+        if ($invoice->has_free_trial()) {
+            $subscription->set_trial_period($interval . ' ' . $period);
+            $subscription->set_status('trialling');
         }
 
         // Calculate the next renewal date.
-        $expiration = date( 'Y-m-d H:i:s', strtotime( "+$interval $period", strtotime( $subscription->get_date_created() ) ) );
+        $expiration = date('Y-m-d H:i:s', strtotime("+$interval $period", strtotime($subscription->get_date_created())));
 
-        $subscription->set_next_renewal_date( $expiration );
+        $subscription->set_next_renewal_date($expiration);
         $subscription->save();
-        $invoice->set_subscription_id( $subscription->get_id() );
+        $invoice->set_subscription_id($subscription->get_id());
         return $subscription->get_id();
 
     }
@@ -449,27 +449,27 @@ 
      * @param       array $data
      * @since       1.0.19
      */
-    public function admin_update_single_subscription( $args ) {
+    public function admin_update_single_subscription($args) {
 
         // Ensure the subscription exists and that a status has been given.
-        if ( empty( $args['subscription_id'] ) ) {
+        if (empty($args['subscription_id'])) {
             return;
         }
 
         // Retrieve the subscriptions.
-        $subscription = new WPInv_Subscription( $args['subscription_id'] );
+        $subscription = new WPInv_Subscription($args['subscription_id']);
 
-        if ( $subscription->get_id() ) {
+        if ($subscription->get_id()) {
 
             $subscription->set_props(
                 array(
-                    'status'     => isset( $args['subscription_status'] ) ? $args['subscription_status'] : null,
-                    'profile_id' => isset( $args['wpinv_subscription_profile_id'] ) ? $args['wpinv_subscription_profile_id'] : null,
+                    'status'     => isset($args['subscription_status']) ? $args['subscription_status'] : null,
+                    'profile_id' => isset($args['wpinv_subscription_profile_id']) ? $args['wpinv_subscription_profile_id'] : null,
                 )
             );
 
             $subscription->save();
-            getpaid_admin()->show_info( __( 'Subscription updated', 'invoicing' ) );
+            getpaid_admin()->show_info(__('Subscription updated', 'invoicing'));
 
         }
 
@@ -481,27 +481,27 @@ 
      * @param       array $data
      * @since       1.0.19
      */
-    public function admin_renew_single_subscription( $args ) {
+    public function admin_renew_single_subscription($args) {
 
         // Ensure the subscription exists and that a status has been given.
-        if ( empty( $args['id'] ) ) {
+        if (empty($args['id'])) {
             return;
         }
 
         // Retrieve the subscriptions.
-        $subscription = new WPInv_Subscription( $args['id'] );
+        $subscription = new WPInv_Subscription($args['id']);
 
-        if ( $subscription->get_id() ) {
+        if ($subscription->get_id()) {
 
-            do_action( 'getpaid_admin_renew_subscription', $subscription );
+            do_action('getpaid_admin_renew_subscription', $subscription);
 
-            $args = array( 'transaction_id', $subscription->get_parent_invoice()->generate_key( 'renewal_' ) );
+            $args = array('transaction_id', $subscription->get_parent_invoice()->generate_key('renewal_'));
 
-            if ( ! $subscription->add_payment( $args ) ) {
-                getpaid_admin()->show_error( __( 'We are unable to renew this subscription as the parent invoice does not exist.', 'invoicing' ) );
+            if (!$subscription->add_payment($args)) {
+                getpaid_admin()->show_error(__('We are unable to renew this subscription as the parent invoice does not exist.', 'invoicing'));
             } else {
                 $subscription->renew();
-                getpaid_admin()->show_info( __( 'This subscription has been renewed and extended.', 'invoicing' ) );
+                getpaid_admin()->show_info(__('This subscription has been renewed and extended.', 'invoicing'));
             }
 
             wp_safe_redirect(
@@ -524,20 +524,20 @@ 
      * @param       array $data
      * @since       1.0.19
      */
-    public function admin_delete_single_subscription( $args ) {
+    public function admin_delete_single_subscription($args) {
 
         // Ensure the subscription exists and that a status has been given.
-        if ( empty( $args['id'] ) ) {
+        if (empty($args['id'])) {
             return;
         }
 
         // Retrieve the subscriptions.
-        $subscription = new WPInv_Subscription( $args['id'] );
+        $subscription = new WPInv_Subscription($args['id']);
 
-        if ( $subscription->delete() ) {
-            getpaid_admin()->show_info( __( 'This subscription has been deleted.', 'invoicing' ) );
+        if ($subscription->delete()) {
+            getpaid_admin()->show_info(__('This subscription has been deleted.', 'invoicing'));
         } else {
-            getpaid_admin()->show_error( __( 'We are unable to delete this subscription. Please try again.', 'invoicing' ) );
+            getpaid_admin()->show_error(__('We are unable to delete this subscription. Please try again.', 'invoicing'));
         }
 
         $redirected = wp_safe_redirect(
@@ -550,7 +550,7 @@ 
             )
         );
 
-        if ( $redirected ) {
+        if ($redirected) {
             exit;
         }
 
@@ -563,16 +563,16 @@ 
      * @param WPInv_Item $item
      * @param WPInv_Invoice $invoice
      */
-    public function filter_invoice_line_item_actions( $actions, $item, $invoice ) {
+    public function filter_invoice_line_item_actions($actions, $item, $invoice) {
 
         // Abort if this invoice uses subscription groups.
-        $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-        if ( ! $invoice->is_recurring() || ! is_object( $subscriptions ) ) {
+        $subscriptions = getpaid_get_invoice_subscriptions($invoice);
+        if (!$invoice->is_recurring() || !is_object($subscriptions)) {
             return $actions;
         }
 
         // Fetch item subscription.
-        $args  = array(
+        $args = array(
             'invoice_in'  => $invoice->is_parent() ? $invoice->get_id() : $invoice->get_parent_id(),
             'product_in'  => $item->get_id(),
             'number'      => 1,
@@ -580,13 +580,13 @@ 
             'fields'      => 'id',
         );
 
-        $subscription = new GetPaid_Subscriptions_Query( $args );
+        $subscription = new GetPaid_Subscriptions_Query($args);
         $subscription = $subscription->get_results();
 
         // In case we found a match...
-        if ( ! empty( $subscription ) ) {
-            $url                     = esc_url( add_query_arg( 'subscription', (int) $subscription[0], get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) ) );
-            $actions['subscription'] = "<a href='$url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
+        if (!empty($subscription)) {
+            $url                     = esc_url(add_query_arg('subscription', (int) $subscription[0], get_permalink((int) wpinv_get_option('invoice_subscription_page'))));
+            $actions['subscription'] = "<a href='$url' class='text-decoration-none'>" . __('Manage Subscription', 'invoicing') . '</a>';
         }
 
         return $actions;

templates/wpinv-payment-processing.php

Spacing +3 added lines, -3 removed lines

@@ -4,8 +4,8 @@ 
         <?php 
             echo
             wp_sprintf(
-                __( 'Your payment is processing. This page will reload automatically in 10 seconds. If it does not, click <a href="%s">here</a>.', 'invoicing' ),
-                esc_url_raw( remove_query_arg( 'payment-confirm' ) )
+                __('Your payment is processing. This page will reload automatically in 10 seconds. If it does not, click <a href="%s">here</a>.', 'invoicing'),
+                esc_url_raw(remove_query_arg('payment-confirm'))
             );
         ?>
         <i class="fa fa-spin fa-refresh"></i>
@@ -14,7 +14,7 @@ 
     <script type="text/javascript">
         setTimeout(
             function(){
-                window.location.href = '<?php echo esc_url_raw( remove_query_arg( 'payment-confirm' ) ) ;?>';
+                window.location.href = '<?php echo esc_url_raw(remove_query_arg('payment-confirm')); ?>';
             },
             10000
         );