AyeCode / invoicing

includes/wpinv-item-functions.php

Indentation +20 added lines, -20 removed lines

@@ -57,21 +57,21 @@ 
     $args = wp_parse_args(
         $args,
         array(
-			'status'     => array( 'publish' ),
-			'limit'      => get_option( 'posts_per_page' ),
-			'page'       => 1,
-			'exclude'    => array(),
-			'orderby'    => 'date',
-			'order'      => 'DESC',
-			'type'       => wpinv_item_types(),
-			'meta_query' => array(
+            'status'     => array( 'publish' ),
+            'limit'      => get_option( 'posts_per_page' ),
+            'page'       => 1,
+            'exclude'    => array(),
+            'orderby'    => 'date',
+            'order'      => 'DESC',
+            'type'       => wpinv_item_types(),
+            'meta_query' => array(
                 array(
                     'key'     => '_wpinv_one_time',
                     'compare' => 'NOT EXISTS',
                 ),
             ),
-			'return'     => 'objects',
-			'paginate'   => false,
+            'return'     => 'objects',
+            'paginate'   => false,
         )
     );
 
@@ -211,9 +211,9 @@ 
 
 function wpinv_get_item_types() {
     $item_types = array(
-		'custom' => __( 'Standard', 'invoicing' ),
-		'fee'    => __( 'Fee', 'invoicing' ),
-	);
+        'custom' => __( 'Standard', 'invoicing' ),
+        'fee'    => __( 'Fee', 'invoicing' ),
+    );
     return apply_filters( 'wpinv_get_item_types', $item_types );
 }
 
@@ -255,16 +255,16 @@ 
     $args = array();
     if ( $post_ids ) {
         $args = array(
-			'fields' => 'ids',
-		);
+            'fields' => 'ids',
+        );
     }
 
     $args = array_merge(
         $args,
         array(
             'post_type'  => 'wpi_item',
-			'orderby'    => 'rand',
-			'post_count' => $num,
+            'orderby'    => 'rand',
+            'post_count' => $num,
             'meta_query' => array(
                 array(
                     'key'     => '_wpinv_one_time',
@@ -439,10 +439,10 @@ 
     $bill_times_less = $bill_times - 1;
 
     if ( ! empty( $bill_times ) ) {
-		$bill_times = $item->get_recurring_interval() * $bill_times;
+        $bill_times = $item->get_recurring_interval() * $bill_times;
         $bill_times_less = getpaid_get_subscription_period_label( $item->get_recurring_period(), $bill_times - $item->get_recurring_interval() );
-		$bill_times = getpaid_get_subscription_period_label( $item->get_recurring_period(), $bill_times );
-	}
+        $bill_times = getpaid_get_subscription_period_label( $item->get_recurring_period(), $bill_times );
+    }
 
     if ( $item instanceof GetPaid_Form_Item && false === $_initial_price ) {
         $initial_price   = wpinv_price( $item->get_sub_total(), $currency );

Spacing +131 added lines, -131 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Retrieves an item by it's ID.
@@ -14,9 +14,9 @@ 
  * @param int the item ID to retrieve.
  * @return WPInv_Item|false
  */
-function wpinv_get_item_by_id( $id ) {
-    $item = wpinv_get_item( $id );
-    return empty( $item ) || $id != $item->get_id() ? false : $item;
+function wpinv_get_item_by_id($id) {
+    $item = wpinv_get_item($id);
+    return empty($item) || $id != $item->get_id() ? false : $item;
 }
 
 /**
@@ -24,14 +24,14 @@ 
  *
  * @return WPInv_Item|false
  */
-function wpinv_get_item_by( $field = '', $value = '', $type = '' ) {
+function wpinv_get_item_by($field = '', $value = '', $type = '') {
 
-    if ( 'id' === strtolower( $field ) ) {
-        return wpinv_get_item_by_id( $value );
+    if ('id' === strtolower($field)) {
+        return wpinv_get_item_by_id($value);
     }
 
-    $id = WPInv_Item::get_item_id_by_field( $value, strtolower( $field ), $type );
-    return empty( $id ) ? false : wpinv_get_item( $id );
+    $id = WPInv_Item::get_item_id_by_field($value, strtolower($field), $type);
+    return empty($id) ? false : wpinv_get_item($id);
 
 }
 
@@ -41,24 +41,24 @@ 
  * @param int|WPInv_Item the item to retrieve.
  * @return WPInv_Item|false
  */
-function wpinv_get_item( $item = 0 ) {
+function wpinv_get_item($item = 0) {
 
-    if ( empty( $item ) ) {
+    if (empty($item)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item );
+    $item = new WPInv_Item($item);
     return $item->exists() ? $item : false;
 
 }
 
-function wpinv_get_all_items( $args = array() ) {
+function wpinv_get_all_items($args = array()) {
 
     $args = wp_parse_args(
         $args,
         array(
-			'status'     => array( 'publish' ),
-			'limit'      => get_option( 'posts_per_page' ),
+			'status'     => array('publish'),
+			'limit'      => get_option('posts_per_page'),
 			'page'       => 1,
 			'exclude'    => array(),
 			'orderby'    => 'date',
@@ -83,44 +83,44 @@ 
         'fields'         => 'ids',
         'orderby'        => $args['orderby'],
         'order'          => $args['order'],
-        'paged'          => absint( $args['page'] ),
+        'paged'          => absint($args['page']),
     );
 
-    if ( ! empty( $args['exclude'] ) ) {
-        $wp_query_args['post__not_in'] = array_map( 'absint', $args['exclude'] );
+    if (!empty($args['exclude'])) {
+        $wp_query_args['post__not_in'] = array_map('absint', $args['exclude']);
     }
 
-    if ( ! $args['paginate'] ) {
+    if (!$args['paginate']) {
         $wp_query_args['no_found_rows'] = true;
     }
 
-    if ( ! empty( $args['search'] ) ) {
+    if (!empty($args['search'])) {
         $wp_query_args['s'] = $args['search'];
     }
 
-    if ( ! empty( $args['type'] ) && $args['type'] !== wpinv_item_types() ) {
-        $types = wpinv_parse_list( $args['type'] );
+    if (!empty($args['type']) && $args['type'] !== wpinv_item_types()) {
+        $types = wpinv_parse_list($args['type']);
         $wp_query_args['meta_query'][] = array(
             'key'     => '_wpinv_type',
-            'value'   => implode( ',', $types ),
+            'value'   => implode(',', $types),
             'compare' => 'IN',
         );
     }
 
-    $wp_query_args = apply_filters( 'wpinv_get_items_args', $wp_query_args, $args );
+    $wp_query_args = apply_filters('wpinv_get_items_args', $wp_query_args, $args);
 
     // Get results.
-    $items = new WP_Query( $wp_query_args );
+    $items = new WP_Query($wp_query_args);
 
-    if ( 'objects' === $args['return'] ) {
-        $return = array_map( 'wpinv_get_item_by_id', $items->posts );
-    } elseif ( 'self' === $args['return'] ) {
+    if ('objects' === $args['return']) {
+        $return = array_map('wpinv_get_item_by_id', $items->posts);
+    } elseif ('self' === $args['return']) {
         return $items;
     } else {
         $return = $items->posts;
     }
 
-    if ( $args['paginate'] ) {
+    if ($args['paginate']) {
         return (object) array(
             'items'         => $return,
             'total'         => $items->found_posts,
@@ -132,12 +132,12 @@ 
 
 }
 
-function wpinv_is_free_item( $item_id = 0 ) {
-    if ( empty( $item_id ) ) {
+function wpinv_is_free_item($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
 
     return $item->is_free();
 }
@@ -147,21 +147,21 @@ 
  *
  * @param WP_Post|WPInv_Item|Int $item The item to check for.
  */
-function wpinv_item_is_editable( $item = 0 ) {
+function wpinv_item_is_editable($item = 0) {
 
     // Fetch the item.
-    $item = new WPInv_Item( $item );
+    $item = new WPInv_Item($item);
 
     // Check if it is editable.
     return $item->is_editable();
 }
 
-function wpinv_get_item_price( $item_id = 0 ) {
-    if ( empty( $item_id ) ) {
+function wpinv_get_item_price($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
 
     return $item->get_price();
 }
@@ -171,89 +171,89 @@ 
  *
  * @param WPInv_Item|int $item
  */
-function wpinv_is_recurring_item( $item = 0 ) {
-    $item = new WPInv_Item( $item );
+function wpinv_is_recurring_item($item = 0) {
+    $item = new WPInv_Item($item);
     return $item->is_recurring();
 }
 
-function wpinv_item_price( $item_id = 0 ) {
-    if ( empty( $item_id ) ) {
+function wpinv_item_price($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $price = wpinv_get_item_price( $item_id );
-    $price = wpinv_price( $price );
+    $price = wpinv_get_item_price($item_id);
+    $price = wpinv_price($price);
 
-    return apply_filters( 'wpinv_item_price', $price, $item_id );
+    return apply_filters('wpinv_item_price', $price, $item_id);
 }
 
-function wpinv_get_item_final_price( $item_id = 0, $amount_override = null ) {
-    if ( is_null( $amount_override ) ) {
-        $original_price = get_post_meta( $item_id, '_wpinv_price', true );
+function wpinv_get_item_final_price($item_id = 0, $amount_override = null) {
+    if (is_null($amount_override)) {
+        $original_price = get_post_meta($item_id, '_wpinv_price', true);
     } else {
         $original_price = $amount_override;
     }
 
     $price = $original_price;
 
-    return apply_filters( 'wpinv_get_item_final_price', $price, $item_id );
+    return apply_filters('wpinv_get_item_final_price', $price, $item_id);
 }
 
-function wpinv_item_custom_singular_name( $item_id ) {
-    if ( empty( $item_id ) ) {
+function wpinv_item_custom_singular_name($item_id) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
 
     return $item->get_custom_singular_name();
 }
 
 function wpinv_get_item_types() {
     $item_types = array(
-		'custom' => __( 'Standard', 'invoicing' ),
-		'fee'    => __( 'Fee', 'invoicing' ),
+		'custom' => __('Standard', 'invoicing'),
+		'fee'    => __('Fee', 'invoicing'),
 	);
-    return apply_filters( 'wpinv_get_item_types', $item_types );
+    return apply_filters('wpinv_get_item_types', $item_types);
 }
 
 function wpinv_item_types() {
     $item_types = wpinv_get_item_types();
 
-    return ( ! empty( $item_types ) ? array_keys( $item_types ) : array() );
+    return (!empty($item_types) ? array_keys($item_types) : array());
 }
 
-function wpinv_get_item_type( $item_id ) {
-    if ( empty( $item_id ) ) {
+function wpinv_get_item_type($item_id) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
 
     return $item->get_type();
 }
 
-function wpinv_item_type( $item_id ) {
+function wpinv_item_type($item_id) {
     $item_types = wpinv_get_item_types();
 
-    $item_type = wpinv_get_item_type( $item_id );
+    $item_type = wpinv_get_item_type($item_id);
 
-    if ( empty( $item_type ) ) {
+    if (empty($item_type)) {
         $item_type = '-';
     }
 
-    $item_type = isset( $item_types[ $item_type ] ) ? $item_types[ $item_type ] : __( $item_type, 'invoicing' );
+    $item_type = isset($item_types[$item_type]) ? $item_types[$item_type] : __($item_type, 'invoicing');
 
-    return apply_filters( 'wpinv_item_type', $item_type, $item_id );
+    return apply_filters('wpinv_item_type', $item_type, $item_id);
 }
 
-function wpinv_get_random_item( $post_ids = true ) {
-    wpinv_get_random_items( 1, $post_ids );
+function wpinv_get_random_item($post_ids = true) {
+    wpinv_get_random_items(1, $post_ids);
 }
 
-function wpinv_get_random_items( $num = 3, $post_ids = true ) {
+function wpinv_get_random_items($num = 3, $post_ids = true) {
     $args = array();
-    if ( $post_ids ) {
+    if ($post_ids) {
         $args = array(
 			'fields' => 'ids',
 		);
@@ -274,9 +274,9 @@ 
         )
     );
 
-    $args  = apply_filters( 'wpinv_get_random_items', $args );
+    $args = apply_filters('wpinv_get_random_items', $args);
 
-    return get_posts( $args );
+    return get_posts($args);
 }
 
 /**
@@ -285,13 +285,13 @@ 
  * @param WPInv_Item|int $item
  * @param bool $html
  */
-function wpinv_get_item_suffix( $item, $html = true ) {
+function wpinv_get_item_suffix($item, $html = true) {
 
-    $item   = new WPInv_Item( $item );
-    $suffix = $item->is_recurring() ? ' ' . __( '(r)', 'invoicing' ) : '';
-    $suffix = $html ? $suffix : wp_strip_all_tags( $suffix );
+    $item   = new WPInv_Item($item);
+    $suffix = $item->is_recurring() ? ' ' . __('(r)', 'invoicing') : '';
+    $suffix = $html ? $suffix : wp_strip_all_tags($suffix);
 
-    return apply_filters( 'wpinv_get_item_suffix', $suffix, $item, $html );
+    return apply_filters('wpinv_get_item_suffix', $suffix, $item, $html);
 }
 
 /**
@@ -300,9 +300,9 @@ 
  * @param WPInv_Item|int $item
  * @param bool $force_delete
  */
-function wpinv_remove_item( $item = 0, $force_delete = false ) {
-    $item = new WPInv_Item( $item );
-    $item->delete( $force_delete );
+function wpinv_remove_item($item = 0, $force_delete = false) {
+    $item = new WPInv_Item($item);
+    $item->delete($force_delete);
 }
 
 /**
@@ -341,44 +341,44 @@ 
  * @param bool $wp_error whether or not to return a WP_Error on failure.
  * @return bool|WP_Error|WPInv_Item
  */
-function wpinv_create_item( $args = array(), $wp_error = false ) {
+function wpinv_create_item($args = array(), $wp_error = false) {
 
     // Prepare the item.
-    if ( ! empty( $args['custom_id'] ) && empty( $args['ID'] ) ) {
-        $type = empty( $args['type'] ) ? 'custom' : $args['type'];
-        $item = wpinv_get_item_by( 'custom_id', $args['custom_id'], $type );
+    if (!empty($args['custom_id']) && empty($args['ID'])) {
+        $type = empty($args['type']) ? 'custom' : $args['type'];
+        $item = wpinv_get_item_by('custom_id', $args['custom_id'], $type);
 
-        if ( ! empty( $item ) ) {
+        if (!empty($item)) {
             $args['ID'] = $item->get_id();
         }
     }
 
     // Do we have an item?
-    if ( ! empty( $args['ID'] ) ) {
-        $item = new WPInv_Item( $args['ID'] );
+    if (!empty($args['ID'])) {
+        $item = new WPInv_Item($args['ID']);
     } else {
         $item = new WPInv_Item();
     }
 
     // Do we have an error?
-    if ( ! empty( $item->last_error ) ) {
-        return $wp_error ? new WP_Error( 'invalid_item', $item->last_error ) : false;
+    if (!empty($item->last_error)) {
+        return $wp_error ? new WP_Error('invalid_item', $item->last_error) : false;
     }
 
     // Update item props.
-    $item->set_props( $args );
+    $item->set_props($args);
 
     // Save the item.
     $item->save();
 
     // Do we have an error?
-    if ( ! empty( $item->last_error ) ) {
-        return $wp_error ? new WP_Error( 'not_saved', $item->last_error ) : false;
+    if (!empty($item->last_error)) {
+        return $wp_error ? new WP_Error('not_saved', $item->last_error) : false;
     }
 
     // Was the item saved?
-    if ( ! $item->get_id() ) {
-        return $wp_error ? new WP_Error( 'not_saved', __( 'An error occured while saving the item', 'invoicing' ) ) : false;
+    if (!$item->get_id()) {
+        return $wp_error ? new WP_Error('not_saved', __('An error occured while saving the item', 'invoicing')) : false;
     }
 
     return $item;
@@ -390,14 +390,14 @@ 
  *
  * @see wpinv_create_item()
  */
-function wpinv_update_item( $args = array(), $wp_error = false ) {
-    return wpinv_create_item( $args, $wp_error );
+function wpinv_update_item($args = array(), $wp_error = false) {
+    return wpinv_create_item($args, $wp_error);
 }
 
 /**
  * Sanitizes a recurring period
  */
-function getpaid_sanitize_recurring_period( $period, $full = false ) {
+function getpaid_sanitize_recurring_period($period, $full = false) {
 
     $periods = array(
         'D' => 'day',
@@ -406,16 +406,16 @@ 
         'Y' => 'year',
     );
 
-    if ( ! isset( $periods[ $period ] ) ) {
+    if (!isset($periods[$period])) {
         $period = 'D';
     }
 
-    return $full ? $periods[ $period ] : $period;
+    return $full ? $periods[$period] : $period;
 
 }
 
-function wpinv_item_max_buyable_quantity( $item_id ) {
-    return apply_filters( 'wpinv_item_max_buyable_quantity', 5, $item_id );
+function wpinv_item_max_buyable_quantity($item_id) {
+    return apply_filters('wpinv_item_max_buyable_quantity', 5, $item_id);
 }
 
 /**
@@ -423,47 +423,47 @@ 
  *
  * @param WPInv_Item|GetPaid_Form_Item $item
  */
-function getpaid_item_recurring_price_help_text( $item, $currency = '', $_initial_price = false, $_recurring_price = false ) {
+function getpaid_item_recurring_price_help_text($item, $currency = '', $_initial_price = false, $_recurring_price = false) {
 
     // Abort if it is not recurring.
-    if ( ! $item->is_recurring() ) {
+    if (!$item->is_recurring()) {
         return '';
     }
 
-    $initial_price   = false === $_initial_price ? wpinv_price( $item->get_initial_price(), $currency ) : $_initial_price;
-    $recurring_price = false === $_recurring_price ? wpinv_price( $item->get_recurring_price(), $currency ) : $_recurring_price;
-    $period          = getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' );
+    $initial_price   = false === $_initial_price ? wpinv_price($item->get_initial_price(), $currency) : $_initial_price;
+    $recurring_price = false === $_recurring_price ? wpinv_price($item->get_recurring_price(), $currency) : $_recurring_price;
+    $period          = getpaid_get_subscription_period_label($item->get_recurring_period(), $item->get_recurring_interval(), '');
     $initial_class   = 'getpaid-item-initial-price';
     $recurring_class = 'getpaid-item-recurring-price';
     $bill_times      = $item->get_recurring_limit();
     $bill_times_less = $bill_times - 1;
 
-    if ( ! empty( $bill_times ) ) {
+    if (!empty($bill_times)) {
 		$bill_times = $item->get_recurring_interval() * $bill_times;
-        $bill_times_less = getpaid_get_subscription_period_label( $item->get_recurring_period(), $bill_times - $item->get_recurring_interval() );
-		$bill_times = getpaid_get_subscription_period_label( $item->get_recurring_period(), $bill_times );
+        $bill_times_less = getpaid_get_subscription_period_label($item->get_recurring_period(), $bill_times - $item->get_recurring_interval());
+		$bill_times = getpaid_get_subscription_period_label($item->get_recurring_period(), $bill_times);
 	}
 
-    if ( $item instanceof GetPaid_Form_Item && false === $_initial_price ) {
-        $initial_price   = wpinv_price( $item->get_sub_total(), $currency );
-        $recurring_price = wpinv_price( $item->get_recurring_sub_total(), $currency );
+    if ($item instanceof GetPaid_Form_Item && false === $_initial_price) {
+        $initial_price   = wpinv_price($item->get_sub_total(), $currency);
+        $recurring_price = wpinv_price($item->get_recurring_sub_total(), $currency);
     }
 
-    if ( wpinv_price( 0, $currency ) == $initial_price && wpinv_price( 0, $currency ) == $recurring_price ) {
-        return __( 'Free forever', 'invoicing' );
+    if (wpinv_price(0, $currency) == $initial_price && wpinv_price(0, $currency) == $recurring_price) {
+        return __('Free forever', 'invoicing');
     }
 
     // For free trial items.
-    if ( $item->has_free_trial() ) {
-        $trial_period = getpaid_get_subscription_period_label( $item->get_trial_period(), $item->get_trial_interval() );
+    if ($item->has_free_trial()) {
+        $trial_period = getpaid_get_subscription_period_label($item->get_trial_period(), $item->get_trial_interval());
 
-        if ( wpinv_price( 0, $currency ) == $initial_price ) {
+        if (wpinv_price(0, $currency) == $initial_price) {
 
-            if ( empty( $bill_times ) ) {
+            if (empty($bill_times)) {
 
                 return sprintf(
                     // translators: $1: is the trial period, $2: is the recurring price, $3: is the susbcription period
-                    _x( 'Free for %1$s then %2$s / %3$s', 'Item subscription amount. (e.g.: Free for 1 month then $120 / year)', 'invoicing' ),
+                    _x('Free for %1$s then %2$s / %3$s', 'Item subscription amount. (e.g.: Free for 1 month then $120 / year)', 'invoicing'),
                     "<span class='getpaid-item-trial-period'>$trial_period</span>",
                     "<span class='$recurring_class'>$recurring_price</span>",
                     "<span class='getpaid-item-recurring-period'>$period</span>"
@@ -473,7 +473,7 @@ 
 
             return sprintf(
                 // translators: $1: is the trial period, $2: is the recurring price, $3: is the susbcription period, $4: is the bill times
-                _x( 'Free for %1$s then %2$s / %3$s for %4$s', 'Item subscription amount. (e.g.: Free for 1 month then $120 / year for 4 years)', 'invoicing' ),
+                _x('Free for %1$s then %2$s / %3$s for %4$s', 'Item subscription amount. (e.g.: Free for 1 month then $120 / year for 4 years)', 'invoicing'),
                 "<span class='getpaid-item-trial-period'>$trial_period</span>",
                 "<span class='$recurring_class'>$recurring_price</span>",
                 "<span class='getpaid-item-recurring-period'>$period</span>",
@@ -482,11 +482,11 @@ 
 
         }
 
-        if ( empty( $bill_times ) ) {
+        if (empty($bill_times)) {
 
             return sprintf(
                 // translators: $1: is the initial price, $2: is the trial period, $3: is the recurring price, $4: is the susbcription period
-                _x( '%1$s for %2$s then %3$s / %4$s', 'Item subscription amount. (e.g.: $7 for 1 month then $120 / year)', 'invoicing' ),
+                _x('%1$s for %2$s then %3$s / %4$s', 'Item subscription amount. (e.g.: $7 for 1 month then $120 / year)', 'invoicing'),
                 "<span class='$initial_class'>$initial_price</span>",
                 "<span class='getpaid-item-trial-period'>$trial_period</span>",
                 "<span class='$recurring_class'>$recurring_price</span>",
@@ -497,7 +497,7 @@ 
 
         return sprintf(
             // translators: $1: is the initial price, $2: is the trial period, $3: is the recurring price, $4: is the susbcription period, $4: is the susbcription bill times
-            _x( '%1$s for %2$s then %3$s / %4$s for %5$s', 'Item subscription amount. (e.g.: $7 for 1 month then $120 / year for 5 years)', 'invoicing' ),
+            _x('%1$s for %2$s then %3$s / %4$s for %5$s', 'Item subscription amount. (e.g.: $7 for 1 month then $120 / year for 5 years)', 'invoicing'),
             "<span class='$initial_class'>$initial_price</span>",
             "<span class='getpaid-item-trial-period'>$trial_period</span>",
             "<span class='$recurring_class'>$recurring_price</span>",
@@ -507,13 +507,13 @@ 
 
     }
 
-    if ( $initial_price == $recurring_price ) {
+    if ($initial_price == $recurring_price) {
 
-        if ( empty( $bill_times ) ) {
+        if (empty($bill_times)) {
 
             return sprintf(
                 // translators: $1: is the recurring price, $2: is the susbcription period
-                _x( '%1$s / %2$s', 'Item subscription amount. (e.g.: $120 / year)', 'invoicing' ),
+                _x('%1$s / %2$s', 'Item subscription amount. (e.g.: $120 / year)', 'invoicing'),
                 "<span class='$recurring_class'>$recurring_price</span>",
                 "<span class='getpaid-item-recurring-period'>$period</span>"
             );
@@ -522,7 +522,7 @@ 
 
         return sprintf(
             // translators: $1: is the recurring price, $2: is the susbcription period, $3: is the susbcription bill times
-            _x( '%1$s / %2$s for %3$s', 'Item subscription amount. (e.g.: $120 / year for 5 years)', 'invoicing' ),
+            _x('%1$s / %2$s for %3$s', 'Item subscription amount. (e.g.: $120 / year for 5 years)', 'invoicing'),
             "<span class='$recurring_class'>$recurring_price</span>",
             "<span class='getpaid-item-recurring-period'>$period</span>",
             "<span class='getpaid-item-recurring-bill-times'>$bill_times</span>"
@@ -530,13 +530,13 @@ 
 
     }
 
-    if ( $initial_price == wpinv_price( 0, $currency ) ) {
+    if ($initial_price == wpinv_price(0, $currency)) {
 
-        if ( empty( $bill_times ) ) {
+        if (empty($bill_times)) {
 
             return sprintf(
                 // translators: $1: is the recurring period, $2: is the recurring price
-                _x( 'Free for %1$s then %2$s / %1$s', 'Item subscription amount. (e.g.: Free for 3 months then $7 / 3 months)', 'invoicing' ),
+                _x('Free for %1$s then %2$s / %1$s', 'Item subscription amount. (e.g.: Free for 3 months then $7 / 3 months)', 'invoicing'),
                 "<span class='getpaid-item-recurring-period'>$period</span>",
                 "<span class='$recurring_class'>$recurring_price</span>"
             );
@@ -545,7 +545,7 @@ 
 
         return sprintf(
             // translators: $1: is the recurring period, $2: is the recurring price, $3: is the bill times
-            _x( 'Free for %1$s then %2$s / %1$s for %3$s', 'Item subscription amount. (e.g.: Free for 3 months then $7 / 3 months for 12 months)', 'invoicing' ),
+            _x('Free for %1$s then %2$s / %1$s for %3$s', 'Item subscription amount. (e.g.: Free for 3 months then $7 / 3 months for 12 months)', 'invoicing'),
             "<span class='getpaid-item-recurring-period'>$period</span>",
             "<span class='$recurring_class'>$recurring_price</span>",
             "<span class='getpaid-item-recurring-bill-times'>$bill_times_less</span>"
@@ -553,11 +553,11 @@ 
 
     }
 
-    if ( empty( $bill_times ) ) {
+    if (empty($bill_times)) {
 
         return sprintf(
             // translators: $1: is the initial price, $2: is the recurring price, $3: is the susbcription period
-            _x( 'Initial payment of %1$s then %2$s / %3$s', 'Item subscription amount. (e.g.: Initial payment of $7 then $120 / year)', 'invoicing' ),
+            _x('Initial payment of %1$s then %2$s / %3$s', 'Item subscription amount. (e.g.: Initial payment of $7 then $120 / year)', 'invoicing'),
             "<span class='$initial_class'>$initial_price</span>",
             "<span class='$recurring_class'>$recurring_price</span>",
             "<span class='getpaid-item-recurring-period'>$period</span>"
@@ -567,7 +567,7 @@ 
 
     return sprintf(
         // translators: $1: is the initial price, $2: is the recurring price, $3: is the susbcription period, $4: is the susbcription bill times
-        _x( 'Initial payment of %1$s then %2$s / %3$s for %4$s', 'Item subscription amount. (e.g.: Initial payment of $7 then $120 / year for 4 years)', 'invoicing' ),
+        _x('Initial payment of %1$s then %2$s / %3$s for %4$s', 'Item subscription amount. (e.g.: Initial payment of $7 then $120 / year for 4 years)', 'invoicing'),
         "<span class='$initial_class'>$initial_price</span>",
         "<span class='$recurring_class'>$recurring_price</span>",
         "<span class='getpaid-item-recurring-period'>$period</span>",

includes/gateways/class-getpaid-authorize-net-gateway.php

Indentation +232 added lines, -232 removed lines

@@ -13,17 +13,17 @@ 
 class GetPaid_Authorize_Net_Gateway extends GetPaid_Authorize_Net_Legacy_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'authorizenet';
 
     /**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
     protected $supports = array(
         'subscription',
         'sandbox',
@@ -36,44 +36,44 @@ 
     );
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
+     * Payment method order.
+     *
+     * @var int
+     */
     public $order = 4;
 
     /**
-	 * Endpoint for requests from Authorize.net.
-	 *
-	 * @var string
-	 */
-	protected $notify_url;
-
-	/**
-	 * Endpoint for requests to Authorize.net.
-	 *
-	 * @var string
-	 */
+     * Endpoint for requests from Authorize.net.
+     *
+     * @var string
+     */
+    protected $notify_url;
+
+    /**
+     * Endpoint for requests to Authorize.net.
+     *
+     * @var string
+     */
     protected $endpoint;
 
     /**
-	 * Currencies this gateway is allowed for.
-	 *
-	 * @var array
-	 */
-	public $currencies = array( 'USD', 'CAD', 'GBP', 'DKK', 'NOK', 'PLN', 'SEK', 'AUD', 'EUR', 'NZD' );
+     * Currencies this gateway is allowed for.
+     *
+     * @var array
+     */
+    public $currencies = array( 'USD', 'CAD', 'GBP', 'DKK', 'NOK', 'PLN', 'SEK', 'AUD', 'EUR', 'NZD' );
 
     /**
-	 * URL to view a transaction.
-	 *
-	 * @var string
-	 */
+     * URL to view a transaction.
+     *
+     * @var string
+     */
     public $view_transaction_url = 'https://{sandbox}authorize.net/ui/themes/sandbox/Transaction/TransactionReceipt.aspx?transid=%s';
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
 
         $this->title                = __( 'Credit Card / Debit Card', 'invoicing' );
         $this->method_title         = __( 'Authorize.Net', 'invoicing' );
@@ -85,11 +85,11 @@ 
     }
 
     /**
-	 * Displays the payment method select field.
-	 *
-	 * @param int $invoice_id 0 or invoice id.
-	 * @param GetPaid_Payment_Form $form Current payment form.
-	 */
+     * Displays the payment method select field.
+     *
+     * @param int $invoice_id 0 or invoice id.
+     * @param GetPaid_Payment_Form $form Current payment form.
+     */
     public function payment_fields( $invoice_id, $form ) {
 
         // Let the user select a payment method.
@@ -100,16 +100,16 @@ 
     }
 
     /**
-	 * Creates a customer profile.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
+     * Creates a customer profile.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
      * @param array $submission_data Posted checkout fields.
      * @param bool $save Whether or not to save the payment as a token.
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-create-customer-profile
-	 * @return string|WP_Error Payment profile id.
-	 */
-	public function create_customer_profile( $invoice, $submission_data, $save = true ) {
+     * @return string|WP_Error Payment profile id.
+     */
+    public function create_customer_profile( $invoice, $submission_data, $save = true ) {
 
         // Remove non-digits from the number
         $submission_data['authorizenet']['cc_number'] = preg_replace( '/\D/', '', $submission_data['authorizenet']['cc_number'] );
@@ -191,14 +191,14 @@ 
     }
 
     /**
-	 * Retrieves a customer profile.
-	 *
-	 *
-	 * @param string $profile_id profile id.
-	 * @return string|WP_Error Profile id.
+     * Retrieves a customer profile.
+     *
+     *
+     * @param string $profile_id profile id.
+     * @return string|WP_Error Profile id.
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-get-customer-profile
-	 */
-	public function get_customer_profile( $profile_id ) {
+     */
+    public function get_customer_profile( $profile_id ) {
 
         // Generate args.
         $args = array(
@@ -213,17 +213,17 @@ 
     }
 
     /**
-	 * Creates a customer profile.
-	 *
-	 *
+     * Creates a customer profile.
+     *
+     *
      * @param string $profile_id profile id.
-	 * @param WPInv_Invoice $invoice Invoice.
+     * @param WPInv_Invoice $invoice Invoice.
      * @param array $submission_data Posted checkout fields.
      * @param bool $save Whether or not to save the payment as a token.
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-create-customer-profile
-	 * @return string|WP_Error Profile id.
-	 */
-	public function create_customer_payment_profile( $customer_profile, $invoice, $submission_data, $save ) {
+     * @return string|WP_Error Profile id.
+     */
+    public function create_customer_payment_profile( $customer_profile, $invoice, $submission_data, $save ) {
 
         // Remove non-digits from the number
         $submission_data['authorizenet']['cc_number'] = preg_replace( '/\D/', '', $submission_data['authorizenet']['cc_number'] );
@@ -311,13 +311,13 @@ 
     }
 
     /**
-	 * Retrieves payment details from cache.
-	 *
-	 *
+     * Retrieves payment details from cache.
+     *
+     *
      * @param array $payment_details.
-	 * @return array|false Profile id.
-	 */
-	public function retrieve_payment_profile_from_cache( $payment_details, $customer_profile, $invoice ) {
+     * @return array|false Profile id.
+     */
+    public function retrieve_payment_profile_from_cache( $payment_details, $customer_profile, $invoice ) {
 
         $cached_information = get_option( 'getpaid_authorize_net_cached_profiles', array() );
         $payment_details    = hash_hmac( 'sha256', json_encode( $payment_details ), SECURE_AUTH_KEY );
@@ -342,13 +342,13 @@ 
     }
 
     /**
-	 * Securely adds payment details to cache.
-	 *
-	 *
+     * Securely adds payment details to cache.
+     *
+     *
      * @param array $payment_details.
      * @param string $payment_profile_id.
-	 */
-	public function add_payment_profile_to_cache( $payment_details, $payment_profile_id ) {
+     */
+    public function add_payment_profile_to_cache( $payment_details, $payment_profile_id ) {
 
         $cached_information = get_option( 'getpaid_authorize_net_cached_profiles', array() );
         $cached_information = is_array( $cached_information ) ? $cached_information : array();
@@ -360,15 +360,15 @@ 
     }
 
     /**
-	 * Retrieves a customer payment profile.
-	 *
-	 *
-	 * @param string $customer_profile_id customer profile id.
+     * Retrieves a customer payment profile.
+     *
+     *
+     * @param string $customer_profile_id customer profile id.
      * @param string $payment_profile_id payment profile id.
-	 * @return string|WP_Error Profile id.
+     * @return string|WP_Error Profile id.
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-get-customer-payment-profile
-	 */
-	public function get_customer_payment_profile( $customer_profile_id, $payment_profile_id ) {
+     */
+    public function get_customer_payment_profile( $customer_profile_id, $payment_profile_id ) {
 
         // Generate args.
         $args = array(
@@ -384,15 +384,15 @@ 
     }
 
     /**
-	 * Charges a customer payment profile.
-	 *
+     * Charges a customer payment profile.
+     *
      * @param string $customer_profile_id customer profile id.
      * @param string $payment_profile_id payment profile id.
-	 * @param WPInv_Invoice $invoice Invoice.
+     * @param WPInv_Invoice $invoice Invoice.
      * @link https://developer.authorize.net/api/reference/index.html#payment-transactions-charge-a-customer-profile
-	 * @return WP_Error|object
-	 */
-	public function charge_customer_payment_profile( $customer_profile_id, $payment_profile_id, $invoice ) {
+     * @return WP_Error|object
+     */
+    public function charge_customer_payment_profile( $customer_profile_id, $payment_profile_id, $invoice ) {
 
         // Generate args.
         $args = array(
@@ -438,43 +438,43 @@ 
     }
 
     /**
-	 * Processes a customer charge.
-	 *
+     * Processes a customer charge.
+     *
      * @param stdClass $result Api response.
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	public function process_charge_response( $result, $invoice ) {
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    public function process_charge_response( $result, $invoice ) {
 
         wpinv_clear_errors();
-		$response_code = (int) $result->transactionResponse->responseCode;
+        $response_code = (int) $result->transactionResponse->responseCode;
 
         $invoice->add_note( 'Transaction Response: ' . print_r( $result->transactionResponse, true ), false, false, true );
 
-		// Succeeded.
-		if ( 1 == $response_code || 4 == $response_code ) {
+        // Succeeded.
+        if ( 1 == $response_code || 4 == $response_code ) {
 
-			// Maybe set a transaction id.
-			if ( ! empty( $result->transactionResponse->transId ) ) {
-				$invoice->set_transaction_id( $result->transactionResponse->transId );
-			}
+            // Maybe set a transaction id.
+            if ( ! empty( $result->transactionResponse->transId ) ) {
+                $invoice->set_transaction_id( $result->transactionResponse->transId );
+            }
 
-			$invoice->add_note( sprintf( __( 'Authentication code: %1$s (%2$s).', 'invoicing' ), $result->transactionResponse->authCode, $result->transactionResponse->accountNumber ), false, false, true );
+            $invoice->add_note( sprintf( __( 'Authentication code: %1$s (%2$s).', 'invoicing' ), $result->transactionResponse->authCode, $result->transactionResponse->accountNumber ), false, false, true );
 
-			if ( 1 == $response_code ) {
-				return $invoice->mark_paid();
-			}
+            if ( 1 == $response_code ) {
+                return $invoice->mark_paid();
+            }
 
-			$invoice->set_status( 'wpi-onhold' );
-        	$invoice->add_note(
+            $invoice->set_status( 'wpi-onhold' );
+            $invoice->add_note(
                 sprintf(
                     __( 'Held for review: %s', 'invoicing' ),
                     $result->transactionResponse->messages->message[0]->description
                 )
-			);
+            );
 
-			return $invoice->save();
+            return $invoice->save();
 
-		}
+        }
 
         wpinv_set_error( 'card_declined' );
 
@@ -486,13 +486,13 @@ 
     }
 
     /**
-	 * Returns payment information.
-	 *
-	 *
-	 * @param array $card Card details.
-	 * @return array
-	 */
-	public function get_payment_information( $card ) {
+     * Returns payment information.
+     *
+     *
+     * @param array $card Card details.
+     * @return array
+     */
+    public function get_payment_information( $card ) {
         return array(
 
             'creditCard' => array(
@@ -505,25 +505,25 @@ 
     }
 
     /**
-	 * Returns the customer profile meta name.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @return string
-	 */
-	public function get_customer_profile_meta_name( $invoice ) {
+     * Returns the customer profile meta name.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @return string
+     */
+    public function get_customer_profile_meta_name( $invoice ) {
         return $this->is_sandbox( $invoice ) ? 'getpaid_authorizenet_sandbox_customer_profile_id' : 'getpaid_authorizenet_customer_profile_id';
     }
 
     /**
-	 * Validates the submitted data.
-	 *
-	 *
-	 * @param array $submission_data Posted checkout fields.
+     * Validates the submitted data.
+     *
+     *
+     * @param array $submission_data Posted checkout fields.
      * @param WPInv_Invoice $invoice
-	 * @return WP_Error|string The payment profile id
-	 */
-	public function validate_submission_data( $submission_data, $invoice ) {
+     * @return WP_Error|string The payment profile id
+     */
+    public function validate_submission_data( $submission_data, $invoice ) {
 
         // Validate authentication details.
         $auth = $this->get_auth_params();
@@ -555,13 +555,13 @@ 
     }
 
     /**
-	 * Returns invoice line items.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @return array
-	 */
-	public function get_line_items( $invoice ) {
+     * Returns invoice line items.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @return array
+     */
+    public function get_line_items( $invoice ) {
         $items = array();
 
         foreach ( $invoice->get_items() as $item ) {
@@ -598,15 +598,15 @@ 
     }
 
     /**
-	 * Process Payment.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Validate the submitted data.
         $payment_profile_id = $this->validate_submission_data( $submission_data, $invoice );
@@ -639,45 +639,45 @@ 
 
         exit;
 
-	}
+    }
 
-	/**
-	 * Processes the initial payment.
-	 *
+    /**
+     * Processes the initial payment.
+     *
      * @param WPInv_Invoice $invoice Invoice.
-	 */
-	protected function process_initial_payment( $invoice ) {
+     */
+    protected function process_initial_payment( $invoice ) {
 
-		$payment_profile_id = get_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
+        $payment_profile_id = get_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
         $customer_profile   = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
-		$result             = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $invoice );
+        $result             = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $invoice );
 
-		// Do we have an error?
-		if ( is_wp_error( $result ) ) {
-			wpinv_set_error( $result->get_error_code(), $result->get_error_message() );
-			wpinv_send_back_to_checkout( $invoice );
-		}
+        // Do we have an error?
+        if ( is_wp_error( $result ) ) {
+            wpinv_set_error( $result->get_error_code(), $result->get_error_message() );
+            wpinv_send_back_to_checkout( $invoice );
+        }
 
-		// Process the response.
-		$this->process_charge_response( $result, $invoice );
+        // Process the response.
+        $this->process_charge_response( $result, $invoice );
 
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
-		}
+        if ( wpinv_get_errors() ) {
+            wpinv_send_back_to_checkout( $invoice );
+        }
 
-	}
+    }
 
     /**
-	 * Processes recurring payments.
-	 *
+     * Processes recurring payments.
+     *
      * @param WPInv_Invoice $invoice Invoice.
      * @param WPInv_Subscription[]|WPInv_Subscription $subscriptions Subscriptions.
-	 */
-	public function process_subscription( $invoice, $subscriptions ) {
+     */
+    public function process_subscription( $invoice, $subscriptions ) {
 
         // Check if there is an initial amount to charge.
         if ( (float) $invoice->get_total() > 0 ) {
-			$this->process_initial_payment( $invoice );
+            $this->process_initial_payment( $invoice );
         }
 
         // Activate the subscriptions.
@@ -695,36 +695,36 @@ 
             }
         }
 
-		// Redirect to the success page.
+        // Redirect to the success page.
         wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
 
     }
 
-	/**
-	 * (Maybe) renews an authorize.net subscription profile.
-	 *
-	 *
+    /**
+     * (Maybe) renews an authorize.net subscription profile.
+     *
+     *
      * @param WPInv_Subscription $subscription
-	 */
-	public function maybe_renew_subscription( $subscription ) {
+     */
+    public function maybe_renew_subscription( $subscription ) {
 
         // Ensure its our subscription && it's active.
         if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
             $this->renew_subscription( $subscription );
         }
 
-	}
+    }
 
     /**
-	 * Renews a subscription.
-	 *
+     * Renews a subscription.
+     *
      * @param WPInv_Subscription $subscription
-	 */
-	public function renew_subscription( $subscription ) {
+     */
+    public function renew_subscription( $subscription ) {
 
-		// Generate the renewal invoice.
-		$new_invoice = $subscription->create_payment();
-		$old_invoice = $subscription->get_parent_payment();
+        // Generate the renewal invoice.
+        $new_invoice = $subscription->create_payment();
+        $old_invoice = $subscription->get_parent_payment();
 
         if ( empty( $new_invoice ) ) {
             $old_invoice->add_note( __( 'Error generating a renewal invoice.', 'invoicing' ), false, false, false );
@@ -733,37 +733,37 @@ 
         }
 
         // Charge the payment method.
-		$payment_profile_id = get_post_meta( $old_invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
-		$customer_profile   = get_user_meta( $old_invoice->get_user_id(), $this->get_customer_profile_meta_name( $old_invoice ), true );
-		$result             = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $new_invoice );
-
-		// Do we have an error?
-		if ( is_wp_error( $result ) ) {
-
-			$old_invoice->add_note(
-				sprintf( __( 'Error renewing subscription : ( %s ).', 'invoicing' ), $result->get_error_message() ),
-				true,
-				false,
-				true
-			);
-			$subscription->failing();
-			return;
-
-		}
-
-		// Process the response.
-		$this->process_charge_response( $result, $new_invoice );
-
-		if ( wpinv_get_errors() ) {
-
-			$old_invoice->add_note(
-				sprintf( __( 'Error renewing subscription : ( %s ).', 'invoicing' ), getpaid_get_errors_html() ),
-				true,
-				false,
-				true
-			);
-			$subscription->failing();
-			return;
+        $payment_profile_id = get_post_meta( $old_invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
+        $customer_profile   = get_user_meta( $old_invoice->get_user_id(), $this->get_customer_profile_meta_name( $old_invoice ), true );
+        $result             = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $new_invoice );
+
+        // Do we have an error?
+        if ( is_wp_error( $result ) ) {
+
+            $old_invoice->add_note(
+                sprintf( __( 'Error renewing subscription : ( %s ).', 'invoicing' ), $result->get_error_message() ),
+                true,
+                false,
+                true
+            );
+            $subscription->failing();
+            return;
+
+        }
+
+        // Process the response.
+        $this->process_charge_response( $result, $new_invoice );
+
+        if ( wpinv_get_errors() ) {
+
+            $old_invoice->add_note(
+                sprintf( __( 'Error renewing subscription : ( %s ).', 'invoicing' ), getpaid_get_errors_html() ),
+                true,
+                false,
+                true
+            );
+            $subscription->failing();
+            return;
 
         }
 
@@ -776,13 +776,13 @@ 
     }
 
     /**
-	 * Processes invoice addons.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	public function process_addons( $invoice, $items ) {
+     * Processes invoice addons.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    public function process_addons( $invoice, $items ) {
 
         global $getpaid_authorize_addons;
 
@@ -801,7 +801,7 @@ 
         $invoice->recalculate_total();
 
         $payment_profile_id = get_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
-		$customer_profile   = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
+        $customer_profile   = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
 
         add_filter( 'getpaid_authorizenet_charge_customer_payment_profile_args', array( $this, 'filter_addons_request' ), 10, 2 );
         $result = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $invoice );
@@ -816,11 +816,11 @@ 
     }
 
     /**
-	 * Processes invoice addons.
-	 *
+     * Processes invoice addons.
+     *
      * @param array $args
-	 * @return array
-	 */
+     * @return array
+     */
     public function filter_addons_request( $args ) {
 
         global $getpaid_authorize_addons;
@@ -854,11 +854,11 @@ 
     }
 
     /**
-	 * Filters the gateway settings.
-	 *
-	 * @param array $admin_settings
-	 */
-	public function admin_settings( $admin_settings ) {
+     * Filters the gateway settings.
+     *
+     * @param array $admin_settings
+     */
+    public function admin_settings( $admin_settings ) {
 
         $currencies = sprintf(
             __( 'Supported Currencies: %s', 'invoicing' ),
@@ -898,7 +898,7 @@ 
             'readonly' => true,
         );
 
-		return $admin_settings;
-	}
+        return $admin_settings;
+    }
 
 }

Spacing +206 added lines, -206 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Authorize.net Payment Gateway class.
@@ -61,7 +61,7 @@ 
 	 *
 	 * @var array
 	 */
-	public $currencies = array( 'USD', 'CAD', 'GBP', 'DKK', 'NOK', 'PLN', 'SEK', 'AUD', 'EUR', 'NZD' );
+	public $currencies = array('USD', 'CAD', 'GBP', 'DKK', 'NOK', 'PLN', 'SEK', 'AUD', 'EUR', 'NZD');
 
     /**
 	 * URL to view a transaction.
@@ -75,12 +75,12 @@ 
 	 */
 	public function __construct() {
 
-        $this->title                = __( 'Credit Card / Debit Card', 'invoicing' );
-        $this->method_title         = __( 'Authorize.Net', 'invoicing' );
-        $this->notify_url           = getpaid_get_non_query_string_ipn_url( $this->id );
+        $this->title                = __('Credit Card / Debit Card', 'invoicing');
+        $this->method_title         = __('Authorize.Net', 'invoicing');
+        $this->notify_url           = getpaid_get_non_query_string_ipn_url($this->id);
 
-        add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
-        add_filter( 'getpaid_authorizenet_sandbox_notice', array( $this, 'sandbox_notice' ) );
+        add_action('getpaid_should_renew_subscription', array($this, 'maybe_renew_subscription'));
+        add_filter('getpaid_authorizenet_sandbox_notice', array($this, 'sandbox_notice'));
         parent::__construct();
     }
 
@@ -90,13 +90,13 @@ 
 	 * @param int $invoice_id 0 or invoice id.
 	 * @param GetPaid_Payment_Form $form Current payment form.
 	 */
-    public function payment_fields( $invoice_id, $form ) {
+    public function payment_fields($invoice_id, $form) {
 
         // Let the user select a payment method.
         $this->saved_payment_methods();
 
         // Show the credit card entry form.
-        $this->new_payment_method_entry( $this->get_cc_form( true ) );
+        $this->new_payment_method_entry($this->get_cc_form(true));
     }
 
     /**
@@ -109,79 +109,79 @@ 
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-create-customer-profile
 	 * @return string|WP_Error Payment profile id.
 	 */
-	public function create_customer_profile( $invoice, $submission_data, $save = true ) {
+	public function create_customer_profile($invoice, $submission_data, $save = true) {
 
         // Remove non-digits from the number
-        $submission_data['authorizenet']['cc_number'] = preg_replace( '/\D/', '', $submission_data['authorizenet']['cc_number'] );
+        $submission_data['authorizenet']['cc_number'] = preg_replace('/\D/', '', $submission_data['authorizenet']['cc_number']);
 
         // Generate args.
         $args = array(
             'createCustomerProfileRequest' => array(
                 'merchantAuthentication' => $this->get_auth_params(),
                 'profile'                => array(
-                    'merchantCustomerId' => getpaid_limit_length( $invoice->get_user_id(), 20 ),
-                    'description'        => getpaid_limit_length( $invoice->get_full_name(), 255 ),
-                    'email'              => getpaid_limit_length( $invoice->get_email(), 255 ),
+                    'merchantCustomerId' => getpaid_limit_length($invoice->get_user_id(), 20),
+                    'description'        => getpaid_limit_length($invoice->get_full_name(), 255),
+                    'email'              => getpaid_limit_length($invoice->get_email(), 255),
                     'paymentProfiles'    => array(
                         'customerType' => 'individual',
 
                         // Billing information.
                         'billTo'       => array(
-                            'firstName' => getpaid_limit_length( $invoice->get_first_name(), 50 ),
-                            'lastName'  => getpaid_limit_length( $invoice->get_last_name(), 50 ),
-                            'address'   => getpaid_limit_length( $invoice->get_address(), 60 ),
-                            'city'      => getpaid_limit_length( $invoice->get_city(), 40 ),
-                            'state'     => getpaid_limit_length( $invoice->get_state(), 40 ),
-                            'zip'       => getpaid_limit_length( $invoice->get_zip(), 20 ),
-                            'country'   => getpaid_limit_length( $invoice->get_country(), 60 ),
+                            'firstName' => getpaid_limit_length($invoice->get_first_name(), 50),
+                            'lastName'  => getpaid_limit_length($invoice->get_last_name(), 50),
+                            'address'   => getpaid_limit_length($invoice->get_address(), 60),
+                            'city'      => getpaid_limit_length($invoice->get_city(), 40),
+                            'state'     => getpaid_limit_length($invoice->get_state(), 40),
+                            'zip'       => getpaid_limit_length($invoice->get_zip(), 20),
+                            'country'   => getpaid_limit_length($invoice->get_country(), 60),
                         ),
 
                         // Payment information.
-                        'payment'      => $this->get_payment_information( $submission_data['authorizenet'] ),
+                        'payment'      => $this->get_payment_information($submission_data['authorizenet']),
                     ),
                 ),
-                'validationMode'         => $this->is_sandbox( $invoice ) ? 'testMode' : 'liveMode',
+                'validationMode'         => $this->is_sandbox($invoice) ? 'testMode' : 'liveMode',
             ),
         );
 
-        $response = $this->post( apply_filters( 'getpaid_authorizenet_customer_profile_args', $args, $invoice ), $invoice );
+        $response = $this->post(apply_filters('getpaid_authorizenet_customer_profile_args', $args, $invoice), $invoice);
 
-        if ( is_wp_error( $response ) ) {
+        if (is_wp_error($response)) {
 
             // In case the payment profile already exists remotely.
-            if ( 'dup_payment_profile' === $response->get_error_code() ) {
-                $customer_profile_id = strtok( $response->get_error_message(), '.' );
-                update_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), $customer_profile_id );
-                return strtok( '.' );
+            if ('dup_payment_profile' === $response->get_error_code()) {
+                $customer_profile_id = strtok($response->get_error_message(), '.');
+                update_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), $customer_profile_id);
+                return strtok('.');
             }
 
             // In case the customer profile already exists remotely.
-            if ( 'E00039' === $response->get_error_code() ) {
-                $customer_profile_id = str_replace( 'A duplicate record with ID ', '', $response->get_error_message() );
-                $customer_profile_id = str_replace( ' already exists.', '', $customer_profile_id );
-                return $this->create_customer_payment_profile( trim( $customer_profile_id ), $invoice, $submission_data, $save );
+            if ('E00039' === $response->get_error_code()) {
+                $customer_profile_id = str_replace('A duplicate record with ID ', '', $response->get_error_message());
+                $customer_profile_id = str_replace(' already exists.', '', $customer_profile_id);
+                return $this->create_customer_payment_profile(trim($customer_profile_id), $invoice, $submission_data, $save);
             }
 
             return $response;
         }
 
-        update_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), $response->customerProfileId );
+        update_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), $response->customerProfileId);
 
         // Save the payment token.
-        if ( $save ) {
+        if ($save) {
             $this->save_token(
                 array(
                     'id'      => $response->customerPaymentProfileIdList[0],
-                    'name'    => getpaid_get_card_name( $submission_data['authorizenet']['cc_number'] ) . '····' . substr( $submission_data['authorizenet']['cc_number'], -4 ),
+                    'name'    => getpaid_get_card_name($submission_data['authorizenet']['cc_number']) . '····' . substr($submission_data['authorizenet']['cc_number'], -4),
                     'default' => true,
-                    'type'    => $this->is_sandbox( $invoice ) ? 'sandbox' : 'live',
+                    'type'    => $this->is_sandbox($invoice) ? 'sandbox' : 'live',
                 )
             );
         }
 
         // Add a note about the validation response.
         $invoice->add_note(
-            sprintf( __( 'Created Authorize.NET customer profile: %s', 'invoicing' ), $response->validationDirectResponseList[0] ),
+            sprintf(__('Created Authorize.NET customer profile: %s', 'invoicing'), $response->validationDirectResponseList[0]),
             false,
             false,
             true
@@ -198,7 +198,7 @@ 
 	 * @return string|WP_Error Profile id.
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-get-customer-profile
 	 */
-	public function get_customer_profile( $profile_id ) {
+	public function get_customer_profile($profile_id) {
 
         // Generate args.
         $args = array(
@@ -208,7 +208,7 @@ 
             ),
         );
 
-        return $this->post( $args, false );
+        return $this->post($args, false);
 
     }
 
@@ -223,18 +223,18 @@ 
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-create-customer-profile
 	 * @return string|WP_Error Profile id.
 	 */
-	public function create_customer_payment_profile( $customer_profile, $invoice, $submission_data, $save ) {
+	public function create_customer_payment_profile($customer_profile, $invoice, $submission_data, $save) {
 
         // Remove non-digits from the number
-        $submission_data['authorizenet']['cc_number'] = preg_replace( '/\D/', '', $submission_data['authorizenet']['cc_number'] );
+        $submission_data['authorizenet']['cc_number'] = preg_replace('/\D/', '', $submission_data['authorizenet']['cc_number']);
 
         // Prepare card details.
-        $payment_information                          = $this->get_payment_information( $submission_data['authorizenet'] );
+        $payment_information                          = $this->get_payment_information($submission_data['authorizenet']);
 
         // Authorize.NET does not support saving the same card twice.
-        $cached_information                           = $this->retrieve_payment_profile_from_cache( $payment_information, $customer_profile, $invoice );
+        $cached_information                           = $this->retrieve_payment_profile_from_cache($payment_information, $customer_profile, $invoice);
 
-        if ( $cached_information ) {
+        if ($cached_information) {
             return $cached_information;
         }
 
@@ -247,34 +247,34 @@ 
 
                     // Billing information.
                     'billTo'  => array(
-                        'firstName' => getpaid_limit_length( $invoice->get_first_name(), 50 ),
-                        'lastName'  => getpaid_limit_length( $invoice->get_last_name(), 50 ),
-                        'address'   => getpaid_limit_length( $invoice->get_address(), 60 ),
-                        'city'      => getpaid_limit_length( $invoice->get_city(), 40 ),
-                        'state'     => getpaid_limit_length( $invoice->get_state(), 40 ),
-                        'zip'       => getpaid_limit_length( $invoice->get_zip(), 20 ),
-                        'country'   => getpaid_limit_length( $invoice->get_country(), 60 ),
+                        'firstName' => getpaid_limit_length($invoice->get_first_name(), 50),
+                        'lastName'  => getpaid_limit_length($invoice->get_last_name(), 50),
+                        'address'   => getpaid_limit_length($invoice->get_address(), 60),
+                        'city'      => getpaid_limit_length($invoice->get_city(), 40),
+                        'state'     => getpaid_limit_length($invoice->get_state(), 40),
+                        'zip'       => getpaid_limit_length($invoice->get_zip(), 20),
+                        'country'   => getpaid_limit_length($invoice->get_country(), 60),
                     ),
 
                     // Payment information.
                     'payment' => $payment_information,
                 ),
-                'validationMode'         => $this->is_sandbox( $invoice ) ? 'testMode' : 'liveMode',
+                'validationMode'         => $this->is_sandbox($invoice) ? 'testMode' : 'liveMode',
             ),
         );
 
-        $response = $this->post( apply_filters( 'getpaid_authorizenet_create_customer_payment_profile_args', $args, $invoice ), $invoice );
+        $response = $this->post(apply_filters('getpaid_authorizenet_create_customer_payment_profile_args', $args, $invoice), $invoice);
 
-        if ( is_wp_error( $response ) ) {
+        if (is_wp_error($response)) {
 
             // In case the payment profile already exists remotely.
-            if ( 'dup_payment_profile' == $response->get_error_code() ) {
-                $customer_profile_id = strtok( $response->get_error_message(), '.' );
-                $payment_profile_id  = strtok( '.' );
-                update_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), $customer_profile_id );
+            if ('dup_payment_profile' == $response->get_error_code()) {
+                $customer_profile_id = strtok($response->get_error_message(), '.');
+                $payment_profile_id  = strtok('.');
+                update_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), $customer_profile_id);
 
                 // Cache payment profile id.
-                $this->add_payment_profile_to_cache( $payment_information, $payment_profile_id );
+                $this->add_payment_profile_to_cache($payment_information, $payment_profile_id);
 
                 return $payment_profile_id;
             }
@@ -283,29 +283,29 @@ 
         }
 
         // Save the payment token.
-        if ( $save ) {
+        if ($save) {
             $this->save_token(
                 array(
                     'id'      => $response->customerPaymentProfileId,
-                    'name'    => getpaid_get_card_name( $submission_data['authorizenet']['cc_number'] ) . ' ···· ' . substr( $submission_data['authorizenet']['cc_number'], -4 ),
+                    'name'    => getpaid_get_card_name($submission_data['authorizenet']['cc_number']) . ' ···· ' . substr($submission_data['authorizenet']['cc_number'], -4),
                     'default' => true,
-                    'type'    => $this->is_sandbox( $invoice ) ? 'sandbox' : 'live',
+                    'type'    => $this->is_sandbox($invoice) ? 'sandbox' : 'live',
                 )
             );
         }
 
         // Cache payment profile id.
-        $this->add_payment_profile_to_cache( $payment_information, $response->customerPaymentProfileId );
+        $this->add_payment_profile_to_cache($payment_information, $response->customerPaymentProfileId);
 
         // Add a note about the validation response.
         $invoice->add_note(
-            sprintf( __( 'Saved Authorize.NET payment profile: %s', 'invoicing' ), $response->validationDirectResponse ),
+            sprintf(__('Saved Authorize.NET payment profile: %s', 'invoicing'), $response->validationDirectResponse),
             false,
             false,
             true
         );
 
-        update_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), $customer_profile );
+        update_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), $customer_profile);
 
         return $response->customerPaymentProfileId;
     }
@@ -317,12 +317,12 @@ 
      * @param array $payment_details.
 	 * @return array|false Profile id.
 	 */
-	public function retrieve_payment_profile_from_cache( $payment_details, $customer_profile, $invoice ) {
+	public function retrieve_payment_profile_from_cache($payment_details, $customer_profile, $invoice) {
 
-        $cached_information = get_option( 'getpaid_authorize_net_cached_profiles', array() );
-        $payment_details    = hash_hmac( 'sha256', json_encode( $payment_details ), SECURE_AUTH_KEY );
+        $cached_information = get_option('getpaid_authorize_net_cached_profiles', array());
+        $payment_details    = hash_hmac('sha256', json_encode($payment_details), SECURE_AUTH_KEY);
 
-        if ( ! is_array( $cached_information ) || ! array_key_exists( $payment_details, $cached_information ) ) {
+        if (!is_array($cached_information) || !array_key_exists($payment_details, $cached_information)) {
             return false;
         }
 
@@ -331,13 +331,13 @@ 
             'getCustomerPaymentProfileRequest' => array(
                 'merchantAuthentication'   => $this->get_auth_params(),
                 'customerProfileId'        => $customer_profile,
-                'customerPaymentProfileId' => $cached_information[ $payment_details ],
+                'customerPaymentProfileId' => $cached_information[$payment_details],
             ),
         );
 
-        $response = $this->post( $args, $invoice );
+        $response = $this->post($args, $invoice);
 
-        return is_wp_error( $response ) ? false : $cached_information[ $payment_details ];
+        return is_wp_error($response) ? false : $cached_information[$payment_details];
 
     }
 
@@ -348,14 +348,14 @@ 
      * @param array $payment_details.
      * @param string $payment_profile_id.
 	 */
-	public function add_payment_profile_to_cache( $payment_details, $payment_profile_id ) {
+	public function add_payment_profile_to_cache($payment_details, $payment_profile_id) {
 
-        $cached_information = get_option( 'getpaid_authorize_net_cached_profiles', array() );
-        $cached_information = is_array( $cached_information ) ? $cached_information : array();
-        $payment_details    = hash_hmac( 'sha256', json_encode( $payment_details ), SECURE_AUTH_KEY );
+        $cached_information = get_option('getpaid_authorize_net_cached_profiles', array());
+        $cached_information = is_array($cached_information) ? $cached_information : array();
+        $payment_details    = hash_hmac('sha256', json_encode($payment_details), SECURE_AUTH_KEY);
 
-        $cached_information[ $payment_details ] = $payment_profile_id;
-        update_option( 'getpaid_authorize_net_cached_profiles', $cached_information );
+        $cached_information[$payment_details] = $payment_profile_id;
+        update_option('getpaid_authorize_net_cached_profiles', $cached_information);
 
     }
 
@@ -368,7 +368,7 @@ 
 	 * @return string|WP_Error Profile id.
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-get-customer-payment-profile
 	 */
-	public function get_customer_payment_profile( $customer_profile_id, $payment_profile_id ) {
+	public function get_customer_payment_profile($customer_profile_id, $payment_profile_id) {
 
         // Generate args.
         $args = array(
@@ -379,7 +379,7 @@ 
             ),
         );
 
-        return $this->post( $args, false );
+        return $this->post($args, false);
 
     }
 
@@ -392,7 +392,7 @@ 
      * @link https://developer.authorize.net/api/reference/index.html#payment-transactions-charge-a-customer-profile
 	 * @return WP_Error|object
 	 */
-	public function charge_customer_payment_profile( $customer_profile_id, $payment_profile_id, $invoice ) {
+	public function charge_customer_payment_profile($customer_profile_id, $payment_profile_id, $invoice) {
 
         // Generate args.
         $args = array(
@@ -412,28 +412,28 @@ 
                         ),
                     ),
                     'order'           => array(
-                        'invoiceNumber' => getpaid_limit_length( $invoice->get_number(), 20 ),
+                        'invoiceNumber' => getpaid_limit_length($invoice->get_number(), 20),
                     ),
-                    'lineItems'       => array( 'lineItem' => $this->get_line_items( $invoice ) ),
+                    'lineItems'       => array('lineItem' => $this->get_line_items($invoice)),
                     'tax'             => array(
                         'amount' => $invoice->get_total_tax(),
-                        'name'   => __( 'TAX', 'invoicing' ),
+                        'name'   => __('TAX', 'invoicing'),
                     ),
-                    'poNumber'        => getpaid_limit_length( $invoice->get_number(), 25 ),
+                    'poNumber'        => getpaid_limit_length($invoice->get_number(), 25),
                     'customer'        => array(
-                        'id'    => getpaid_limit_length( $invoice->get_user_id(), 25 ),
-                        'email' => getpaid_limit_length( $invoice->get_email(), 25 ),
+                        'id'    => getpaid_limit_length($invoice->get_user_id(), 25),
+                        'email' => getpaid_limit_length($invoice->get_email(), 25),
                     ),
                     'customerIP'      => $invoice->get_ip(),
                 ),
             ),
         );
 
-        if ( 0 == $invoice->get_total_tax() ) {
-            unset( $args['createTransactionRequest']['transactionRequest']['tax'] );
+        if (0 == $invoice->get_total_tax()) {
+            unset($args['createTransactionRequest']['transactionRequest']['tax']);
         }
 
-        return $this->post( apply_filters( 'getpaid_authorizenet_charge_customer_payment_profile_args', $args, $invoice ), $invoice );
+        return $this->post(apply_filters('getpaid_authorizenet_charge_customer_payment_profile_args', $args, $invoice), $invoice);
 
     }
 
@@ -443,31 +443,31 @@ 
      * @param stdClass $result Api response.
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	public function process_charge_response( $result, $invoice ) {
+	public function process_charge_response($result, $invoice) {
 
         wpinv_clear_errors();
 		$response_code = (int) $result->transactionResponse->responseCode;
 
-        $invoice->add_note( 'Transaction Response: ' . print_r( $result->transactionResponse, true ), false, false, true );
+        $invoice->add_note('Transaction Response: ' . print_r($result->transactionResponse, true), false, false, true);
 
 		// Succeeded.
-		if ( 1 == $response_code || 4 == $response_code ) {
+		if (1 == $response_code || 4 == $response_code) {
 
 			// Maybe set a transaction id.
-			if ( ! empty( $result->transactionResponse->transId ) ) {
-				$invoice->set_transaction_id( $result->transactionResponse->transId );
+			if (!empty($result->transactionResponse->transId)) {
+				$invoice->set_transaction_id($result->transactionResponse->transId);
 			}
 
-			$invoice->add_note( sprintf( __( 'Authentication code: %1$s (%2$s).', 'invoicing' ), $result->transactionResponse->authCode, $result->transactionResponse->accountNumber ), false, false, true );
+			$invoice->add_note(sprintf(__('Authentication code: %1$s (%2$s).', 'invoicing'), $result->transactionResponse->authCode, $result->transactionResponse->accountNumber), false, false, true);
 
-			if ( 1 == $response_code ) {
+			if (1 == $response_code) {
 				return $invoice->mark_paid();
 			}
 
-			$invoice->set_status( 'wpi-onhold' );
+			$invoice->set_status('wpi-onhold');
         	$invoice->add_note(
                 sprintf(
-                    __( 'Held for review: %s', 'invoicing' ),
+                    __('Held for review: %s', 'invoicing'),
                     $result->transactionResponse->messages->message[0]->description
                 )
 			);
@@ -476,11 +476,11 @@ 
 
 		}
 
-        wpinv_set_error( 'card_declined' );
+        wpinv_set_error('card_declined');
 
-        if ( ! empty( $result->transactionResponse->errors ) ) {
+        if (!empty($result->transactionResponse->errors)) {
             $errors = (object) $result->transactionResponse->errors;
-            wpinv_set_error( $errors->error[0]->errorCode, esc_html( $errors->error[0]->errorText ) );
+            wpinv_set_error($errors->error[0]->errorCode, esc_html($errors->error[0]->errorText));
         }
 
     }
@@ -492,7 +492,7 @@ 
 	 * @param array $card Card details.
 	 * @return array
 	 */
-	public function get_payment_information( $card ) {
+	public function get_payment_information($card) {
         return array(
 
             'creditCard' => array(
@@ -511,8 +511,8 @@ 
 	 * @param WPInv_Invoice $invoice Invoice.
 	 * @return string
 	 */
-	public function get_customer_profile_meta_name( $invoice ) {
-        return $this->is_sandbox( $invoice ) ? 'getpaid_authorizenet_sandbox_customer_profile_id' : 'getpaid_authorizenet_customer_profile_id';
+	public function get_customer_profile_meta_name($invoice) {
+        return $this->is_sandbox($invoice) ? 'getpaid_authorizenet_sandbox_customer_profile_id' : 'getpaid_authorizenet_customer_profile_id';
     }
 
     /**
@@ -523,34 +523,34 @@ 
      * @param WPInv_Invoice $invoice
 	 * @return WP_Error|string The payment profile id
 	 */
-	public function validate_submission_data( $submission_data, $invoice ) {
+	public function validate_submission_data($submission_data, $invoice) {
 
         // Validate authentication details.
         $auth = $this->get_auth_params();
 
-        if ( empty( $auth['name'] ) || empty( $auth['transactionKey'] ) ) {
-            return new WP_Error( 'invalid_settings', __( 'Please set-up your login id and transaction key before using this gateway.', 'invoicing' ) );
+        if (empty($auth['name']) || empty($auth['transactionKey'])) {
+            return new WP_Error('invalid_settings', __('Please set-up your login id and transaction key before using this gateway.', 'invoicing'));
         }
 
         // Validate the payment method.
-        if ( empty( $submission_data['getpaid-authorizenet-payment-method'] ) ) {
-            return new WP_Error( 'invalid_payment_method', __( 'Please select a different payment method or add a new card.', 'invoicing' ) );
+        if (empty($submission_data['getpaid-authorizenet-payment-method'])) {
+            return new WP_Error('invalid_payment_method', __('Please select a different payment method or add a new card.', 'invoicing'));
         }
 
         // Are we adding a new payment method?
-        if ( 'new' != $submission_data['getpaid-authorizenet-payment-method'] ) {
+        if ('new' != $submission_data['getpaid-authorizenet-payment-method']) {
             return $submission_data['getpaid-authorizenet-payment-method'];
         }
 
         // Retrieve the customer profile id.
-        $profile_id = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
+        $profile_id = get_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), true);
 
         // Create payment method.
-        if ( empty( $profile_id ) ) {
-            return $this->create_customer_profile( $invoice, $submission_data, ! empty( $submission_data['getpaid-authorizenet-new-payment-method'] ) );
+        if (empty($profile_id)) {
+            return $this->create_customer_profile($invoice, $submission_data, !empty($submission_data['getpaid-authorizenet-new-payment-method']));
         }
 
-        return $this->create_customer_payment_profile( $profile_id, $invoice, $submission_data, ! empty( $submission_data['getpaid-authorizenet-new-payment-method'] ) );
+        return $this->create_customer_payment_profile($profile_id, $invoice, $submission_data, !empty($submission_data['getpaid-authorizenet-new-payment-method']));
 
     }
 
@@ -561,32 +561,32 @@ 
 	 * @param WPInv_Invoice $invoice Invoice.
 	 * @return array
 	 */
-	public function get_line_items( $invoice ) {
+	public function get_line_items($invoice) {
         $items = array();
 
-        foreach ( $invoice->get_items() as $item ) {
+        foreach ($invoice->get_items() as $item) {
 
             $amount  = $invoice->is_renewal() ? $item->get_price() : $item->get_initial_price();
             $items[] = array(
-                'itemId'      => getpaid_limit_length( $item->get_id(), 31 ),
-                'name'        => getpaid_limit_length( $item->get_raw_name(), 31 ),
-                'description' => getpaid_limit_length( $item->get_description(), 255 ),
-                'quantity'    => (string) ( $invoice->get_template() == 'amount' ? 1 : $item->get_quantity() ),
+                'itemId'      => getpaid_limit_length($item->get_id(), 31),
+                'name'        => getpaid_limit_length($item->get_raw_name(), 31),
+                'description' => getpaid_limit_length($item->get_description(), 255),
+                'quantity'    => (string) ($invoice->get_template() == 'amount' ? 1 : $item->get_quantity()),
                 'unitPrice'   => (float) $amount,
                 'taxable'     => wpinv_use_taxes() && $invoice->is_taxable() && 'tax-exempt' != $item->get_vat_rule(),
             );
 
         }
 
-        foreach ( $invoice->get_fees() as $fee_name => $fee ) {
+        foreach ($invoice->get_fees() as $fee_name => $fee) {
 
-            $amount  = $invoice->is_renewal() ? $fee['recurring_fee'] : $fee['initial_fee'];
+            $amount = $invoice->is_renewal() ? $fee['recurring_fee'] : $fee['initial_fee'];
 
-            if ( $amount > 0 ) {
+            if ($amount > 0) {
                 $items[] = array(
-                    'itemId'      => getpaid_limit_length( $fee_name, 31 ),
-                    'name'        => getpaid_limit_length( $fee_name, 31 ),
-                    'description' => getpaid_limit_length( $fee_name, 255 ),
+                    'itemId'      => getpaid_limit_length($fee_name, 31),
+                    'name'        => getpaid_limit_length($fee_name, 31),
+                    'description' => getpaid_limit_length($fee_name, 255),
                     'quantity'    => '1',
                     'unitPrice'   => (float) $amount,
                     'taxable'     => false,
@@ -606,36 +606,36 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Validate the submitted data.
-        $payment_profile_id = $this->validate_submission_data( $submission_data, $invoice );
+        $payment_profile_id = $this->validate_submission_data($submission_data, $invoice);
 
         // Do we have an error?
-        if ( is_wp_error( $payment_profile_id ) ) {
-            wpinv_set_error( $payment_profile_id->get_error_code(), $payment_profile_id->get_error_message() );
-            wpinv_send_back_to_checkout( $invoice );
+        if (is_wp_error($payment_profile_id)) {
+            wpinv_set_error($payment_profile_id->get_error_code(), $payment_profile_id->get_error_message());
+            wpinv_send_back_to_checkout($invoice);
         }
 
         // Save the payment method to the order.
-        update_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', $payment_profile_id );
+        update_post_meta($invoice->get_id(), 'getpaid_authorizenet_profile_id', $payment_profile_id);
 
         // Check if this is a subscription or not.
-        $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-        if ( ! empty( $subscriptions ) ) {
-            $this->process_subscription( $invoice, $subscriptions );
+        $subscriptions = getpaid_get_invoice_subscriptions($invoice);
+        if (!empty($subscriptions)) {
+            $this->process_subscription($invoice, $subscriptions);
         }
 
         // If it is free, send to the success page.
-        if ( ! $invoice->needs_payment() ) {
+        if (!$invoice->needs_payment()) {
             $invoice->mark_paid();
-            wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+            wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
         }
 
         // Charge the payment profile.
-        $this->process_initial_payment( $invoice );
+        $this->process_initial_payment($invoice);
 
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
         exit;
 
@@ -646,23 +646,23 @@ 
 	 *
      * @param WPInv_Invoice $invoice Invoice.
 	 */
-	protected function process_initial_payment( $invoice ) {
+	protected function process_initial_payment($invoice) {
 
-		$payment_profile_id = get_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
-        $customer_profile   = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
-		$result             = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $invoice );
+		$payment_profile_id = get_post_meta($invoice->get_id(), 'getpaid_authorizenet_profile_id', true);
+        $customer_profile = get_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), true);
+		$result             = $this->charge_customer_payment_profile($customer_profile, $payment_profile_id, $invoice);
 
 		// Do we have an error?
-		if ( is_wp_error( $result ) ) {
-			wpinv_set_error( $result->get_error_code(), $result->get_error_message() );
-			wpinv_send_back_to_checkout( $invoice );
+		if (is_wp_error($result)) {
+			wpinv_set_error($result->get_error_code(), $result->get_error_message());
+			wpinv_send_back_to_checkout($invoice);
 		}
 
 		// Process the response.
-		$this->process_charge_response( $result, $invoice );
+		$this->process_charge_response($result, $invoice);
 
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
+		if (wpinv_get_errors()) {
+			wpinv_send_back_to_checkout($invoice);
 		}
 
 	}
@@ -673,30 +673,30 @@ 
      * @param WPInv_Invoice $invoice Invoice.
      * @param WPInv_Subscription[]|WPInv_Subscription $subscriptions Subscriptions.
 	 */
-	public function process_subscription( $invoice, $subscriptions ) {
+	public function process_subscription($invoice, $subscriptions) {
 
         // Check if there is an initial amount to charge.
-        if ( (float) $invoice->get_total() > 0 ) {
-			$this->process_initial_payment( $invoice );
+        if ((float) $invoice->get_total() > 0) {
+			$this->process_initial_payment($invoice);
         }
 
         // Activate the subscriptions.
-        $subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+        $subscriptions = is_array($subscriptions) ? $subscriptions : array($subscriptions);
 
-        foreach ( $subscriptions as $subscription ) {
-            if ( $subscription->exists() ) {
-                $duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-                $expiry   = date( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+        foreach ($subscriptions as $subscription) {
+            if ($subscription->exists()) {
+                $duration = strtotime($subscription->get_expiration()) - strtotime($subscription->get_date_created());
+                $expiry   = date('Y-m-d H:i:s', (current_time('timestamp') + $duration));
 
-                $subscription->set_next_renewal_date( $expiry );
-                $subscription->set_date_created( current_time( 'mysql' ) );
-                $subscription->set_profile_id( $invoice->generate_key( 'authnet_sub_' . $invoice->get_id() . '_' . $subscription->get_id() ) );
+                $subscription->set_next_renewal_date($expiry);
+                $subscription->set_date_created(current_time('mysql'));
+                $subscription->set_profile_id($invoice->generate_key('authnet_sub_' . $invoice->get_id() . '_' . $subscription->get_id()));
                 $subscription->activate();
             }
         }
 
 		// Redirect to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
 
@@ -706,11 +706,11 @@ 
 	 *
      * @param WPInv_Subscription $subscription
 	 */
-	public function maybe_renew_subscription( $subscription ) {
+	public function maybe_renew_subscription($subscription) {
 
         // Ensure its our subscription && it's active.
-        if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
-            $this->renew_subscription( $subscription );
+        if ($this->id === $subscription->get_gateway() && $subscription->has_status('active trialling')) {
+            $this->renew_subscription($subscription);
         }
 
 	}
@@ -720,28 +720,28 @@ 
 	 *
      * @param WPInv_Subscription $subscription
 	 */
-	public function renew_subscription( $subscription ) {
+	public function renew_subscription($subscription) {
 
 		// Generate the renewal invoice.
 		$new_invoice = $subscription->create_payment();
 		$old_invoice = $subscription->get_parent_payment();
 
-        if ( empty( $new_invoice ) ) {
-            $old_invoice->add_note( __( 'Error generating a renewal invoice.', 'invoicing' ), false, false, false );
+        if (empty($new_invoice)) {
+            $old_invoice->add_note(__('Error generating a renewal invoice.', 'invoicing'), false, false, false);
             $subscription->failing();
             return;
         }
 
         // Charge the payment method.
-		$payment_profile_id = get_post_meta( $old_invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
-		$customer_profile   = get_user_meta( $old_invoice->get_user_id(), $this->get_customer_profile_meta_name( $old_invoice ), true );
-		$result             = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $new_invoice );
+		$payment_profile_id = get_post_meta($old_invoice->get_id(), 'getpaid_authorizenet_profile_id', true);
+		$customer_profile   = get_user_meta($old_invoice->get_user_id(), $this->get_customer_profile_meta_name($old_invoice), true);
+		$result             = $this->charge_customer_payment_profile($customer_profile, $payment_profile_id, $new_invoice);
 
 		// Do we have an error?
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 
 			$old_invoice->add_note(
-				sprintf( __( 'Error renewing subscription : ( %s ).', 'invoicing' ), $result->get_error_message() ),
+				sprintf(__('Error renewing subscription : ( %s ).', 'invoicing'), $result->get_error_message()),
 				true,
 				false,
 				true
@@ -752,12 +752,12 @@ 
 		}
 
 		// Process the response.
-		$this->process_charge_response( $result, $new_invoice );
+		$this->process_charge_response($result, $new_invoice);
 
-		if ( wpinv_get_errors() ) {
+		if (wpinv_get_errors()) {
 
 			$old_invoice->add_note(
-				sprintf( __( 'Error renewing subscription : ( %s ).', 'invoicing' ), getpaid_get_errors_html() ),
+				sprintf(__('Error renewing subscription : ( %s ).', 'invoicing'), getpaid_get_errors_html()),
 				true,
 				false,
 				true
@@ -767,9 +767,9 @@ 
 
         }
 
-        if ( ! $new_invoice->needs_payment() ) {
+        if (!$new_invoice->needs_payment()) {
             $subscription->renew();
-            $subscription->after_add_payment( $new_invoice );
+            $subscription->after_add_payment($new_invoice);
         } else {
             $subscription->failing();
         }
@@ -782,33 +782,33 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
         global $getpaid_authorize_addons;
 
         $getpaid_authorize_addons = array();
-        foreach ( $items as $item ) {
+        foreach ($items as $item) {
 
-            if ( is_null( $invoice->get_item( $item->get_id() ) ) && ! is_wp_error( $invoice->add_item( $item ) ) ) {
+            if (is_null($invoice->get_item($item->get_id())) && !is_wp_error($invoice->add_item($item))) {
                 $getpaid_authorize_addons[] = $item;
             }
 }
 
-        if ( empty( $getpaid_authorize_addons ) ) {
+        if (empty($getpaid_authorize_addons)) {
             return;
         }
 
         $invoice->recalculate_total();
 
-        $payment_profile_id = get_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
-		$customer_profile   = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
+        $payment_profile_id = get_post_meta($invoice->get_id(), 'getpaid_authorizenet_profile_id', true);
+		$customer_profile = get_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), true);
 
-        add_filter( 'getpaid_authorizenet_charge_customer_payment_profile_args', array( $this, 'filter_addons_request' ), 10, 2 );
-        $result = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $invoice );
-        remove_filter( 'getpaid_authorizenet_charge_customer_payment_profile_args', array( $this, 'filter_addons_request' ) );
+        add_filter('getpaid_authorizenet_charge_customer_payment_profile_args', array($this, 'filter_addons_request'), 10, 2);
+        $result = $this->charge_customer_payment_profile($customer_profile, $payment_profile_id, $invoice);
+        remove_filter('getpaid_authorizenet_charge_customer_payment_profile_args', array($this, 'filter_addons_request'));
 
-        if ( is_wp_error( $result ) ) {
-            wpinv_set_error( $result->get_error_code(), $result->get_error_message() );
+        if (is_wp_error($result)) {
+            wpinv_set_error($result->get_error_code(), $result->get_error_message());
             return;
         }
 
@@ -821,19 +821,19 @@ 
      * @param array $args
 	 * @return array
 	 */
-    public function filter_addons_request( $args ) {
+    public function filter_addons_request($args) {
 
         global $getpaid_authorize_addons;
         $total = 0;
 
-        foreach ( $getpaid_authorize_addons as $addon ) {
+        foreach ($getpaid_authorize_addons as $addon) {
             $total += $addon->get_sub_total();
         }
 
         $args['createTransactionRequest']['transactionRequest']['amount'] = $total;
 
-        if ( isset( $args['createTransactionRequest']['transactionRequest']['tax'] ) ) {
-            unset( $args['createTransactionRequest']['transactionRequest']['tax'] );
+        if (isset($args['createTransactionRequest']['transactionRequest']['tax'])) {
+            unset($args['createTransactionRequest']['transactionRequest']['tax']);
         }
 
         return $args;
@@ -846,7 +846,7 @@ 
     public function sandbox_notice() {
 
         return sprintf(
-            __( 'SANDBOX ENABLED. You can use sandbox testing details only. See the %1$sAuthorize.NET Sandbox Testing Guide%2$s for more details.', 'invoicing' ),
+            __('SANDBOX ENABLED. You can use sandbox testing details only. See the %1$sAuthorize.NET Sandbox Testing Guide%2$s for more details.', 'invoicing'),
             '<a href="https://developer.authorize.net/hello_world/testing_guide.html">',
             '</a>'
         );
@@ -858,42 +858,42 @@ 
 	 *
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
         $currencies = sprintf(
-            __( 'Supported Currencies: %s', 'invoicing' ),
-            implode( ', ', $this->currencies )
+            __('Supported Currencies: %s', 'invoicing'),
+            implode(', ', $this->currencies)
         );
 
         $admin_settings['authorizenet_active']['desc'] .= " ($currencies)";
-        $admin_settings['authorizenet_desc']['std']     = __( 'Pay securely using your credit or debit card.', 'invoicing' );
+        $admin_settings['authorizenet_desc']['std']     = __('Pay securely using your credit or debit card.', 'invoicing');
 
         $admin_settings['authorizenet_login_id'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_login_id',
-            'name' => __( 'API Login ID', 'invoicing' ),
-            'desc' => '<a href="https://support.authorize.net/s/article/How-do-I-obtain-my-API-Login-ID-and-Transaction-Key"><em>' . __( 'How do I obtain my API Login ID and Transaction Key?', 'invoicing' ) . '</em></a>',
+            'name' => __('API Login ID', 'invoicing'),
+            'desc' => '<a href="https://support.authorize.net/s/article/How-do-I-obtain-my-API-Login-ID-and-Transaction-Key"><em>' . __('How do I obtain my API Login ID and Transaction Key?', 'invoicing') . '</em></a>',
         );
 
         $admin_settings['authorizenet_transaction_key'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_transaction_key',
-            'name' => __( 'Transaction Key', 'invoicing' ),
+            'name' => __('Transaction Key', 'invoicing'),
         );
 
         $admin_settings['authorizenet_signature_key'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_signature_key',
-            'name' => __( 'Signature Key', 'invoicing' ),
-            'desc' => '<a href="https://support.authorize.net/s/article/What-is-a-Signature-Key"><em>' . __( 'Learn more.', 'invoicing' ) . '</em></a>',
+            'name' => __('Signature Key', 'invoicing'),
+            'desc' => '<a href="https://support.authorize.net/s/article/What-is-a-Signature-Key"><em>' . __('Learn more.', 'invoicing') . '</em></a>',
         );
 
         $admin_settings['authorizenet_ipn_url'] = array(
             'type'     => 'ipn_url',
             'id'       => 'authorizenet_ipn_url',
-            'name'     => __( 'Webhook URL', 'invoicing' ),
+            'name'     => __('Webhook URL', 'invoicing'),
             'std'      => $this->notify_url,
-            'desc'     => __( 'Create a new webhook using this URL as the endpoint URL and set it to receive all payment events.', 'invoicing' ) . ' <a href="https://support.authorize.net/s/article/How-do-I-add-edit-Webhook-notification-end-points"><em>' . __( 'Learn more.', 'invoicing' ) . '</em></a>',
+            'desc'     => __('Create a new webhook using this URL as the endpoint URL and set it to receive all payment events.', 'invoicing') . ' <a href="https://support.authorize.net/s/article/How-do-I-add-edit-Webhook-notification-end-points"><em>' . __('Learn more.', 'invoicing') . '</em></a>',
             'custom'   => 'authorizenet',
             'readonly' => true,
         );

includes/wpinv-subscription.php

Indentation +1051 added lines, -1051 removed lines

@@ -15,125 +15,125 @@ 
  */
 class WPInv_Subscription extends GetPaid_Data {
 
-	/**
-	 * Which data store to load.
-	 *
-	 * @var string
-	 */
-	protected $data_store_name = 'subscription';
-
-	/**
-	 * This is the name of this object type.
-	 *
-	 * @var string
-	 */
-	protected $object_type = 'subscription';
-
-	/**
-	 * Item Data array. This is the core item data exposed in APIs.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $data = array(
-		'customer_id'       => 0,
-		'frequency'         => 1,
-		'period'            => 'D',
-		'initial_amount'    => null,
-		'recurring_amount'  => null,
-		'bill_times'        => 0,
-		'transaction_id'    => '',
-		'parent_payment_id' => null,
-		'product_id'        => 0,
-		'created'           => '0000-00-00 00:00:00',
-		'expiration'        => '0000-00-00 00:00:00',
-		'trial_period'      => '',
-		'status'            => 'pending',
-		'profile_id'        => '',
-		'gateway'           => '',
-		'customer'          => '',
-	);
-
-	/**
-	 * Stores the status transition information.
-	 *
-	 * @since 1.0.19
-	 * @var bool
-	 */
-	protected $status_transition = false;
-
-	/**
-	 * Get the subscription if ID is passed, otherwise the subscription is new and empty.
-	 *
-	 * @param  int|string|object|WPInv_Subscription $subscription Subscription id, profile_id, or object to read.
-	 * @param  bool $deprecated
-	 */
-	function __construct( $subscription = 0, $deprecated = false ) {
-
-		parent::__construct( $subscription );
-
-		if ( ! $deprecated && ! empty( $subscription ) && is_numeric( $subscription ) ) {
-			$this->set_id( $subscription );
-		} elseif ( $subscription instanceof self ) {
-			$this->set_id( $subscription->get_id() );
-		} elseif ( $deprecated && $subscription_id = self::get_subscription_id_by_field( $subscription, 'profile_id' ) ) {
-			$this->set_id( $subscription_id );
-		} elseif ( ! empty( $subscription->id ) ) {
-			$this->set_id( $subscription->id );
-		} else {
-			$this->set_object_read( true );
-		}
-
-		// Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
-
-		if ( $this->get_id() > 0 ) {
-			$this->data_store->read( $this );
-		}
-
-	}
-
-	/**
-	 * Given an invoice id, profile id, transaction id, it returns the subscription's id.
-	 *
-	 *
-	 * @static
-	 * @param string $value
-	 * @param string $field Either invoice_id, transaction_id or profile_id.
-	 * @since 1.0.19
-	 * @return int
-	 */
-	public static function get_subscription_id_by_field( $value, $field = 'profile_id' ) {
+    /**
+     * Which data store to load.
+     *
+     * @var string
+     */
+    protected $data_store_name = 'subscription';
+
+    /**
+     * This is the name of this object type.
+     *
+     * @var string
+     */
+    protected $object_type = 'subscription';
+
+    /**
+     * Item Data array. This is the core item data exposed in APIs.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $data = array(
+        'customer_id'       => 0,
+        'frequency'         => 1,
+        'period'            => 'D',
+        'initial_amount'    => null,
+        'recurring_amount'  => null,
+        'bill_times'        => 0,
+        'transaction_id'    => '',
+        'parent_payment_id' => null,
+        'product_id'        => 0,
+        'created'           => '0000-00-00 00:00:00',
+        'expiration'        => '0000-00-00 00:00:00',
+        'trial_period'      => '',
+        'status'            => 'pending',
+        'profile_id'        => '',
+        'gateway'           => '',
+        'customer'          => '',
+    );
+
+    /**
+     * Stores the status transition information.
+     *
+     * @since 1.0.19
+     * @var bool
+     */
+    protected $status_transition = false;
+
+    /**
+     * Get the subscription if ID is passed, otherwise the subscription is new and empty.
+     *
+     * @param  int|string|object|WPInv_Subscription $subscription Subscription id, profile_id, or object to read.
+     * @param  bool $deprecated
+     */
+    function __construct( $subscription = 0, $deprecated = false ) {
+
+        parent::__construct( $subscription );
+
+        if ( ! $deprecated && ! empty( $subscription ) && is_numeric( $subscription ) ) {
+            $this->set_id( $subscription );
+        } elseif ( $subscription instanceof self ) {
+            $this->set_id( $subscription->get_id() );
+        } elseif ( $deprecated && $subscription_id = self::get_subscription_id_by_field( $subscription, 'profile_id' ) ) {
+            $this->set_id( $subscription_id );
+        } elseif ( ! empty( $subscription->id ) ) {
+            $this->set_id( $subscription->id );
+        } else {
+            $this->set_object_read( true );
+        }
+
+        // Load the datastore.
+        $this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+
+        if ( $this->get_id() > 0 ) {
+            $this->data_store->read( $this );
+        }
+
+    }
+
+    /**
+     * Given an invoice id, profile id, transaction id, it returns the subscription's id.
+     *
+     *
+     * @static
+     * @param string $value
+     * @param string $field Either invoice_id, transaction_id or profile_id.
+     * @since 1.0.19
+     * @return int
+     */
+    public static function get_subscription_id_by_field( $value, $field = 'profile_id' ) {
         global $wpdb;
 
-		// Trim the value.
-		$value = trim( $value );
+        // Trim the value.
+        $value = trim( $value );
 
-		if ( empty( $value ) ) {
-			return 0;
-		}
+        if ( empty( $value ) ) {
+            return 0;
+        }
 
-		if ( 'invoice_id' == $field ) {
-			$field = 'parent_payment_id';
-		}
+        if ( 'invoice_id' == $field ) {
+            $field = 'parent_payment_id';
+        }
 
         // Valid fields.
         $fields = array(
-			'parent_payment_id',
-			'transaction_id',
-			'profile_id',
-		);
-
-		// Ensure a field has been passed.
-		if ( empty( $field ) || ! in_array( $field, $fields ) ) {
-			return 0;
-		}
-
-		// Maybe retrieve from the cache.
-		$subscription_id   = wp_cache_get( $value, "getpaid_subscription_{$field}s_to_subscription_ids" );
-		if ( ! empty( $subscription_id ) ) {
-			return $subscription_id;
-		}
+            'parent_payment_id',
+            'transaction_id',
+            'profile_id',
+        );
+
+        // Ensure a field has been passed.
+        if ( empty( $field ) || ! in_array( $field, $fields ) ) {
+            return 0;
+        }
+
+        // Maybe retrieve from the cache.
+        $subscription_id   = wp_cache_get( $value, "getpaid_subscription_{$field}s_to_subscription_ids" );
+        if ( ! empty( $subscription_id ) ) {
+            return $subscription_id;
+        }
 
         // Fetch from the db.
         $table            = $wpdb->prefix . 'wpinv_subscriptions';
@@ -141,42 +141,42 @@ 
             $wpdb->prepare( "SELECT `id` FROM $table WHERE `$field`=%s LIMIT 1", $value )
         );
 
-		if ( empty( $subscription_id ) ) {
-			return 0;
-		}
+        if ( empty( $subscription_id ) ) {
+            return 0;
+        }
 
-		// Update the cache with our data.
-		wp_cache_set( $value, $subscription_id, "getpaid_subscription_{$field}s_to_subscription_ids" );
+        // Update the cache with our data.
+        wp_cache_set( $value, $subscription_id, "getpaid_subscription_{$field}s_to_subscription_ids" );
 
-		return $subscription_id;
-	}
+        return $subscription_id;
+    }
 
-	/**
+    /**
      * Clears the subscription's cache.
      */
     public function clear_cache() {
-		$caches = array(
-			'getpaid_subscription_parent_payment_ids_to_subscription_ids' => $this->get_parent_payment_id(),
-			'getpaid_subscription_transaction_ids_to_subscription_ids'    => $this->get_transaction_id(),
-			'getpaid_subscription_profile_ids_to_subscription_ids'        => $this->get_profile_id(),
-			'getpaid_subscriptions'                                       => $this->get_id(),
-		);
-
-		foreach ( $caches as $cache => $value ) {
-			if ( '' !== $value && false !== $value ) {
-				wp_cache_delete( $value, $cache );
-			}
-		}
-	}
-
-	/**
+        $caches = array(
+            'getpaid_subscription_parent_payment_ids_to_subscription_ids' => $this->get_parent_payment_id(),
+            'getpaid_subscription_transaction_ids_to_subscription_ids'    => $this->get_transaction_id(),
+            'getpaid_subscription_profile_ids_to_subscription_ids'        => $this->get_profile_id(),
+            'getpaid_subscriptions'                                       => $this->get_id(),
+        );
+
+        foreach ( $caches as $cache => $value ) {
+            if ( '' !== $value && false !== $value ) {
+                wp_cache_delete( $value, $cache );
+            }
+        }
+    }
+
+    /**
      * Checks if a subscription key is set.
      */
     public function _isset( $key ) {
         return isset( $this->data[ $key ] ) || method_exists( $this, "get_$key" );
-	}
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD methods
 	|--------------------------------------------------------------------------
@@ -185,544 +185,544 @@ 
 	|
     */
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Getters
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Get customer id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_customer_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'customer_id', $context );
-	}
-
-	/**
-	 * Get customer information.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return WP_User|false WP_User object on success, false on failure.
-	 */
-	public function get_customer( $context = 'view' ) {
-		return get_userdata( $this->get_customer_id( $context ) );
-	}
-
-	/**
-	 * Get parent invoice id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_parent_invoice_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'parent_payment_id', $context );
-	}
-
-	/**
-	 * Alias for self::get_parent_invoice_id().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
+    /**
+     * Get customer id.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_customer_id( $context = 'view' ) {
+        return (int) $this->get_prop( 'customer_id', $context );
+    }
+
+    /**
+     * Get customer information.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return WP_User|false WP_User object on success, false on failure.
+     */
+    public function get_customer( $context = 'view' ) {
+        return get_userdata( $this->get_customer_id( $context ) );
+    }
+
+    /**
+     * Get parent invoice id.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_parent_invoice_id( $context = 'view' ) {
+        return (int) $this->get_prop( 'parent_payment_id', $context );
+    }
+
+    /**
+     * Alias for self::get_parent_invoice_id().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
     public function get_parent_payment_id( $context = 'view' ) {
         return $this->get_parent_invoice_id( $context );
-	}
+    }
+
+    /**
+     * Alias for self::get_parent_invoice_id().
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_original_payment_id( $context = 'view' ) {
+        return $this->get_parent_invoice_id( $context );
+    }
+
+    /**
+     * Get parent invoice.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return WPInv_Invoice
+     */
+    public function get_parent_invoice( $context = 'view' ) {
+        return new WPInv_Invoice( $this->get_parent_invoice_id( $context ) );
+    }
+
+    /**
+     * Alias for self::get_parent_invoice().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return WPInv_Invoice
+     */
+    public function get_parent_payment( $context = 'view' ) {
+        return $this->get_parent_invoice( $context );
+    }
+
+    /**
+     * Get subscription's product id.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_product_id( $context = 'view' ) {
+        return (int) $this->get_prop( 'product_id', $context );
+    }
+
+    /**
+     * Get the subscription product.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return WPInv_Item
+     */
+    public function get_product( $context = 'view' ) {
+        return new WPInv_Item( $this->get_product_id( $context ) );
+    }
+
+    /**
+     * Get parent invoice's gateway.
+     *
+     * Here for backwards compatibility.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_gateway( $context = 'view' ) {
+        return $this->get_parent_invoice( $context )->get_gateway();
+    }
+
+    /**
+     * Get the period of a renewal.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_period( $context = 'view' ) {
+        return $this->get_prop( 'period', $context );
+    }
+
+    /**
+     * Get number of periods each renewal is valid for.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_frequency( $context = 'view' ) {
+        return (int) $this->get_prop( 'frequency', $context );
+    }
+
+    /**
+     * Get the initial amount for the subscription.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_initial_amount( $context = 'view' ) {
+        return (float) wpinv_sanitize_amount( $this->get_prop( 'initial_amount', $context ) );
+    }
+
+    /**
+     * Get the recurring amount for the subscription.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_recurring_amount( $context = 'view' ) {
+        return (float) wpinv_sanitize_amount( $this->get_prop( 'recurring_amount', $context ) );
+    }
+
+    /**
+     * Get number of times that this subscription can be renewed.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_bill_times( $context = 'view' ) {
+        return (int) $this->get_prop( 'bill_times', $context );
+    }
+
+    /**
+     * Get transaction id of this subscription's parent invoice.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_transaction_id( $context = 'view' ) {
+        return $this->get_prop( 'transaction_id', $context );
+    }
+
+    /**
+     * Get the date that the subscription was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_created( $context = 'view' ) {
+        return $this->get_prop( 'created', $context );
+    }
+
+    /**
+     * Alias for self::get_created().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created( $context = 'view' ) {
+        return $this->get_created( $context );
+    }
+
+    /**
+     * Retrieves the creation date in a timestamp
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_time_created() {
+        $created = $this->get_date_created();
+        return empty( $created ) ? current_time( 'timestamp' ) : strtotime( $created, current_time( 'timestamp' ) );
+    }
+
+    /**
+     * Get GMT date when the subscription was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created_gmt( $context = 'view' ) {
+        $date = $this->get_date_created( $context );
+
+        if ( $date ) {
+            $date = get_gmt_from_date( $date );
+        }
+        return $date;
+    }
+
+    /**
+     * Get the date that the subscription will renew.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_next_renewal_date( $context = 'view' ) {
+        return $this->get_prop( 'expiration', $context );
+    }
+
+    /**
+     * Alias for self::get_next_renewal_date().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_expiration( $context = 'view' ) {
+        return $this->get_next_renewal_date( $context );
+    }
+
+    /**
+     * Retrieves the expiration date in a timestamp
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_expiration_time() {
+        $expiration = $this->get_expiration();
+
+        if ( empty( $expiration ) || '0000-00-00 00:00:00' == $expiration ) {
+            return current_time( 'timestamp' );
+        }
+
+        $expiration = strtotime( $expiration, current_time( 'timestamp' ) );
+        return $expiration < current_time( 'timestamp' ) ? current_time( 'timestamp' ) : $expiration;
+    }
+
+    /**
+     * Get GMT date when the subscription will renew.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_next_renewal_date_gmt( $context = 'view' ) {
+        $date = $this->get_next_renewal_date( $context );
+
+        if ( $date ) {
+            $date = get_gmt_from_date( $date );
+        }
+        return $date;
+    }
+
+    /**
+     * Get the subscription's trial period.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_trial_period( $context = 'view' ) {
+        return $this->get_prop( 'trial_period', $context );
+    }
+
+    /**
+     * Get the subscription's status.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_status( $context = 'view' ) {
+        return $this->get_prop( 'status', $context );
+    }
+
+    /**
+     * Get the subscription's profile id.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_profile_id( $context = 'view' ) {
+        return $this->get_prop( 'profile_id', $context );
+    }
+
+    /*
+	|--------------------------------------------------------------------------
+	| Setters
+	|--------------------------------------------------------------------------
+	*/
+
+    /**
+     * Set customer id.
+     *
+     * @since 1.0.19
+     * @param  int $value The customer's id.
+     */
+    public function set_customer_id( $value ) {
+        $this->set_prop( 'customer_id', (int) $value );
+    }
+
+    /**
+     * Set parent invoice id.
+     *
+     * @since 1.0.19
+     * @param  int $value The parent invoice id.
+     */
+    public function set_parent_invoice_id( $value ) {
+        $this->set_prop( 'parent_payment_id', (int) $value );
+    }
+
+    /**
+     * Alias for self::set_parent_invoice_id().
+     *
+     * @since 1.0.19
+     * @param  int $value The parent invoice id.
+     */
+    public function set_parent_payment_id( $value ) {
+        $this->set_parent_invoice_id( $value );
+    }
+
+    /**
+     * Alias for self::set_parent_invoice_id().
+     *
+     * @since 1.0.19
+     * @param  int $value The parent invoice id.
+     */
+    public function set_original_payment_id( $value ) {
+        $this->set_parent_invoice_id( $value );
+    }
+
+    /**
+     * Set subscription's product id.
+     *
+     * @since 1.0.19
+     * @param  int $value The subscription product id.
+     */
+    public function set_product_id( $value ) {
+        $this->set_prop( 'product_id', (int) $value );
+    }
+
+    /**
+     * Set the period of a renewal.
+     *
+     * @since 1.0.19
+     * @param  string $value The renewal period.
+     */
+    public function set_period( $value ) {
+        $this->set_prop( 'period', $value );
+    }
+
+    /**
+     * Set number of periods each renewal is valid for.
+     *
+     * @since 1.0.19
+     * @param  int $value The subscription frequency.
+     */
+    public function set_frequency( $value ) {
+        $value = empty( $value ) ? 1 : (int) $value;
+        $this->set_prop( 'frequency', absint( $value ) );
+    }
+
+    /**
+     * Set the initial amount for the subscription.
+     *
+     * @since 1.0.19
+     * @param  float $value The initial subcription amount.
+     */
+    public function set_initial_amount( $value ) {
+        $this->set_prop( 'initial_amount', wpinv_sanitize_amount( $value ) );
+    }
+
+    /**
+     * Set the recurring amount for the subscription.
+     *
+     * @since 1.0.19
+     * @param  float $value The recurring subcription amount.
+     */
+    public function set_recurring_amount( $value ) {
+        $this->set_prop( 'recurring_amount', wpinv_sanitize_amount( $value ) );
+    }
+
+    /**
+     * Set number of times that this subscription can be renewed.
+     *
+     * @since 1.0.19
+     * @param  int $value Bill times.
+     */
+    public function set_bill_times( $value ) {
+        $this->set_prop( 'bill_times', (int) $value );
+    }
+
+    /**
+     * Get transaction id of this subscription's parent invoice.
+     *
+     * @since 1.0.19
+     * @param string $value Bill times.
+     */
+    public function set_transaction_id( $value ) {
+        $this->set_prop( 'transaction_id', sanitize_text_field( $value ) );
+    }
+
+    /**
+     * Set date when this subscription started.
+     *
+     * @since 1.0.19
+     * @param string $value strtotime compliant date.
+     */
+    public function set_created( $value ) {
+        $date = strtotime( $value );
+
+        if ( $date && $value !== '0000-00-00 00:00:00' ) {
+            $this->set_prop( 'created', gmdate( 'Y-m-d H:i:s', $date ) );
+            return;
+        }
+
+        $this->set_prop( 'created', '' );
+
+    }
 
-	/**
-     * Alias for self::get_parent_invoice_id().
+    /**
+     * Alias for self::set_created().
      *
-     * @since  1.0.0
-     * @return int
+     * @since 1.0.19
+     * @param string $value strtotime compliant date.
      */
-    public function get_original_payment_id( $context = 'view' ) {
-        return $this->get_parent_invoice_id( $context );
+    public function set_date_created( $value ) {
+        $this->set_created( $value );
     }
 
-	/**
-	 * Get parent invoice.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return WPInv_Invoice
-	 */
-	public function get_parent_invoice( $context = 'view' ) {
-		return new WPInv_Invoice( $this->get_parent_invoice_id( $context ) );
-	}
-
-	/**
-	 * Alias for self::get_parent_invoice().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return WPInv_Invoice
-	 */
-    public function get_parent_payment( $context = 'view' ) {
-        return $this->get_parent_invoice( $context );
-	}
-
-	/**
-	 * Get subscription's product id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_product_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'product_id', $context );
-	}
-
-	/**
-	 * Get the subscription product.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return WPInv_Item
-	 */
-	public function get_product( $context = 'view' ) {
-		return new WPInv_Item( $this->get_product_id( $context ) );
-	}
-
-	/**
-	 * Get parent invoice's gateway.
-	 *
-	 * Here for backwards compatibility.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_gateway( $context = 'view' ) {
-		return $this->get_parent_invoice( $context )->get_gateway();
-	}
-
-	/**
-	 * Get the period of a renewal.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_period( $context = 'view' ) {
-		return $this->get_prop( 'period', $context );
-	}
-
-	/**
-	 * Get number of periods each renewal is valid for.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_frequency( $context = 'view' ) {
-		return (int) $this->get_prop( 'frequency', $context );
-	}
-
-	/**
-	 * Get the initial amount for the subscription.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_initial_amount( $context = 'view' ) {
-		return (float) wpinv_sanitize_amount( $this->get_prop( 'initial_amount', $context ) );
-	}
-
-	/**
-	 * Get the recurring amount for the subscription.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_recurring_amount( $context = 'view' ) {
-		return (float) wpinv_sanitize_amount( $this->get_prop( 'recurring_amount', $context ) );
-	}
-
-	/**
-	 * Get number of times that this subscription can be renewed.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_bill_times( $context = 'view' ) {
-		return (int) $this->get_prop( 'bill_times', $context );
-	}
-
-	/**
-	 * Get transaction id of this subscription's parent invoice.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_transaction_id( $context = 'view' ) {
-		return $this->get_prop( 'transaction_id', $context );
-	}
-
-	/**
-	 * Get the date that the subscription was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_created( $context = 'view' ) {
-		return $this->get_prop( 'created', $context );
-	}
-
-	/**
-	 * Alias for self::get_created().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_created( $context );
-	}
-
-	/**
-	 * Retrieves the creation date in a timestamp
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_time_created() {
-		$created = $this->get_date_created();
-		return empty( $created ) ? current_time( 'timestamp' ) : strtotime( $created, current_time( 'timestamp' ) );
-	}
-
-	/**
-	 * Get GMT date when the subscription was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created_gmt( $context = 'view' ) {
-        $date = $this->get_date_created( $context );
+    /**
+     * Set the date that the subscription will renew.
+     *
+     * @since 1.0.19
+     * @param string $value strtotime compliant date.
+     */
+    public function set_next_renewal_date( $value ) {
+        $date = strtotime( $value );
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ( $date && $value !== '0000-00-00 00:00:00' ) {
+            $this->set_prop( 'expiration', gmdate( 'Y-m-d H:i:s', $date ) );
+            return;
         }
-		return $date;
-	}
-
-	/**
-	 * Get the date that the subscription will renew.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_next_renewal_date( $context = 'view' ) {
-		return $this->get_prop( 'expiration', $context );
-	}
-
-	/**
-	 * Alias for self::get_next_renewal_date().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_expiration( $context = 'view' ) {
-		return $this->get_next_renewal_date( $context );
-	}
-
-	/**
-	 * Retrieves the expiration date in a timestamp
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_expiration_time() {
-		$expiration = $this->get_expiration();
-
-		if ( empty( $expiration ) || '0000-00-00 00:00:00' == $expiration ) {
-			return current_time( 'timestamp' );
-		}
-
-		$expiration = strtotime( $expiration, current_time( 'timestamp' ) );
-		return $expiration < current_time( 'timestamp' ) ? current_time( 'timestamp' ) : $expiration;
-	}
-
-	/**
-	 * Get GMT date when the subscription will renew.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_next_renewal_date_gmt( $context = 'view' ) {
-        $date = $this->get_next_renewal_date( $context );
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
-        }
-		return $date;
-	}
-
-	/**
-	 * Get the subscription's trial period.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_trial_period( $context = 'view' ) {
-		return $this->get_prop( 'trial_period', $context );
-	}
-
-	/**
-	 * Get the subscription's status.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
-	}
-
-	/**
-	 * Get the subscription's profile id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_profile_id( $context = 'view' ) {
-		return $this->get_prop( 'profile_id', $context );
-	}
-
-	/*
-	|--------------------------------------------------------------------------
-	| Setters
-	|--------------------------------------------------------------------------
-	*/
+        $this->set_prop( 'expiration', '' );
 
-	/**
-	 * Set customer id.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value The customer's id.
-	 */
-	public function set_customer_id( $value ) {
-		$this->set_prop( 'customer_id', (int) $value );
-	}
-
-	/**
-	 * Set parent invoice id.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value The parent invoice id.
-	 */
-	public function set_parent_invoice_id( $value ) {
-		$this->set_prop( 'parent_payment_id', (int) $value );
-	}
-
-	/**
-	 * Alias for self::set_parent_invoice_id().
-	 *
-	 * @since 1.0.19
-	 * @param  int $value The parent invoice id.
-	 */
-    public function set_parent_payment_id( $value ) {
-        $this->set_parent_invoice_id( $value );
-	}
+    }
 
-	/**
-     * Alias for self::set_parent_invoice_id().
+    /**
+     * Alias for self::set_next_renewal_date().
      *
      * @since 1.0.19
-	 * @param  int $value The parent invoice id.
+     * @param string $value strtotime compliant date.
      */
-    public function set_original_payment_id( $value ) {
-        $this->set_parent_invoice_id( $value );
-	}
-
-	/**
-	 * Set subscription's product id.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value The subscription product id.
-	 */
-	public function set_product_id( $value ) {
-		$this->set_prop( 'product_id', (int) $value );
-	}
-
-	/**
-	 * Set the period of a renewal.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value The renewal period.
-	 */
-	public function set_period( $value ) {
-		$this->set_prop( 'period', $value );
-	}
-
-	/**
-	 * Set number of periods each renewal is valid for.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value The subscription frequency.
-	 */
-	public function set_frequency( $value ) {
-		$value = empty( $value ) ? 1 : (int) $value;
-		$this->set_prop( 'frequency', absint( $value ) );
-	}
-
-	/**
-	 * Set the initial amount for the subscription.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value The initial subcription amount.
-	 */
-	public function set_initial_amount( $value ) {
-		$this->set_prop( 'initial_amount', wpinv_sanitize_amount( $value ) );
-	}
-
-	/**
-	 * Set the recurring amount for the subscription.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value The recurring subcription amount.
-	 */
-	public function set_recurring_amount( $value ) {
-		$this->set_prop( 'recurring_amount', wpinv_sanitize_amount( $value ) );
-	}
-
-	/**
-	 * Set number of times that this subscription can be renewed.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value Bill times.
-	 */
-	public function set_bill_times( $value ) {
-		$this->set_prop( 'bill_times', (int) $value );
-	}
-
-	/**
-	 * Get transaction id of this subscription's parent invoice.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Bill times.
-	 */
-	public function set_transaction_id( $value ) {
-		$this->set_prop( 'transaction_id', sanitize_text_field( $value ) );
-	}
-
-	/**
-	 * Set date when this subscription started.
-	 *
-	 * @since 1.0.19
-	 * @param string $value strtotime compliant date.
-	 */
-	public function set_created( $value ) {
-        $date = strtotime( $value );
+    public function set_expiration( $value ) {
+        $this->set_next_renewal_date( $value );
+    }
 
-        if ( $date && $value !== '0000-00-00 00:00:00' ) {
-            $this->set_prop( 'created', gmdate( 'Y-m-d H:i:s', $date ) );
+    /**
+     * Set the subscription's trial period.
+     *
+     * @since 1.0.19
+     * @param string $value trial period e.g 1 year.
+     */
+    public function set_trial_period( $value ) {
+        $this->set_prop( 'trial_period', $value );
+    }
+
+    /**
+     * Set the subscription's status.
+     *
+     * @since 1.0.19
+     * @param string $new_status    New subscription status.
+     */
+    public function set_status( $new_status ) {
+
+        // Abort if this is not a valid status;
+        if ( ! array_key_exists( $new_status, getpaid_get_subscription_statuses() ) ) {
             return;
         }
 
-		$this->set_prop( 'created', '' );
-
-	}
+        $old_status = ! empty( $this->status_transition['from'] ) ? $this->status_transition['from'] : $this->get_status();
+        if ( true === $this->object_read && $old_status !== $new_status ) {
+            $this->status_transition = array(
+                'from' => $old_status,
+                'to'   => $new_status,
+            );
+        }
 
-	/**
-	 * Alias for self::set_created().
-	 *
-	 * @since 1.0.19
-	 * @param string $value strtotime compliant date.
-	 */
-	public function set_date_created( $value ) {
-		$this->set_created( $value );
+        $this->set_prop( 'status', $new_status );
     }
 
-	/**
-	 * Set the date that the subscription will renew.
-	 *
-	 * @since 1.0.19
-	 * @param string $value strtotime compliant date.
-	 */
-	public function set_next_renewal_date( $value ) {
-		$date = strtotime( $value );
+    /**
+     * Set the subscription's (remote) profile id.
+     *
+     * @since 1.0.19
+     * @param  string $value the remote profile id.
+     */
+    public function set_profile_id( $value ) {
+        $this->set_prop( 'profile_id', sanitize_text_field( $value ) );
+    }
 
-        if ( $date && $value !== '0000-00-00 00:00:00' ) {
-            $this->set_prop( 'expiration', gmdate( 'Y-m-d H:i:s', $date ) );
-            return;
-		}
-
-		$this->set_prop( 'expiration', '' );
-
-	}
-
-	/**
-	 * Alias for self::set_next_renewal_date().
-	 *
-	 * @since 1.0.19
-	 * @param string $value strtotime compliant date.
-	 */
-	public function set_expiration( $value ) {
-		$this->set_next_renewal_date( $value );
-    }
-
-	/**
-	 * Set the subscription's trial period.
-	 *
-	 * @since 1.0.19
-	 * @param string $value trial period e.g 1 year.
-	 */
-	public function set_trial_period( $value ) {
-		$this->set_prop( 'trial_period', $value );
-	}
-
-	/**
-	 * Set the subscription's status.
-	 *
-	 * @since 1.0.19
-	 * @param string $new_status    New subscription status.
-	 */
-	public function set_status( $new_status ) {
-
-		// Abort if this is not a valid status;
-		if ( ! array_key_exists( $new_status, getpaid_get_subscription_statuses() ) ) {
-			return;
-		}
-
-		$old_status = ! empty( $this->status_transition['from'] ) ? $this->status_transition['from'] : $this->get_status();
-		if ( true === $this->object_read && $old_status !== $new_status ) {
-			$this->status_transition = array(
-				'from' => $old_status,
-				'to'   => $new_status,
-			);
-		}
-
-		$this->set_prop( 'status', $new_status );
-	}
-
-	/**
-	 * Set the subscription's (remote) profile id.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value the remote profile id.
-	 */
-	public function set_profile_id( $value ) {
-		$this->set_prop( 'profile_id', sanitize_text_field( $value ) );
-	}
-
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Boolean methods
 	|--------------------------------------------------------------------------
@@ -731,55 +731,55 @@ 
 	|
 	*/
 
-	/**
+    /**
      * Checks if the subscription has a given status.
-	 *
-	 * @param string|array String or array of strings to check for.
-	 * @return bool
+     *
+     * @param string|array String or array of strings to check for.
+     * @return bool
      */
     public function has_status( $status ) {
         return in_array( $this->get_status(), wpinv_clean( wpinv_parse_list( $status ) ) );
-	}
+    }
 
-	/**
+    /**
      * Checks if the subscription has a trial period.
-	 *
-	 * @return bool
+     *
+     * @return bool
      */
     public function has_trial_period() {
-		$period = $this->get_trial_period();
+        $period = $this->get_trial_period();
         return ! empty( $period );
-	}
-
-	/**
-	 * Is the subscription active?
-	 *
-	 * @return bool
-	 */
-	public function is_active() {
-		return $this->has_status( 'active trialling' ) && ! $this->is_expired();
-	}
-
-	/**
-	 * Is the subscription expired?
-	 *
-	 * @return bool
-	 */
-	public function is_expired() {
-		return $this->has_status( 'expired' ) || ( $this->has_status( 'active cancelled trialling' ) && $this->get_expiration_time() < current_time( 'timestamp' ) );
-	}
-
-	/**
-	 * Is this the last renewals?
-	 *
-	 * @return bool
-	 */
-	public function is_last_renewal() {
-		$max_bills = $this->get_bill_times();
-		return ! empty( $max_bills ) && $max_bills <= $this->get_times_billed();
-	}
-
-	/*
+    }
+
+    /**
+     * Is the subscription active?
+     *
+     * @return bool
+     */
+    public function is_active() {
+        return $this->has_status( 'active trialling' ) && ! $this->is_expired();
+    }
+
+    /**
+     * Is the subscription expired?
+     *
+     * @return bool
+     */
+    public function is_expired() {
+        return $this->has_status( 'expired' ) || ( $this->has_status( 'active cancelled trialling' ) && $this->get_expiration_time() < current_time( 'timestamp' ) );
+    }
+
+    /**
+     * Is this the last renewals?
+     *
+     * @return bool
+     */
+    public function is_last_renewal() {
+        $max_bills = $this->get_bill_times();
+        return ! empty( $max_bills ) && $max_bills <= $this->get_times_billed();
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Additional methods
 	|--------------------------------------------------------------------------
@@ -788,27 +788,27 @@ 
 	|
 	*/
 
-	/**
-	 * Backwards compatibilty.
-	 */
-	public function create( $data = array() ) {
+    /**
+     * Backwards compatibilty.
+     */
+    public function create( $data = array() ) {
 
-		// Set the properties.
-		if ( is_array( $data ) ) {
-			$this->set_props( $data );
-		}
+        // Set the properties.
+        if ( is_array( $data ) ) {
+            $this->set_props( $data );
+        }
 
-		// Save the item.
-		return $this->save();
+        // Save the item.
+        return $this->save();
 
-	}
+    }
 
-	/**
-	 * Backwards compatibilty.
-	 */
-	public function update( $args = array() ) {
-		return $this->create( $args );
-	}
+    /**
+     * Backwards compatibilty.
+     */
+    public function update( $args = array() ) {
+        return $this->create( $args );
+    }
 
     /**
      * Retrieve renewal payments for a subscription
@@ -818,22 +818,22 @@ 
      */
     public function get_child_payments( $hide_pending = true ) {
 
-		$statuses = array( 'publish', 'wpi-processing', 'wpi-renewal' );
+        $statuses = array( 'publish', 'wpi-processing', 'wpi-renewal' );
 
-		if ( ! $hide_pending ) {
-			$statuses = array_keys( wpinv_get_invoice_statuses() );
-		}
+        if ( ! $hide_pending ) {
+            $statuses = array_keys( wpinv_get_invoice_statuses() );
+        }
 
         return get_posts(
-			array(
-            	'post_parent' => $this->get_parent_payment_id(),
-            	'numberposts' => -1,
-            	'post_status' => $statuses,
-            	'orderby'     => 'ID',
-            	'order'       => 'ASC',
-            	'post_type'   => 'wpi_invoice',
-			)
-		);
+            array(
+                'post_parent' => $this->get_parent_payment_id(),
+                'numberposts' => -1,
+                'post_status' => $statuses,
+                'orderby'     => 'ID',
+                'order'       => 'ASC',
+                'post_type'   => 'wpi_invoice',
+            )
+        );
     }
 
     /**
@@ -843,7 +843,7 @@ 
      * @return int
      */
     public function get_total_payments() {
-		return getpaid_count_subscription_invoices( $this->get_parent_invoice_id(), $this->get_id() );
+        return getpaid_count_subscription_invoices( $this->get_parent_invoice_id(), $this->get_id() );
     }
 
     /**
@@ -867,192 +867,192 @@ 
      *
      * @since  2.4
      * @param  array $args Array of values for the payment, including amount and transaction ID
-	 * @param  WPInv_Invoice $invoice If adding an existing invoice.
+     * @param  WPInv_Invoice $invoice If adding an existing invoice.
      * @return bool
      */
     public function add_payment( $args = array(), $invoice = false ) {
 
-		// Process each payment once.
+        // Process each payment once.
         if ( ! empty( $args['transaction_id'] ) && $this->payment_exists( $args['transaction_id'] ) ) {
             return false;
         }
 
-		// Are we creating a new invoice?
-		if ( empty( $invoice ) ) {
-			$invoice = $this->create_payment( false );
+        // Are we creating a new invoice?
+        if ( empty( $invoice ) ) {
+            $invoice = $this->create_payment( false );
 
-			if ( empty( $invoice ) ) {
-				return false;
-			}
-		}
+            if ( empty( $invoice ) ) {
+                return false;
+            }
+        }
 
-		// Maybe set a transaction id.
-		if ( ! empty( $args['transaction_id'] ) ) {
-			$invoice->set_transaction_id( $args['transaction_id'] );
-		}
+        // Maybe set a transaction id.
+        if ( ! empty( $args['transaction_id'] ) ) {
+            $invoice->set_transaction_id( $args['transaction_id'] );
+        }
 
-		// Set the completed date.
-		$invoice->set_completed_date( current_time( 'mysql' ) );
+        // Set the completed date.
+        $invoice->set_completed_date( current_time( 'mysql' ) );
 
-		// And the gateway.
-		if ( ! empty( $args['gateway'] ) ) {
-			$invoice->set_gateway( $args['gateway'] );
-		}
+        // And the gateway.
+        if ( ! empty( $args['gateway'] ) ) {
+            $invoice->set_gateway( $args['gateway'] );
+        }
 
-		$invoice->set_status( 'wpi-renewal' );
-		$invoice->save();
+        $invoice->set_status( 'wpi-renewal' );
+        $invoice->save();
 
-		if ( ! $invoice->exists() ) {
-			return false;
-		}
+        if ( ! $invoice->exists() ) {
+            return false;
+        }
 
-		return $this->after_add_payment( $invoice );
-	}
+        return $this->after_add_payment( $invoice );
+    }
 
     public function after_add_payment( $invoice ) {
 
-		do_action( 'getpaid_after_create_subscription_renewal_invoice', $invoice, $this );
-		do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $this );
+        do_action( 'getpaid_after_create_subscription_renewal_invoice', $invoice, $this );
+        do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $this );
         do_action( 'wpinv_recurring_record_payment', $invoice->get_id(), $this->get_parent_invoice_id(), $invoice->get_recurring_total(), $invoice->get_transaction_id() );
 
         update_post_meta( $invoice->get_id(), '_wpinv_subscription_id', $this->id );
 
         return $invoice->get_id();
-	}
+    }
 
-	/**
+    /**
      * Creates a new invoice and returns it.
      *
      * @since  1.0.19
-	 * @param bool $save Whether we should save the invoice.
+     * @param bool $save Whether we should save the invoice.
      * @return WPInv_Invoice|bool
      */
     public function create_payment( $save = true ) {
 
-		$parent_invoice = $this->get_parent_payment();
-
-		if ( ! $parent_invoice->exists() ) {
-			return false;
-		}
-
-		// Duplicate the parent invoice.
-		$invoice = getpaid_duplicate_invoice( $parent_invoice );
-		$invoice->set_parent_id( $parent_invoice->get_id() );
-		$invoice->set_subscription_id( $this->get_id() );
-		$invoice->set_remote_subscription_id( $this->get_profile_id() );
-
-		// Set invoice items.
-		$subscription_group = getpaid_get_invoice_subscription_group( $parent_invoice->get_id(), $this->get_id() );
-		$allowed_items      = empty( $subscription_group ) ? array( $this->get_product_id() ) : array_keys( $subscription_group['items'] );
-		$invoice_items      = array();
-
-		foreach ( $invoice->get_items() as $item ) {
-			if ( in_array( $item->get_id(), $allowed_items ) ) {
-				$invoice_items[] = $item;
-			}
-		}
-
-		$invoice->set_items( $invoice_items );
-
-		if ( ! empty( $subscription_group['fees'] ) ) {
-			$invoice->set_fees( $subscription_group['fees'] );
-		}
-
-		// Maybe recalculate discount (Pre-GetPaid Fix).
-		$discount = new WPInv_Discount( $invoice->get_discount_code() );
-		if ( $discount->exists() && $discount->is_recurring() && 0 == $invoice->get_total_discount() ) {
-			$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
-		}
-
-		$invoice->recalculate_total();
-		$invoice->set_status( 'wpi-pending' );
-
-		if ( ! $save ) {
-			return $invoice;
-		}
-
-		$invoice->save();
-
-		return $invoice->exists() ? $invoice : false;
-    }
-
-	/**
-	 * Renews or completes a subscription
-	 *
-	 * @since  1.0.0
-	 * @return int The subscription's id
-	 */
-	public function renew( $calculate_from = null ) {
-
-		// Complete subscription if applicable
-		if ( $this->is_last_renewal() ) {
-			return $this->complete();
-		}
-
-		// Calculate new expiration
-		$frequency      = $this->get_frequency();
-		$period         = $this->get_period();
-		$calculate_from = empty( $calculate_from ) ? $this->get_expiration_time() : $calculate_from;
-		$new_expiration = strtotime( "+ $frequency $period", $calculate_from );
-
-		$this->set_expiration( date( 'Y-m-d H:i:s', $new_expiration ) );
-		$this->set_status( 'active' );
-		$this->save();
-
-		do_action( 'getpaid_subscription_renewed', $this );
-
-		return $this->get_id();
-	}
-
-	/**
-	 * Marks a subscription as completed
-	 *
-	 * Subscription is completed when the number of payments matches the billing_times field
-	 *
-	 * @since  1.0.0
-	 * @return int|bool Subscription id or false if the subscription is cancelled.
-	 */
-	public function complete() {
-
-		// Only mark a subscription as complete if it's not already cancelled.
-		if ( $this->has_status( 'cancelled' ) ) {
-			return false;
-		}
-
-		$this->set_status( 'completed' );
-		return $this->save();
-
-	}
-
-	/**
-	 * Marks a subscription as expired
-	 *
-	 * @since  1.0.0
-	 * @param  bool $check_expiration
-	 * @return int|bool Subscription id or false if $check_expiration is true and expiration date is in the future.
-	 */
-	public function expire( $check_expiration = false ) {
-
-		if ( $check_expiration && $this->get_expiration_time() > current_time( 'timestamp' ) ) {
-			// Do not mark as expired since real expiration date is in the future
-			return false;
-		}
-
-		$this->set_status( 'expired' );
-		return $this->save();
-
-	}
-
-	/**
-	 * Marks a subscription as failing
-	 *
-	 * @since  2.4.2
-	 * @return int Subscription id.
-	 */
-	public function failing() {
-		$this->set_status( 'failing' );
-		return $this->save();
-	}
+        $parent_invoice = $this->get_parent_payment();
+
+        if ( ! $parent_invoice->exists() ) {
+            return false;
+        }
+
+        // Duplicate the parent invoice.
+        $invoice = getpaid_duplicate_invoice( $parent_invoice );
+        $invoice->set_parent_id( $parent_invoice->get_id() );
+        $invoice->set_subscription_id( $this->get_id() );
+        $invoice->set_remote_subscription_id( $this->get_profile_id() );
+
+        // Set invoice items.
+        $subscription_group = getpaid_get_invoice_subscription_group( $parent_invoice->get_id(), $this->get_id() );
+        $allowed_items      = empty( $subscription_group ) ? array( $this->get_product_id() ) : array_keys( $subscription_group['items'] );
+        $invoice_items      = array();
+
+        foreach ( $invoice->get_items() as $item ) {
+            if ( in_array( $item->get_id(), $allowed_items ) ) {
+                $invoice_items[] = $item;
+            }
+        }
+
+        $invoice->set_items( $invoice_items );
+
+        if ( ! empty( $subscription_group['fees'] ) ) {
+            $invoice->set_fees( $subscription_group['fees'] );
+        }
+
+        // Maybe recalculate discount (Pre-GetPaid Fix).
+        $discount = new WPInv_Discount( $invoice->get_discount_code() );
+        if ( $discount->exists() && $discount->is_recurring() && 0 == $invoice->get_total_discount() ) {
+            $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+        }
+
+        $invoice->recalculate_total();
+        $invoice->set_status( 'wpi-pending' );
+
+        if ( ! $save ) {
+            return $invoice;
+        }
+
+        $invoice->save();
+
+        return $invoice->exists() ? $invoice : false;
+    }
+
+    /**
+     * Renews or completes a subscription
+     *
+     * @since  1.0.0
+     * @return int The subscription's id
+     */
+    public function renew( $calculate_from = null ) {
+
+        // Complete subscription if applicable
+        if ( $this->is_last_renewal() ) {
+            return $this->complete();
+        }
+
+        // Calculate new expiration
+        $frequency      = $this->get_frequency();
+        $period         = $this->get_period();
+        $calculate_from = empty( $calculate_from ) ? $this->get_expiration_time() : $calculate_from;
+        $new_expiration = strtotime( "+ $frequency $period", $calculate_from );
+
+        $this->set_expiration( date( 'Y-m-d H:i:s', $new_expiration ) );
+        $this->set_status( 'active' );
+        $this->save();
+
+        do_action( 'getpaid_subscription_renewed', $this );
+
+        return $this->get_id();
+    }
+
+    /**
+     * Marks a subscription as completed
+     *
+     * Subscription is completed when the number of payments matches the billing_times field
+     *
+     * @since  1.0.0
+     * @return int|bool Subscription id or false if the subscription is cancelled.
+     */
+    public function complete() {
+
+        // Only mark a subscription as complete if it's not already cancelled.
+        if ( $this->has_status( 'cancelled' ) ) {
+            return false;
+        }
+
+        $this->set_status( 'completed' );
+        return $this->save();
+
+    }
+
+    /**
+     * Marks a subscription as expired
+     *
+     * @since  1.0.0
+     * @param  bool $check_expiration
+     * @return int|bool Subscription id or false if $check_expiration is true and expiration date is in the future.
+     */
+    public function expire( $check_expiration = false ) {
+
+        if ( $check_expiration && $this->get_expiration_time() > current_time( 'timestamp' ) ) {
+            // Do not mark as expired since real expiration date is in the future
+            return false;
+        }
+
+        $this->set_status( 'expired' );
+        return $this->save();
+
+    }
+
+    /**
+     * Marks a subscription as failing
+     *
+     * @since  2.4.2
+     * @return int Subscription id.
+     */
+    public function failing() {
+        $this->set_status( 'failing' );
+        return $this->save();
+    }
 
     /**
      * Marks a subscription as cancelled
@@ -1061,19 +1061,19 @@ 
      * @return int Subscription id.
      */
     public function cancel() {
-		$this->set_status( 'cancelled' );
-		return $this->save();
+        $this->set_status( 'cancelled' );
+        return $this->save();
     }
 
-	/**
-	 * Determines if a subscription can be cancelled both locally and with a payment processor.
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function can_cancel() {
-		return apply_filters( 'wpinv_subscription_can_cancel', $this->has_status( $this->get_cancellable_statuses() ), $this );
-	}
+    /**
+     * Determines if a subscription can be cancelled both locally and with a payment processor.
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function can_cancel() {
+        return apply_filters( 'wpinv_subscription_can_cancel', $this->has_status( $this->get_cancellable_statuses() ), $this );
+    }
 
     /**
      * Returns an array of subscription statuses that can be cancelled
@@ -1086,109 +1086,109 @@ 
         return apply_filters( 'wpinv_recurring_cancellable_statuses', array( 'active', 'trialling', 'failing' ) );
     }
 
-	/**
-	 * Retrieves the URL to cancel subscription
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_cancel_url() {
-		$url = getpaid_get_authenticated_action_url( 'subscription_cancel', $this->get_view_url() );
-		return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
-	}
-
-	/**
-	 * Retrieves the URL to view a subscription
-	 *
-	 * @since  1.0.19
-	 * @return string
-	 */
-	public function get_view_url() {
-
-		$url = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
-		$url = add_query_arg( 'subscription', $this->get_id(), $url );
-
-		return apply_filters( 'getpaid_get_subscription_view_url', $url, $this );
-	}
-
-	/**
-	 * Determines if subscription can be manually renewed
-	 *
-	 * This method is filtered by payment gateways in order to return true on subscriptions
-	 * that can be renewed manually
-	 *
-	 * @since  2.5
-	 * @return bool
-	 */
-	public function can_renew() {
-		return apply_filters( 'wpinv_subscription_can_renew', true, $this );
-	}
-
-	/**
-	 * Retrieves the URL to renew a subscription
-	 *
-	 * @since  2.5
-	 * @return string
-	 */
-	public function get_renew_url() {
-		$url = wp_nonce_url(
+    /**
+     * Retrieves the URL to cancel subscription
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_cancel_url() {
+        $url = getpaid_get_authenticated_action_url( 'subscription_cancel', $this->get_view_url() );
+        return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+    }
+
+    /**
+     * Retrieves the URL to view a subscription
+     *
+     * @since  1.0.19
+     * @return string
+     */
+    public function get_view_url() {
+
+        $url = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
+        $url = add_query_arg( 'subscription', $this->get_id(), $url );
+
+        return apply_filters( 'getpaid_get_subscription_view_url', $url, $this );
+    }
+
+    /**
+     * Determines if subscription can be manually renewed
+     *
+     * This method is filtered by payment gateways in order to return true on subscriptions
+     * that can be renewed manually
+     *
+     * @since  2.5
+     * @return bool
+     */
+    public function can_renew() {
+        return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+    }
+
+    /**
+     * Retrieves the URL to renew a subscription
+     *
+     * @since  2.5
+     * @return string
+     */
+    public function get_renew_url() {
+        $url = wp_nonce_url(
             add_query_arg(
                 array(
-					'getpaid-action' => 'renew_subscription',
-					'sub_id'         => $this->get_id,
+                    'getpaid-action' => 'renew_subscription',
+                    'sub_id'         => $this->get_id,
                 )
             ),
             'getpaid-nonce'
         );
-		return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
-	}
-
-	/**
-	 * Determines if subscription can have their payment method updated
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function can_update() {
-		return apply_filters( 'wpinv_subscription_can_update', false, $this );
-	}
-
-	/**
-	 * Retrieves the URL to update subscription
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_update_url() {
-		$url = add_query_arg(
+        return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
+    }
+
+    /**
+     * Determines if subscription can have their payment method updated
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function can_update() {
+        return apply_filters( 'wpinv_subscription_can_update', false, $this );
+    }
+
+    /**
+     * Retrieves the URL to update subscription
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_update_url() {
+        $url = add_query_arg(
             array(
-				'action'          => 'update',
-				'subscription_id' => $this->get_id(),
+                'action'          => 'update',
+                'subscription_id' => $this->get_id(),
             )
         );
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
-	}
-
-	/**
-	 * Retrieves the subscription status label
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_status_label() {
-		return getpaid_get_subscription_status_label( $this->get_status() );
-	}
-
-	/**
-	 * Retrieves the subscription status class
-	 *
-	 * @since  1.0.19
-	 * @return string
-	 */
-	public function get_status_class() {
-		$statuses = getpaid_get_subscription_status_classes();
-		return isset( $statuses[ $this->get_status() ] ) ? $statuses[ $this->get_status() ] : 'bg-dark';
-	}
+        return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+    }
+
+    /**
+     * Retrieves the subscription status label
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_status_label() {
+        return getpaid_get_subscription_status_label( $this->get_status() );
+    }
+
+    /**
+     * Retrieves the subscription status class
+     *
+     * @since  1.0.19
+     * @return string
+     */
+    public function get_status_class() {
+        $statuses = getpaid_get_subscription_status_classes();
+        return isset( $statuses[ $this->get_status() ] ) ? $statuses[ $this->get_status() ] : 'bg-dark';
+    }
 
     /**
      * Retrieves the subscription status label
@@ -1198,11 +1198,11 @@ 
      */
     public function get_status_label_html() {
 
-		$status_label = sanitize_text_field( $this->get_status_label() );
-		$class        = esc_attr( $this->get_status_class() );
-		$status       = sanitize_html_class( $this->get_status() );
+        $status_label = sanitize_text_field( $this->get_status_label() );
+        $class        = esc_attr( $this->get_status_class() );
+        $status       = sanitize_html_class( $this->get_status() );
 
-		return "<span class='bsui'><span class='badge $class $status'>$status_label</span></span>";
+        return "<span class='bsui'><span class='badge $class $status'>$status_label</span></span>";
     }
 
     /**
@@ -1213,75 +1213,75 @@ 
      * @return bool
      */
     public function payment_exists( $txn_id = '' ) {
-		$invoice_id = WPInv_Invoice::get_invoice_id_by_field( $txn_id, 'transaction_id' );
+        $invoice_id = WPInv_Invoice::get_invoice_id_by_field( $txn_id, 'transaction_id' );
         return ! empty( $invoice_id );
-	}
-
-	/**
-	 * Handle the status transition.
-	 */
-	protected function status_transition() {
-		$status_transition = $this->status_transition;
-
-		// Reset status transition variable.
-		$this->status_transition = false;
-
-		if ( $status_transition ) {
-			try {
-
-				// Fire a hook for the status change.
-				do_action( 'wpinv_subscription_' . $status_transition['to'], $this->get_id(), $this, $status_transition );
-				do_action( 'getpaid_subscription_' . $status_transition['to'], $this, $status_transition );
-
-				if ( ! empty( $status_transition['from'] ) ) {
-
-					/* translators: 1: old subscription status 2: new subscription status */
-					$transition_note = sprintf( __( 'Subscription status changed from %1$s to %2$s.', 'invoicing' ), getpaid_get_subscription_status_label( $status_transition['from'] ), getpaid_get_subscription_status_label( $status_transition['to'] ) );
-
-					// Note the transition occurred.
-					$this->get_parent_payment()->add_note( $transition_note, false, false, true );
-
-					// Fire another hook.
-					do_action( 'getpaid_subscription_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this->get_id(), $this );
-					do_action( 'getpaid_subscription_status_changed', $this, $status_transition['from'], $status_transition['to'] );
-
-				} else {
-					/* translators: %s: new invoice status */
-					$transition_note = sprintf( __( 'Subscription status set to %s.', 'invoicing' ), getpaid_get_subscription_status_label( $status_transition['to'] ) );
-
-					// Note the transition occurred.
-					$this->get_parent_payment()->add_note( $transition_note, false, false, true );
-
-				}
-			} catch ( Exception $e ) {
-				$this->get_parent_payment()->add_note( __( 'Error during subscription status transition.', 'invoicing' ) . ' ' . $e->getMessage() );
-			}
-		}
-
-	}
-
-	/**
-	 * Save data to the database.
-	 *
-	 * @since 1.0.19
-	 * @return int subscription ID
-	 */
-	public function save() {
-		parent::save();
-		$this->status_transition();
-		return $this->get_id();
-	}
-
-	/**
-	 * Activates a subscription.
-	 *
-	 * @since 1.0.19
-	 * @return int subscription ID
-	 */
-	public function activate() {
-		$status = $this->has_trial_period() && 'trialling' === $this->get_status() ? 'trialling' : 'active';
-		$this->set_status( $status );
-		return $this->save();
-	}
+    }
+
+    /**
+     * Handle the status transition.
+     */
+    protected function status_transition() {
+        $status_transition = $this->status_transition;
+
+        // Reset status transition variable.
+        $this->status_transition = false;
+
+        if ( $status_transition ) {
+            try {
+
+                // Fire a hook for the status change.
+                do_action( 'wpinv_subscription_' . $status_transition['to'], $this->get_id(), $this, $status_transition );
+                do_action( 'getpaid_subscription_' . $status_transition['to'], $this, $status_transition );
+
+                if ( ! empty( $status_transition['from'] ) ) {
+
+                    /* translators: 1: old subscription status 2: new subscription status */
+                    $transition_note = sprintf( __( 'Subscription status changed from %1$s to %2$s.', 'invoicing' ), getpaid_get_subscription_status_label( $status_transition['from'] ), getpaid_get_subscription_status_label( $status_transition['to'] ) );
+
+                    // Note the transition occurred.
+                    $this->get_parent_payment()->add_note( $transition_note, false, false, true );
+
+                    // Fire another hook.
+                    do_action( 'getpaid_subscription_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this->get_id(), $this );
+                    do_action( 'getpaid_subscription_status_changed', $this, $status_transition['from'], $status_transition['to'] );
+
+                } else {
+                    /* translators: %s: new invoice status */
+                    $transition_note = sprintf( __( 'Subscription status set to %s.', 'invoicing' ), getpaid_get_subscription_status_label( $status_transition['to'] ) );
+
+                    // Note the transition occurred.
+                    $this->get_parent_payment()->add_note( $transition_note, false, false, true );
+
+                }
+            } catch ( Exception $e ) {
+                $this->get_parent_payment()->add_note( __( 'Error during subscription status transition.', 'invoicing' ) . ' ' . $e->getMessage() );
+            }
+        }
+
+    }
+
+    /**
+     * Save data to the database.
+     *
+     * @since 1.0.19
+     * @return int subscription ID
+     */
+    public function save() {
+        parent::save();
+        $this->status_transition();
+        return $this->get_id();
+    }
+
+    /**
+     * Activates a subscription.
+     *
+     * @since 1.0.19
+     * @return int subscription ID
+     */
+    public function activate() {
+        $status = $this->has_trial_period() && 'trialling' === $this->get_status() ? 'trialling' : 'active';
+        $this->set_status( $status );
+        return $this->save();
+    }
 
 }

Spacing +234 added lines, -234 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The Subscription Class
@@ -68,27 +68,27 @@ 
 	 * @param  int|string|object|WPInv_Subscription $subscription Subscription id, profile_id, or object to read.
 	 * @param  bool $deprecated
 	 */
-	function __construct( $subscription = 0, $deprecated = false ) {
+	function __construct($subscription = 0, $deprecated = false) {
 
-		parent::__construct( $subscription );
+		parent::__construct($subscription);
 
-		if ( ! $deprecated && ! empty( $subscription ) && is_numeric( $subscription ) ) {
-			$this->set_id( $subscription );
-		} elseif ( $subscription instanceof self ) {
-			$this->set_id( $subscription->get_id() );
-		} elseif ( $deprecated && $subscription_id = self::get_subscription_id_by_field( $subscription, 'profile_id' ) ) {
-			$this->set_id( $subscription_id );
-		} elseif ( ! empty( $subscription->id ) ) {
-			$this->set_id( $subscription->id );
+		if (!$deprecated && !empty($subscription) && is_numeric($subscription)) {
+			$this->set_id($subscription);
+		} elseif ($subscription instanceof self) {
+			$this->set_id($subscription->get_id());
+		} elseif ($deprecated && $subscription_id = self::get_subscription_id_by_field($subscription, 'profile_id')) {
+			$this->set_id($subscription_id);
+		} elseif (!empty($subscription->id)) {
+			$this->set_id($subscription->id);
 		} else {
-			$this->set_object_read( true );
+			$this->set_object_read(true);
 		}
 
 		// Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+		$this->data_store = GetPaid_Data_Store::load($this->data_store_name);
 
-		if ( $this->get_id() > 0 ) {
-			$this->data_store->read( $this );
+		if ($this->get_id() > 0) {
+			$this->data_store->read($this);
 		}
 
 	}
@@ -103,17 +103,17 @@ 
 	 * @since 1.0.19
 	 * @return int
 	 */
-	public static function get_subscription_id_by_field( $value, $field = 'profile_id' ) {
+	public static function get_subscription_id_by_field($value, $field = 'profile_id') {
         global $wpdb;
 
 		// Trim the value.
-		$value = trim( $value );
+		$value = trim($value);
 
-		if ( empty( $value ) ) {
+		if (empty($value)) {
 			return 0;
 		}
 
-		if ( 'invoice_id' == $field ) {
+		if ('invoice_id' == $field) {
 			$field = 'parent_payment_id';
 		}
 
@@ -125,28 +125,28 @@ 
 		);
 
 		// Ensure a field has been passed.
-		if ( empty( $field ) || ! in_array( $field, $fields ) ) {
+		if (empty($field) || !in_array($field, $fields)) {
 			return 0;
 		}
 
 		// Maybe retrieve from the cache.
-		$subscription_id   = wp_cache_get( $value, "getpaid_subscription_{$field}s_to_subscription_ids" );
-		if ( ! empty( $subscription_id ) ) {
+		$subscription_id = wp_cache_get($value, "getpaid_subscription_{$field}s_to_subscription_ids");
+		if (!empty($subscription_id)) {
 			return $subscription_id;
 		}
 
         // Fetch from the db.
         $table            = $wpdb->prefix . 'wpinv_subscriptions';
         $subscription_id  = (int) $wpdb->get_var(
-            $wpdb->prepare( "SELECT `id` FROM $table WHERE `$field`=%s LIMIT 1", $value )
+            $wpdb->prepare("SELECT `id` FROM $table WHERE `$field`=%s LIMIT 1", $value)
         );
 
-		if ( empty( $subscription_id ) ) {
+		if (empty($subscription_id)) {
 			return 0;
 		}
 
 		// Update the cache with our data.
-		wp_cache_set( $value, $subscription_id, "getpaid_subscription_{$field}s_to_subscription_ids" );
+		wp_cache_set($value, $subscription_id, "getpaid_subscription_{$field}s_to_subscription_ids");
 
 		return $subscription_id;
 	}
@@ -162,9 +162,9 @@ 
 			'getpaid_subscriptions'                                       => $this->get_id(),
 		);
 
-		foreach ( $caches as $cache => $value ) {
-			if ( '' !== $value && false !== $value ) {
-				wp_cache_delete( $value, $cache );
+		foreach ($caches as $cache => $value) {
+			if ('' !== $value && false !== $value) {
+				wp_cache_delete($value, $cache);
 			}
 		}
 	}
@@ -172,8 +172,8 @@ 
 	/**
      * Checks if a subscription key is set.
      */
-    public function _isset( $key ) {
-        return isset( $this->data[ $key ] ) || method_exists( $this, "get_$key" );
+    public function _isset($key) {
+        return isset($this->data[$key]) || method_exists($this, "get_$key");
 	}
 
 	/*
@@ -198,8 +198,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_customer_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'customer_id', $context );
+	public function get_customer_id($context = 'view') {
+		return (int) $this->get_prop('customer_id', $context);
 	}
 
 	/**
@@ -209,8 +209,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return WP_User|false WP_User object on success, false on failure.
 	 */
-	public function get_customer( $context = 'view' ) {
-		return get_userdata( $this->get_customer_id( $context ) );
+	public function get_customer($context = 'view') {
+		return get_userdata($this->get_customer_id($context));
 	}
 
 	/**
@@ -220,8 +220,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_parent_invoice_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'parent_payment_id', $context );
+	public function get_parent_invoice_id($context = 'view') {
+		return (int) $this->get_prop('parent_payment_id', $context);
 	}
 
 	/**
@@ -231,8 +231,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-    public function get_parent_payment_id( $context = 'view' ) {
-        return $this->get_parent_invoice_id( $context );
+    public function get_parent_payment_id($context = 'view') {
+        return $this->get_parent_invoice_id($context);
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
      * @since  1.0.0
      * @return int
      */
-    public function get_original_payment_id( $context = 'view' ) {
-        return $this->get_parent_invoice_id( $context );
+    public function get_original_payment_id($context = 'view') {
+        return $this->get_parent_invoice_id($context);
     }
 
 	/**
@@ -252,8 +252,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return WPInv_Invoice
 	 */
-	public function get_parent_invoice( $context = 'view' ) {
-		return new WPInv_Invoice( $this->get_parent_invoice_id( $context ) );
+	public function get_parent_invoice($context = 'view') {
+		return new WPInv_Invoice($this->get_parent_invoice_id($context));
 	}
 
 	/**
@@ -263,8 +263,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return WPInv_Invoice
 	 */
-    public function get_parent_payment( $context = 'view' ) {
-        return $this->get_parent_invoice( $context );
+    public function get_parent_payment($context = 'view') {
+        return $this->get_parent_invoice($context);
 	}
 
 	/**
@@ -274,8 +274,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_product_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'product_id', $context );
+	public function get_product_id($context = 'view') {
+		return (int) $this->get_prop('product_id', $context);
 	}
 
 	/**
@@ -285,8 +285,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return WPInv_Item
 	 */
-	public function get_product( $context = 'view' ) {
-		return new WPInv_Item( $this->get_product_id( $context ) );
+	public function get_product($context = 'view') {
+		return new WPInv_Item($this->get_product_id($context));
 	}
 
 	/**
@@ -298,8 +298,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_gateway( $context = 'view' ) {
-		return $this->get_parent_invoice( $context )->get_gateway();
+	public function get_gateway($context = 'view') {
+		return $this->get_parent_invoice($context)->get_gateway();
 	}
 
 	/**
@@ -309,8 +309,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_period( $context = 'view' ) {
-		return $this->get_prop( 'period', $context );
+	public function get_period($context = 'view') {
+		return $this->get_prop('period', $context);
 	}
 
 	/**
@@ -320,8 +320,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_frequency( $context = 'view' ) {
-		return (int) $this->get_prop( 'frequency', $context );
+	public function get_frequency($context = 'view') {
+		return (int) $this->get_prop('frequency', $context);
 	}
 
 	/**
@@ -331,8 +331,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_initial_amount( $context = 'view' ) {
-		return (float) wpinv_sanitize_amount( $this->get_prop( 'initial_amount', $context ) );
+	public function get_initial_amount($context = 'view') {
+		return (float) wpinv_sanitize_amount($this->get_prop('initial_amount', $context));
 	}
 
 	/**
@@ -342,8 +342,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_recurring_amount( $context = 'view' ) {
-		return (float) wpinv_sanitize_amount( $this->get_prop( 'recurring_amount', $context ) );
+	public function get_recurring_amount($context = 'view') {
+		return (float) wpinv_sanitize_amount($this->get_prop('recurring_amount', $context));
 	}
 
 	/**
@@ -353,8 +353,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_bill_times( $context = 'view' ) {
-		return (int) $this->get_prop( 'bill_times', $context );
+	public function get_bill_times($context = 'view') {
+		return (int) $this->get_prop('bill_times', $context);
 	}
 
 	/**
@@ -364,8 +364,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_transaction_id( $context = 'view' ) {
-		return $this->get_prop( 'transaction_id', $context );
+	public function get_transaction_id($context = 'view') {
+		return $this->get_prop('transaction_id', $context);
 	}
 
 	/**
@@ -375,8 +375,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_created( $context = 'view' ) {
-		return $this->get_prop( 'created', $context );
+	public function get_created($context = 'view') {
+		return $this->get_prop('created', $context);
 	}
 
 	/**
@@ -386,8 +386,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_created( $context );
+	public function get_date_created($context = 'view') {
+		return $this->get_created($context);
 	}
 
 	/**
@@ -398,7 +398,7 @@ 
 	 */
 	public function get_time_created() {
 		$created = $this->get_date_created();
-		return empty( $created ) ? current_time( 'timestamp' ) : strtotime( $created, current_time( 'timestamp' ) );
+		return empty($created) ? current_time('timestamp') : strtotime($created, current_time('timestamp'));
 	}
 
 	/**
@@ -408,11 +408,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created_gmt( $context = 'view' ) {
-        $date = $this->get_date_created( $context );
+	public function get_date_created_gmt($context = 'view') {
+        $date = $this->get_date_created($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
 	}
@@ -424,8 +424,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_next_renewal_date( $context = 'view' ) {
-		return $this->get_prop( 'expiration', $context );
+	public function get_next_renewal_date($context = 'view') {
+		return $this->get_prop('expiration', $context);
 	}
 
 	/**
@@ -435,8 +435,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_expiration( $context = 'view' ) {
-		return $this->get_next_renewal_date( $context );
+	public function get_expiration($context = 'view') {
+		return $this->get_next_renewal_date($context);
 	}
 
 	/**
@@ -448,12 +448,12 @@ 
 	public function get_expiration_time() {
 		$expiration = $this->get_expiration();
 
-		if ( empty( $expiration ) || '0000-00-00 00:00:00' == $expiration ) {
-			return current_time( 'timestamp' );
+		if (empty($expiration) || '0000-00-00 00:00:00' == $expiration) {
+			return current_time('timestamp');
 		}
 
-		$expiration = strtotime( $expiration, current_time( 'timestamp' ) );
-		return $expiration < current_time( 'timestamp' ) ? current_time( 'timestamp' ) : $expiration;
+		$expiration = strtotime($expiration, current_time('timestamp'));
+		return $expiration < current_time('timestamp') ? current_time('timestamp') : $expiration;
 	}
 
 	/**
@@ -463,11 +463,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_next_renewal_date_gmt( $context = 'view' ) {
-        $date = $this->get_next_renewal_date( $context );
+	public function get_next_renewal_date_gmt($context = 'view') {
+        $date = $this->get_next_renewal_date($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
 	}
@@ -479,8 +479,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_trial_period( $context = 'view' ) {
-		return $this->get_prop( 'trial_period', $context );
+	public function get_trial_period($context = 'view') {
+		return $this->get_prop('trial_period', $context);
 	}
 
 	/**
@@ -490,8 +490,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
+	public function get_status($context = 'view') {
+		return $this->get_prop('status', $context);
 	}
 
 	/**
@@ -501,8 +501,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_profile_id( $context = 'view' ) {
-		return $this->get_prop( 'profile_id', $context );
+	public function get_profile_id($context = 'view') {
+		return $this->get_prop('profile_id', $context);
 	}
 
 	/*
@@ -517,8 +517,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The customer's id.
 	 */
-	public function set_customer_id( $value ) {
-		$this->set_prop( 'customer_id', (int) $value );
+	public function set_customer_id($value) {
+		$this->set_prop('customer_id', (int) $value);
 	}
 
 	/**
@@ -527,8 +527,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The parent invoice id.
 	 */
-	public function set_parent_invoice_id( $value ) {
-		$this->set_prop( 'parent_payment_id', (int) $value );
+	public function set_parent_invoice_id($value) {
+		$this->set_prop('parent_payment_id', (int) $value);
 	}
 
 	/**
@@ -537,8 +537,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The parent invoice id.
 	 */
-    public function set_parent_payment_id( $value ) {
-        $this->set_parent_invoice_id( $value );
+    public function set_parent_payment_id($value) {
+        $this->set_parent_invoice_id($value);
 	}
 
 	/**
@@ -547,8 +547,8 @@ 
      * @since 1.0.19
 	 * @param  int $value The parent invoice id.
      */
-    public function set_original_payment_id( $value ) {
-        $this->set_parent_invoice_id( $value );
+    public function set_original_payment_id($value) {
+        $this->set_parent_invoice_id($value);
 	}
 
 	/**
@@ -557,8 +557,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The subscription product id.
 	 */
-	public function set_product_id( $value ) {
-		$this->set_prop( 'product_id', (int) $value );
+	public function set_product_id($value) {
+		$this->set_prop('product_id', (int) $value);
 	}
 
 	/**
@@ -567,8 +567,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value The renewal period.
 	 */
-	public function set_period( $value ) {
-		$this->set_prop( 'period', $value );
+	public function set_period($value) {
+		$this->set_prop('period', $value);
 	}
 
 	/**
@@ -577,9 +577,9 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The subscription frequency.
 	 */
-	public function set_frequency( $value ) {
-		$value = empty( $value ) ? 1 : (int) $value;
-		$this->set_prop( 'frequency', absint( $value ) );
+	public function set_frequency($value) {
+		$value = empty($value) ? 1 : (int) $value;
+		$this->set_prop('frequency', absint($value));
 	}
 
 	/**
@@ -588,8 +588,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value The initial subcription amount.
 	 */
-	public function set_initial_amount( $value ) {
-		$this->set_prop( 'initial_amount', wpinv_sanitize_amount( $value ) );
+	public function set_initial_amount($value) {
+		$this->set_prop('initial_amount', wpinv_sanitize_amount($value));
 	}
 
 	/**
@@ -598,8 +598,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value The recurring subcription amount.
 	 */
-	public function set_recurring_amount( $value ) {
-		$this->set_prop( 'recurring_amount', wpinv_sanitize_amount( $value ) );
+	public function set_recurring_amount($value) {
+		$this->set_prop('recurring_amount', wpinv_sanitize_amount($value));
 	}
 
 	/**
@@ -608,8 +608,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value Bill times.
 	 */
-	public function set_bill_times( $value ) {
-		$this->set_prop( 'bill_times', (int) $value );
+	public function set_bill_times($value) {
+		$this->set_prop('bill_times', (int) $value);
 	}
 
 	/**
@@ -618,8 +618,8 @@ 
 	 * @since 1.0.19
 	 * @param string $value Bill times.
 	 */
-	public function set_transaction_id( $value ) {
-		$this->set_prop( 'transaction_id', sanitize_text_field( $value ) );
+	public function set_transaction_id($value) {
+		$this->set_prop('transaction_id', sanitize_text_field($value));
 	}
 
 	/**
@@ -628,15 +628,15 @@ 
 	 * @since 1.0.19
 	 * @param string $value strtotime compliant date.
 	 */
-	public function set_created( $value ) {
-        $date = strtotime( $value );
+	public function set_created($value) {
+        $date = strtotime($value);
 
-        if ( $date && $value !== '0000-00-00 00:00:00' ) {
-            $this->set_prop( 'created', gmdate( 'Y-m-d H:i:s', $date ) );
+        if ($date && $value !== '0000-00-00 00:00:00') {
+            $this->set_prop('created', gmdate('Y-m-d H:i:s', $date));
             return;
         }
 
-		$this->set_prop( 'created', '' );
+		$this->set_prop('created', '');
 
 	}
 
@@ -646,8 +646,8 @@ 
 	 * @since 1.0.19
 	 * @param string $value strtotime compliant date.
 	 */
-	public function set_date_created( $value ) {
-		$this->set_created( $value );
+	public function set_date_created($value) {
+		$this->set_created($value);
     }
 
 	/**
@@ -656,15 +656,15 @@ 
 	 * @since 1.0.19
 	 * @param string $value strtotime compliant date.
 	 */
-	public function set_next_renewal_date( $value ) {
-		$date = strtotime( $value );
+	public function set_next_renewal_date($value) {
+		$date = strtotime($value);
 
-        if ( $date && $value !== '0000-00-00 00:00:00' ) {
-            $this->set_prop( 'expiration', gmdate( 'Y-m-d H:i:s', $date ) );
+        if ($date && $value !== '0000-00-00 00:00:00') {
+            $this->set_prop('expiration', gmdate('Y-m-d H:i:s', $date));
             return;
 		}
 
-		$this->set_prop( 'expiration', '' );
+		$this->set_prop('expiration', '');
 
 	}
 
@@ -674,8 +674,8 @@ 
 	 * @since 1.0.19
 	 * @param string $value strtotime compliant date.
 	 */
-	public function set_expiration( $value ) {
-		$this->set_next_renewal_date( $value );
+	public function set_expiration($value) {
+		$this->set_next_renewal_date($value);
     }
 
 	/**
@@ -684,8 +684,8 @@ 
 	 * @since 1.0.19
 	 * @param string $value trial period e.g 1 year.
 	 */
-	public function set_trial_period( $value ) {
-		$this->set_prop( 'trial_period', $value );
+	public function set_trial_period($value) {
+		$this->set_prop('trial_period', $value);
 	}
 
 	/**
@@ -694,22 +694,22 @@ 
 	 * @since 1.0.19
 	 * @param string $new_status    New subscription status.
 	 */
-	public function set_status( $new_status ) {
+	public function set_status($new_status) {
 
 		// Abort if this is not a valid status;
-		if ( ! array_key_exists( $new_status, getpaid_get_subscription_statuses() ) ) {
+		if (!array_key_exists($new_status, getpaid_get_subscription_statuses())) {
 			return;
 		}
 
-		$old_status = ! empty( $this->status_transition['from'] ) ? $this->status_transition['from'] : $this->get_status();
-		if ( true === $this->object_read && $old_status !== $new_status ) {
+		$old_status = !empty($this->status_transition['from']) ? $this->status_transition['from'] : $this->get_status();
+		if (true === $this->object_read && $old_status !== $new_status) {
 			$this->status_transition = array(
 				'from' => $old_status,
 				'to'   => $new_status,
 			);
 		}
 
-		$this->set_prop( 'status', $new_status );
+		$this->set_prop('status', $new_status);
 	}
 
 	/**
@@ -718,8 +718,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value the remote profile id.
 	 */
-	public function set_profile_id( $value ) {
-		$this->set_prop( 'profile_id', sanitize_text_field( $value ) );
+	public function set_profile_id($value) {
+		$this->set_prop('profile_id', sanitize_text_field($value));
 	}
 
 	/*
@@ -737,8 +737,8 @@ 
 	 * @param string|array String or array of strings to check for.
 	 * @return bool
      */
-    public function has_status( $status ) {
-        return in_array( $this->get_status(), wpinv_clean( wpinv_parse_list( $status ) ) );
+    public function has_status($status) {
+        return in_array($this->get_status(), wpinv_clean(wpinv_parse_list($status)));
 	}
 
 	/**
@@ -748,7 +748,7 @@ 
      */
     public function has_trial_period() {
 		$period = $this->get_trial_period();
-        return ! empty( $period );
+        return !empty($period);
 	}
 
 	/**
@@ -757,7 +757,7 @@ 
 	 * @return bool
 	 */
 	public function is_active() {
-		return $this->has_status( 'active trialling' ) && ! $this->is_expired();
+		return $this->has_status('active trialling') && !$this->is_expired();
 	}
 
 	/**
@@ -766,7 +766,7 @@ 
 	 * @return bool
 	 */
 	public function is_expired() {
-		return $this->has_status( 'expired' ) || ( $this->has_status( 'active cancelled trialling' ) && $this->get_expiration_time() < current_time( 'timestamp' ) );
+		return $this->has_status('expired') || ($this->has_status('active cancelled trialling') && $this->get_expiration_time() < current_time('timestamp'));
 	}
 
 	/**
@@ -776,7 +776,7 @@ 
 	 */
 	public function is_last_renewal() {
 		$max_bills = $this->get_bill_times();
-		return ! empty( $max_bills ) && $max_bills <= $this->get_times_billed();
+		return !empty($max_bills) && $max_bills <= $this->get_times_billed();
 	}
 
 	/*
@@ -791,11 +791,11 @@ 
 	/**
 	 * Backwards compatibilty.
 	 */
-	public function create( $data = array() ) {
+	public function create($data = array()) {
 
 		// Set the properties.
-		if ( is_array( $data ) ) {
-			$this->set_props( $data );
+		if (is_array($data)) {
+			$this->set_props($data);
 		}
 
 		// Save the item.
@@ -806,8 +806,8 @@ 
 	/**
 	 * Backwards compatibilty.
 	 */
-	public function update( $args = array() ) {
-		return $this->create( $args );
+	public function update($args = array()) {
+		return $this->create($args);
 	}
 
     /**
@@ -816,12 +816,12 @@ 
      * @since  1.0.0
      * @return WP_Post[]
      */
-    public function get_child_payments( $hide_pending = true ) {
+    public function get_child_payments($hide_pending = true) {
 
-		$statuses = array( 'publish', 'wpi-processing', 'wpi-renewal' );
+		$statuses = array('publish', 'wpi-processing', 'wpi-renewal');
 
-		if ( ! $hide_pending ) {
-			$statuses = array_keys( wpinv_get_invoice_statuses() );
+		if (!$hide_pending) {
+			$statuses = array_keys(wpinv_get_invoice_statuses());
 		}
 
         return get_posts(
@@ -843,7 +843,7 @@ 
      * @return int
      */
     public function get_total_payments() {
-		return getpaid_count_subscription_invoices( $this->get_parent_invoice_id(), $this->get_id() );
+		return getpaid_count_subscription_invoices($this->get_parent_invoice_id(), $this->get_id());
     }
 
     /**
@@ -855,7 +855,7 @@ 
     public function get_times_billed() {
         $times_billed = $this->get_total_payments();
 
-        if ( (float) $this->get_initial_amount() == 0 && $times_billed > 0 ) {
+        if ((float) $this->get_initial_amount() == 0 && $times_billed > 0) {
             $times_billed--;
         }
 
@@ -870,52 +870,52 @@ 
 	 * @param  WPInv_Invoice $invoice If adding an existing invoice.
      * @return bool
      */
-    public function add_payment( $args = array(), $invoice = false ) {
+    public function add_payment($args = array(), $invoice = false) {
 
 		// Process each payment once.
-        if ( ! empty( $args['transaction_id'] ) && $this->payment_exists( $args['transaction_id'] ) ) {
+        if (!empty($args['transaction_id']) && $this->payment_exists($args['transaction_id'])) {
             return false;
         }
 
 		// Are we creating a new invoice?
-		if ( empty( $invoice ) ) {
-			$invoice = $this->create_payment( false );
+		if (empty($invoice)) {
+			$invoice = $this->create_payment(false);
 
-			if ( empty( $invoice ) ) {
+			if (empty($invoice)) {
 				return false;
 			}
 		}
 
 		// Maybe set a transaction id.
-		if ( ! empty( $args['transaction_id'] ) ) {
-			$invoice->set_transaction_id( $args['transaction_id'] );
+		if (!empty($args['transaction_id'])) {
+			$invoice->set_transaction_id($args['transaction_id']);
 		}
 
 		// Set the completed date.
-		$invoice->set_completed_date( current_time( 'mysql' ) );
+		$invoice->set_completed_date(current_time('mysql'));
 
 		// And the gateway.
-		if ( ! empty( $args['gateway'] ) ) {
-			$invoice->set_gateway( $args['gateway'] );
+		if (!empty($args['gateway'])) {
+			$invoice->set_gateway($args['gateway']);
 		}
 
-		$invoice->set_status( 'wpi-renewal' );
+		$invoice->set_status('wpi-renewal');
 		$invoice->save();
 
-		if ( ! $invoice->exists() ) {
+		if (!$invoice->exists()) {
 			return false;
 		}
 
-		return $this->after_add_payment( $invoice );
+		return $this->after_add_payment($invoice);
 	}
 
-    public function after_add_payment( $invoice ) {
+    public function after_add_payment($invoice) {
 
-		do_action( 'getpaid_after_create_subscription_renewal_invoice', $invoice, $this );
-		do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $this );
-        do_action( 'wpinv_recurring_record_payment', $invoice->get_id(), $this->get_parent_invoice_id(), $invoice->get_recurring_total(), $invoice->get_transaction_id() );
+		do_action('getpaid_after_create_subscription_renewal_invoice', $invoice, $this);
+		do_action('wpinv_recurring_add_subscription_payment', $invoice, $this);
+        do_action('wpinv_recurring_record_payment', $invoice->get_id(), $this->get_parent_invoice_id(), $invoice->get_recurring_total(), $invoice->get_transaction_id());
 
-        update_post_meta( $invoice->get_id(), '_wpinv_subscription_id', $this->id );
+        update_post_meta($invoice->get_id(), '_wpinv_subscription_id', $this->id);
 
         return $invoice->get_id();
 	}
@@ -927,47 +927,47 @@ 
 	 * @param bool $save Whether we should save the invoice.
      * @return WPInv_Invoice|bool
      */
-    public function create_payment( $save = true ) {
+    public function create_payment($save = true) {
 
 		$parent_invoice = $this->get_parent_payment();
 
-		if ( ! $parent_invoice->exists() ) {
+		if (!$parent_invoice->exists()) {
 			return false;
 		}
 
 		// Duplicate the parent invoice.
-		$invoice = getpaid_duplicate_invoice( $parent_invoice );
-		$invoice->set_parent_id( $parent_invoice->get_id() );
-		$invoice->set_subscription_id( $this->get_id() );
-		$invoice->set_remote_subscription_id( $this->get_profile_id() );
+		$invoice = getpaid_duplicate_invoice($parent_invoice);
+		$invoice->set_parent_id($parent_invoice->get_id());
+		$invoice->set_subscription_id($this->get_id());
+		$invoice->set_remote_subscription_id($this->get_profile_id());
 
 		// Set invoice items.
-		$subscription_group = getpaid_get_invoice_subscription_group( $parent_invoice->get_id(), $this->get_id() );
-		$allowed_items      = empty( $subscription_group ) ? array( $this->get_product_id() ) : array_keys( $subscription_group['items'] );
+		$subscription_group = getpaid_get_invoice_subscription_group($parent_invoice->get_id(), $this->get_id());
+		$allowed_items      = empty($subscription_group) ? array($this->get_product_id()) : array_keys($subscription_group['items']);
 		$invoice_items      = array();
 
-		foreach ( $invoice->get_items() as $item ) {
-			if ( in_array( $item->get_id(), $allowed_items ) ) {
+		foreach ($invoice->get_items() as $item) {
+			if (in_array($item->get_id(), $allowed_items)) {
 				$invoice_items[] = $item;
 			}
 		}
 
-		$invoice->set_items( $invoice_items );
+		$invoice->set_items($invoice_items);
 
-		if ( ! empty( $subscription_group['fees'] ) ) {
-			$invoice->set_fees( $subscription_group['fees'] );
+		if (!empty($subscription_group['fees'])) {
+			$invoice->set_fees($subscription_group['fees']);
 		}
 
 		// Maybe recalculate discount (Pre-GetPaid Fix).
-		$discount = new WPInv_Discount( $invoice->get_discount_code() );
-		if ( $discount->exists() && $discount->is_recurring() && 0 == $invoice->get_total_discount() ) {
-			$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+		$discount = new WPInv_Discount($invoice->get_discount_code());
+		if ($discount->exists() && $discount->is_recurring() && 0 == $invoice->get_total_discount()) {
+			$invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
 		}
 
 		$invoice->recalculate_total();
-		$invoice->set_status( 'wpi-pending' );
+		$invoice->set_status('wpi-pending');
 
-		if ( ! $save ) {
+		if (!$save) {
 			return $invoice;
 		}
 
@@ -982,24 +982,24 @@ 
 	 * @since  1.0.0
 	 * @return int The subscription's id
 	 */
-	public function renew( $calculate_from = null ) {
+	public function renew($calculate_from = null) {
 
 		// Complete subscription if applicable
-		if ( $this->is_last_renewal() ) {
+		if ($this->is_last_renewal()) {
 			return $this->complete();
 		}
 
 		// Calculate new expiration
 		$frequency      = $this->get_frequency();
 		$period         = $this->get_period();
-		$calculate_from = empty( $calculate_from ) ? $this->get_expiration_time() : $calculate_from;
-		$new_expiration = strtotime( "+ $frequency $period", $calculate_from );
+		$calculate_from = empty($calculate_from) ? $this->get_expiration_time() : $calculate_from;
+		$new_expiration = strtotime("+ $frequency $period", $calculate_from);
 
-		$this->set_expiration( date( 'Y-m-d H:i:s', $new_expiration ) );
-		$this->set_status( 'active' );
+		$this->set_expiration(date('Y-m-d H:i:s', $new_expiration));
+		$this->set_status('active');
 		$this->save();
 
-		do_action( 'getpaid_subscription_renewed', $this );
+		do_action('getpaid_subscription_renewed', $this);
 
 		return $this->get_id();
 	}
@@ -1015,11 +1015,11 @@ 
 	public function complete() {
 
 		// Only mark a subscription as complete if it's not already cancelled.
-		if ( $this->has_status( 'cancelled' ) ) {
+		if ($this->has_status('cancelled')) {
 			return false;
 		}
 
-		$this->set_status( 'completed' );
+		$this->set_status('completed');
 		return $this->save();
 
 	}
@@ -1031,14 +1031,14 @@ 
 	 * @param  bool $check_expiration
 	 * @return int|bool Subscription id or false if $check_expiration is true and expiration date is in the future.
 	 */
-	public function expire( $check_expiration = false ) {
+	public function expire($check_expiration = false) {
 
-		if ( $check_expiration && $this->get_expiration_time() > current_time( 'timestamp' ) ) {
+		if ($check_expiration && $this->get_expiration_time() > current_time('timestamp')) {
 			// Do not mark as expired since real expiration date is in the future
 			return false;
 		}
 
-		$this->set_status( 'expired' );
+		$this->set_status('expired');
 		return $this->save();
 
 	}
@@ -1050,7 +1050,7 @@ 
 	 * @return int Subscription id.
 	 */
 	public function failing() {
-		$this->set_status( 'failing' );
+		$this->set_status('failing');
 		return $this->save();
 	}
 
@@ -1061,7 +1061,7 @@ 
      * @return int Subscription id.
      */
     public function cancel() {
-		$this->set_status( 'cancelled' );
+		$this->set_status('cancelled');
 		return $this->save();
     }
 
@@ -1072,7 +1072,7 @@ 
 	 * @return bool
 	 */
 	public function can_cancel() {
-		return apply_filters( 'wpinv_subscription_can_cancel', $this->has_status( $this->get_cancellable_statuses() ), $this );
+		return apply_filters('wpinv_subscription_can_cancel', $this->has_status($this->get_cancellable_statuses()), $this);
 	}
 
     /**
@@ -1083,7 +1083,7 @@ 
      * @return      array
      */
     public function get_cancellable_statuses() {
-        return apply_filters( 'wpinv_recurring_cancellable_statuses', array( 'active', 'trialling', 'failing' ) );
+        return apply_filters('wpinv_recurring_cancellable_statuses', array('active', 'trialling', 'failing'));
     }
 
 	/**
@@ -1093,8 +1093,8 @@ 
 	 * @return string
 	 */
 	public function get_cancel_url() {
-		$url = getpaid_get_authenticated_action_url( 'subscription_cancel', $this->get_view_url() );
-		return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+		$url = getpaid_get_authenticated_action_url('subscription_cancel', $this->get_view_url());
+		return apply_filters('wpinv_subscription_cancel_url', $url, $this);
 	}
 
 	/**
@@ -1105,10 +1105,10 @@ 
 	 */
 	public function get_view_url() {
 
-		$url = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
-		$url = add_query_arg( 'subscription', $this->get_id(), $url );
+		$url = getpaid_get_tab_url('gp-subscriptions', get_permalink((int) wpinv_get_option('invoice_subscription_page')));
+		$url = add_query_arg('subscription', $this->get_id(), $url);
 
-		return apply_filters( 'getpaid_get_subscription_view_url', $url, $this );
+		return apply_filters('getpaid_get_subscription_view_url', $url, $this);
 	}
 
 	/**
@@ -1121,7 +1121,7 @@ 
 	 * @return bool
 	 */
 	public function can_renew() {
-		return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+		return apply_filters('wpinv_subscription_can_renew', true, $this);
 	}
 
 	/**
@@ -1140,7 +1140,7 @@ 
             ),
             'getpaid-nonce'
         );
-		return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
+		return apply_filters('wpinv_subscription_renew_url', $url, $this);
 	}
 
 	/**
@@ -1150,7 +1150,7 @@ 
 	 * @return bool
 	 */
 	public function can_update() {
-		return apply_filters( 'wpinv_subscription_can_update', false, $this );
+		return apply_filters('wpinv_subscription_can_update', false, $this);
 	}
 
 	/**
@@ -1166,7 +1166,7 @@ 
 				'subscription_id' => $this->get_id(),
             )
         );
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+		return apply_filters('wpinv_subscription_update_url', $url, $this);
 	}
 
 	/**
@@ -1176,7 +1176,7 @@ 
 	 * @return string
 	 */
 	public function get_status_label() {
-		return getpaid_get_subscription_status_label( $this->get_status() );
+		return getpaid_get_subscription_status_label($this->get_status());
 	}
 
 	/**
@@ -1187,7 +1187,7 @@ 
 	 */
 	public function get_status_class() {
 		$statuses = getpaid_get_subscription_status_classes();
-		return isset( $statuses[ $this->get_status() ] ) ? $statuses[ $this->get_status() ] : 'bg-dark';
+		return isset($statuses[$this->get_status()]) ? $statuses[$this->get_status()] : 'bg-dark';
 	}
 
     /**
@@ -1198,9 +1198,9 @@ 
      */
     public function get_status_label_html() {
 
-		$status_label = sanitize_text_field( $this->get_status_label() );
-		$class        = esc_attr( $this->get_status_class() );
-		$status       = sanitize_html_class( $this->get_status() );
+		$status_label = sanitize_text_field($this->get_status_label());
+		$class        = esc_attr($this->get_status_class());
+		$status       = sanitize_html_class($this->get_status());
 
 		return "<span class='bsui'><span class='badge $class $status'>$status_label</span></span>";
     }
@@ -1212,9 +1212,9 @@ 
      * @param  string $txn_id The transaction ID from the merchant processor
      * @return bool
      */
-    public function payment_exists( $txn_id = '' ) {
-		$invoice_id = WPInv_Invoice::get_invoice_id_by_field( $txn_id, 'transaction_id' );
-        return ! empty( $invoice_id );
+    public function payment_exists($txn_id = '') {
+		$invoice_id = WPInv_Invoice::get_invoice_id_by_field($txn_id, 'transaction_id');
+        return !empty($invoice_id);
 	}
 
 	/**
@@ -1226,35 +1226,35 @@ 
 		// Reset status transition variable.
 		$this->status_transition = false;
 
-		if ( $status_transition ) {
+		if ($status_transition) {
 			try {
 
 				// Fire a hook for the status change.
-				do_action( 'wpinv_subscription_' . $status_transition['to'], $this->get_id(), $this, $status_transition );
-				do_action( 'getpaid_subscription_' . $status_transition['to'], $this, $status_transition );
+				do_action('wpinv_subscription_' . $status_transition['to'], $this->get_id(), $this, $status_transition);
+				do_action('getpaid_subscription_' . $status_transition['to'], $this, $status_transition);
 
-				if ( ! empty( $status_transition['from'] ) ) {
+				if (!empty($status_transition['from'])) {
 
 					/* translators: 1: old subscription status 2: new subscription status */
-					$transition_note = sprintf( __( 'Subscription status changed from %1$s to %2$s.', 'invoicing' ), getpaid_get_subscription_status_label( $status_transition['from'] ), getpaid_get_subscription_status_label( $status_transition['to'] ) );
+					$transition_note = sprintf(__('Subscription status changed from %1$s to %2$s.', 'invoicing'), getpaid_get_subscription_status_label($status_transition['from']), getpaid_get_subscription_status_label($status_transition['to']));
 
 					// Note the transition occurred.
-					$this->get_parent_payment()->add_note( $transition_note, false, false, true );
+					$this->get_parent_payment()->add_note($transition_note, false, false, true);
 
 					// Fire another hook.
-					do_action( 'getpaid_subscription_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this->get_id(), $this );
-					do_action( 'getpaid_subscription_status_changed', $this, $status_transition['from'], $status_transition['to'] );
+					do_action('getpaid_subscription_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this->get_id(), $this);
+					do_action('getpaid_subscription_status_changed', $this, $status_transition['from'], $status_transition['to']);
 
 				} else {
 					/* translators: %s: new invoice status */
-					$transition_note = sprintf( __( 'Subscription status set to %s.', 'invoicing' ), getpaid_get_subscription_status_label( $status_transition['to'] ) );
+					$transition_note = sprintf(__('Subscription status set to %s.', 'invoicing'), getpaid_get_subscription_status_label($status_transition['to']));
 
 					// Note the transition occurred.
-					$this->get_parent_payment()->add_note( $transition_note, false, false, true );
+					$this->get_parent_payment()->add_note($transition_note, false, false, true);
 
 				}
-			} catch ( Exception $e ) {
-				$this->get_parent_payment()->add_note( __( 'Error during subscription status transition.', 'invoicing' ) . ' ' . $e->getMessage() );
+			} catch (Exception $e) {
+				$this->get_parent_payment()->add_note(__('Error during subscription status transition.', 'invoicing') . ' ' . $e->getMessage());
 			}
 		}
 
@@ -1280,7 +1280,7 @@ 
 	 */
 	public function activate() {
 		$status = $this->has_trial_period() && 'trialling' === $this->get_status() ? 'trialling' : 'active';
-		$this->set_status( $status );
+		$this->set_status($status);
 		return $this->save();
 	}
 

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

Indentation +184 added lines, -184 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -15,196 +15,196 @@ 
  */
 class GetPaid_Customer_Data_Store {
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Method to create a new customer in the database.
-	 *
-	 * @param GetPaid_Customer $customer customer object.
-	 */
-	public function create( &$customer ) {
-		global $wpdb;
-
-		$values  = array();
-		$formats = array();
-
-		$fields = self::get_database_fields();
-		unset( $fields['id'] );
-
-		foreach ( $fields as $key => $format ) {
-			$values[ $key ] = $customer->get( $key, 'edit' );
-			$formats[]      = $format;
-		}
-
-		$result = $wpdb->insert( $wpdb->prefix . 'getpaid_customers', $values, $formats );
-
-		if ( $result ) {
-			$customer->set_id( $wpdb->insert_id );
-			$customer->apply_changes();
-			$customer->clear_cache();
-			do_action( 'getpaid_new_customer', $customer );
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Method to read a customer from the database.
-	 *
-	 * @param GetPaid_Customer $customer customer object.
-	 *
-	 */
-	public function read( &$customer ) {
-		global $wpdb;
-
-		$customer->set_defaults();
-
-		if ( ! $customer->get_id() ) {
-			$customer->last_error = 'Invalid customer.';
-			$customer->set_id( 0 );
-			return false;
-		}
-
-		// Maybe retrieve from the cache.
-		$raw_customer = wp_cache_get( $customer->get_id(), 'getpaid_customers' );
-
-		// If not found, retrieve from the db.
-		if ( false === $raw_customer ) {
-
-			$raw_customer = $wpdb->get_row(
-				$wpdb->prepare(
-					"SELECT * FROM {$wpdb->prefix}getpaid_customers WHERE id = %d",
-					$customer->get_id()
-				)
-			);
-
-			// Update the cache with our data
-			wp_cache_set( $customer->get_id(), $raw_customer, 'getpaid_customers' );
-
-		}
-
-		if ( ! $raw_customer ) {
-			$raw_customer->last_error = 'Invalid customer.';
-			return false;
-		}
-
-		// Loop through raw customer fields.
-		foreach ( (array) $raw_customer as $key => $value ) {
-			$customer->set( $key, $value );
-		}
-
-		$customer->set_object_read( true );
-		do_action( 'getpaid_read_customer', $customer );
-
-	}
-
-	/**
-	 * Method to update a customer in the database.
-	 *
-	 * @param GetPaid_Customer $customer Customer object.
-	 */
-	public function update( &$customer ) {
-		global $wpdb;
-
-		do_action( 'getpaid_before_update_customer', $customer, $customer->get_changes() );
-
-		$changes = $customer->get_changes();
-		$values  = array();
-		$format  = array();
-
-		foreach ( self::get_database_fields() as $key => $format ) {
-			if ( array_key_exists( $key, $changes ) ) {
-				$values[ $key ] = $customer->get( $key, 'edit' );
-				$formats[]      = $format;
-			}
-		}
-
-		if ( empty( $values ) ) {
-			return;
-		}
-
-		$wpdb->update(
-			$wpdb->prefix . 'getpaid_customers',
-			$values,
-			array(
-				'id' => $customer->get_id(),
-			),
-			$formats,
-			'%d'
-		);
-
-		// Apply the changes.
-		$customer->apply_changes();
-
-		// Delete cache.
-		$customer->clear_cache();
-
-		// Fire a hook.
-		do_action( 'getpaid_update_customer', $customer );
-
-	}
-
-	/**
-	 * Method to delete a customer from the database.
-	 *
-	 * @param GetPaid_Customer $customer
-	 */
-	public function delete( &$customer ) {
-		global $wpdb;
-
-		do_action( 'getpaid_before_delete_customer', $customer );
-
-		$wpdb->delete(
-			$wpdb->prefix . 'getpaid_customers',
-			array(
-				'id' => $customer->get_id(),
-			),
-			'%d'
-		);
-
-		// Delete cache.
-		$customer->clear_cache();
-
-		// Fire a hook.
-		do_action( 'getpaid_delete_customer', $customer );
-
-		$customer->set_id( 0 );
-	}
-
-	/*
+    /**
+     * Method to create a new customer in the database.
+     *
+     * @param GetPaid_Customer $customer customer object.
+     */
+    public function create( &$customer ) {
+        global $wpdb;
+
+        $values  = array();
+        $formats = array();
+
+        $fields = self::get_database_fields();
+        unset( $fields['id'] );
+
+        foreach ( $fields as $key => $format ) {
+            $values[ $key ] = $customer->get( $key, 'edit' );
+            $formats[]      = $format;
+        }
+
+        $result = $wpdb->insert( $wpdb->prefix . 'getpaid_customers', $values, $formats );
+
+        if ( $result ) {
+            $customer->set_id( $wpdb->insert_id );
+            $customer->apply_changes();
+            $customer->clear_cache();
+            do_action( 'getpaid_new_customer', $customer );
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Method to read a customer from the database.
+     *
+     * @param GetPaid_Customer $customer customer object.
+     *
+     */
+    public function read( &$customer ) {
+        global $wpdb;
+
+        $customer->set_defaults();
+
+        if ( ! $customer->get_id() ) {
+            $customer->last_error = 'Invalid customer.';
+            $customer->set_id( 0 );
+            return false;
+        }
+
+        // Maybe retrieve from the cache.
+        $raw_customer = wp_cache_get( $customer->get_id(), 'getpaid_customers' );
+
+        // If not found, retrieve from the db.
+        if ( false === $raw_customer ) {
+
+            $raw_customer = $wpdb->get_row(
+                $wpdb->prepare(
+                    "SELECT * FROM {$wpdb->prefix}getpaid_customers WHERE id = %d",
+                    $customer->get_id()
+                )
+            );
+
+            // Update the cache with our data
+            wp_cache_set( $customer->get_id(), $raw_customer, 'getpaid_customers' );
+
+        }
+
+        if ( ! $raw_customer ) {
+            $raw_customer->last_error = 'Invalid customer.';
+            return false;
+        }
+
+        // Loop through raw customer fields.
+        foreach ( (array) $raw_customer as $key => $value ) {
+            $customer->set( $key, $value );
+        }
+
+        $customer->set_object_read( true );
+        do_action( 'getpaid_read_customer', $customer );
+
+    }
+
+    /**
+     * Method to update a customer in the database.
+     *
+     * @param GetPaid_Customer $customer Customer object.
+     */
+    public function update( &$customer ) {
+        global $wpdb;
+
+        do_action( 'getpaid_before_update_customer', $customer, $customer->get_changes() );
+
+        $changes = $customer->get_changes();
+        $values  = array();
+        $format  = array();
+
+        foreach ( self::get_database_fields() as $key => $format ) {
+            if ( array_key_exists( $key, $changes ) ) {
+                $values[ $key ] = $customer->get( $key, 'edit' );
+                $formats[]      = $format;
+            }
+        }
+
+        if ( empty( $values ) ) {
+            return;
+        }
+
+        $wpdb->update(
+            $wpdb->prefix . 'getpaid_customers',
+            $values,
+            array(
+                'id' => $customer->get_id(),
+            ),
+            $formats,
+            '%d'
+        );
+
+        // Apply the changes.
+        $customer->apply_changes();
+
+        // Delete cache.
+        $customer->clear_cache();
+
+        // Fire a hook.
+        do_action( 'getpaid_update_customer', $customer );
+
+    }
+
+    /**
+     * Method to delete a customer from the database.
+     *
+     * @param GetPaid_Customer $customer
+     */
+    public function delete( &$customer ) {
+        global $wpdb;
+
+        do_action( 'getpaid_before_delete_customer', $customer );
+
+        $wpdb->delete(
+            $wpdb->prefix . 'getpaid_customers',
+            array(
+                'id' => $customer->get_id(),
+            ),
+            '%d'
+        );
+
+        // Delete cache.
+        $customer->clear_cache();
+
+        // Fire a hook.
+        do_action( 'getpaid_delete_customer', $customer );
+
+        $customer->set_id( 0 );
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Additional Methods
 	|--------------------------------------------------------------------------
 	*/
-	public static function get_database_fields() {
-
-		$fields = array(
-			'id'             => '%d',
-			'user_id'        => '%d',
-			'email'          => '%s',
-			'email_cc'       => '%s',
-			'status'         => '%s',
-			'purchase_value' => '%f',
-			'purchase_count' => '%d',
-			'date_created'   => '%s',
-			'date_modified'  => '%s',
-			'uuid'           => '%s',
-		);
-
-		// Add address fields.
-		foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
-
-			// Skip id, user_id and email.
-			if ( ! in_array( $field, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid' ), true ) ) {
-				$fields[ $field ] = '%s';
-			}
-		}
-
-		return $fields;
-	}
+    public static function get_database_fields() {
+
+        $fields = array(
+            'id'             => '%d',
+            'user_id'        => '%d',
+            'email'          => '%s',
+            'email_cc'       => '%s',
+            'status'         => '%s',
+            'purchase_value' => '%f',
+            'purchase_count' => '%d',
+            'date_created'   => '%s',
+            'date_modified'  => '%s',
+            'uuid'           => '%s',
+        );
+
+        // Add address fields.
+        foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+
+            // Skip id, user_id and email.
+            if ( ! in_array( $field, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid' ), true ) ) {
+                $fields[ $field ] = '%s';
+            }
+        }
+
+        return $fields;
+    }
 }

Spacing +34 added lines, -34 removed lines

@@ -4,7 +4,7 @@ 
  * GetPaid_Customer_Data_Store class file.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,27 +26,27 @@ 
 	 *
 	 * @param GetPaid_Customer $customer customer object.
 	 */
-	public function create( &$customer ) {
+	public function create(&$customer) {
 		global $wpdb;
 
 		$values  = array();
 		$formats = array();
 
 		$fields = self::get_database_fields();
-		unset( $fields['id'] );
+		unset($fields['id']);
 
-		foreach ( $fields as $key => $format ) {
-			$values[ $key ] = $customer->get( $key, 'edit' );
+		foreach ($fields as $key => $format) {
+			$values[$key] = $customer->get($key, 'edit');
 			$formats[]      = $format;
 		}
 
-		$result = $wpdb->insert( $wpdb->prefix . 'getpaid_customers', $values, $formats );
+		$result = $wpdb->insert($wpdb->prefix . 'getpaid_customers', $values, $formats);
 
-		if ( $result ) {
-			$customer->set_id( $wpdb->insert_id );
+		if ($result) {
+			$customer->set_id($wpdb->insert_id);
 			$customer->apply_changes();
 			$customer->clear_cache();
-			do_action( 'getpaid_new_customer', $customer );
+			do_action('getpaid_new_customer', $customer);
 			return true;
 		}
 
@@ -59,22 +59,22 @@ 
 	 * @param GetPaid_Customer $customer customer object.
 	 *
 	 */
-	public function read( &$customer ) {
+	public function read(&$customer) {
 		global $wpdb;
 
 		$customer->set_defaults();
 
-		if ( ! $customer->get_id() ) {
+		if (!$customer->get_id()) {
 			$customer->last_error = 'Invalid customer.';
-			$customer->set_id( 0 );
+			$customer->set_id(0);
 			return false;
 		}
 
 		// Maybe retrieve from the cache.
-		$raw_customer = wp_cache_get( $customer->get_id(), 'getpaid_customers' );
+		$raw_customer = wp_cache_get($customer->get_id(), 'getpaid_customers');
 
 		// If not found, retrieve from the db.
-		if ( false === $raw_customer ) {
+		if (false === $raw_customer) {
 
 			$raw_customer = $wpdb->get_row(
 				$wpdb->prepare(
@@ -84,22 +84,22 @@ 
 			);
 
 			// Update the cache with our data
-			wp_cache_set( $customer->get_id(), $raw_customer, 'getpaid_customers' );
+			wp_cache_set($customer->get_id(), $raw_customer, 'getpaid_customers');
 
 		}
 
-		if ( ! $raw_customer ) {
+		if (!$raw_customer) {
 			$raw_customer->last_error = 'Invalid customer.';
 			return false;
 		}
 
 		// Loop through raw customer fields.
-		foreach ( (array) $raw_customer as $key => $value ) {
-			$customer->set( $key, $value );
+		foreach ((array) $raw_customer as $key => $value) {
+			$customer->set($key, $value);
 		}
 
-		$customer->set_object_read( true );
-		do_action( 'getpaid_read_customer', $customer );
+		$customer->set_object_read(true);
+		do_action('getpaid_read_customer', $customer);
 
 	}
 
@@ -108,23 +108,23 @@ 
 	 *
 	 * @param GetPaid_Customer $customer Customer object.
 	 */
-	public function update( &$customer ) {
+	public function update(&$customer) {
 		global $wpdb;
 
-		do_action( 'getpaid_before_update_customer', $customer, $customer->get_changes() );
+		do_action('getpaid_before_update_customer', $customer, $customer->get_changes());
 
 		$changes = $customer->get_changes();
 		$values  = array();
 		$format  = array();
 
-		foreach ( self::get_database_fields() as $key => $format ) {
-			if ( array_key_exists( $key, $changes ) ) {
-				$values[ $key ] = $customer->get( $key, 'edit' );
+		foreach (self::get_database_fields() as $key => $format) {
+			if (array_key_exists($key, $changes)) {
+				$values[$key] = $customer->get($key, 'edit');
 				$formats[]      = $format;
 			}
 		}
 
-		if ( empty( $values ) ) {
+		if (empty($values)) {
 			return;
 		}
 
@@ -145,7 +145,7 @@ 
 		$customer->clear_cache();
 
 		// Fire a hook.
-		do_action( 'getpaid_update_customer', $customer );
+		do_action('getpaid_update_customer', $customer);
 
 	}
 
@@ -154,10 +154,10 @@ 
 	 *
 	 * @param GetPaid_Customer $customer
 	 */
-	public function delete( &$customer ) {
+	public function delete(&$customer) {
 		global $wpdb;
 
-		do_action( 'getpaid_before_delete_customer', $customer );
+		do_action('getpaid_before_delete_customer', $customer);
 
 		$wpdb->delete(
 			$wpdb->prefix . 'getpaid_customers',
@@ -171,9 +171,9 @@ 
 		$customer->clear_cache();
 
 		// Fire a hook.
-		do_action( 'getpaid_delete_customer', $customer );
+		do_action('getpaid_delete_customer', $customer);
 
-		$customer->set_id( 0 );
+		$customer->set_id(0);
 	}
 
 	/*
@@ -197,11 +197,11 @@ 
 		);
 
 		// Add address fields.
-		foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+		foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
 			// Skip id, user_id and email.
-			if ( ! in_array( $field, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid' ), true ) ) {
-				$fields[ $field ] = '%s';
+			if (!in_array($field, array('id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid'), true)) {
+				$fields[$field] = '%s';
 			}
 		}
 

includes/class-wpinv.php

Indentation +606 added lines, -606 removed lines

@@ -14,652 +14,652 @@
  */
 class WPInv_Plugin {
 
-	/**
-	 * GetPaid version.
-	 *
-	 * @var string
-	 */
-	public $version;
-
-	/**
-	 * Data container.
-	 *
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Form elements instance.
-	 *
-	 * @var WPInv_Payment_Form_Elements
-	 */
-	public $form_elements;
-
-	/**
-	 * @var array An array of payment gateways.
-	 */
-	public $gateways;
-
-	/**
-	 * Class constructor.
-	 */
-	public function __construct() {
-		$this->define_constants();
-		$this->includes();
-		$this->init_hooks();
-		$this->set_properties();
-	}
-
-	/**
-	 * Sets a custom data property.
-	 *
-	 * @param string $prop The prop to set.
-	 * @param mixed $value The value to retrieve.
-	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
-	}
-
-	/**
-	 * Gets a custom data property.
-	 *
-	 * @param string $prop The prop to set.
-	 * @return mixed The value.
-	 */
-	public function get( $prop ) {
-
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Define class properties.
-	 */
-	public function set_properties() {
-
-		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
-		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
-
-		// Init other objects.
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
-		$this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
-
-	}
-
-	 /**
-	 * Define plugin constants.
-	 */
-	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
-		$this->version = WPINV_VERSION;
-	}
-
-	/**
-	 * Hook into actions and filters.
-	 *
-	 * @since 1.0.19
-	 */
-	protected function init_hooks() {
-		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
-
-		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		add_action( 'init', array( $this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
-		add_action( 'wp_footer', array( $this, 'wp_footer' ) );
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-		add_action( 'widgets_init', array( $this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'the_seo_framework_sitemap_supported_post_types', array( $this, 'exclude_invoicing_post_types' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
-
-		add_filter( 'query_vars', array( $this, 'custom_query_vars' ) );
+    /**
+     * GetPaid version.
+     *
+     * @var string
+     */
+    public $version;
+
+    /**
+     * Data container.
+     *
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * Form elements instance.
+     *
+     * @var WPInv_Payment_Form_Elements
+     */
+    public $form_elements;
+
+    /**
+     * @var array An array of payment gateways.
+     */
+    public $gateways;
+
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
+        $this->define_constants();
+        $this->includes();
+        $this->init_hooks();
+        $this->set_properties();
+    }
+
+    /**
+     * Sets a custom data property.
+     *
+     * @param string $prop The prop to set.
+     * @param mixed $value The value to retrieve.
+     */
+    public function set( $prop, $value ) {
+        $this->data[ $prop ] = $value;
+    }
+
+    /**
+     * Gets a custom data property.
+     *
+     * @param string $prop The prop to set.
+     * @return mixed The value.
+     */
+    public function get( $prop ) {
+
+        if ( isset( $this->data[ $prop ] ) ) {
+            return $this->data[ $prop ];
+        }
+
+        return null;
+    }
+
+    /**
+     * Define class properties.
+     */
+    public function set_properties() {
+
+        // Sessions.
+        $this->set( 'session', new WPInv_Session_Handler() );
+        $GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+        $GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
+
+        // Init other objects.
+        $this->set( 'notes', new WPInv_Notes() );
+        $this->set( 'api', new WPInv_API() );
+        $this->set( 'post_types', new GetPaid_Post_Types() );
+        $this->set( 'template', new GetPaid_Template() );
+        $this->set( 'admin', new GetPaid_Admin() );
+        $this->set( 'subscriptions', new WPInv_Subscriptions() );
+        $this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
+        $this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
+        $this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
+        $this->set( 'payment_forms', new GetPaid_Payment_Forms() );
+        $this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+
+    }
+
+        /**
+         * Define plugin constants.
+         */
+    public function define_constants() {
+        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
+        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        $this->version = WPINV_VERSION;
+    }
+
+    /**
+     * Hook into actions and filters.
+     *
+     * @since 1.0.19
+     */
+    protected function init_hooks() {
+        /* Internationalize the text strings used. */
+        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+
+        // Init the plugin after WordPress inits.
+        add_action( 'init', array( $this, 'init' ), 1 );
+        add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
+        add_action( 'init', array( $this, 'wpinv_actions' ) );
+        add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
+        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
+        add_action( 'wp_footer', array( $this, 'wp_footer' ) );
+        add_action( 'wp_head', array( $this, 'wp_head' ) );
+        add_action( 'widgets_init', array( $this, 'register_widgets' ) );
+        add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
+        add_filter( 'the_seo_framework_sitemap_supported_post_types', array( $this, 'exclude_invoicing_post_types' ) );
+        add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+
+        add_filter( 'query_vars', array( $this, 'custom_query_vars' ) );
         add_action( 'init', array( $this, 'add_rewrite_rule' ), 10, 0 );
-		add_action( 'pre_get_posts', array( $this, 'maybe_process_new_ipn' ), 1 );
-
-		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
-
-	}
-
-	public function plugins_loaded() {
-		/* Internationalize the text strings used. */
-		$this->load_textdomain();
-
-		do_action( 'wpinv_loaded' );
-
-		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
-			wpinv_oxygen_fix_conflict();
-		}
-	}
-
-	/**
-	 * Load Localisation files.
-	 *
-	 * Note: the first-loaded translation file overrides any following ones if the same translation is present.
-	 *
-	 * Locales found in:
-	 *      - WP_LANG_DIR/plugins/invoicing-LOCALE.mo
-	 *      - WP_PLUGIN_DIR/invoicing/languages/invoicing-LOCALE.mo
-	 *
-	 * @since 1.0.0
-	 */
-	public function load_textdomain() {
-
-		load_plugin_textdomain(
-			'invoicing',
-			false,
-			plugin_basename( dirname( WPINV_PLUGIN_FILE ) ) . '/languages/'
-		);
-
-	}
-
-	/**
-	 * Include required core files used in admin and on the frontend.
-	 */
-	public function includes() {
-
-		// Start with the settings.
-		require_once WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php';
-
-		// Packages/libraries.
-		require_once WPINV_PLUGIN_DIR . 'vendor/autoload.php';
-		require_once WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php';
-
-		// Load functions.
-		require_once WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/invoice-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/subscription-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/user-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/error-functions.php';
-
-		// Register autoloader.
-		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
-		}
-
-		require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/checkout.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/invoice-history.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/subscriptions.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/buy-item.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/getpaid.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/invoice.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php';
-
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-			GetPaid_Post_Types_Admin::init();
-
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php';
-			// load the user class only on the users.php page
-			global $pagenow;
-			if ( $pagenow == 'users.php' ) {
-				new WPInv_Admin_Users();
-			}
-		}
-
-		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php';
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
-		}
-
-	}
-
-	/**
-	 * Class autoloader
-	 *
-	 * @param       string $class_name The name of the class to load.
-	 * @access      public
-	 * @since       1.0.19
-	 * @return      void
-	 */
-	public function autoload( $class_name ) {
-
-		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
-
-		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
-			return;
-		}
-
-		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
-
-		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
-
-		// And an array of possible locations in order of importance.
-		$locations = array(
-			"$plugin_path/includes",
-			"$plugin_path/includes/data-stores",
-			"$plugin_path/includes/gateways",
-			"$plugin_path/includes/payments",
-			"$plugin_path/includes/geolocation",
-			"$plugin_path/includes/reports",
-			"$plugin_path/includes/api",
-			"$plugin_path/includes/admin",
-			"$plugin_path/includes/admin/meta-boxes",
-		);
-
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
-
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
-				break;
-			}
+        add_action( 'pre_get_posts', array( $this, 'maybe_process_new_ipn' ), 1 );
+
+        // Fires after registering actions.
+        do_action( 'wpinv_actions', $this );
+        do_action( 'getpaid_actions', $this );
+
+    }
+
+    public function plugins_loaded() {
+        /* Internationalize the text strings used. */
+        $this->load_textdomain();
+
+        do_action( 'wpinv_loaded' );
+
+        // Fix oxygen page builder conflict
+        if ( function_exists( 'ct_css_output' ) ) {
+            wpinv_oxygen_fix_conflict();
+        }
+    }
+
+    /**
+     * Load Localisation files.
+     *
+     * Note: the first-loaded translation file overrides any following ones if the same translation is present.
+     *
+     * Locales found in:
+     *      - WP_LANG_DIR/plugins/invoicing-LOCALE.mo
+     *      - WP_PLUGIN_DIR/invoicing/languages/invoicing-LOCALE.mo
+     *
+     * @since 1.0.0
+     */
+    public function load_textdomain() {
+
+        load_plugin_textdomain(
+            'invoicing',
+            false,
+            plugin_basename( dirname( WPINV_PLUGIN_FILE ) ) . '/languages/'
+        );
+
+    }
+
+    /**
+     * Include required core files used in admin and on the frontend.
+     */
+    public function includes() {
+
+        // Start with the settings.
+        require_once WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php';
+
+        // Packages/libraries.
+        require_once WPINV_PLUGIN_DIR . 'vendor/autoload.php';
+        require_once WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php';
+
+        // Load functions.
+        require_once WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/invoice-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/subscription-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/user-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/error-functions.php';
+
+        // Register autoloader.
+        try {
+            spl_autoload_register( array( $this, 'autoload' ), true );
+        } catch ( Exception $e ) {
+            wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+        }
+
+        require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/checkout.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/invoice-history.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/subscriptions.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/buy-item.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/getpaid.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/invoice.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php';
+
+        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+            GetPaid_Post_Types_Admin::init();
+
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php';
+            // load the user class only on the users.php page
+            global $pagenow;
+            if ( $pagenow == 'users.php' ) {
+                new WPInv_Admin_Users();
+            }
+        }
+
+        // Register cli commands
+        if ( defined( 'WP_CLI' ) && WP_CLI ) {
+            require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php';
+            WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+        }
+
+    }
+
+    /**
+     * Class autoloader
+     *
+     * @param       string $class_name The name of the class to load.
+     * @access      public
+     * @since       1.0.19
+     * @return      void
+     */
+    public function autoload( $class_name ) {
+
+        // Normalize the class name...
+        $class_name  = strtolower( $class_name );
+
+        // ... and make sure it is our class.
+        if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+            return;
+        }
+
+        // Next, prepare the file name from the class.
+        $file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+
+        // Base path of the classes.
+        $plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+
+        // And an array of possible locations in order of importance.
+        $locations = array(
+            "$plugin_path/includes",
+            "$plugin_path/includes/data-stores",
+            "$plugin_path/includes/gateways",
+            "$plugin_path/includes/payments",
+            "$plugin_path/includes/geolocation",
+            "$plugin_path/includes/reports",
+            "$plugin_path/includes/api",
+            "$plugin_path/includes/admin",
+            "$plugin_path/includes/admin/meta-boxes",
+        );
+
+        foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
+
+            if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
+                include trailingslashit( $location ) . $file_name;
+                break;
+            }
 }
 
-	}
-
-	/**
-	 * Inits hooks etc.
-	 */
-	public function init() {
-
-		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
-
-		// Maybe upgrade.
-		$this->maybe_upgrade_database();
-
-		// Load default gateways.
-		$gateways = apply_filters(
-			'getpaid_default_gateways',
-			array(
-				'manual'        => 'GetPaid_Manual_Gateway',
-				'paypal'        => 'GetPaid_Paypal_Gateway',
-				'worldpay'      => 'GetPaid_Worldpay_Gateway',
-				'bank_transfer' => 'GetPaid_Bank_Transfer_Gateway',
-				'authorizenet'  => 'GetPaid_Authorize_Net_Gateway',
-			)
-		);
-
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
-		}
-
-		if ( 'yes' != get_option( 'wpinv_renamed_gateways' ) ) {
-			GetPaid_Installer::rename_gateways_label();
-			update_option( 'wpinv_renamed_gateways', 'yes' );
-		}
-
-		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
-
-	}
-
-	/**
-	 * Checks if this is an IPN request and processes it.
-	 */
-	public function maybe_process_ipn() {
-
-		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
-			return;
-		}
-
-		$gateway = sanitize_text_field( $_GET['wpi-gateway'] );
-
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
-		exit;
-
-	}
-
-	public function enqueue_scripts() {
-
-		// Fires before adding scripts.
-		do_action( 'getpaid_enqueue_scripts' );
-
-		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-		$localize['thousands']            = wpinv_thousands_separator();
-		$localize['decimals']             = wpinv_decimal_separator();
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
-		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['loading']              = __( 'Loading...', 'invoicing' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
-		$localize['recaptchaSettings']    = getpaid_get_recaptcha_settings();
-
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
-
-		// reCaptcha.
-		if ( getpaid_is_recaptcha_enabled() ) {
-			$url = apply_filters(
-				'getpaid_recaptcha_api_url',
-				add_query_arg(
-					array(
-						'render' => 'v2' === getpaid_get_recaptcha_version() ? 'explicit' : getpaid_get_recaptcha_site_key(),
-					),
-					'https://www.google.com/recaptcha/api.js'
-				)
-			);
-			wp_enqueue_script( 'recaptcha', $url, array(), null, true ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
-		}
-
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'jquery' ), $version, true );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
-	}
-
-	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
-		}
-
-		if ( defined( 'WP_ALL_IMPORT_ROOT_DIR' ) ) {
-			include plugin_dir_path( __FILE__ ) . 'libraries/wp-all-import/class-getpaid-wp-all-import.php';
-		}
-	}
-
-	/**
+    }
+
+    /**
+     * Inits hooks etc.
+     */
+    public function init() {
+
+        // Fires before getpaid inits.
+        do_action( 'before_getpaid_init', $this );
+
+        // Maybe upgrade.
+        $this->maybe_upgrade_database();
+
+        // Load default gateways.
+        $gateways = apply_filters(
+            'getpaid_default_gateways',
+            array(
+                'manual'        => 'GetPaid_Manual_Gateway',
+                'paypal'        => 'GetPaid_Paypal_Gateway',
+                'worldpay'      => 'GetPaid_Worldpay_Gateway',
+                'bank_transfer' => 'GetPaid_Bank_Transfer_Gateway',
+                'authorizenet'  => 'GetPaid_Authorize_Net_Gateway',
+            )
+        );
+
+        foreach ( $gateways as $id => $class ) {
+            $this->gateways[ $id ] = new $class();
+        }
+
+        if ( 'yes' != get_option( 'wpinv_renamed_gateways' ) ) {
+            GetPaid_Installer::rename_gateways_label();
+            update_option( 'wpinv_renamed_gateways', 'yes' );
+        }
+
+        // Fires after getpaid inits.
+        do_action( 'getpaid_init', $this );
+
+    }
+
+    /**
+     * Checks if this is an IPN request and processes it.
+     */
+    public function maybe_process_ipn() {
+
+        // Ensure that this is an IPN request.
+        if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+            return;
+        }
+
+        $gateway = sanitize_text_field( $_GET['wpi-gateway'] );
+
+        do_action( 'wpinv_verify_payment_ipn', $gateway );
+        do_action( "wpinv_verify_{$gateway}_ipn" );
+        exit;
+
+    }
+
+    public function enqueue_scripts() {
+
+        // Fires before adding scripts.
+        do_action( 'getpaid_enqueue_scripts' );
+
+        $localize                         = array();
+        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
+        $localize['thousands']            = wpinv_thousands_separator();
+        $localize['decimals']             = wpinv_decimal_separator();
+        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['txtComplete']          = __( 'Continue', 'invoicing' );
+        $localize['UseTaxes']             = wpinv_use_taxes();
+        $localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
+        $localize['loading']              = __( 'Loading...', 'invoicing' );
+        $localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+        $localize['recaptchaSettings']    = getpaid_get_recaptcha_settings();
+
+        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+
+        // reCaptcha.
+        if ( getpaid_is_recaptcha_enabled() ) {
+            $url = apply_filters(
+                'getpaid_recaptcha_api_url',
+                add_query_arg(
+                    array(
+                        'render' => 'v2' === getpaid_get_recaptcha_version() ? 'explicit' : getpaid_get_recaptcha_site_key(),
+                    ),
+                    'https://www.google.com/recaptcha/api.js'
+                )
+            );
+            wp_enqueue_script( 'recaptcha', $url, array(), null, true ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
+        }
+
+        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
+        wp_enqueue_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'jquery' ), $version, true );
+        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+    }
+
+    public function wpinv_actions() {
+        if ( isset( $_REQUEST['wpi_action'] ) ) {
+            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        }
+
+        if ( defined( 'WP_ALL_IMPORT_ROOT_DIR' ) ) {
+            include plugin_dir_path( __FILE__ ) . 'libraries/wp-all-import/class-getpaid-wp-all-import.php';
+        }
+    }
+
+    /**
      * Fires an action after verifying that a user can fire them.
-	 *
-	 * Note: If the action is on an invoice, subscription etc, esure that the
-	 * current user owns the invoice/subscription.
+     *
+     * Note: If the action is on an invoice, subscription etc, esure that the
+     * current user owns the invoice/subscription.
      */
     public function maybe_do_authenticated_action() {
 
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
+        if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
 
-			$key  = sanitize_key( $_REQUEST['getpaid-action'] );
-			$data = wp_unslash( $_REQUEST );
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $data );
-			}
+            $key  = sanitize_key( $_REQUEST['getpaid-action'] );
+            $data = wp_unslash( $_REQUEST );
+            if ( is_user_logged_in() ) {
+                do_action( "getpaid_authenticated_action_$key", $data );
+            }
 
-			do_action( "getpaid_unauthenticated_action_$key", $data );
+            do_action( "getpaid_unauthenticated_action_$key", $data );
 
-		}
+        }
 
     }
 
-	public function pre_get_posts( $wp_query ) {
-
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
-		}
-
-		return $wp_query;
-	}
-
-	/**
-	 * Register widgets
-	 *
-	 */
-	public function register_widgets() {
-		global $pagenow;
-
-		// Currently, UX Builder does not work particulaly well with SuperDuper.
-		// So we disable our widgets when editing a page with UX Builder.
-		if ( function_exists( 'ux_builder_is_active' ) && ux_builder_is_active() ) {
-			return;
-		}
-
-		$block_widget_init_screens = function_exists( 'sd_pagenow_exclude' ) ? sd_pagenow_exclude() : array();
-
-		if ( is_admin() && $pagenow && in_array( $pagenow, $block_widget_init_screens ) ) {
-			// don't initiate in these conditions.
-		} else {
-
-			// Only load allowed widgets.
-			$exclude = function_exists( 'sd_widget_exclude' ) ? sd_widget_exclude() : array();
-			$widgets = apply_filters(
-				'getpaid_widget_classes',
-				array(
-					'WPInv_Checkout_Widget',
-					'WPInv_History_Widget',
-					'WPInv_Receipt_Widget',
-					'WPInv_Subscriptions_Widget',
-					'WPInv_Buy_Item_Widget',
-					'WPInv_Messages_Widget',
-					'WPInv_GetPaid_Widget',
-					'WPInv_Invoice_Widget',
-				)
-			);
-
-			// For each widget...
-			foreach ( $widgets as $widget ) {
-
-				// Abort early if it is excluded for this page.
-				if ( in_array( $widget, $exclude ) ) {
-					continue;
-				}
-
-				// SD V1 used to extend the widget class. V2 does not, so we cannot call register widget on it.
-				if ( is_subclass_of( $widget, 'WP_Widget' ) ) {
-					register_widget( $widget );
-				} else {
-					new $widget();
-				}
+    public function pre_get_posts( $wp_query ) {
+
+        if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
+            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+        }
+
+        return $wp_query;
+    }
+
+    /**
+     * Register widgets
+     *
+     */
+    public function register_widgets() {
+        global $pagenow;
+
+        // Currently, UX Builder does not work particulaly well with SuperDuper.
+        // So we disable our widgets when editing a page with UX Builder.
+        if ( function_exists( 'ux_builder_is_active' ) && ux_builder_is_active() ) {
+            return;
+        }
+
+        $block_widget_init_screens = function_exists( 'sd_pagenow_exclude' ) ? sd_pagenow_exclude() : array();
+
+        if ( is_admin() && $pagenow && in_array( $pagenow, $block_widget_init_screens ) ) {
+            // don't initiate in these conditions.
+        } else {
+
+            // Only load allowed widgets.
+            $exclude = function_exists( 'sd_widget_exclude' ) ? sd_widget_exclude() : array();
+            $widgets = apply_filters(
+                'getpaid_widget_classes',
+                array(
+                    'WPInv_Checkout_Widget',
+                    'WPInv_History_Widget',
+                    'WPInv_Receipt_Widget',
+                    'WPInv_Subscriptions_Widget',
+                    'WPInv_Buy_Item_Widget',
+                    'WPInv_Messages_Widget',
+                    'WPInv_GetPaid_Widget',
+                    'WPInv_Invoice_Widget',
+                )
+            );
+
+            // For each widget...
+            foreach ( $widgets as $widget ) {
+
+                // Abort early if it is excluded for this page.
+                if ( in_array( $widget, $exclude ) ) {
+                    continue;
+                }
+
+                // SD V1 used to extend the widget class. V2 does not, so we cannot call register widget on it.
+                if ( is_subclass_of( $widget, 'WP_Widget' ) ) {
+                    register_widget( $widget );
+                } else {
+                    new $widget();
+                }
 }
 }
 
-	}
+    }
+
+    /**
+     * Upgrades the database.
+     *
+     * @since 2.0.2
+     */
+    public function maybe_upgrade_database() {
+
+        // Ensure the database tables are up to date.
+        GetPaid_Installer::maybe_create_db_tables();
+
+        $wpi_version = get_option( 'wpinv_version', 0 );
+
+        if ( $wpi_version == WPINV_VERSION ) {
+            return;
+        }
+
+        $installer = new GetPaid_Installer();
+
+        if ( empty( $wpi_version ) ) {
+            return $installer->upgrade_db( 0 );
+        }
+
+        $upgrades  = array(
+            '0.0.5' => '004',
+            '1.0.3' => '102',
+            '2.0.0' => '118',
+            '2.8.0' => '279',
+        );
+
+        foreach ( $upgrades as $key => $method ) {
+
+            if ( version_compare( $wpi_version, $key, '<' ) ) {
+                return $installer->upgrade_db( $method );
+            }
+        }
+
+    }
+
+    /**
+     * Flushes the permalinks if needed.
+     *
+     * @since 2.0.8
+     */
+    public function maybe_flush_permalinks() {
+
+        $flush = get_option( 'wpinv_flush_permalinks', 0 );
+
+        if ( ! empty( $flush ) ) {
+            flush_rewrite_rules();
+            delete_option( 'wpinv_flush_permalinks' );
+        }
+
+    }
+
+    /**
+     * Remove our pages from yoast sitemaps.
+     *
+     * @since 1.0.19
+     * @param int[] $excluded_posts_ids
+     */
+    public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ) {
+
+        // Ensure that we have an array.
+        if ( ! is_array( $excluded_posts_ids ) ) {
+            $excluded_posts_ids = array();
+        }
+
+        // Prepare our pages.
+        $our_pages = array();
+
+        // Checkout page.
+        $our_pages[] = wpinv_get_option( 'checkout_page', false );
+
+        // Success page.
+        $our_pages[] = wpinv_get_option( 'success_page', false );
+
+        // Failure page.
+        $our_pages[] = wpinv_get_option( 'failure_page', false );
 
-	/**
-	 * Upgrades the database.
-	 *
-	 * @since 2.0.2
-	 */
-	public function maybe_upgrade_database() {
+        // History page.
+        $our_pages[] = wpinv_get_option( 'invoice_history_page', false );
 
-		// Ensure the database tables are up to date.
-		GetPaid_Installer::maybe_create_db_tables();
+        // Subscriptions page.
+        $our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
 
-		$wpi_version = get_option( 'wpinv_version', 0 );
+        $our_pages   = array_map( 'intval', array_filter( $our_pages ) );
 
-		if ( $wpi_version == WPINV_VERSION ) {
-			return;
-		}
+        $excluded_posts_ids = $excluded_posts_ids + $our_pages;
+        return array_unique( $excluded_posts_ids );
 
-		$installer = new GetPaid_Installer();
+    }
+
+    /**
+     * Remove our pages from yoast sitemaps.
+     *
+     * @since 1.0.19
+     * @param string[] $post_types
+     */
+    public function exclude_invoicing_post_types( $post_types ) {
+
+        // Ensure that we have an array.
+        if ( ! is_array( $post_types ) ) {
+            $post_types = array();
+        }
+
+        // Remove our post types.
+        return array_diff( $post_types, array_keys( getpaid_get_invoice_post_types() ) );
+    }
+
+    /**
+     * Displays additional footer code.
+     *
+     * @since 2.0.0
+     */
+    public function wp_footer() {
+        wpinv_get_template( 'frontend-footer.php' );
+    }
 
-		if ( empty( $wpi_version ) ) {
-			return $installer->upgrade_db( 0 );
-		}
+    /**
+     * Displays additional header code.
+     *
+     * @since 2.0.0
+     */
+    public function wp_head() {
+        wpinv_get_template( 'frontend-head.php' );
+    }
 
-		$upgrades  = array(
-			'0.0.5' => '004',
-			'1.0.3' => '102',
-			'2.0.0' => '118',
-			'2.8.0' => '279',
-		);
-
-		foreach ( $upgrades as $key => $method ) {
-
-			if ( version_compare( $wpi_version, $key, '<' ) ) {
-				return $installer->upgrade_db( $method );
-			}
-		}
-
-	}
-
-	/**
-	 * Flushes the permalinks if needed.
-	 *
-	 * @since 2.0.8
-	 */
-	public function maybe_flush_permalinks() {
-
-		$flush = get_option( 'wpinv_flush_permalinks', 0 );
-
-		if ( ! empty( $flush ) ) {
-			flush_rewrite_rules();
-			delete_option( 'wpinv_flush_permalinks' );
-		}
-
-	}
-
-	/**
-	 * Remove our pages from yoast sitemaps.
-	 *
-	 * @since 1.0.19
-	 * @param int[] $excluded_posts_ids
-	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ) {
-
-		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
-			$excluded_posts_ids = array();
-		}
-
-		// Prepare our pages.
-		$our_pages = array();
-
-		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
-
-		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
-
-		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
-
-		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
-
-		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
-
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
-
-		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
-		return array_unique( $excluded_posts_ids );
-
-	}
-
-	/**
-	 * Remove our pages from yoast sitemaps.
-	 *
-	 * @since 1.0.19
-	 * @param string[] $post_types
-	 */
-	public function exclude_invoicing_post_types( $post_types ) {
-
-		// Ensure that we have an array.
-		if ( ! is_array( $post_types ) ) {
-			$post_types = array();
-		}
-
-		// Remove our post types.
-		return array_diff( $post_types, array_keys( getpaid_get_invoice_post_types() ) );
-	}
-
-	/**
-	 * Displays additional footer code.
-	 *
-	 * @since 2.0.0
-	 */
-	public function wp_footer() {
-		wpinv_get_template( 'frontend-footer.php' );
-	}
-
-	/**
-	 * Displays additional header code.
-	 *
-	 * @since 2.0.0
-	 */
-	public function wp_head() {
-		wpinv_get_template( 'frontend-head.php' );
-	}
-
-	/**
-	 * Custom query vars.
-	 *
-	 */
-	public function custom_query_vars( $vars ) {
+    /**
+     * Custom query vars.
+     *
+     */
+    public function custom_query_vars( $vars ) {
         $vars[] = 'getpaid-ipn';
         return $vars;
-	}
+    }
 
-	/**
-	 * Add rewrite tags and rules.
-	 *
-	 */
-	public function add_rewrite_rule() {
+    /**
+     * Add rewrite tags and rules.
+     *
+     */
+    public function add_rewrite_rule() {
         $tag = 'getpaid-ipn';
         add_rewrite_tag( "%$tag%", '([^&]+)' );
         add_rewrite_rule( "^$tag/([^/]*)/?", "index.php?$tag=\$matches[1]", 'top' );
-	}
+    }
 
-	/**
-	 * Processes non-query string ipns.
-	 *
-	 */
-	public function maybe_process_new_ipn( $query ) {
+    /**
+     * Processes non-query string ipns.
+     *
+     */
+    public function maybe_process_new_ipn( $query ) {
 
         if ( is_admin() || ! $query->is_main_query() ) {
             return;
         }
 
-		$gateway = get_query_var( 'getpaid-ipn' );
+        $gateway = get_query_var( 'getpaid-ipn' );
 
         if ( ! empty( $gateway ) ) {
 
-			$gateway = sanitize_text_field( $gateway );
-			nocache_headers();
-			do_action( 'wpinv_verify_payment_ipn', $gateway );
-			do_action( "wpinv_verify_{$gateway}_ipn" );
-			exit;
+            $gateway = sanitize_text_field( $gateway );
+            nocache_headers();
+            do_action( 'wpinv_verify_payment_ipn', $gateway );
+            do_action( "wpinv_verify_{$gateway}_ipn" );
+            exit;
 
         }
 
-	}
+    }
 
 }

Spacing +136 added lines, -136 removed lines

@@ -6,7 +6,7 @@ 
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main Invoicing class.
@@ -56,8 +56,8 @@ 
 	 * @param string $prop The prop to set.
 	 * @param mixed $value The value to retrieve.
 	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
+	public function set($prop, $value) {
+		$this->data[$prop] = $value;
 	}
 
 	/**
@@ -66,10 +66,10 @@ 
 	 * @param string $prop The prop to set.
 	 * @return mixed The value.
 	 */
-	public function get( $prop ) {
+	public function get($prop) {
 
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
+		if (isset($this->data[$prop])) {
+			return $this->data[$prop];
 		}
 
 		return null;
@@ -81,22 +81,22 @@ 
 	public function set_properties() {
 
 		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+		$this->set('session', new WPInv_Session_Handler());
+		$GLOBALS['wpi_session'] = $this->get('session'); // Backwards compatibility.
 		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
 
 		// Init other objects.
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
-		$this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+		$this->set('notes', new WPInv_Notes());
+		$this->set('api', new WPInv_API());
+		$this->set('post_types', new GetPaid_Post_Types());
+		$this->set('template', new GetPaid_Template());
+		$this->set('admin', new GetPaid_Admin());
+		$this->set('subscriptions', new WPInv_Subscriptions());
+		$this->set('invoice_emails', new GetPaid_Invoice_Notification_Emails());
+		$this->set('subscription_emails', new GetPaid_Subscription_Notification_Emails());
+		$this->set('daily_maintenace', new GetPaid_Daily_Maintenance());
+		$this->set('payment_forms', new GetPaid_Payment_Forms());
+		$this->set('maxmind', new GetPaid_MaxMind_Geolocation());
 
 	}
 
@@ -104,8 +104,8 @@ 
 	 * Define plugin constants.
 	 */
 	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+		define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+		define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
 		$this->version = WPINV_VERSION;
 	}
 
@@ -116,28 +116,28 @@ 
 	 */
 	protected function init_hooks() {
 		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+		add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
 
 		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		add_action( 'init', array( $this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
-		add_action( 'wp_footer', array( $this, 'wp_footer' ) );
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-		add_action( 'widgets_init', array( $this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'the_seo_framework_sitemap_supported_post_types', array( $this, 'exclude_invoicing_post_types' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
-
-		add_filter( 'query_vars', array( $this, 'custom_query_vars' ) );
-        add_action( 'init', array( $this, 'add_rewrite_rule' ), 10, 0 );
-		add_action( 'pre_get_posts', array( $this, 'maybe_process_new_ipn' ), 1 );
+		add_action('init', array($this, 'init'), 1);
+		add_action('init', array($this, 'maybe_process_ipn'), 10);
+		add_action('init', array($this, 'wpinv_actions'));
+		add_action('init', array($this, 'maybe_do_authenticated_action'), 100);
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), 11);
+		add_action('wp_footer', array($this, 'wp_footer'));
+		add_action('wp_head', array($this, 'wp_head'));
+		add_action('widgets_init', array($this, 'register_widgets'));
+		add_filter('wpseo_exclude_from_sitemap_by_post_ids', array($this, 'wpseo_exclude_from_sitemap_by_post_ids'));
+		add_filter('the_seo_framework_sitemap_supported_post_types', array($this, 'exclude_invoicing_post_types'));
+		add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
+
+		add_filter('query_vars', array($this, 'custom_query_vars'));
+        add_action('init', array($this, 'add_rewrite_rule'), 10, 0);
+		add_action('pre_get_posts', array($this, 'maybe_process_new_ipn'), 1);
 
 		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
+		do_action('wpinv_actions', $this);
+		do_action('getpaid_actions', $this);
 
 	}
 
@@ -145,10 +145,10 @@ 
 		/* Internationalize the text strings used. */
 		$this->load_textdomain();
 
-		do_action( 'wpinv_loaded' );
+		do_action('wpinv_loaded');
 
 		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
+		if (function_exists('ct_css_output')) {
 			wpinv_oxygen_fix_conflict();
 		}
 	}
@@ -169,7 +169,7 @@ 
 		load_plugin_textdomain(
 			'invoicing',
 			false,
-			plugin_basename( dirname( WPINV_PLUGIN_FILE ) ) . '/languages/'
+			plugin_basename(dirname(WPINV_PLUGIN_FILE)) . '/languages/'
 		);
 
 	}
@@ -205,9 +205,9 @@ 
 
 		// Register autoloader.
 		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+			spl_autoload_register(array($this, 'autoload'), true);
+		} catch (Exception $e) {
+			wpinv_error_log($e->getMessage(), '', __FILE__, 149, true);
 		}
 
 		require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php';
@@ -233,7 +233,7 @@ 
 		require_once WPINV_PLUGIN_DIR . 'widgets/invoice.php';
 		require_once WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php';
 
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+		if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
 			GetPaid_Post_Types_Admin::init();
 
 			require_once WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php';
@@ -244,15 +244,15 @@ 
 			require_once WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php';
 			// load the user class only on the users.php page
 			global $pagenow;
-			if ( $pagenow == 'users.php' ) {
+			if ($pagenow == 'users.php') {
 				new WPInv_Admin_Users();
 			}
 		}
 
 		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
+		if (defined('WP_CLI') && WP_CLI) {
 			require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php';
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+			WP_CLI::add_command('invoicing', 'WPInv_CLI');
 		}
 
 	}
@@ -265,21 +265,21 @@ 
 	 * @since       1.0.19
 	 * @return      void
 	 */
-	public function autoload( $class_name ) {
+	public function autoload($class_name) {
 
 		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
+		$class_name = strtolower($class_name);
 
 		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+		if (false === strpos($class_name, 'getpaid_') && false === strpos($class_name, 'wpinv_')) {
 			return;
 		}
 
 		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+		$file_name = 'class-' . str_replace('_', '-', $class_name) . '.php';
 
 		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+		$plugin_path = untrailingslashit(WPINV_PLUGIN_DIR);
 
 		// And an array of possible locations in order of importance.
 		$locations = array(
@@ -294,10 +294,10 @@ 
 			"$plugin_path/includes/admin/meta-boxes",
 		);
 
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
+		foreach (apply_filters('getpaid_autoload_locations', $locations) as $location) {
 
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
+			if (file_exists(trailingslashit($location) . $file_name)) {
+				include trailingslashit($location) . $file_name;
 				break;
 			}
 }
@@ -310,7 +310,7 @@ 
 	public function init() {
 
 		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
+		do_action('before_getpaid_init', $this);
 
 		// Maybe upgrade.
 		$this->maybe_upgrade_database();
@@ -327,17 +327,17 @@ 
 			)
 		);
 
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
+		foreach ($gateways as $id => $class) {
+			$this->gateways[$id] = new $class();
 		}
 
-		if ( 'yes' != get_option( 'wpinv_renamed_gateways' ) ) {
+		if ('yes' != get_option('wpinv_renamed_gateways')) {
 			GetPaid_Installer::rename_gateways_label();
-			update_option( 'wpinv_renamed_gateways', 'yes' );
+			update_option('wpinv_renamed_gateways', 'yes');
 		}
 
 		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
+		do_action('getpaid_init', $this);
 
 	}
 
@@ -347,14 +347,14 @@ 
 	public function maybe_process_ipn() {
 
 		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+		if (empty($_GET['wpi-listener']) || 'IPN' !== $_GET['wpi-listener'] || empty($_GET['wpi-gateway'])) {
 			return;
 		}
 
-		$gateway = sanitize_text_field( $_GET['wpi-gateway'] );
+		$gateway = sanitize_text_field($_GET['wpi-gateway']);
 
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
+		do_action('wpinv_verify_payment_ipn', $gateway);
+		do_action("wpinv_verify_{$gateway}_ipn");
 		exit;
 
 	}
@@ -362,24 +362,24 @@ 
 	public function enqueue_scripts() {
 
 		// Fires before adding scripts.
-		do_action( 'getpaid_enqueue_scripts' );
+		do_action('getpaid_enqueue_scripts');
 
 		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
+		$localize['ajax_url']             = admin_url('admin-ajax.php');
 		$localize['thousands']            = wpinv_thousands_separator();
 		$localize['decimals']             = wpinv_decimal_separator();
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
+		$localize['nonce']                = wp_create_nonce('wpinv-nonce');
+		$localize['txtComplete']          = __('Continue', 'invoicing');
 		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['loading']              = __( 'Loading...', 'invoicing' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+		$localize['formNonce']            = wp_create_nonce('getpaid_form_nonce');
+		$localize['loading']              = __('Loading...', 'invoicing');
+		$localize['connectionError']      = __('Could not establish a connection to the server.', 'invoicing');
 		$localize['recaptchaSettings']    = getpaid_get_recaptcha_settings();
 
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
+		$localize = apply_filters('wpinv_front_js_localize', $localize);
 
 		// reCaptcha.
-		if ( getpaid_is_recaptcha_enabled() ) {
+		if (getpaid_is_recaptcha_enabled()) {
 			$url = apply_filters(
 				'getpaid_recaptcha_api_url',
 				add_query_arg(
@@ -389,21 +389,21 @@ 
 					'https://www.google.com/recaptcha/api.js'
 				)
 			);
-			wp_enqueue_script( 'recaptcha', $url, array(), null, true ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
+			wp_enqueue_script('recaptcha', $url, array(), null, true); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
 		}
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'jquery' ), $version, true );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js');
+		wp_enqueue_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array('jquery'), $version, true);
+		wp_localize_script('wpinv-front-script', 'WPInv', $localize);
 	}
 
 	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+		if (isset($_REQUEST['wpi_action'])) {
+			do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
 		}
 
-		if ( defined( 'WP_ALL_IMPORT_ROOT_DIR' ) ) {
-			include plugin_dir_path( __FILE__ ) . 'libraries/wp-all-import/class-getpaid-wp-all-import.php';
+		if (defined('WP_ALL_IMPORT_ROOT_DIR')) {
+			include plugin_dir_path(__FILE__) . 'libraries/wp-all-import/class-getpaid-wp-all-import.php';
 		}
 	}
 
@@ -415,24 +415,24 @@ 
      */
     public function maybe_do_authenticated_action() {
 
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
+		if (isset($_REQUEST['getpaid-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce')) {
 
-			$key  = sanitize_key( $_REQUEST['getpaid-action'] );
-			$data = wp_unslash( $_REQUEST );
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $data );
+			$key  = sanitize_key($_REQUEST['getpaid-action']);
+			$data = wp_unslash($_REQUEST);
+			if (is_user_logged_in()) {
+				do_action("getpaid_authenticated_action_$key", $data);
 			}
 
-			do_action( "getpaid_unauthenticated_action_$key", $data );
+			do_action("getpaid_unauthenticated_action_$key", $data);
 
 		}
 
     }
 
-	public function pre_get_posts( $wp_query ) {
+	public function pre_get_posts($wp_query) {
 
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+		if (!is_admin() && !empty($wp_query->query_vars['post_type']) && getpaid_is_invoice_post_type($wp_query->query_vars['post_type']) && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+			$wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses(false, false, $wp_query->query_vars['post_type']));
 		}
 
 		return $wp_query;
@@ -447,18 +447,18 @@ 
 
 		// Currently, UX Builder does not work particulaly well with SuperDuper.
 		// So we disable our widgets when editing a page with UX Builder.
-		if ( function_exists( 'ux_builder_is_active' ) && ux_builder_is_active() ) {
+		if (function_exists('ux_builder_is_active') && ux_builder_is_active()) {
 			return;
 		}
 
-		$block_widget_init_screens = function_exists( 'sd_pagenow_exclude' ) ? sd_pagenow_exclude() : array();
+		$block_widget_init_screens = function_exists('sd_pagenow_exclude') ? sd_pagenow_exclude() : array();
 
-		if ( is_admin() && $pagenow && in_array( $pagenow, $block_widget_init_screens ) ) {
+		if (is_admin() && $pagenow && in_array($pagenow, $block_widget_init_screens)) {
 			// don't initiate in these conditions.
 		} else {
 
 			// Only load allowed widgets.
-			$exclude = function_exists( 'sd_widget_exclude' ) ? sd_widget_exclude() : array();
+			$exclude = function_exists('sd_widget_exclude') ? sd_widget_exclude() : array();
 			$widgets = apply_filters(
 				'getpaid_widget_classes',
 				array(
@@ -474,16 +474,16 @@ 
 			);
 
 			// For each widget...
-			foreach ( $widgets as $widget ) {
+			foreach ($widgets as $widget) {
 
 				// Abort early if it is excluded for this page.
-				if ( in_array( $widget, $exclude ) ) {
+				if (in_array($widget, $exclude)) {
 					continue;
 				}
 
 				// SD V1 used to extend the widget class. V2 does not, so we cannot call register widget on it.
-				if ( is_subclass_of( $widget, 'WP_Widget' ) ) {
-					register_widget( $widget );
+				if (is_subclass_of($widget, 'WP_Widget')) {
+					register_widget($widget);
 				} else {
 					new $widget();
 				}
@@ -502,29 +502,29 @@ 
 		// Ensure the database tables are up to date.
 		GetPaid_Installer::maybe_create_db_tables();
 
-		$wpi_version = get_option( 'wpinv_version', 0 );
+		$wpi_version = get_option('wpinv_version', 0);
 
-		if ( $wpi_version == WPINV_VERSION ) {
+		if ($wpi_version == WPINV_VERSION) {
 			return;
 		}
 
 		$installer = new GetPaid_Installer();
 
-		if ( empty( $wpi_version ) ) {
-			return $installer->upgrade_db( 0 );
+		if (empty($wpi_version)) {
+			return $installer->upgrade_db(0);
 		}
 
-		$upgrades  = array(
+		$upgrades = array(
 			'0.0.5' => '004',
 			'1.0.3' => '102',
 			'2.0.0' => '118',
 			'2.8.0' => '279',
 		);
 
-		foreach ( $upgrades as $key => $method ) {
+		foreach ($upgrades as $key => $method) {
 
-			if ( version_compare( $wpi_version, $key, '<' ) ) {
-				return $installer->upgrade_db( $method );
+			if (version_compare($wpi_version, $key, '<')) {
+				return $installer->upgrade_db($method);
 			}
 		}
 
@@ -537,11 +537,11 @@ 
 	 */
 	public function maybe_flush_permalinks() {
 
-		$flush = get_option( 'wpinv_flush_permalinks', 0 );
+		$flush = get_option('wpinv_flush_permalinks', 0);
 
-		if ( ! empty( $flush ) ) {
+		if (!empty($flush)) {
 			flush_rewrite_rules();
-			delete_option( 'wpinv_flush_permalinks' );
+			delete_option('wpinv_flush_permalinks');
 		}
 
 	}
@@ -552,10 +552,10 @@ 
 	 * @since 1.0.19
 	 * @param int[] $excluded_posts_ids
 	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ) {
+	public function wpseo_exclude_from_sitemap_by_post_ids($excluded_posts_ids) {
 
 		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
+		if (!is_array($excluded_posts_ids)) {
 			$excluded_posts_ids = array();
 		}
 
@@ -563,24 +563,24 @@ 
 		$our_pages = array();
 
 		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
+		$our_pages[] = wpinv_get_option('checkout_page', false);
 
 		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
+		$our_pages[] = wpinv_get_option('success_page', false);
 
 		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
+		$our_pages[] = wpinv_get_option('failure_page', false);
 
 		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+		$our_pages[] = wpinv_get_option('invoice_history_page', false);
 
 		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+		$our_pages[] = wpinv_get_option('invoice_subscription_page', false);
 
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+		$our_pages   = array_map('intval', array_filter($our_pages));
 
 		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
-		return array_unique( $excluded_posts_ids );
+		return array_unique($excluded_posts_ids);
 
 	}
 
@@ -590,15 +590,15 @@ 
 	 * @since 1.0.19
 	 * @param string[] $post_types
 	 */
-	public function exclude_invoicing_post_types( $post_types ) {
+	public function exclude_invoicing_post_types($post_types) {
 
 		// Ensure that we have an array.
-		if ( ! is_array( $post_types ) ) {
+		if (!is_array($post_types)) {
 			$post_types = array();
 		}
 
 		// Remove our post types.
-		return array_diff( $post_types, array_keys( getpaid_get_invoice_post_types() ) );
+		return array_diff($post_types, array_keys(getpaid_get_invoice_post_types()));
 	}
 
 	/**
@@ -607,7 +607,7 @@ 
 	 * @since 2.0.0
 	 */
 	public function wp_footer() {
-		wpinv_get_template( 'frontend-footer.php' );
+		wpinv_get_template('frontend-footer.php');
 	}
 
 	/**
@@ -616,14 +616,14 @@ 
 	 * @since 2.0.0
 	 */
 	public function wp_head() {
-		wpinv_get_template( 'frontend-head.php' );
+		wpinv_get_template('frontend-head.php');
 	}
 
 	/**
 	 * Custom query vars.
 	 *
 	 */
-	public function custom_query_vars( $vars ) {
+	public function custom_query_vars($vars) {
         $vars[] = 'getpaid-ipn';
         return $vars;
 	}
@@ -634,28 +634,28 @@ 
 	 */
 	public function add_rewrite_rule() {
         $tag = 'getpaid-ipn';
-        add_rewrite_tag( "%$tag%", '([^&]+)' );
-        add_rewrite_rule( "^$tag/([^/]*)/?", "index.php?$tag=\$matches[1]", 'top' );
+        add_rewrite_tag("%$tag%", '([^&]+)');
+        add_rewrite_rule("^$tag/([^/]*)/?", "index.php?$tag=\$matches[1]", 'top');
 	}
 
 	/**
 	 * Processes non-query string ipns.
 	 *
 	 */
-	public function maybe_process_new_ipn( $query ) {
+	public function maybe_process_new_ipn($query) {
 
-        if ( is_admin() || ! $query->is_main_query() ) {
+        if (is_admin() || !$query->is_main_query()) {
             return;
         }
 
-		$gateway = get_query_var( 'getpaid-ipn' );
+		$gateway = get_query_var('getpaid-ipn');
 
-        if ( ! empty( $gateway ) ) {
+        if (!empty($gateway)) {
 
-			$gateway = sanitize_text_field( $gateway );
+			$gateway = sanitize_text_field($gateway);
 			nocache_headers();
-			do_action( 'wpinv_verify_payment_ipn', $gateway );
-			do_action( "wpinv_verify_{$gateway}_ipn" );
+			do_action('wpinv_verify_payment_ipn', $gateway);
+			do_action("wpinv_verify_{$gateway}_ipn");
 			exit;
 
         }

includes/user-functions.php

Indentation +88 added lines, -88 removed lines

@@ -19,28 +19,28 @@ 
  */
 function getpaid_get_customers( $args = array(), $return = 'results' ) {
 
-	// Do not retrieve all fields if we just want the count.
-	if ( 'count' === $return ) {
-		$args['fields'] = 'id';
-		$args['number'] = 1;
-	}
+    // Do not retrieve all fields if we just want the count.
+    if ( 'count' === $return ) {
+        $args['fields'] = 'id';
+        $args['number'] = 1;
+    }
 
-	// Do not count all matches if we just want the results.
-	if ( 'results' === $return ) {
-		$args['count_total'] = false;
-	}
+    // Do not count all matches if we just want the results.
+    if ( 'results' === $return ) {
+        $args['count_total'] = false;
+    }
 
-	$query = new GetPaid_Customers_Query( $args );
+    $query = new GetPaid_Customers_Query( $args );
 
-	if ( 'results' === $return ) {
-		return $query->get_results();
-	}
+    if ( 'results' === $return ) {
+        return $query->get_results();
+    }
 
-	if ( 'count' === $return ) {
-		return $query->get_total();
-	}
+    if ( 'count' === $return ) {
+        return $query->get_total();
+    }
 
-	return $query;
+    return $query;
 }
 
 /**
@@ -106,11 +106,11 @@ 
  */
 function wpinv_get_capability( $capalibilty = 'manage_invoicing' ) {
 
-	if ( current_user_can( 'manage_options' ) ) {
-		return 'manage_options';
-	};
+    if ( current_user_can( 'manage_options' ) ) {
+        return 'manage_options';
+    };
 
-	return $capalibilty;
+    return $capalibilty;
 }
 
 /**
@@ -133,9 +133,9 @@ 
  * @return bool Whether the current user has the given capability.
  */
 function wpinv_current_user_can( $capability, $args = array() ) {
-	$can = wpinv_current_user_can_manage_invoicing();
+    $can = wpinv_current_user_can_manage_invoicing();
 
-	return apply_filters( 'getpaid_current_user_can', $can, $capability, $args );
+    return apply_filters( 'getpaid_current_user_can', $can, $capability, $args );
 }
 
 /**
@@ -149,10 +149,10 @@ 
     // Prepare user values.
     $prefix = preg_replace( '/\s+/', '', $prefix );
     $prefix = empty( $prefix ) ? $email : $prefix;
-	$args   = array(
-		'user_login' => wpinv_generate_user_name( $prefix ),
-		'user_pass'  => wp_generate_password(),
-		'user_email' => $email,
+    $args   = array(
+        'user_login' => wpinv_generate_user_name( $prefix ),
+        'user_pass'  => wp_generate_password(),
+        'user_email' => $email,
         'role'       => 'subscriber',
     );
 
@@ -169,16 +169,16 @@ 
 function wpinv_generate_user_name( $prefix = '' ) {
 
     // If prefix is an email, retrieve the part before the email.
-	$prefix = strtok( $prefix, '@' );
+    $prefix = strtok( $prefix, '@' );
     $prefix = trim( $prefix, '.' );
 
-	// Sanitize the username.
-	$prefix = sanitize_user( $prefix, true );
+    // Sanitize the username.
+    $prefix = sanitize_user( $prefix, true );
 
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
-	if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
-		$prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
-	}
+    $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+    if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
+        $prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
+    }
 
     $username = $prefix;
     $postfix  = 2;
@@ -317,43 +317,43 @@ 
 
                         $value = $customer->get( $key );
 
-					// Display the country.
-					if ( 'country' == $key ) {
-
-						aui()->select(
-							array(
-								'options'     => wpinv_get_country_list(),
-								'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
-								'id'          => 'wpinv-' . sanitize_html_class( $key ),
-								'value'       => sanitize_text_field( $value ),
-								'placeholder' => $label,
-								'label'       => wp_kses_post( $label ),
-								'label_type'  => 'vertical',
-								'class'       => 'getpaid-address-field',
+                    // Display the country.
+                    if ( 'country' == $key ) {
+
+                        aui()->select(
+                            array(
+                                'options'     => wpinv_get_country_list(),
+                                'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
+                                'id'          => 'wpinv-' . sanitize_html_class( $key ),
+                                'value'       => sanitize_text_field( $value ),
+                                'placeholder' => $label,
+                                'label'       => wp_kses_post( $label ),
+                                'label_type'  => 'vertical',
+                                'class'       => 'getpaid-address-field',
                             ),
                             true
-						);
+                        );
 
-					}
+                    }
 
-					// Display the state.
-					elseif ( 'state' == $key ) {
+                    // Display the state.
+                    elseif ( 'state' == $key ) {
 
-						getpaid_get_states_select_markup(
+                        getpaid_get_states_select_markup(
                             $customer->get( 'country' ),
-							$value,
-							$label,
-							$label,
-							'',
-							false,
-							'',
-							'getpaid_address[' . esc_attr( $key ) . ']',
+                            $value,
+                            $label,
+                            $label,
+                            '',
+                            false,
+                            '',
+                            'getpaid_address[' . esc_attr( $key ) . ']',
                             true
-						);
+                        );
 
                         } else {
 
-						aui()->input(
+                        aui()->input(
                             array(
                                 'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
                                 'id'          => 'wpinv-' . sanitize_html_class( $key ),
@@ -365,7 +365,7 @@ 
                                 'class'       => 'getpaid-address-field',
                             ),
                             true
-						);
+                        );
 
                         }
                     }
@@ -509,7 +509,7 @@ 
 function getpaid_allowed_html() {
     $allowed_html = wp_kses_allowed_html( 'post' );
 
-	// form fields
+    // form fields
     $allowed_html['form'] = array(
         'action'         => true,
         'accept'         => true,
@@ -521,12 +521,12 @@ 
     );
 
     // - input
-	$allowed_html['input'] = array(
-		'class'        => array(),
-		'id'           => array(),
-		'name'         => array(),
-		'value'        => array(),
-		'type'         => array(),
+    $allowed_html['input'] = array(
+        'class'        => array(),
+        'id'           => array(),
+        'name'         => array(),
+        'value'        => array(),
+        'type'         => array(),
         'placeholder'  => array(),
         'autocomplete' => array(),
         'autofocus'    => array(),
@@ -540,33 +540,33 @@ 
         'max'          => array(),
         'step'         => array(),
         'size'         => array(),
-	);
+    );
 
     // - input
-	$allowed_html['textarea'] = array(
-		'class' => array(),
-		'id'    => array(),
-		'name'  => array(),
-		'value' => array(),
-	);
-
-	// select
-	$allowed_html['select'] = array(
-		'class'        => array(),
-		'id'           => array(),
-		'name'         => array(),
+    $allowed_html['textarea'] = array(
+        'class' => array(),
+        'id'    => array(),
+        'name'  => array(),
+        'value' => array(),
+    );
+
+    // select
+    $allowed_html['select'] = array(
+        'class'        => array(),
+        'id'           => array(),
+        'name'         => array(),
         'autocomplete' => array(),
         'multiple'     => array(),
-	);
+    );
 
-	// select options
-	$allowed_html['option'] = array(
-		'selected' => array(),
+    // select options
+    $allowed_html['option'] = array(
+        'selected' => array(),
         'disabled' => array(),
         'value'    => array(),
-	);
+    );
 
-	return $allowed_html;
+    return $allowed_html;
 
 }
 

Spacing +150 added lines, -150 removed lines

@@ -6,7 +6,7 @@ 
  * @package GetPaid
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Queries the customers database.
@@ -17,26 +17,26 @@ 
  *
  * @return int|array|GetPaid_Customer[]|GetPaid_Customers_Query
  */
-function getpaid_get_customers( $args = array(), $return = 'results' ) {
+function getpaid_get_customers($args = array(), $return = 'results') {
 
 	// Do not retrieve all fields if we just want the count.
-	if ( 'count' === $return ) {
+	if ('count' === $return) {
 		$args['fields'] = 'id';
 		$args['number'] = 1;
 	}
 
 	// Do not count all matches if we just want the results.
-	if ( 'results' === $return ) {
+	if ('results' === $return) {
 		$args['count_total'] = false;
 	}
 
-	$query = new GetPaid_Customers_Query( $args );
+	$query = new GetPaid_Customers_Query($args);
 
-	if ( 'results' === $return ) {
+	if ('results' === $return) {
 		return $query->get_results();
 	}
 
-	if ( 'count' === $return ) {
+	if ('count' === $return) {
 		return $query->get_total();
 	}
 
@@ -49,19 +49,19 @@ 
  * @param int|string|object|GetPaid_Customer $customer customer id, email or object.
  * @return GetPaid_Customer|null
  */
-function getpaid_get_customer( $customer ) {
+function getpaid_get_customer($customer) {
 
-    if ( empty( $customer ) ) {
+    if (empty($customer)) {
         return null;
     }
 
     // Retrieve the customer.
-    if ( ! is_a( $customer, 'GetPaid_Customer' ) ) {
-        $customer = new GetPaid_Customer( $customer );
+    if (!is_a($customer, 'GetPaid_Customer')) {
+        $customer = new GetPaid_Customer($customer);
     }
 
     // Check if it exists.
-    if ( $customer->exists() ) {
+    if ($customer->exists()) {
         return $customer;
     }
 
@@ -74,9 +74,9 @@ 
  * @return GetPaid_Customer|null
  * @since 1.0.0
  */
-function getpaid_get_customer_by_user_id( $user_id ) {
+function getpaid_get_customer_by_user_id($user_id) {
     return getpaid_get_customer(
-        GetPaid_Customer::get_customer_id_by( $user_id, 'user_id' )
+        GetPaid_Customer::get_customer_id_by($user_id, 'user_id')
     );
 }
 
@@ -88,13 +88,13 @@ 
  * @param array $args
  * @see wp_dropdown_users
  */
-function wpinv_dropdown_users( $args = '' ) {
+function wpinv_dropdown_users($args = '') {
 
-    if ( is_array( $args ) && ! empty( $args['show'] ) && 'display_name_with_email' == $args['show'] ) {
+    if (is_array($args) && !empty($args['show']) && 'display_name_with_email' == $args['show']) {
         $args['show'] = 'display_name_with_login';
     }
 
-    return wp_dropdown_users( $args );
+    return wp_dropdown_users($args);
 }
 
 /**
@@ -104,9 +104,9 @@ 
  * @return string capability to check against
  * @param string $capalibilty Optional. The alternative capability to check against.
  */
-function wpinv_get_capability( $capalibilty = 'manage_invoicing' ) {
+function wpinv_get_capability($capalibilty = 'manage_invoicing') {
 
-	if ( current_user_can( 'manage_options' ) ) {
+	if (current_user_can('manage_options')) {
 		return 'manage_options';
 	};
 
@@ -120,7 +120,7 @@ 
  * @return bool
  */
 function wpinv_current_user_can_manage_invoicing() {
-    return current_user_can( wpinv_get_capability() );
+    return current_user_can(wpinv_get_capability());
 }
 
 /**
@@ -132,10 +132,10 @@ 
  * @param mixed  $args    Optional further parameters, typically starting with an object.
  * @return bool Whether the current user has the given capability.
  */
-function wpinv_current_user_can( $capability, $args = array() ) {
+function wpinv_current_user_can($capability, $args = array()) {
 	$can = wpinv_current_user_can_manage_invoicing();
 
-	return apply_filters( 'getpaid_current_user_can', $can, $capability, $args );
+	return apply_filters('getpaid_current_user_can', $can, $capability, $args);
 }
 
 /**
@@ -144,19 +144,19 @@ 
  * @since 1.0.19
  * @return int|WP_Error
  */
-function wpinv_create_user( $email, $prefix = '' ) {
+function wpinv_create_user($email, $prefix = '') {
 
     // Prepare user values.
-    $prefix = preg_replace( '/\s+/', '', $prefix );
-    $prefix = empty( $prefix ) ? $email : $prefix;
-	$args   = array(
-		'user_login' => wpinv_generate_user_name( $prefix ),
+    $prefix = preg_replace('/\s+/', '', $prefix);
+    $prefix = empty($prefix) ? $email : $prefix;
+	$args = array(
+		'user_login' => wpinv_generate_user_name($prefix),
 		'user_pass'  => wp_generate_password(),
 		'user_email' => $email,
         'role'       => 'subscriber',
     );
 
-    return wp_insert_user( $args );
+    return wp_insert_user($args);
 
 }
 
@@ -166,26 +166,26 @@ 
  * @since 1.0.19
  * @return bool|WP_User
  */
-function wpinv_generate_user_name( $prefix = '' ) {
+function wpinv_generate_user_name($prefix = '') {
 
     // If prefix is an email, retrieve the part before the email.
-	$prefix = strtok( $prefix, '@' );
-    $prefix = trim( $prefix, '.' );
+	$prefix = strtok($prefix, '@');
+    $prefix = trim($prefix, '.');
 
 	// Sanitize the username.
-	$prefix = sanitize_user( $prefix, true );
+	$prefix = sanitize_user($prefix, true);
 
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
-	if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
-		$prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
+	$illegal_logins = (array) apply_filters('illegal_user_logins', array());
+	if (empty($prefix) || in_array(strtolower($prefix), array_map('strtolower', $illegal_logins), true)) {
+		$prefix = 'gtp_' . zeroise(wp_rand(0, 9999), 4);
 	}
 
     $username = $prefix;
     $postfix  = 2;
 
-    while ( username_exists( $username ) ) {
+    while (username_exists($username)) {
         $username = "{$prefix}{$postfix}";
-        $postfix ++;
+        $postfix++;
     }
 
     return $username;
@@ -202,31 +202,31 @@ 
     $tabs = array(
 
         'gp-invoices'      => array(
-            'label'   => __( 'Invoices', 'invoicing' ), // Name of the tab.
+            'label'   => __('Invoices', 'invoicing'), // Name of the tab.
             'content' => '[wpinv_history]', // Content of the tab. Or specify "callback" to provide a callback instead.
             'icon'    => 'fas fa-file-invoice', // Shown on some profile plugins.
         ),
 
         'gp-subscriptions' => array(
-            'label'   => __( 'Subscriptions', 'invoicing' ),
+            'label'   => __('Subscriptions', 'invoicing'),
             'content' => '[wpinv_subscriptions]',
             'icon'    => 'fas fa-redo',
         ),
 
         'gp-edit-address'  => array(
-            'label'    => __( 'Billing Address', 'invoicing' ),
+            'label'    => __('Billing Address', 'invoicing'),
             'callback' => 'getpaid_display_address_edit_tab',
             'icon'     => 'fas fa-credit-card',
         ),
 
     );
 
-    $tabs = apply_filters( 'getpaid_user_content_tabs', $tabs );
+    $tabs = apply_filters('getpaid_user_content_tabs', $tabs);
 
     // Make sure address editing is last on the list.
-    if ( isset( $tabs['gp-edit-address'] ) ) {
+    if (isset($tabs['gp-edit-address'])) {
         $address = $tabs['gp-edit-address'];
-        unset( $tabs['gp-edit-address'] );
+        unset($tabs['gp-edit-address']);
         $tabs['gp-edit-address'] = $address;
     }
 
@@ -240,19 +240,19 @@ 
  * @param array $tab
  * @return array
  */
-function getpaid_prepare_user_content_tab( $tab ) {
+function getpaid_prepare_user_content_tab($tab) {
 
-    if ( ! empty( $tab['callback'] ) ) {
-        return call_user_func( $tab['callback'] );
+    if (!empty($tab['callback'])) {
+        return call_user_func($tab['callback']);
     }
 
-    if ( ! empty( $tab['content'] ) ) {
-        return convert_smilies( capital_P_dangit( wp_filter_content_tags( do_shortcode( shortcode_unautop( wpautop( wptexturize( do_blocks( $tab['content'] ) ) ) ) ) ) ) );
+    if (!empty($tab['content'])) {
+        return convert_smilies(capital_P_dangit(wp_filter_content_tags(do_shortcode(shortcode_unautop(wpautop(wptexturize(do_blocks($tab['content']))))))));
     }
 
     $notice = aui()->alert(
         array(
-            'content' => __( 'This tab has no content or content callback.', 'invoicing' ),
+            'content' => __('This tab has no content or content callback.', 'invoicing'),
             'type'    => 'error',
         )
     );
@@ -268,14 +268,14 @@ 
  * @param string $default
  * @return array
  */
-function getpaid_get_tab_url( $tab, $default ) {
+function getpaid_get_tab_url($tab, $default) {
     global $getpaid_tab_url;
 
-    if ( empty( $getpaid_tab_url ) ) {
+    if (empty($getpaid_tab_url)) {
         return $default;
     }
 
-    return sprintf( $getpaid_tab_url, $tab );
+    return sprintf($getpaid_tab_url, $tab);
 
 }
 
@@ -287,21 +287,21 @@ 
  */
 function getpaid_display_address_edit_tab() {
 
-    if ( 0 === get_current_user_id() ) {
+    if (0 === get_current_user_id()) {
         return '<div class="bsui">' . aui()->alert(
             array(
                 'type'        => 'error',
-                'content'     => __( 'Your must be logged in to view this section', 'invoicing' ),
+                'content'     => __('Your must be logged in to view this section', 'invoicing'),
                 'dismissible' => false,
             )
         ) . '</div>';
     }
 
-    $customer = getpaid_get_customer_by_user_id( get_current_user_id() );
+    $customer = getpaid_get_customer_by_user_id(get_current_user_id());
 
-    if ( empty( $customer ) ) {
-        $customer = new GetPaid_Customer( 0 );
-        $customer->clone_user( get_current_user_id() );
+    if (empty($customer)) {
+        $customer = new GetPaid_Customer(0);
+        $customer->clone_user(get_current_user_id());
         $customer->save();
     }
 
@@ -313,21 +313,21 @@ 
 
                 <?php
 
-                    foreach ( getpaid_user_address_fields() as $key => $label ) {
+                    foreach (getpaid_user_address_fields() as $key => $label) {
 
-                        $value = $customer->get( $key );
+                        $value = $customer->get($key);
 
 					// Display the country.
-					if ( 'country' == $key ) {
+					if ('country' == $key) {
 
 						aui()->select(
 							array(
 								'options'     => wpinv_get_country_list(),
-								'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
-								'id'          => 'wpinv-' . sanitize_html_class( $key ),
-								'value'       => sanitize_text_field( $value ),
+								'name'        => 'getpaid_address[' . esc_attr($key) . ']',
+								'id'          => 'wpinv-' . sanitize_html_class($key),
+								'value'       => sanitize_text_field($value),
 								'placeholder' => $label,
-								'label'       => wp_kses_post( $label ),
+								'label'       => wp_kses_post($label),
 								'label_type'  => 'vertical',
 								'class'       => 'getpaid-address-field',
                             ),
@@ -337,17 +337,17 @@ 
 					}
 
 					// Display the state.
-					elseif ( 'state' == $key ) {
+					elseif ('state' == $key) {
 
 						getpaid_get_states_select_markup(
-                            $customer->get( 'country' ),
+                            $customer->get('country'),
 							$value,
 							$label,
 							$label,
 							'',
 							false,
 							'',
-							'getpaid_address[' . esc_attr( $key ) . ']',
+							'getpaid_address[' . esc_attr($key) . ']',
                             true
 						);
 
@@ -355,13 +355,13 @@ 
 
 						aui()->input(
                             array(
-                                'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
-                                'id'          => 'wpinv-' . sanitize_html_class( $key ),
+                                'name'        => 'getpaid_address[' . esc_attr($key) . ']',
+                                'id'          => 'wpinv-' . sanitize_html_class($key),
                                 'placeholder' => $label,
-                                'label'       => wp_kses_post( $label ),
+                                'label'       => wp_kses_post($label),
                                 'label_type'  => 'vertical',
                                 'type'        => 'text',
-                                'value'       => sanitize_text_field( $value ),
+                                'value'       => sanitize_text_field($value),
                                 'class'       => 'getpaid-address-field',
                             ),
                             true
@@ -375,32 +375,32 @@ 
                             'name'        => 'getpaid_address[email_cc]',
                             'id'          => 'wpinv-email_cc',
                             'placeholder' => 'email1@example.com, email2@example.com',
-                            'label'       => __( 'Other email addresses', 'invoicing' ),
+                            'label'       => __('Other email addresses', 'invoicing'),
                             'label_type'  => 'vertical',
                             'type'        => 'text',
-                            'value'       => sanitize_text_field( $customer->get( 'email_cc' ) ),
+                            'value'       => sanitize_text_field($customer->get('email_cc')),
                             'class'       => 'getpaid-address-field',
-                            'help_text'   => __( 'Optionally provide other email addresses where we should send payment notifications', 'invoicing' ),
+                            'help_text'   => __('Optionally provide other email addresses where we should send payment notifications', 'invoicing'),
                         ),
                         true
                     );
 
-                    do_action( 'getpaid_display_address_edit_tab' );
+                    do_action('getpaid_display_address_edit_tab');
 
                     aui()->input(
                         array(
                             'name'      => 'getpaid_profile_edit_submit_button',
                             'id'        => 'getpaid_profile_edit_submit_button',
-                            'value'     => __( 'Save Address', 'invoicing' ),
-                            'help_text' => __( 'New invoices will use this address as the billing address.', 'invoicing' ),
+                            'value'     => __('Save Address', 'invoicing'),
+                            'help_text' => __('New invoices will use this address as the billing address.', 'invoicing'),
                             'type'      => 'submit',
                             'class'     => 'btn btn-primary btn-block submit-button',
                         ),
                         true
                     );
 
-                    wp_nonce_field( 'getpaid-nonce', 'getpaid-nonce' );
-                    getpaid_hidden_field( 'getpaid-action', 'edit_billing_details' );
+                    wp_nonce_field('getpaid-nonce', 'getpaid-nonce');
+                    getpaid_hidden_field('getpaid-action', 'edit_billing_details');
                 ?>
 
             </form>
@@ -410,7 +410,7 @@ 
 
     return ob_get_clean();
 }
-add_shortcode( 'getpaid_edit_address', 'getpaid_display_address_edit_tab' );
+add_shortcode('getpaid_edit_address', 'getpaid_display_address_edit_tab');
 
 /**
  * Saves the billing address edit tab.
@@ -418,35 +418,35 @@ 
  * @since 2.1.4
  * @param array $data
  */
-function getpaid_save_address_edit_tab( $data ) {
+function getpaid_save_address_edit_tab($data) {
 
-    if ( empty( $data['getpaid_address'] ) || ! is_array( $data['getpaid_address'] ) ) {
+    if (empty($data['getpaid_address']) || !is_array($data['getpaid_address'])) {
         return;
     }
 
     $data     = $data['getpaid_address'];
-    $customer = getpaid_get_customer_by_user_id( get_current_user_id() );
+    $customer = getpaid_get_customer_by_user_id(get_current_user_id());
 
-    if ( empty( $customer ) ) {
-        $customer = new GetPaid_Customer( 0 );
-        $customer->clone_user( get_current_user_id() );
+    if (empty($customer)) {
+        $customer = new GetPaid_Customer(0);
+        $customer->clone_user(get_current_user_id());
     }
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-        if ( isset( $data[ $field ] ) ) {
-            $customer->set( $field, sanitize_text_field( $data[ $field ] ) );
+        if (isset($data[$field])) {
+            $customer->set($field, sanitize_text_field($data[$field]));
         }
     }
 
-    if ( isset( $data['email_cc'] ) ) {
-        $customer->set( 'email_cc', sanitize_text_field( $data['email_cc'] ) );
+    if (isset($data['email_cc'])) {
+        $customer->set('email_cc', sanitize_text_field($data['email_cc']));
     }
 
     $customer->save();
-    wpinv_set_error( 'address_updated' );
+    wpinv_set_error('address_updated');
 }
-add_action( 'getpaid_authenticated_action_edit_billing_details', 'getpaid_save_address_edit_tab' );
+add_action('getpaid_authenticated_action_edit_billing_details', 'getpaid_save_address_edit_tab');
 
 
 /*
@@ -464,27 +464,27 @@ 
  * @param  array $tabs
  * @return array
  */
-function getpaid_filter_userswp_account_tabs( $tabs ) {
+function getpaid_filter_userswp_account_tabs($tabs) {
 
     // Abort if the integration is inactive.
-    if ( ! getpaid_is_userswp_integration_active() ) {
+    if (!getpaid_is_userswp_integration_active()) {
         return $tabs;
     }
 
-    $new_tabs   = array();
+    $new_tabs = array();
 
-    foreach ( getpaid_get_user_content_tabs() as $slug => $tab ) {
+    foreach (getpaid_get_user_content_tabs() as $slug => $tab) {
 
-        $new_tabs[ $slug ] = array(
+        $new_tabs[$slug] = array(
             'title' => $tab['label'],
             'icon'  => $tab['icon'],
         );
 
     }
 
-    return array_merge( $tabs, $new_tabs );
+    return array_merge($tabs, $new_tabs);
 }
-add_filter( 'uwp_account_available_tabs', 'getpaid_filter_userswp_account_tabs' );
+add_filter('uwp_account_available_tabs', 'getpaid_filter_userswp_account_tabs');
 
 /**
  * Display our UsersWP account tabs.
@@ -493,21 +493,21 @@ 
  * @param  array $tabs
  * @return array
  */
-function getpaid_display_userswp_account_tabs( $tab ) {
+function getpaid_display_userswp_account_tabs($tab) {
     global $getpaid_tab_url;
 
     $our_tabs = getpaid_get_user_content_tabs();
 
-    if ( getpaid_is_userswp_integration_active() && isset( $our_tabs[ $tab ] ) ) {
-        $getpaid_tab_url = add_query_arg( 'type', '%s', uwp_get_account_page_url() );
-        echo wp_kses( getpaid_prepare_user_content_tab( $our_tabs[ $tab ] ), getpaid_allowed_html() );
+    if (getpaid_is_userswp_integration_active() && isset($our_tabs[$tab])) {
+        $getpaid_tab_url = add_query_arg('type', '%s', uwp_get_account_page_url());
+        echo wp_kses(getpaid_prepare_user_content_tab($our_tabs[$tab]), getpaid_allowed_html());
     }
 
 }
-add_action( 'uwp_account_form_display', 'getpaid_display_userswp_account_tabs' );
+add_action('uwp_account_form_display', 'getpaid_display_userswp_account_tabs');
 
 function getpaid_allowed_html() {
-    $allowed_html = wp_kses_allowed_html( 'post' );
+    $allowed_html = wp_kses_allowed_html('post');
 
 	// form fields
     $allowed_html['form'] = array(
@@ -578,17 +578,17 @@ 
  * @param  string $tab   Current tab.
  * @return string Title.
  */
-function getpaid_filter_userswp_account_title( $title, $tab ) {
+function getpaid_filter_userswp_account_title($title, $tab) {
 
-    $our_tabs   = getpaid_get_user_content_tabs();
+    $our_tabs = getpaid_get_user_content_tabs();
 
-    if ( getpaid_is_userswp_integration_active() && isset( $our_tabs[ $tab ] ) ) {
-        return $our_tabs[ $tab ]['label'];
+    if (getpaid_is_userswp_integration_active() && isset($our_tabs[$tab])) {
+        return $our_tabs[$tab]['label'];
     }
 
     return $title;
 }
-add_filter( 'uwp_account_page_title', 'getpaid_filter_userswp_account_title', 10, 2 );
+add_filter('uwp_account_page_title', 'getpaid_filter_userswp_account_title', 10, 2);
 
 /**
  * Registers the UsersWP integration settings.
@@ -597,26 +597,26 @@ 
  * @param  array $settings An array of integration settings.
  * @return array
  */
-function getpaid_register_userswp_settings( $settings ) {
+function getpaid_register_userswp_settings($settings) {
 
-    if ( defined( 'USERSWP_PLUGIN_FILE' ) ) {
+    if (defined('USERSWP_PLUGIN_FILE')) {
 
         $settings[] = array(
 
             'id'       => 'userswp',
-            'label'    => __( 'UsersWP', 'invoicing' ),
+            'label'    => __('UsersWP', 'invoicing'),
             'settings' => array(
 
                 'userswp_settings' => array(
                     'id'   => 'userswp_settings',
-                    'name' => '<h3>' . __( 'UsersWP', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('UsersWP', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
 
                 'enable_userswp'   => array(
                     'id'   => 'enable_userswp',
-                    'name' => __( 'Enable Integration', 'invoicing' ),
-                    'desc' => __( 'Display GetPaid items on UsersWP account page.', 'invoicing' ),
+                    'name' => __('Enable Integration', 'invoicing'),
+                    'desc' => __('Display GetPaid items on UsersWP account page.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => 1,
                 ),
@@ -629,7 +629,7 @@ 
 
     return $settings;
 }
-add_filter( 'getpaid_integration_settings', 'getpaid_register_userswp_settings' );
+add_filter('getpaid_integration_settings', 'getpaid_register_userswp_settings');
 
 /**
  * Ovewrites the invoices history page to UsersWP.
@@ -637,18 +637,18 @@ 
  * @since  2.3.1
  * @return bool
  */
-function getpaid_userswp_overwrite_invoice_history_page( $url, $post_type ) {
+function getpaid_userswp_overwrite_invoice_history_page($url, $post_type) {
 
     $our_tabs = getpaid_get_user_content_tabs();
     $tab      = "gp-{$post_type}s";
-    if ( getpaid_is_userswp_integration_active() && isset( $our_tabs[ $tab ] ) ) {
-        return add_query_arg( 'type', $tab, uwp_get_account_page_url() );
+    if (getpaid_is_userswp_integration_active() && isset($our_tabs[$tab])) {
+        return add_query_arg('type', $tab, uwp_get_account_page_url());
     }
 
     return $url;
 
 }
-add_filter( 'wpinv_get_history_page_uri', 'getpaid_userswp_overwrite_invoice_history_page', 10, 2 );
+add_filter('wpinv_get_history_page_uri', 'getpaid_userswp_overwrite_invoice_history_page', 10, 2);
 
 /**
  * Checks if the integration is enabled.
@@ -657,8 +657,8 @@ 
  * @return bool
  */
 function getpaid_is_userswp_integration_active() {
-    $enabled = wpinv_get_option( 'enable_userswp', 1 );
-    return defined( 'USERSWP_PLUGIN_FILE' ) && ! empty( $enabled );
+    $enabled = wpinv_get_option('enable_userswp', 1);
+    return defined('USERSWP_PLUGIN_FILE') && !empty($enabled);
 }
 
 /*
@@ -676,26 +676,26 @@ 
  * @param  array $settings An array of integration settings.
  * @return array
  */
-function getpaid_register_buddypress_settings( $settings ) {
+function getpaid_register_buddypress_settings($settings) {
 
-    if ( class_exists( 'BuddyPress' ) ) {
+    if (class_exists('BuddyPress')) {
 
         $settings[] = array(
 
             'id'       => 'buddypress',
-            'label'    => __( 'BuddyPress', 'invoicing' ),
+            'label'    => __('BuddyPress', 'invoicing'),
             'settings' => array(
 
                 'buddypress_settings' => array(
                     'id'   => 'buddypress_settings',
-                    'name' => '<h3>' . __( 'BuddyPress', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('BuddyPress', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
 
                 'enable_buddypress'   => array(
                     'id'   => 'enable_buddypress',
-                    'name' => __( 'Enable Integration', 'invoicing' ),
-                    'desc' => __( 'Display GetPaid items on BuddyPress account pages.', 'invoicing' ),
+                    'name' => __('Enable Integration', 'invoicing'),
+                    'desc' => __('Display GetPaid items on BuddyPress account pages.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => 1,
                 ),
@@ -708,7 +708,7 @@ 
 
     return $settings;
 }
-add_filter( 'getpaid_integration_settings', 'getpaid_register_buddypress_settings' );
+add_filter('getpaid_integration_settings', 'getpaid_register_buddypress_settings');
 
 /**
  * Checks if the integration is enabled.
@@ -717,8 +717,8 @@ 
  * @return bool
  */
 function getpaid_is_buddypress_integration_active() {
-    $enabled = wpinv_get_option( 'enable_buddypress', 1 );
-    return class_exists( 'BuddyPress' ) && ! empty( $enabled );
+    $enabled = wpinv_get_option('enable_buddypress', 1);
+    return class_exists('BuddyPress') && !empty($enabled);
 }
 
 /**
@@ -729,13 +729,13 @@ 
  */
 function getpaid_setup_buddypress_integration() {
 
-    if ( getpaid_is_buddypress_integration_active() ) {
+    if (getpaid_is_buddypress_integration_active()) {
         require_once WPINV_PLUGIN_DIR . 'includes/class-bp-getpaid-component.php';
         buddypress()->getpaid = new BP_GetPaid_Component();
     }
 
 }
-add_action( 'bp_setup_components', 'getpaid_setup_buddypress_integration' );
+add_action('bp_setup_components', 'getpaid_setup_buddypress_integration');
 
 /**
  * Checks if a given user has purchased a given item.
@@ -744,10 +744,10 @@ 
  * @param int $item_id The item id.
  * @return int The IDs of users who purchased the item.
  */
-function getpaid_user_ids_who_purchased_item( $item_id ) {
+function getpaid_user_ids_who_purchased_item($item_id) {
     global $wpdb;
 
-    if ( empty( $item_id ) ) {
+    if (empty($item_id)) {
         return false;
     }
 
@@ -760,7 +760,7 @@ 
         )
     );
 
-    return wp_parse_id_list( $ids );
+    return wp_parse_id_list($ids);
 }
 
 /**
@@ -769,10 +769,10 @@ 
  * @since 2.6.17
  * @param int $user_id The user id.
  */
-function getpaid_has_user_purchased_item( $user_id, $item_id ) {
+function getpaid_has_user_purchased_item($user_id, $item_id) {
     global $wpdb;
 
-    if ( empty( $user_id ) ) {
+    if (empty($user_id)) {
         return false;
     }
 
@@ -787,7 +787,7 @@ 
         )
     );
 
-    return ! empty( $count );
+    return !empty($count);
 }
 
 /**
@@ -796,7 +796,7 @@ 
  * @since 2.6.17
  * @param int $user_id The user id.
  */
-function getpaid_get_user_total_spend( $user_id ) {
+function getpaid_get_user_total_spend($user_id) {
     $args = array(
         'data'           => array(
 
@@ -811,17 +811,17 @@ 
 
             'author' => array(
                 'type'     => 'post_data',
-                'value'    => absint( $user_id ),
+                'value'    => absint($user_id),
                 'key'      => 'posts.post_author',
                 'operator' => '=',
             ),
 
         ),
         'query_type'     => 'get_var',
-        'invoice_status' => array( 'wpi-renewal', 'wpi-processing', 'publish' ),
+        'invoice_status' => array('wpi-renewal', 'wpi-processing', 'publish'),
     );
 
-    return wpinv_round_amount( GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
+    return wpinv_round_amount(GetPaid_Reports_Helper::get_invoice_report_data($args));
 }
 
 /**
@@ -830,7 +830,7 @@ 
  * @since 2.6.17
  * @param int $user_id The user id.
  */
-function getpaid_count_user_invoices( $user_id ) {
+function getpaid_count_user_invoices($user_id) {
     $args = array(
         'data'           => array(
 
@@ -846,15 +846,15 @@ 
 
             'author' => array(
                 'type'     => 'post_data',
-                'value'    => absint( $user_id ),
+                'value'    => absint($user_id),
                 'key'      => 'posts.post_author',
                 'operator' => '=',
             ),
 
         ),
         'query_type'     => 'get_var',
-        'invoice_status' => array_keys( wpinv_get_invoice_statuses() ),
+        'invoice_status' => array_keys(wpinv_get_invoice_statuses()),
     );
 
-    return absint( GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
+    return absint(GetPaid_Reports_Helper::get_invoice_report_data($args));
 }

includes/class-getpaid-customer.php

Indentation +176 added lines, -176 removed lines

@@ -15,69 +15,69 @@ 
  */
 class GetPaid_Customer extends GetPaid_Data {
 
-	/**
-	 * Which data store to load.
-	 *
-	 * @var string
-	 */
+    /**
+     * Which data store to load.
+     *
+     * @var string
+     */
     protected $data_store_name = 'customer';
 
     /**
-	 * This is the name of this object type.
-	 *
-	 * @var string
-	 */
-	protected $object_type = 'customer';
-
-	/**
-	 * Get the customer if ID is passed, otherwise the customer is new and empty.
-	 *
-	 * @param int|string|GetPaid_Customer|object $customer customer id, object, or email.
-	 */
-	public function __construct( $customer = 0 ) {
+     * This is the name of this object type.
+     *
+     * @var string
+     */
+    protected $object_type = 'customer';
+
+    /**
+     * Get the customer if ID is passed, otherwise the customer is new and empty.
+     *
+     * @param int|string|GetPaid_Customer|object $customer customer id, object, or email.
+     */
+    public function __construct( $customer = 0 ) {
 
         // Setup default customer data.
         $this->setup_default_data();
 
-		if ( is_numeric( $customer ) ) {
-			$this->set_id( $customer );
-		} elseif ( $customer instanceof self ) {
-			$this->set_id( $customer->get_id() );
-		} elseif ( is_string( $customer ) && $customer_id = self::get_customer_id_by( $customer, 'email' ) ) {
-			$this->set_id( $customer_id );
-		} elseif ( ! empty( $customer->id ) ) {
-			$this->set_id( $customer->id );
-		}
+        if ( is_numeric( $customer ) ) {
+            $this->set_id( $customer );
+        } elseif ( $customer instanceof self ) {
+            $this->set_id( $customer->get_id() );
+        } elseif ( is_string( $customer ) && $customer_id = self::get_customer_id_by( $customer, 'email' ) ) {
+            $this->set_id( $customer_id );
+        } elseif ( ! empty( $customer->id ) ) {
+            $this->set_id( $customer->id );
+        }
 
         // Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+        $this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
 
-		if ( $this->get_id() > 0 ) {
-			$this->data_store->read( $this );
+        if ( $this->get_id() > 0 ) {
+            $this->data_store->read( $this );
         }
 
         $this->set_object_read( true );
-	}
+    }
 
     /**
-	 * Sets up default customer data.
-	 */
-	private function setup_default_data() {
+     * Sets up default customer data.
+     */
+    private function setup_default_data() {
 
         $this->data = array(
-			'user_id'        => 0,
-			'email'          => '',
-			'email_cc'       => '',
-			'status'         => 'active',
-			'purchase_value' => 0,
-			'purchase_count' => 0,
-			'date_created'   => current_time( 'mysql' ),
-			'date_modified'  => current_time( 'mysql' ),
-			'uuid'           => wp_generate_uuid4(),
-		);
+            'user_id'        => 0,
+            'email'          => '',
+            'email_cc'       => '',
+            'status'         => 'active',
+            'purchase_value' => 0,
+            'purchase_count' => 0,
+            'date_created'   => current_time( 'mysql' ),
+            'date_modified'  => current_time( 'mysql' ),
+            'uuid'           => wp_generate_uuid4(),
+        );
 
         // Add address fields.
-		foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+        foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
 
             if ( isset( $this->data[ $field ] ) ) {
                 continue;
@@ -95,22 +95,22 @@ 
                 continue;
             }
 
-			$this->data[ $field ] = '';
-		}
+            $this->data[ $field ] = '';
+        }
 
         $this->default_data = $this->data;
-	}
-
-	/**
-	 * Given a customer email or user id, it returns a customer id.
-	 *
-	 * @static
-	 * @param string $value
-	 * @since 1.0.15
-	 * @return int
-	 */
-	public static function get_customer_id_by( $value, $by = 'email' ) {
-		global $wpdb;
+    }
+
+    /**
+     * Given a customer email or user id, it returns a customer id.
+     *
+     * @static
+     * @param string $value
+     * @since 1.0.15
+     * @return int
+     */
+    public static function get_customer_id_by( $value, $by = 'email' ) {
+        global $wpdb;
 
         // Prepare value.
         if ( 'email' === $by ) {
@@ -125,12 +125,12 @@ 
             return 0;
         }
 
-		// Maybe retrieve from the cache.
+        // Maybe retrieve from the cache.
         $cache_key   = 'getpaid_customer_ids_by_' . $by;
-		$customer_id = wp_cache_get( $value, $cache_key );
-		if ( false !== $customer_id ) {
-			return $customer_id;
-		}
+        $customer_id = wp_cache_get( $value, $cache_key );
+        if ( false !== $customer_id ) {
+            return $customer_id;
+        }
 
         if ( 'email' === $by ) {
             $customer_id = (int) $wpdb->get_var(
@@ -142,23 +142,23 @@ 
             );
         }
 
-		// Update the cache with our data
-		wp_cache_set( $value, $customer_id, $cache_key );
+        // Update the cache with our data
+        wp_cache_set( $value, $customer_id, $cache_key );
 
-		return $customer_id;
+        return $customer_id;
 
-	}
+    }
 
-	/**
+    /**
      * Clears the customer's cache.
      */
     public function clear_cache() {
         wp_cache_delete( $this->get( 'email' ), 'getpaid_customer_ids_by_email' );
         wp_cache_delete( $this->get( 'user_id' ), 'getpaid_customer_ids_by_user_id' );
-		wp_cache_delete( $this->get_id(), 'getpaid_customers' );
-	}
+        wp_cache_delete( $this->get_id(), 'getpaid_customers' );
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD methods
 	|--------------------------------------------------------------------------
@@ -189,11 +189,11 @@ 
             return call_user_func( array( $this, 'get_' . $key ), $context );
         }
 
-		return $this->get_prop( $key, $context );
+        return $this->get_prop( $key, $context );
 
     }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Setters
 	|--------------------------------------------------------------------------
@@ -216,114 +216,114 @@ 
             return call_user_func( array( $this, 'set_' . $key ), $value );
         }
 
-		return $this->set_prop( $key, $value );
+        return $this->set_prop( $key, $value );
 
     }
 
-	/**
-	 * Sets customer status.
-	 *
-	 * @since 1.0.0
-	 * @param  string $status New status.
-	 */
-	public function set_status( $status ) {
-
-		if ( in_array( $status, array( 'active', 'inactive', 'blocked' ), true ) ) {
-			return $this->set_prop( 'status', $status );
-		}
-
-		$this->set_prop( 'status', 'inactive' );
-	}
-
-	/**
-	 * Sets the purchase value.
-	 *
-	 * @since 1.0.0
-	 * @param float $purchase_value.
-	 */
-	public function set_purchase_value( $purchase_value ) {
-		$this->set_prop( 'purchase_value', (float) $purchase_value );
-	}
+    /**
+     * Sets customer status.
+     *
+     * @since 1.0.0
+     * @param  string $status New status.
+     */
+    public function set_status( $status ) {
+
+        if ( in_array( $status, array( 'active', 'inactive', 'blocked' ), true ) ) {
+            return $this->set_prop( 'status', $status );
+        }
+
+        $this->set_prop( 'status', 'inactive' );
+    }
+
+    /**
+     * Sets the purchase value.
+     *
+     * @since 1.0.0
+     * @param float $purchase_value.
+     */
+    public function set_purchase_value( $purchase_value ) {
+        $this->set_prop( 'purchase_value', (float) $purchase_value );
+    }
 
     /**
-	 * Sets the purchase count.
-	 *
-	 * @since 1.0.0
-	 * @param int $purchase_count.
-	 */
-	public function set_purchase_count( $purchase_count ) {
-		$this->set_prop( 'purchase_count', absint( $purchase_count ) );
-	}
+     * Sets the purchase count.
+     *
+     * @since 1.0.0
+     * @param int $purchase_count.
+     */
+    public function set_purchase_count( $purchase_count ) {
+        $this->set_prop( 'purchase_count', absint( $purchase_count ) );
+    }
 
     /**
-	 * Sets the user id.
-	 *
-	 * @since 1.0.0
-	 * @param int $user_id.
-	 */
-	public function set_user_id( $user_id ) {
-		$this->set_prop( 'user_id', absint( $user_id ) );
-	}
+     * Sets the user id.
+     *
+     * @since 1.0.0
+     * @param int $user_id.
+     */
+    public function set_user_id( $user_id ) {
+        $this->set_prop( 'user_id', absint( $user_id ) );
+    }
 
     /**
-	 * Sets the email.
-	 *
-	 * @since 1.0.0
-	 * @param string $email.
-	 */
-	public function set_email( $email ) {
+     * Sets the email.
+     *
+     * @since 1.0.0
+     * @param string $email.
+     */
+    public function set_email( $email ) {
         $email = is_string( $email ) ? sanitize_email( $email ) : '';
-		$this->set_prop( 'email', $email );
-	}
+        $this->set_prop( 'email', $email );
+    }
 
     /**
-	 * Sets the email cc.
-	 *
-	 * @since 1.0.0
-	 * @param string $email_cc.
-	 */
-	public function set_email_cc( $email_cc ) {
+     * Sets the email cc.
+     *
+     * @since 1.0.0
+     * @param string $email_cc.
+     */
+    public function set_email_cc( $email_cc ) {
         $email_cc = implode( ', ', wp_parse_list( $email_cc ) );
-		$this->set_prop( 'email_cc', $email_cc );
-	}
+        $this->set_prop( 'email_cc', $email_cc );
+    }
 
     /**
-	 * Sets the created date.
-	 *
-	 * @since 1.0.0
-	 * @param  string $date_created date created.
-	 */
-	public function set_date_created( $date_created ) {
+     * Sets the created date.
+     *
+     * @since 1.0.0
+     * @param  string $date_created date created.
+     */
+    public function set_date_created( $date_created ) {
 
-		$date = strtotime( $date_created );
+        $date = strtotime( $date_created );
 
         if ( $date && $date_created !== '0000-00-00 00:00:00'  && $date_created !== '0000-00-00 00:00' ) {
             $this->set_prop( 'date_created', gmdate( 'Y-m-d H:i:s', $date ) );
             return;
-		}
+        }
 
-		$this->set_prop( 'date_created', null );
-	}
+        $this->set_prop( 'date_created', null );
+    }
 
     /**
-	 * Sets the created date.
-	 *
-	 * @since 1.0.0
-	 * @param  string $date_modified date created.
-	 */
-	public function set_date_modified( $date_modified ) {
+     * Sets the created date.
+     *
+     * @since 1.0.0
+     * @param  string $date_modified date created.
+     */
+    public function set_date_modified( $date_modified ) {
 
-		$date = strtotime( $date_modified );
+        $date = strtotime( $date_modified );
 
         if ( $date && $date_modified !== '0000-00-00 00:00:00'  && $date_modified !== '0000-00-00 00:00' ) {
             $this->set_prop( 'date_modified', gmdate( 'Y-m-d H:i:s', $date ) );
             return;
-		}
+        }
 
-		$this->set_prop( 'date_modified', null );
-	}
+        $this->set_prop( 'date_modified', null );
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Additional methods
 	|--------------------------------------------------------------------------
@@ -332,12 +332,12 @@ 
 	|
 	*/
 
-	/**
-	 * Saves the customer.
-	 *
-	 * @since 1.0.0
-	 */
-	public function save() {
+    /**
+     * Saves the customer.
+     *
+     * @since 1.0.0
+     */
+    public function save() {
 
         $maybe_set = array(
             'uuid'         => wp_generate_uuid4(),
@@ -354,29 +354,29 @@ 
 
         $this->set( 'date_modified', current_time( 'mysql' ) );
 
-		return parent::save();
-	}
+        return parent::save();
+    }
 
     /**
-	 * Helper method to clone a customer from a user ID.
-	 *
-	 * @since 1.0.0
-	 * @param int $user_id.
-	 */
-	public function clone_user( $user_id ) {
+     * Helper method to clone a customer from a user ID.
+     *
+     * @since 1.0.0
+     * @param int $user_id.
+     */
+    public function clone_user( $user_id ) {
         $user = get_userdata( $user_id );
 
         if ( empty( $user ) ) {
             return;
         }
 
-		$this->set_user_id( $user->ID );
+        $this->set_user_id( $user->ID );
         $this->set_email( $user->user_email );
         $this->set_purchase_value( getpaid_get_user_total_spend( $user->ID ) );
         $this->set_purchase_count( getpaid_count_user_invoices( $user->ID ) );
         $this->set( 'first_name', $user->first_name );
         $this->set( 'last_name', $user->last_name );
-		$this->set_date_created( $user->user_registered );
+        $this->set_date_created( $user->user_registered );
 
         // Fetch extra data from WC or old GetPaid.
         $prefixes = array(
@@ -400,18 +400,18 @@ 
                     continue;
                 }
             }
-		}
-	}
+        }
+    }
 
     /**
-	 * Helper method to migrate an existing user ID to the new customers table.
-	 *
-	 * @since 1.0.0
-	 * @param int $user_id.
-	 */
-	public function migrate_from_user( $user_id ) {
+     * Helper method to migrate an existing user ID to the new customers table.
+     *
+     * @since 1.0.0
+     * @param int $user_id.
+     */
+    public function migrate_from_user( $user_id ) {
         $this->clone_user( $user_id );
         do_action( 'getpaid_customer_migrated_from_user', $this, $user_id );
         $this->save();
-	}
+    }
 }

Spacing +100 added lines, -100 removed lines

@@ -5,7 +5,7 @@ 
  * @since   1.0.15
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Customer class.
@@ -34,29 +34,29 @@ 
 	 *
 	 * @param int|string|GetPaid_Customer|object $customer customer id, object, or email.
 	 */
-	public function __construct( $customer = 0 ) {
+	public function __construct($customer = 0) {
 
         // Setup default customer data.
         $this->setup_default_data();
 
-		if ( is_numeric( $customer ) ) {
-			$this->set_id( $customer );
-		} elseif ( $customer instanceof self ) {
-			$this->set_id( $customer->get_id() );
-		} elseif ( is_string( $customer ) && $customer_id = self::get_customer_id_by( $customer, 'email' ) ) {
-			$this->set_id( $customer_id );
-		} elseif ( ! empty( $customer->id ) ) {
-			$this->set_id( $customer->id );
+		if (is_numeric($customer)) {
+			$this->set_id($customer);
+		} elseif ($customer instanceof self) {
+			$this->set_id($customer->get_id());
+		} elseif (is_string($customer) && $customer_id = self::get_customer_id_by($customer, 'email')) {
+			$this->set_id($customer_id);
+		} elseif (!empty($customer->id)) {
+			$this->set_id($customer->id);
 		}
 
         // Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+		$this->data_store = GetPaid_Data_Store::load($this->data_store_name);
 
-		if ( $this->get_id() > 0 ) {
-			$this->data_store->read( $this );
+		if ($this->get_id() > 0) {
+			$this->data_store->read($this);
         }
 
-        $this->set_object_read( true );
+        $this->set_object_read(true);
 	}
 
     /**
@@ -71,31 +71,31 @@ 
 			'status'         => 'active',
 			'purchase_value' => 0,
 			'purchase_count' => 0,
-			'date_created'   => current_time( 'mysql' ),
-			'date_modified'  => current_time( 'mysql' ),
+			'date_created'   => current_time('mysql'),
+			'date_modified'  => current_time('mysql'),
 			'uuid'           => wp_generate_uuid4(),
 		);
 
         // Add address fields.
-		foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+		foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-            if ( isset( $this->data[ $field ] ) ) {
+            if (isset($this->data[$field])) {
                 continue;
             }
 
             // Country.
-            if ( 'country' === $field ) {
-                $this->data[ $field ] = wpinv_get_default_country();
+            if ('country' === $field) {
+                $this->data[$field] = wpinv_get_default_country();
                 continue;
             }
 
             // State.
-            if ( 'state' === $field ) {
-                $this->data[ $field ] = wpinv_get_default_state();
+            if ('state' === $field) {
+                $this->data[$field] = wpinv_get_default_state();
                 continue;
             }
 
-			$this->data[ $field ] = '';
+			$this->data[$field] = '';
 		}
 
         $this->default_data = $this->data;
@@ -109,41 +109,41 @@ 
 	 * @since 1.0.15
 	 * @return int
 	 */
-	public static function get_customer_id_by( $value, $by = 'email' ) {
+	public static function get_customer_id_by($value, $by = 'email') {
 		global $wpdb;
 
         // Prepare value.
-        if ( 'email' === $by ) {
-            $value = sanitize_email( $value );
-        } elseif ( 'user_id' === $by ) {
-            $value = absint( $value );
+        if ('email' === $by) {
+            $value = sanitize_email($value);
+        } elseif ('user_id' === $by) {
+            $value = absint($value);
         } else {
             return 0;
         }
 
-        if ( empty( $value ) ) {
+        if (empty($value)) {
             return 0;
         }
 
 		// Maybe retrieve from the cache.
-        $cache_key   = 'getpaid_customer_ids_by_' . $by;
-		$customer_id = wp_cache_get( $value, $cache_key );
-		if ( false !== $customer_id ) {
+        $cache_key = 'getpaid_customer_ids_by_' . $by;
+		$customer_id = wp_cache_get($value, $cache_key);
+		if (false !== $customer_id) {
 			return $customer_id;
 		}
 
-        if ( 'email' === $by ) {
+        if ('email' === $by) {
             $customer_id = (int) $wpdb->get_var(
-                $wpdb->prepare( "SELECT id FROM {$wpdb->prefix}getpaid_customers WHERE email=%s LIMIT 1", $value )
+                $wpdb->prepare("SELECT id FROM {$wpdb->prefix}getpaid_customers WHERE email=%s LIMIT 1", $value)
             );
-        } elseif ( 'user_id' === $by ) {
+        } elseif ('user_id' === $by) {
             $customer_id = (int) $wpdb->get_var(
-                $wpdb->prepare( "SELECT id FROM {$wpdb->prefix}getpaid_customers WHERE user_id=%d LIMIT 1", $value )
+                $wpdb->prepare("SELECT id FROM {$wpdb->prefix}getpaid_customers WHERE user_id=%d LIMIT 1", $value)
             );
         }
 
 		// Update the cache with our data
-		wp_cache_set( $value, $customer_id, $cache_key );
+		wp_cache_set($value, $customer_id, $cache_key);
 
 		return $customer_id;
 
@@ -153,9 +153,9 @@ 
      * Clears the customer's cache.
      */
     public function clear_cache() {
-        wp_cache_delete( $this->get( 'email' ), 'getpaid_customer_ids_by_email' );
-        wp_cache_delete( $this->get( 'user_id' ), 'getpaid_customer_ids_by_user_id' );
-		wp_cache_delete( $this->get_id(), 'getpaid_customers' );
+        wp_cache_delete($this->get('email'), 'getpaid_customer_ids_by_email');
+        wp_cache_delete($this->get('user_id'), 'getpaid_customer_ids_by_user_id');
+		wp_cache_delete($this->get_id(), 'getpaid_customers');
 	}
 
 	/*
@@ -179,17 +179,17 @@ 
      * @param  string $key The key to fetch.
      * @param  string $context View or edit context.
      */
-    public function get( $key, $context = 'view' ) {
+    public function get($key, $context = 'view') {
 
         // Maybe strip _wpinv_ prefix from key.
-        $key = str_replace( '_wpinv_', '', $key );
+        $key = str_replace('_wpinv_', '', $key);
 
         // Check if we have a helper method for that.
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            return call_user_func( array( $this, 'get_' . $key ), $context );
+        if (method_exists($this, 'get_' . $key)) {
+            return call_user_func(array($this, 'get_' . $key), $context);
         }
 
-		return $this->get_prop( $key, $context );
+		return $this->get_prop($key, $context);
 
     }
 
@@ -209,14 +209,14 @@ 
      * @param string $key The key to fetch.
      * @param mixed $value The new value.
      */
-    public function set( $key, $value ) {
+    public function set($key, $value) {
 
         // Check if we have a helper method for that.
-        if ( method_exists( $this, 'set_' . $key ) ) {
-            return call_user_func( array( $this, 'set_' . $key ), $value );
+        if (method_exists($this, 'set_' . $key)) {
+            return call_user_func(array($this, 'set_' . $key), $value);
         }
 
-		return $this->set_prop( $key, $value );
+		return $this->set_prop($key, $value);
 
     }
 
@@ -226,13 +226,13 @@ 
 	 * @since 1.0.0
 	 * @param  string $status New status.
 	 */
-	public function set_status( $status ) {
+	public function set_status($status) {
 
-		if ( in_array( $status, array( 'active', 'inactive', 'blocked' ), true ) ) {
-			return $this->set_prop( 'status', $status );
+		if (in_array($status, array('active', 'inactive', 'blocked'), true)) {
+			return $this->set_prop('status', $status);
 		}
 
-		$this->set_prop( 'status', 'inactive' );
+		$this->set_prop('status', 'inactive');
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
 	 * @since 1.0.0
 	 * @param float $purchase_value.
 	 */
-	public function set_purchase_value( $purchase_value ) {
-		$this->set_prop( 'purchase_value', (float) $purchase_value );
+	public function set_purchase_value($purchase_value) {
+		$this->set_prop('purchase_value', (float) $purchase_value);
 	}
 
     /**
@@ -251,8 +251,8 @@ 
 	 * @since 1.0.0
 	 * @param int $purchase_count.
 	 */
-	public function set_purchase_count( $purchase_count ) {
-		$this->set_prop( 'purchase_count', absint( $purchase_count ) );
+	public function set_purchase_count($purchase_count) {
+		$this->set_prop('purchase_count', absint($purchase_count));
 	}
 
     /**
@@ -261,8 +261,8 @@ 
 	 * @since 1.0.0
 	 * @param int $user_id.
 	 */
-	public function set_user_id( $user_id ) {
-		$this->set_prop( 'user_id', absint( $user_id ) );
+	public function set_user_id($user_id) {
+		$this->set_prop('user_id', absint($user_id));
 	}
 
     /**
@@ -271,9 +271,9 @@ 
 	 * @since 1.0.0
 	 * @param string $email.
 	 */
-	public function set_email( $email ) {
-        $email = is_string( $email ) ? sanitize_email( $email ) : '';
-		$this->set_prop( 'email', $email );
+	public function set_email($email) {
+        $email = is_string($email) ? sanitize_email($email) : '';
+		$this->set_prop('email', $email);
 	}
 
     /**
@@ -282,9 +282,9 @@ 
 	 * @since 1.0.0
 	 * @param string $email_cc.
 	 */
-	public function set_email_cc( $email_cc ) {
-        $email_cc = implode( ', ', wp_parse_list( $email_cc ) );
-		$this->set_prop( 'email_cc', $email_cc );
+	public function set_email_cc($email_cc) {
+        $email_cc = implode(', ', wp_parse_list($email_cc));
+		$this->set_prop('email_cc', $email_cc);
 	}
 
     /**
@@ -293,16 +293,16 @@ 
 	 * @since 1.0.0
 	 * @param  string $date_created date created.
 	 */
-	public function set_date_created( $date_created ) {
+	public function set_date_created($date_created) {
 
-		$date = strtotime( $date_created );
+		$date = strtotime($date_created);
 
-        if ( $date && $date_created !== '0000-00-00 00:00:00'  && $date_created !== '0000-00-00 00:00' ) {
-            $this->set_prop( 'date_created', gmdate( 'Y-m-d H:i:s', $date ) );
+        if ($date && $date_created !== '0000-00-00 00:00:00' && $date_created !== '0000-00-00 00:00') {
+            $this->set_prop('date_created', gmdate('Y-m-d H:i:s', $date));
             return;
 		}
 
-		$this->set_prop( 'date_created', null );
+		$this->set_prop('date_created', null);
 	}
 
     /**
@@ -311,16 +311,16 @@ 
 	 * @since 1.0.0
 	 * @param  string $date_modified date created.
 	 */
-	public function set_date_modified( $date_modified ) {
+	public function set_date_modified($date_modified) {
 
-		$date = strtotime( $date_modified );
+		$date = strtotime($date_modified);
 
-        if ( $date && $date_modified !== '0000-00-00 00:00:00'  && $date_modified !== '0000-00-00 00:00' ) {
-            $this->set_prop( 'date_modified', gmdate( 'Y-m-d H:i:s', $date ) );
+        if ($date && $date_modified !== '0000-00-00 00:00:00' && $date_modified !== '0000-00-00 00:00') {
+            $this->set_prop('date_modified', gmdate('Y-m-d H:i:s', $date));
             return;
 		}
 
-		$this->set_prop( 'date_modified', null );
+		$this->set_prop('date_modified', null);
 	}
 
 	/*
@@ -341,18 +341,18 @@ 
 
         $maybe_set = array(
             'uuid'         => wp_generate_uuid4(),
-            'date_created' => current_time( 'mysql' ),
+            'date_created' => current_time('mysql'),
         );
 
-        foreach ( $maybe_set as $key => $value ) {
-            $current_value = $this->get( $key );
+        foreach ($maybe_set as $key => $value) {
+            $current_value = $this->get($key);
 
-            if ( empty( $current_value ) ) {
-                $this->set( $key, $value );
+            if (empty($current_value)) {
+                $this->set($key, $value);
             }
         }
 
-        $this->set( 'date_modified', current_time( 'mysql' ) );
+        $this->set('date_modified', current_time('mysql'));
 
 		return parent::save();
 	}
@@ -363,20 +363,20 @@ 
 	 * @since 1.0.0
 	 * @param int $user_id.
 	 */
-	public function clone_user( $user_id ) {
-        $user = get_userdata( $user_id );
+	public function clone_user($user_id) {
+        $user = get_userdata($user_id);
 
-        if ( empty( $user ) ) {
+        if (empty($user)) {
             return;
         }
 
-		$this->set_user_id( $user->ID );
-        $this->set_email( $user->user_email );
-        $this->set_purchase_value( getpaid_get_user_total_spend( $user->ID ) );
-        $this->set_purchase_count( getpaid_count_user_invoices( $user->ID ) );
-        $this->set( 'first_name', $user->first_name );
-        $this->set( 'last_name', $user->last_name );
-		$this->set_date_created( $user->user_registered );
+		$this->set_user_id($user->ID);
+        $this->set_email($user->user_email);
+        $this->set_purchase_value(getpaid_get_user_total_spend($user->ID));
+        $this->set_purchase_count(getpaid_count_user_invoices($user->ID));
+        $this->set('first_name', $user->first_name);
+        $this->set('last_name', $user->last_name);
+		$this->set_date_created($user->user_registered);
 
         // Fetch extra data from WC or old GetPaid.
         $prefixes = array(
@@ -385,18 +385,18 @@ 
             '',
         );
 
-        foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+        foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-            foreach ( $prefixes as $prefix ) {
+            foreach ($prefixes as $prefix) {
 
                 // Meta table.
-                $value = get_user_meta( $user_id, $prefix . $field, true );
+                $value = get_user_meta($user_id, $prefix . $field, true);
 
                 // UWP table.
-                $value = ( empty( $value ) && function_exists( 'uwp_get_usermeta' ) ) ? uwp_get_usermeta( $user_id, $prefix . $field ) : $value;
+                $value = (empty($value) && function_exists('uwp_get_usermeta')) ? uwp_get_usermeta($user_id, $prefix . $field) : $value;
 
-                if ( ! empty( $value ) ) {
-                    $this->set( $field, $value );
+                if (!empty($value)) {
+                    $this->set($field, $value);
                     continue;
                 }
             }
@@ -409,9 +409,9 @@ 
 	 * @since 1.0.0
 	 * @param int $user_id.
 	 */
-	public function migrate_from_user( $user_id ) {
-        $this->clone_user( $user_id );
-        do_action( 'getpaid_customer_migrated_from_user', $this, $user_id );
+	public function migrate_from_user($user_id) {
+        $this->clone_user($user_id);
+        do_action('getpaid_customer_migrated_from_user', $this, $user_id);
         $this->save();
 	}
 }

includes/payments/class-getpaid-checkout.php

Indentation +309 added lines, -309 removed lines

@@ -12,184 +12,184 @@ 
  */
 class GetPaid_Checkout {
 
-	/**
-	 * @var GetPaid_Payment_Form_Submission
-	 */
-	protected $payment_form_submission;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-		$this->payment_form_submission = $submission;
-	}
-
-	/**
-	 * Processes the checkout.
-	 *
-	 */
-	public function process_checkout() {
-
-		// Validate the submission.
-		$this->validate_submission();
-
-		// Prepare the invoice.
-		$items    = $this->get_submission_items();
-		$invoice  = $this->get_submission_invoice();
-		$invoice  = $this->process_submission_invoice( $invoice, $items );
-		$prepared = $this->prepare_submission_data_for_saving();
-
-		$this->prepare_billing_info( $invoice );
-
-		$shipping   = $this->prepare_shipping_info( $invoice );
-
-		// Save the invoice.
-		$invoice->set_is_viewed( true );
-		$invoice->recalculate_total();
+    /**
+     * @var GetPaid_Payment_Form_Submission
+     */
+    protected $payment_form_submission;
+
+    /**
+     * Class constructor.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+        $this->payment_form_submission = $submission;
+    }
+
+    /**
+     * Processes the checkout.
+     *
+     */
+    public function process_checkout() {
+
+        // Validate the submission.
+        $this->validate_submission();
+
+        // Prepare the invoice.
+        $items    = $this->get_submission_items();
+        $invoice  = $this->get_submission_invoice();
+        $invoice  = $this->process_submission_invoice( $invoice, $items );
+        $prepared = $this->prepare_submission_data_for_saving();
+
+        $this->prepare_billing_info( $invoice );
+
+        $shipping   = $this->prepare_shipping_info( $invoice );
+
+        // Save the invoice.
+        $invoice->set_is_viewed( true );
+        $invoice->recalculate_total();
         $invoice->save();
 
-		do_action( 'getpaid_checkout_invoice_updated', $invoice );
+        do_action( 'getpaid_checkout_invoice_updated', $invoice );
 
-		// Send to the gateway.
-		$this->post_process_submission( $invoice, $prepared, $shipping );
-	}
+        // Send to the gateway.
+        $this->post_process_submission( $invoice, $prepared, $shipping );
+    }
 
-	/**
-	 * Validates the submission.
-	 *
-	 */
-	protected function validate_submission() {
+    /**
+     * Validates the submission.
+     *
+     */
+    protected function validate_submission() {
 
-		$submission = $this->payment_form_submission;
-		$data       = $submission->get_data();
+        $submission = $this->payment_form_submission;
+        $data       = $submission->get_data();
 
-		// Do we have an error?
+        // Do we have an error?
         if ( ! empty( $submission->last_error ) ) {
-			wp_send_json_error( $submission->last_error );
+            wp_send_json_error( $submission->last_error );
         }
 
-		// We need a billing email.
+        // We need a billing email.
         if ( ! $submission->has_billing_email() ) {
             wp_send_json_error( __( 'Provide a valid billing email.', 'invoicing' ) );
-		}
+        }
 
-		// Non-recurring gateways should not be allowed to process recurring invoices.
-		if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
-		}
+        // Non-recurring gateways should not be allowed to process recurring invoices.
+        if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
+            wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
+        }
 
-		// Ensure the gateway is active.
-		if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway is not active', 'invoicing' ) );
-		}
+        // Ensure the gateway is active.
+        if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
+            wp_send_json_error( __( 'The selected payment gateway is not active', 'invoicing' ) );
+        }
 
-		// Clear any existing errors.
-		wpinv_clear_errors();
+        // Clear any existing errors.
+        wpinv_clear_errors();
 
-		// Allow themes and plugins to hook to errors
-		do_action( 'getpaid_checkout_error_checks', $submission );
+        // Allow themes and plugins to hook to errors
+        do_action( 'getpaid_checkout_error_checks', $submission );
 
-		// Do we have any errors?
+        // Do we have any errors?
         if ( wpinv_get_errors() ) {
             wp_send_json_error( getpaid_get_errors_html() );
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Retrieves submission items.
-	 *
-	 * @return GetPaid_Form_Item[]
-	 */
-	protected function get_submission_items() {
+    /**
+     * Retrieves submission items.
+     *
+     * @return GetPaid_Form_Item[]
+     */
+    protected function get_submission_items() {
 
-		$items = $this->payment_form_submission->get_items();
+        $items = $this->payment_form_submission->get_items();
 
         // Ensure that we have items.
         if ( empty( $items ) && ! $this->payment_form_submission->has_fees() ) {
             wp_send_json_error( __( 'Please provide at least one item or amount.', 'invoicing' ) );
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Retrieves submission invoice.
-	 *
-	 * @return WPInv_Invoice
-	 */
-	protected function get_submission_invoice() {
-		$submission = $this->payment_form_submission;
-
-		if ( ! $submission->has_invoice() ) {
-			$invoice = new WPInv_Invoice();
-			$invoice->set_created_via( 'payment_form' );
-			return $invoice;
         }
 
-		$invoice = $submission->get_invoice();
+        return $items;
+    }
+
+    /**
+     * Retrieves submission invoice.
+     *
+     * @return WPInv_Invoice
+     */
+    protected function get_submission_invoice() {
+        $submission = $this->payment_form_submission;
 
-		// Make sure that it is neither paid or refunded.
-		if ( $invoice->is_paid() || $invoice->is_refunded() ) {
-			wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
-		}
+        if ( ! $submission->has_invoice() ) {
+            $invoice = new WPInv_Invoice();
+            $invoice->set_created_via( 'payment_form' );
+            return $invoice;
+        }
 
-		return $invoice;
-	}
+        $invoice = $submission->get_invoice();
 
-	/**
-	 * Processes the submission invoice.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	protected function process_submission_invoice( $invoice, $items ) {
+        // Make sure that it is neither paid or refunded.
+        if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+            wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
+        }
 
-		$submission = $this->payment_form_submission;
+        return $invoice;
+    }
 
-		// Set-up the invoice details.
-		$invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
-		$invoice->set_user_id( $this->get_submission_customer() );
-		$invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
+    /**
+     * Processes the submission invoice.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    protected function process_submission_invoice( $invoice, $items ) {
+
+        $submission = $this->payment_form_submission;
+
+        // Set-up the invoice details.
+        $invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
+        $invoice->set_user_id( $this->get_submission_customer() );
+        $invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
         $invoice->set_items( $items );
         $invoice->set_fees( $submission->get_fees() );
         $invoice->set_taxes( $submission->get_taxes() );
-		$invoice->set_discounts( $submission->get_discounts() );
-		$invoice->set_gateway( $submission->get_field( 'wpi-gateway' ) );
-		$invoice->set_currency( $submission->get_currency() );
+        $invoice->set_discounts( $submission->get_discounts() );
+        $invoice->set_gateway( $submission->get_field( 'wpi-gateway' ) );
+        $invoice->set_currency( $submission->get_currency() );
 
-		if ( $submission->has_shipping() ) {
-			$invoice->set_shipping( $submission->get_shipping() );
-		}
+        if ( $submission->has_shipping() ) {
+            $invoice->set_shipping( $submission->get_shipping() );
+        }
 
-		$address_confirmed = $submission->get_field( 'confirm-address' );
-		$invoice->set_address_confirmed( ! empty( $address_confirmed ) );
+        $address_confirmed = $submission->get_field( 'confirm-address' );
+        $invoice->set_address_confirmed( ! empty( $address_confirmed ) );
 
-		if ( $submission->has_discount_code() ) {
+        if ( $submission->has_discount_code() ) {
             $invoice->set_discount_code( $submission->get_discount_code() );
-		}
-
-		getpaid_maybe_add_default_address( $invoice );
-		return $invoice;
-	}
-
-	/**
-	 * Retrieves the submission's customer.
-	 *
-	 * @return int The customer id.
-	 */
-	protected function get_submission_customer() {
-		$submission = $this->payment_form_submission;
-
-		// If this is an existing invoice...
-		if ( $submission->has_invoice() ) {
-			return $submission->get_invoice()->get_user_id();
-		}
-
-		// (Maybe) create the user.
+        }
+
+        getpaid_maybe_add_default_address( $invoice );
+        return $invoice;
+    }
+
+    /**
+     * Retrieves the submission's customer.
+     *
+     * @return int The customer id.
+     */
+    protected function get_submission_customer() {
+        $submission = $this->payment_form_submission;
+
+        // If this is an existing invoice...
+        if ( $submission->has_invoice() ) {
+            return $submission->get_invoice()->get_user_id();
+        }
+
+        // (Maybe) create the user.
         $user = get_current_user_id();
 
         if ( empty( $user ) ) {
@@ -197,16 +197,16 @@ 
         }
 
         if ( empty( $user ) ) {
-			$name = array( $submission->get_field( 'wpinv_first_name', 'billing' ), $submission->get_field( 'wpinv_last_name', 'billing' ) );
-			$name = implode( '', array_filter( $name ) );
+            $name = array( $submission->get_field( 'wpinv_first_name', 'billing' ), $submission->get_field( 'wpinv_last_name', 'billing' ) );
+            $name = implode( '', array_filter( $name ) );
             $user = wpinv_create_user( $submission->get_billing_email(), $name );
 
-			// (Maybe) send new user notification.
-			$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-			if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ), $user ) ) {
-				wp_send_new_user_notifications( $user, 'user' );
-			}
-		}
+            // (Maybe) send new user notification.
+            $should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
+            if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ), $user ) ) {
+                wp_send_new_user_notifications( $user, 'user' );
+            }
+        }
 
         if ( is_wp_error( $user ) ) {
             wp_send_json_error( $user->get_error_message() );
@@ -214,49 +214,49 @@ 
 
         if ( is_numeric( $user ) ) {
             return $user;
-		}
+        }
 
-		return $user->ID;
+        return $user->ID;
 
-	}
+    }
 
-	/**
+    /**
      * Prepares submission data for saving to the database.
      *
-	 * @return array
+     * @return array
      */
     public function prepare_submission_data_for_saving() {
 
-		$submission = $this->payment_form_submission;
+        $submission = $this->payment_form_submission;
 
-		// Prepared submission details.
+        // Prepared submission details.
         $prepared = array(
-			'all'  => array(),
-			'meta' => array(),
-		);
+            'all'  => array(),
+            'meta' => array(),
+        );
 
         // Raw submission details.
-		$data     = $submission->get_data();
+        $data     = $submission->get_data();
 
-		// Loop through the submitted details.
+        // Loop through the submitted details.
         foreach ( $submission->get_payment_form()->get_elements() as $field ) {
 
-			// Skip premade fields.
+            // Skip premade fields.
             if ( ! empty( $field['premade'] ) ) {
                 continue;
             }
 
-			// Ensure address is provided.
-			if ( 'address' === $field['type'] ) {
+            // Ensure address is provided.
+            if ( 'address' === $field['type'] ) {
                 $address_type = isset( $field['address_type'] ) && 'shipping' === $field['address_type'] ? 'shipping' : 'billing';
 
-				foreach ( $field['fields'] as $address_field ) {
+                foreach ( $field['fields'] as $address_field ) {
 
-					if ( ! empty( $address_field['visible'] ) && ! empty( $address_field['required'] ) && '' === trim( $_POST[ $address_type ][ $address_field['name'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
-						wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
-					}
-			}
-		}
+                    if ( ! empty( $address_field['visible'] ) && ! empty( $address_field['required'] ) && '' === trim( $_POST[ $address_type ][ $address_field['name'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+                        wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
+                    }
+            }
+        }
 
             // If it is required and not set, abort.
             if ( ! $submission->is_required_field_set( $field ) ) {
@@ -266,31 +266,31 @@ 
             // Handle misc fields.
             if ( isset( $data[ $field['id'] ] ) ) {
 
-				// Uploads.
-				if ( 'file_upload' === $field['type'] ) {
-					$max_file_num = empty( $field['max_file_num'] ) ? 1 : absint( $field['max_file_num'] );
+                // Uploads.
+                if ( 'file_upload' === $field['type'] ) {
+                    $max_file_num = empty( $field['max_file_num'] ) ? 1 : absint( $field['max_file_num'] );
 
-					if ( count( $data[ $field['id'] ] ) > $max_file_num ) {
-						wp_send_json_error( __( 'Maximum number of allowed files exceeded.', 'invoicing' ) );
-					}
+                    if ( count( $data[ $field['id'] ] ) > $max_file_num ) {
+                        wp_send_json_error( __( 'Maximum number of allowed files exceeded.', 'invoicing' ) );
+                    }
 
-					$value = array();
+                    $value = array();
 
-					foreach ( $data[ $field['id'] ] as $url => $name ) {
-						$value[] = sprintf(
-							'<a href="%s" target="_blank">%s</a>',
-							esc_url_raw( $url ),
-							esc_html( $name )
-						);
-					}
+                    foreach ( $data[ $field['id'] ] as $url => $name ) {
+                        $value[] = sprintf(
+                            '<a href="%s" target="_blank">%s</a>',
+                            esc_url_raw( $url ),
+                            esc_html( $name )
+                        );
+                    }
 
-					$value = implode( ' | ', $value );
+                    $value = implode( ' | ', $value );
 
-				} elseif ( 'checkbox' === $field['type'] ) {
-					$value = ! empty( $data[ $field['id'] ] ) ? __( 'Yes', 'invoicing' ) : __( 'No', 'invoicing' );
-				} else {
-					$value = wp_kses_post( $data[ $field['id'] ] );
-				}
+                } elseif ( 'checkbox' === $field['type'] ) {
+                    $value = ! empty( $data[ $field['id'] ] ) ? __( 'Yes', 'invoicing' ) : __( 'No', 'invoicing' );
+                } else {
+                    $value = wp_kses_post( $data[ $field['id'] ] );
+                }
 
                 $label = $field['id'];
 
@@ -298,192 +298,192 @@ 
                     $label = $field['label'];
                 }
 
-				if ( ! empty( $field['add_meta'] ) ) {
-					$prepared['meta'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
-				}
-				$prepared['all'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+                if ( ! empty( $field['add_meta'] ) ) {
+                    $prepared['meta'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+                }
+                $prepared['all'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
 
             }
-		}
+        }
 
-		return $prepared;
+        return $prepared;
 
-	}
+    }
 
-	/**
+    /**
      * Retrieves address details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
-	 * @param string $type
+     * @return array
+     * @param WPInv_Invoice $invoice
+     * @param string $type
      */
     public function prepare_address_details( $invoice, $type = 'billing' ) {
 
-		$data     = $this->payment_form_submission->get_data();
-		$type     = sanitize_key( $type );
-		$address  = array();
-		$prepared = array();
+        $data     = $this->payment_form_submission->get_data();
+        $type     = sanitize_key( $type );
+        $address  = array();
+        $prepared = array();
 
-		if ( ! empty( $data[ $type ] ) ) {
-			$address = $data[ $type ];
-		}
+        if ( ! empty( $data[ $type ] ) ) {
+            $address = $data[ $type ];
+        }
 
-		// Clean address details.
-		foreach ( $address as $key => $value ) {
-			$key             = sanitize_key( $key );
-			$key             = str_replace( 'wpinv_', '', $key );
-			$value           = wpinv_clean( $value );
-			$prepared[ $key ] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
-		}
+        // Clean address details.
+        foreach ( $address as $key => $value ) {
+            $key             = sanitize_key( $key );
+            $key             = str_replace( 'wpinv_', '', $key );
+            $value           = wpinv_clean( $value );
+            $prepared[ $key ] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
+        }
 
-		// Filter address details.
-		$prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
+        // Filter address details.
+        $prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
 
-		// Remove non-whitelisted values.
-		return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
+        // Remove non-whitelisted values.
+        return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
 
-	}
+    }
 
-	/**
+    /**
      * Prepares the billing details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
+     * @return array
+     * @param WPInv_Invoice $invoice
      */
     protected function prepare_billing_info( &$invoice ) {
 
-		$billing_address = $this->prepare_address_details( $invoice, 'billing' );
+        $billing_address = $this->prepare_address_details( $invoice, 'billing' );
 
-		// Update the invoice with the billing details.
-		$invoice->set_props( $billing_address );
+        // Update the invoice with the billing details.
+        $invoice->set_props( $billing_address );
 
-	}
+    }
 
-	/**
+    /**
      * Prepares the shipping details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
+     * @return array
+     * @param WPInv_Invoice $invoice
      */
     protected function prepare_shipping_info( $invoice ) {
 
-		$data = $this->payment_form_submission->get_data();
+        $data = $this->payment_form_submission->get_data();
 
-		if ( empty( $data['same-shipping-address'] ) ) {
-			return $this->prepare_address_details( $invoice, 'shipping' );
-		}
+        if ( empty( $data['same-shipping-address'] ) ) {
+            return $this->prepare_address_details( $invoice, 'shipping' );
+        }
 
-		return $this->prepare_address_details( $invoice, 'billing' );
+        return $this->prepare_address_details( $invoice, 'billing' );
 
-	}
+    }
 
-	/**
-	 * Confirms the submission is valid and send users to the gateway.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param array $prepared_payment_form_data
-	 * @param array $shipping
-	 */
-	protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
+    /**
+     * Confirms the submission is valid and send users to the gateway.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param array $prepared_payment_form_data
+     * @param array $shipping
+     */
+    protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
 
-		// Ensure the invoice exists.
+        // Ensure the invoice exists.
         if ( ! $invoice->exists() ) {
             wp_send_json_error( __( 'An error occured while saving your invoice. Please try again.', 'invoicing' ) );
         }
 
-		// Save payment form data.
-		$prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
+        // Save payment form data.
+        $prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
         delete_post_meta( $invoice->get_id(), 'payment_form_data' );
-		delete_post_meta( $invoice->get_id(), 'additional_meta_data' );
-		if ( ! empty( $prepared_payment_form_data ) ) {
+        delete_post_meta( $invoice->get_id(), 'additional_meta_data' );
+        if ( ! empty( $prepared_payment_form_data ) ) {
 
-			if ( ! empty( $prepared_payment_form_data['all'] ) ) {
-				update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all'] );
-			}
+            if ( ! empty( $prepared_payment_form_data['all'] ) ) {
+                update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all'] );
+            }
 
-			if ( ! empty( $prepared_payment_form_data['meta'] ) ) {
-				update_post_meta( $invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta'] );
-			}
-		}
+            if ( ! empty( $prepared_payment_form_data['meta'] ) ) {
+                update_post_meta( $invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta'] );
+            }
+        }
 
-		// Save payment form data.
-		$shipping = apply_filters( 'getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission );
+        // Save payment form data.
+        $shipping = apply_filters( 'getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission );
         if ( ! empty( $shipping ) ) {
             update_post_meta( $invoice->get_id(), 'shipping_address', $shipping );
-		}
+        }
 
-		// Backwards compatibility.
+        // Backwards compatibility.
         add_filter( 'wp_redirect', array( $this, 'send_redirect_response' ) );
 
-		try {
-			$this->process_payment( $invoice );
-		} catch ( Exception $e ) {
-			wpinv_set_error( 'payment_error', $e->getMessage() );
-		}
+        try {
+            $this->process_payment( $invoice );
+        } catch ( Exception $e ) {
+            wpinv_set_error( 'payment_error', $e->getMessage() );
+        }
 
         // If we are here, there was an error.
-		wpinv_send_back_to_checkout( $invoice );
+        wpinv_send_back_to_checkout( $invoice );
 
-	}
+    }
 
-	/**
-	 * Processes the actual payment.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	protected function process_payment( $invoice ) {
+    /**
+     * Processes the actual payment.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    protected function process_payment( $invoice ) {
 
-		// Clear any checkout errors.
-		wpinv_clear_errors();
+        // Clear any checkout errors.
+        wpinv_clear_errors();
 
-		// No need to send free invoices to the gateway.
-		if ( $invoice->is_free() ) {
-			$this->process_free_payment( $invoice );
-		}
+        // No need to send free invoices to the gateway.
+        if ( $invoice->is_free() ) {
+            $this->process_free_payment( $invoice );
+        }
 
-		$submission = $this->payment_form_submission;
+        $submission = $this->payment_form_submission;
 
-		// Fires before sending to the gateway.
-		do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
+        // Fires before sending to the gateway.
+        do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
 
-		// Allow the sumission data to be modified before it is sent to the gateway.
-		$submission_data    = $submission->get_data();
-		$submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
-		$submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
+        // Allow the sumission data to be modified before it is sent to the gateway.
+        $submission_data    = $submission->get_data();
+        $submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
+        $submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
 
-		// Validate the currency.
-		if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
-			wpinv_set_error( 'invalid_currency' );
-		}
+        // Validate the currency.
+        if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
+            wpinv_set_error( 'invalid_currency' );
+        }
 
-		// Check to see if we have any errors.
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
-		}
+        // Check to see if we have any errors.
+        if ( wpinv_get_errors() ) {
+            wpinv_send_back_to_checkout( $invoice );
+        }
 
-		// Send info to the gateway for payment processing
-		do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
+        // Send info to the gateway for payment processing
+        do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
 
-		// Backwards compatibility.
-		wpinv_send_to_gateway( $submission_gateway, $invoice );
+        // Backwards compatibility.
+        wpinv_send_to_gateway( $submission_gateway, $invoice );
 
-	}
+    }
 
-	/**
-	 * Marks the invoice as paid in case the checkout is free.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	protected function process_free_payment( $invoice ) {
+    /**
+     * Marks the invoice as paid in case the checkout is free.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    protected function process_free_payment( $invoice ) {
 
-		$invoice->set_gateway( 'none' );
-		$invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
-		$invoice->mark_paid();
-		wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        $invoice->set_gateway( 'none' );
+        $invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
+        $invoice->mark_paid();
+        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
 
-	}
+    }
 
-	/**
+    /**
      * Sends a redrect response to payment details.
      *
      */

Spacing +138 added lines, -138 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main Checkout Class.
@@ -22,7 +22,7 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 		$this->payment_form_submission = $submission;
 	}
 
@@ -38,22 +38,22 @@ 
 		// Prepare the invoice.
 		$items    = $this->get_submission_items();
 		$invoice  = $this->get_submission_invoice();
-		$invoice  = $this->process_submission_invoice( $invoice, $items );
+		$invoice  = $this->process_submission_invoice($invoice, $items);
 		$prepared = $this->prepare_submission_data_for_saving();
 
-		$this->prepare_billing_info( $invoice );
+		$this->prepare_billing_info($invoice);
 
-		$shipping   = $this->prepare_shipping_info( $invoice );
+		$shipping = $this->prepare_shipping_info($invoice);
 
 		// Save the invoice.
-		$invoice->set_is_viewed( true );
+		$invoice->set_is_viewed(true);
 		$invoice->recalculate_total();
         $invoice->save();
 
-		do_action( 'getpaid_checkout_invoice_updated', $invoice );
+		do_action('getpaid_checkout_invoice_updated', $invoice);
 
 		// Send to the gateway.
-		$this->post_process_submission( $invoice, $prepared, $shipping );
+		$this->post_process_submission($invoice, $prepared, $shipping);
 	}
 
 	/**
@@ -66,34 +66,34 @@ 
 		$data       = $submission->get_data();
 
 		// Do we have an error?
-        if ( ! empty( $submission->last_error ) ) {
-			wp_send_json_error( $submission->last_error );
+        if (!empty($submission->last_error)) {
+			wp_send_json_error($submission->last_error);
         }
 
 		// We need a billing email.
-        if ( ! $submission->has_billing_email() ) {
-            wp_send_json_error( __( 'Provide a valid billing email.', 'invoicing' ) );
+        if (!$submission->has_billing_email()) {
+            wp_send_json_error(__('Provide a valid billing email.', 'invoicing'));
 		}
 
 		// Non-recurring gateways should not be allowed to process recurring invoices.
-		if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
+		if ($submission->should_collect_payment_details() && $submission->has_recurring && !wpinv_gateway_support_subscription($data['wpi-gateway'])) {
+			wp_send_json_error(__('The selected payment gateway does not support subscription payments.', 'invoicing'));
 		}
 
 		// Ensure the gateway is active.
-		if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway is not active', 'invoicing' ) );
+		if ($submission->should_collect_payment_details() && !wpinv_is_gateway_active($data['wpi-gateway'])) {
+			wp_send_json_error(__('The selected payment gateway is not active', 'invoicing'));
 		}
 
 		// Clear any existing errors.
 		wpinv_clear_errors();
 
 		// Allow themes and plugins to hook to errors
-		do_action( 'getpaid_checkout_error_checks', $submission );
+		do_action('getpaid_checkout_error_checks', $submission);
 
 		// Do we have any errors?
-        if ( wpinv_get_errors() ) {
-            wp_send_json_error( getpaid_get_errors_html() );
+        if (wpinv_get_errors()) {
+            wp_send_json_error(getpaid_get_errors_html());
 		}
 
 	}
@@ -108,8 +108,8 @@ 
 		$items = $this->payment_form_submission->get_items();
 
         // Ensure that we have items.
-        if ( empty( $items ) && ! $this->payment_form_submission->has_fees() ) {
-            wp_send_json_error( __( 'Please provide at least one item or amount.', 'invoicing' ) );
+        if (empty($items) && !$this->payment_form_submission->has_fees()) {
+            wp_send_json_error(__('Please provide at least one item or amount.', 'invoicing'));
 		}
 
 		return $items;
@@ -123,17 +123,17 @@ 
 	protected function get_submission_invoice() {
 		$submission = $this->payment_form_submission;
 
-		if ( ! $submission->has_invoice() ) {
+		if (!$submission->has_invoice()) {
 			$invoice = new WPInv_Invoice();
-			$invoice->set_created_via( 'payment_form' );
+			$invoice->set_created_via('payment_form');
 			return $invoice;
         }
 
 		$invoice = $submission->get_invoice();
 
 		// Make sure that it is neither paid or refunded.
-		if ( $invoice->is_paid() || $invoice->is_refunded() ) {
-			wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
+		if ($invoice->is_paid() || $invoice->is_refunded()) {
+			wp_send_json_error(__('This invoice has already been paid for.', 'invoicing'));
 		}
 
 		return $invoice;
@@ -146,33 +146,33 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	protected function process_submission_invoice( $invoice, $items ) {
+	protected function process_submission_invoice($invoice, $items) {
 
 		$submission = $this->payment_form_submission;
 
 		// Set-up the invoice details.
-		$invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
-		$invoice->set_user_id( $this->get_submission_customer() );
-		$invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
-        $invoice->set_items( $items );
-        $invoice->set_fees( $submission->get_fees() );
-        $invoice->set_taxes( $submission->get_taxes() );
-		$invoice->set_discounts( $submission->get_discounts() );
-		$invoice->set_gateway( $submission->get_field( 'wpi-gateway' ) );
-		$invoice->set_currency( $submission->get_currency() );
-
-		if ( $submission->has_shipping() ) {
-			$invoice->set_shipping( $submission->get_shipping() );
+		$invoice->set_email(sanitize_email($submission->get_billing_email()));
+		$invoice->set_user_id($this->get_submission_customer());
+		$invoice->set_payment_form(absint($submission->get_payment_form()->get_id()));
+        $invoice->set_items($items);
+        $invoice->set_fees($submission->get_fees());
+        $invoice->set_taxes($submission->get_taxes());
+		$invoice->set_discounts($submission->get_discounts());
+		$invoice->set_gateway($submission->get_field('wpi-gateway'));
+		$invoice->set_currency($submission->get_currency());
+
+		if ($submission->has_shipping()) {
+			$invoice->set_shipping($submission->get_shipping());
 		}
 
-		$address_confirmed = $submission->get_field( 'confirm-address' );
-		$invoice->set_address_confirmed( ! empty( $address_confirmed ) );
+		$address_confirmed = $submission->get_field('confirm-address');
+		$invoice->set_address_confirmed(!empty($address_confirmed));
 
-		if ( $submission->has_discount_code() ) {
-            $invoice->set_discount_code( $submission->get_discount_code() );
+		if ($submission->has_discount_code()) {
+            $invoice->set_discount_code($submission->get_discount_code());
 		}
 
-		getpaid_maybe_add_default_address( $invoice );
+		getpaid_maybe_add_default_address($invoice);
 		return $invoice;
 	}
 
@@ -185,34 +185,34 @@ 
 		$submission = $this->payment_form_submission;
 
 		// If this is an existing invoice...
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			return $submission->get_invoice()->get_user_id();
 		}
 
 		// (Maybe) create the user.
         $user = get_current_user_id();
 
-        if ( empty( $user ) ) {
-            $user = get_user_by( 'email', $submission->get_billing_email() );
+        if (empty($user)) {
+            $user = get_user_by('email', $submission->get_billing_email());
         }
 
-        if ( empty( $user ) ) {
-			$name = array( $submission->get_field( 'wpinv_first_name', 'billing' ), $submission->get_field( 'wpinv_last_name', 'billing' ) );
-			$name = implode( '', array_filter( $name ) );
-            $user = wpinv_create_user( $submission->get_billing_email(), $name );
+        if (empty($user)) {
+			$name = array($submission->get_field('wpinv_first_name', 'billing'), $submission->get_field('wpinv_last_name', 'billing'));
+			$name = implode('', array_filter($name));
+            $user = wpinv_create_user($submission->get_billing_email(), $name);
 
 			// (Maybe) send new user notification.
-			$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-			if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ), $user ) ) {
-				wp_send_new_user_notifications( $user, 'user' );
+			$should_send_notification = wpinv_get_option('disable_new_user_emails');
+			if (!empty($user) && is_numeric($user) && apply_filters('getpaid_send_new_user_notification', empty($should_send_notification), $user)) {
+				wp_send_new_user_notifications($user, 'user');
 			}
 		}
 
-        if ( is_wp_error( $user ) ) {
-            wp_send_json_error( $user->get_error_message() );
+        if (is_wp_error($user)) {
+            wp_send_json_error($user->get_error_message());
         }
 
-        if ( is_numeric( $user ) ) {
+        if (is_numeric($user)) {
             return $user;
 		}
 
@@ -236,72 +236,72 @@ 
 		);
 
         // Raw submission details.
-		$data     = $submission->get_data();
+		$data = $submission->get_data();
 
 		// Loop through the submitted details.
-        foreach ( $submission->get_payment_form()->get_elements() as $field ) {
+        foreach ($submission->get_payment_form()->get_elements() as $field) {
 
 			// Skip premade fields.
-            if ( ! empty( $field['premade'] ) ) {
+            if (!empty($field['premade'])) {
                 continue;
             }
 
 			// Ensure address is provided.
-			if ( 'address' === $field['type'] ) {
-                $address_type = isset( $field['address_type'] ) && 'shipping' === $field['address_type'] ? 'shipping' : 'billing';
+			if ('address' === $field['type']) {
+                $address_type = isset($field['address_type']) && 'shipping' === $field['address_type'] ? 'shipping' : 'billing';
 
-				foreach ( $field['fields'] as $address_field ) {
+				foreach ($field['fields'] as $address_field) {
 
-					if ( ! empty( $address_field['visible'] ) && ! empty( $address_field['required'] ) && '' === trim( $_POST[ $address_type ][ $address_field['name'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
-						wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
+					if (!empty($address_field['visible']) && !empty($address_field['required']) && '' === trim($_POST[$address_type][$address_field['name']])) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+						wp_send_json_error(__('Please fill all required fields.', 'invoicing'));
 					}
 			}
 		}
 
             // If it is required and not set, abort.
-            if ( ! $submission->is_required_field_set( $field ) ) {
-                wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
+            if (!$submission->is_required_field_set($field)) {
+                wp_send_json_error(__('Please fill all required fields.', 'invoicing'));
             }
 
             // Handle misc fields.
-            if ( isset( $data[ $field['id'] ] ) ) {
+            if (isset($data[$field['id']])) {
 
 				// Uploads.
-				if ( 'file_upload' === $field['type'] ) {
-					$max_file_num = empty( $field['max_file_num'] ) ? 1 : absint( $field['max_file_num'] );
+				if ('file_upload' === $field['type']) {
+					$max_file_num = empty($field['max_file_num']) ? 1 : absint($field['max_file_num']);
 
-					if ( count( $data[ $field['id'] ] ) > $max_file_num ) {
-						wp_send_json_error( __( 'Maximum number of allowed files exceeded.', 'invoicing' ) );
+					if (count($data[$field['id']]) > $max_file_num) {
+						wp_send_json_error(__('Maximum number of allowed files exceeded.', 'invoicing'));
 					}
 
 					$value = array();
 
-					foreach ( $data[ $field['id'] ] as $url => $name ) {
+					foreach ($data[$field['id']] as $url => $name) {
 						$value[] = sprintf(
 							'<a href="%s" target="_blank">%s</a>',
-							esc_url_raw( $url ),
-							esc_html( $name )
+							esc_url_raw($url),
+							esc_html($name)
 						);
 					}
 
-					$value = implode( ' | ', $value );
+					$value = implode(' | ', $value);
 
-				} elseif ( 'checkbox' === $field['type'] ) {
-					$value = ! empty( $data[ $field['id'] ] ) ? __( 'Yes', 'invoicing' ) : __( 'No', 'invoicing' );
+				} elseif ('checkbox' === $field['type']) {
+					$value = !empty($data[$field['id']]) ? __('Yes', 'invoicing') : __('No', 'invoicing');
 				} else {
-					$value = wp_kses_post( $data[ $field['id'] ] );
+					$value = wp_kses_post($data[$field['id']]);
 				}
 
                 $label = $field['id'];
 
-                if ( isset( $field['label'] ) ) {
+                if (isset($field['label'])) {
                     $label = $field['label'];
                 }
 
-				if ( ! empty( $field['add_meta'] ) ) {
-					$prepared['meta'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+				if (!empty($field['add_meta'])) {
+					$prepared['meta'][wpinv_clean($label)] = wp_kses_post_deep($value);
 				}
-				$prepared['all'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+				$prepared['all'][wpinv_clean($label)] = wp_kses_post_deep($value);
 
             }
 		}
@@ -317,30 +317,30 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @param string $type
      */
-    public function prepare_address_details( $invoice, $type = 'billing' ) {
+    public function prepare_address_details($invoice, $type = 'billing') {
 
 		$data     = $this->payment_form_submission->get_data();
-		$type     = sanitize_key( $type );
+		$type     = sanitize_key($type);
 		$address  = array();
 		$prepared = array();
 
-		if ( ! empty( $data[ $type ] ) ) {
-			$address = $data[ $type ];
+		if (!empty($data[$type])) {
+			$address = $data[$type];
 		}
 
 		// Clean address details.
-		foreach ( $address as $key => $value ) {
-			$key             = sanitize_key( $key );
-			$key             = str_replace( 'wpinv_', '', $key );
-			$value           = wpinv_clean( $value );
-			$prepared[ $key ] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
+		foreach ($address as $key => $value) {
+			$key             = sanitize_key($key);
+			$key             = str_replace('wpinv_', '', $key);
+			$value           = wpinv_clean($value);
+			$prepared[$key] = apply_filters("getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice);
 		}
 
 		// Filter address details.
-		$prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
+		$prepared = apply_filters("getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice);
 
 		// Remove non-whitelisted values.
-		return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
+		return array_filter($prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY);
 
 	}
 
@@ -350,12 +350,12 @@ 
 	 * @return array
 	 * @param WPInv_Invoice $invoice
      */
-    protected function prepare_billing_info( &$invoice ) {
+    protected function prepare_billing_info(&$invoice) {
 
-		$billing_address = $this->prepare_address_details( $invoice, 'billing' );
+		$billing_address = $this->prepare_address_details($invoice, 'billing');
 
 		// Update the invoice with the billing details.
-		$invoice->set_props( $billing_address );
+		$invoice->set_props($billing_address);
 
 	}
 
@@ -365,15 +365,15 @@ 
 	 * @return array
 	 * @param WPInv_Invoice $invoice
      */
-    protected function prepare_shipping_info( $invoice ) {
+    protected function prepare_shipping_info($invoice) {
 
 		$data = $this->payment_form_submission->get_data();
 
-		if ( empty( $data['same-shipping-address'] ) ) {
-			return $this->prepare_address_details( $invoice, 'shipping' );
+		if (empty($data['same-shipping-address'])) {
+			return $this->prepare_address_details($invoice, 'shipping');
 		}
 
-		return $this->prepare_address_details( $invoice, 'billing' );
+		return $this->prepare_address_details($invoice, 'billing');
 
 	}
 
@@ -384,45 +384,45 @@ 
 	 * @param array $prepared_payment_form_data
 	 * @param array $shipping
 	 */
-	protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
+	protected function post_process_submission($invoice, $prepared_payment_form_data, $shipping) {
 
 		// Ensure the invoice exists.
-        if ( ! $invoice->exists() ) {
-            wp_send_json_error( __( 'An error occured while saving your invoice. Please try again.', 'invoicing' ) );
+        if (!$invoice->exists()) {
+            wp_send_json_error(__('An error occured while saving your invoice. Please try again.', 'invoicing'));
         }
 
 		// Save payment form data.
-		$prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
-        delete_post_meta( $invoice->get_id(), 'payment_form_data' );
-		delete_post_meta( $invoice->get_id(), 'additional_meta_data' );
-		if ( ! empty( $prepared_payment_form_data ) ) {
+		$prepared_payment_form_data = apply_filters('getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice);
+        delete_post_meta($invoice->get_id(), 'payment_form_data');
+		delete_post_meta($invoice->get_id(), 'additional_meta_data');
+		if (!empty($prepared_payment_form_data)) {
 
-			if ( ! empty( $prepared_payment_form_data['all'] ) ) {
-				update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all'] );
+			if (!empty($prepared_payment_form_data['all'])) {
+				update_post_meta($invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all']);
 			}
 
-			if ( ! empty( $prepared_payment_form_data['meta'] ) ) {
-				update_post_meta( $invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta'] );
+			if (!empty($prepared_payment_form_data['meta'])) {
+				update_post_meta($invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta']);
 			}
 		}
 
 		// Save payment form data.
-		$shipping = apply_filters( 'getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission );
-        if ( ! empty( $shipping ) ) {
-            update_post_meta( $invoice->get_id(), 'shipping_address', $shipping );
+		$shipping = apply_filters('getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission);
+        if (!empty($shipping)) {
+            update_post_meta($invoice->get_id(), 'shipping_address', $shipping);
 		}
 
 		// Backwards compatibility.
-        add_filter( 'wp_redirect', array( $this, 'send_redirect_response' ) );
+        add_filter('wp_redirect', array($this, 'send_redirect_response'));
 
 		try {
-			$this->process_payment( $invoice );
-		} catch ( Exception $e ) {
-			wpinv_set_error( 'payment_error', $e->getMessage() );
+			$this->process_payment($invoice);
+		} catch (Exception $e) {
+			wpinv_set_error('payment_error', $e->getMessage());
 		}
 
         // If we are here, there was an error.
-		wpinv_send_back_to_checkout( $invoice );
+		wpinv_send_back_to_checkout($invoice);
 
 	}
 
@@ -431,41 +431,41 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	protected function process_payment( $invoice ) {
+	protected function process_payment($invoice) {
 
 		// Clear any checkout errors.
 		wpinv_clear_errors();
 
 		// No need to send free invoices to the gateway.
-		if ( $invoice->is_free() ) {
-			$this->process_free_payment( $invoice );
+		if ($invoice->is_free()) {
+			$this->process_free_payment($invoice);
 		}
 
 		$submission = $this->payment_form_submission;
 
 		// Fires before sending to the gateway.
-		do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
+		do_action('getpaid_checkout_before_gateway', $invoice, $submission);
 
 		// Allow the sumission data to be modified before it is sent to the gateway.
 		$submission_data    = $submission->get_data();
-		$submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
-		$submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
+		$submission_gateway = apply_filters('getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice);
+		$submission_data    = apply_filters('getpaid_gateway_submission_data', $submission_data, $submission, $invoice);
 
 		// Validate the currency.
-		if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
-			wpinv_set_error( 'invalid_currency' );
+		if (!apply_filters("getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency())) {
+			wpinv_set_error('invalid_currency');
 		}
 
 		// Check to see if we have any errors.
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
+		if (wpinv_get_errors()) {
+			wpinv_send_back_to_checkout($invoice);
 		}
 
 		// Send info to the gateway for payment processing
-		do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
+		do_action("getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission);
 
 		// Backwards compatibility.
-		wpinv_send_to_gateway( $submission_gateway, $invoice );
+		wpinv_send_to_gateway($submission_gateway, $invoice);
 
 	}
 
@@ -474,12 +474,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	protected function process_free_payment( $invoice ) {
+	protected function process_free_payment($invoice) {
 
-		$invoice->set_gateway( 'none' );
-		$invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
+		$invoice->set_gateway('none');
+		$invoice->add_note(__("This is a free invoice and won't be sent to the payment gateway", 'invoicing'), false, false, true);
 		$invoice->mark_paid();
-		wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+		wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
 	}
 
@@ -487,9 +487,9 @@ 
      * Sends a redrect response to payment details.
      *
      */
-    public function send_redirect_response( $url ) {
-        $url = rawurlencode( $url );
-        wp_send_json_success( $url );
+    public function send_redirect_response($url) {
+        $url = rawurlencode($url);
+        wp_send_json_success($url);
     }
 
 }

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

Indentation +150 added lines, -150 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -75,16 +75,16 @@ 
             $class .= ' wpi-recurring';
         }
 
-		$refund_url = wp_nonce_url(
-			add_query_arg(
-				array(
-					'getpaid-admin-action' => 'refund_invoice',
-					'invoice_id'           => $invoice->get_id(),
-				)
-			),
-			'getpaid-nonce',
-			'getpaid-nonce'
-		);
+        $refund_url = wp_nonce_url(
+            add_query_arg(
+                array(
+                    'getpaid-admin-action' => 'refund_invoice',
+                    'invoice_id'           => $invoice->get_id(),
+                )
+            ),
+            'getpaid-nonce',
+            'getpaid-nonce'
+        );
     ?>
 
         <div class="wpinv-items-wrap<?php echo esc_attr( $class ); ?>" id="wpinv_items_wrap" data-status="<?php echo esc_attr( $invoice->get_status() ); ?>">
@@ -96,8 +96,8 @@ 
                             <th class="
                             <?php
                             echo esc_attr( $key );
-							echo 'total' == $key || 'qty' == $key ? ' hide-if-amount' : '';
-							?>
+                            echo 'total' == $key || 'qty' == $key ? ' hide-if-amount' : '';
+                            ?>
 							"><?php echo wp_kses_post( $label ); ?></th>
                         <?php endforeach; ?>
                     </tr>
@@ -106,7 +106,7 @@ 
                 <tbody class="wpinv-line-items">
                     <?php
                         foreach ( $invoice->get_items() as $int => $item ) {
-						self::output_row( $columns, $item, $invoice, $int % 2 == 0 ? 'even' : 'odd' );
+                        self::output_row( $columns, $item, $invoice, $int % 2 == 0 ? 'even' : 'odd' );
                         }
                     ?>
                 </tbody>
@@ -151,13 +151,13 @@ 
                                                         <?php
                                                         wpinv_html_select(
                                                             array(
-																'options'          => $item_types,
-																'name'             => '_wpinv_quick[type]',
-																'id'               => '_wpinv_quick_type',
-																'selected'         => 'custom',
-																'show_option_all'  => false,
-																'show_option_none' => false,
-																'class'            => 'gdmbx2-text-medium wpinv-quick-type',
+                                                                'options'          => $item_types,
+                                                                'name'             => '_wpinv_quick[type]',
+                                                                'id'               => '_wpinv_quick_type',
+                                                                'selected'         => 'custom',
+                                                                'show_option_all'  => false,
+                                                                'show_option_none' => false,
+                                                                'class'            => 'gdmbx2-text-medium wpinv-quick-type',
                                                             )
                                                         );
                                                             ?>
@@ -172,16 +172,16 @@ 
                                                             <?php
                                                                 wpinv_html_select(
                                                                     array(
-																		'options'          => array_merge(
-																			array( '' => __( 'Select VAT Rule', 'invoicing' ) ),
-																			getpaid_get_tax_rules()
-																		),
-																		'name'             => '_wpinv_quick[vat_rule]',
-																		'id'               => '_wpinv_quick_vat_rule',
-																		'show_option_all'  => false,
-																		'show_option_none' => false,
-																		'class'            => 'gdmbx2-text-medium wpinv-quick-vat-rule',
-																		'selected'         => 'digital',
+                                                                        'options'          => array_merge(
+                                                                            array( '' => __( 'Select VAT Rule', 'invoicing' ) ),
+                                                                            getpaid_get_tax_rules()
+                                                                        ),
+                                                                        'name'             => '_wpinv_quick[vat_rule]',
+                                                                        'id'               => '_wpinv_quick_vat_rule',
+                                                                        'show_option_all'  => false,
+                                                                        'show_option_none' => false,
+                                                                        'class'            => 'gdmbx2-text-medium wpinv-quick-vat-rule',
+                                                                        'selected'         => 'digital',
                                                                     )
                                                                 );
                                                             ?>
@@ -194,16 +194,16 @@ 
                                                             <?php
                                                                 wpinv_html_select(
                                                                     array(
-																		'options'          => array_merge(
-																			array( '' => __( 'Select VAT Class', 'invoicing' ) ),
-																			getpaid_get_tax_classes()
-																		),
-																		'name'             => '_wpinv_quick[vat_class]',
-																		'id'               => '_wpinv_quick_vat_class',
-																		'show_option_all'  => false,
-																		'show_option_none' => false,
-																		'class'            => 'gdmbx2-text-medium wpinv-quick-vat-class',
-																		'selected'         => '_standard',
+                                                                        'options'          => array_merge(
+                                                                            array( '' => __( 'Select VAT Class', 'invoicing' ) ),
+                                                                            getpaid_get_tax_classes()
+                                                                        ),
+                                                                        'name'             => '_wpinv_quick[vat_class]',
+                                                                        'id'               => '_wpinv_quick_vat_class',
+                                                                        'show_option_all'  => false,
+                                                                        'show_option_none' => false,
+                                                                        'class'            => 'gdmbx2-text-medium wpinv-quick-vat-class',
+                                                                        'selected'         => '_standard',
                                                                     )
                                                                 );
                                                             ?>
@@ -294,37 +294,37 @@ 
 								</p>
 								<?php if ( getpaid_payment_gateway_supports( $invoice->get_gateway(), 'refunds' ) ) : ?>
 									<?php
-										aui()->input(
-											array(
-												'type'  => 'checkbox',
-												'name'  => 'getpaid_refund_remote',
-												'id'    => 'getpaid_refund_remote',
-												'label' => sprintf(
-													'Refund payment in %s',
-													wpinv_get_gateway_admin_label( $invoice->get_gateway() )
-												),
-												'value' => 1,
-												'class' => 'getpaid-refund-field',
-											),
-											true
-										);
-									?>
+                                        aui()->input(
+                                            array(
+                                                'type'  => 'checkbox',
+                                                'name'  => 'getpaid_refund_remote',
+                                                'id'    => 'getpaid_refund_remote',
+                                                'label' => sprintf(
+                                                    'Refund payment in %s',
+                                                    wpinv_get_gateway_admin_label( $invoice->get_gateway() )
+                                                ),
+                                                'value' => 1,
+                                                'class' => 'getpaid-refund-field',
+                                            ),
+                                            true
+                                        );
+                                    ?>
 								<?php endif; ?>
 
 								<?php if ( getpaid_get_invoice_subscriptions( $invoice ) ) : ?>
 									<?php
-										aui()->input(
-											array(
-												'type'  => 'checkbox',
-												'name'  => 'getpaid_cancel_subscription',
-												'id'    => 'getpaid_cancel_subscription',
-												'label' => __( 'Cancel subscription', 'invoicing' ),
-												'value' => 1,
-												'class' => 'getpaid-refund-field',
-											),
-											true
-										);
-									?>
+                                        aui()->input(
+                                            array(
+                                                'type'  => 'checkbox',
+                                                'name'  => 'getpaid_cancel_subscription',
+                                                'id'    => 'getpaid_cancel_subscription',
+                                                'label' => __( 'Cancel subscription', 'invoicing' ),
+                                                'value' => 1,
+                                                'class' => 'getpaid-refund-field',
+                                            ),
+                                            true
+                                        );
+                                    ?>
 								<?php endif; ?>
                             </div>
                             <div class="modal-footer">
@@ -364,23 +364,23 @@ 
                 <?php
                     if ( $invoice->is_paid() ) {
 
-						printf(
-							'<span class="bsui"><button type="button" class="button button-primary" data-toggle="modal" data-bs-toggle="modal" data-bs-target="#getpaid-refund-invoice-modal" data-target="#getpaid-refund-invoice-modal">%s</button></span>',
-							esc_html__( 'Refund', 'invoicing' )
-						);
+                        printf(
+                            '<span class="bsui"><button type="button" class="button button-primary" data-toggle="modal" data-bs-toggle="modal" data-bs-target="#getpaid-refund-invoice-modal" data-target="#getpaid-refund-invoice-modal">%s</button></span>',
+                            esc_html__( 'Refund', 'invoicing' )
+                        );
                     } elseif ( ! $invoice->is_refunded() ) {
-						wpinv_item_dropdown(
-							array(
-								'name'           => 'wpinv_invoice_item',
-								'id'             => 'wpinv_invoice_item',
-								'show_recurring' => true,
-								'class'          => 'wpi_select2',
-							)
-						);
-
-						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-add-item">' . sprintf( esc_html__( 'Add item to %s', 'invoicing' ), esc_html( $invoice->get_label() ) ) . '</button>';
-						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-new-item">' . esc_html__( 'Create new item', 'invoicing' ) . '</button>';
-						echo '&nbsp;' . '<button type="button" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">' . esc_html__( 'Recalculate Totals', 'invoicing' ) . '</button>';
+                        wpinv_item_dropdown(
+                            array(
+                                'name'           => 'wpinv_invoice_item',
+                                'id'             => 'wpinv_invoice_item',
+                                'show_recurring' => true,
+                                'class'          => 'wpi_select2',
+                            )
+                        );
+
+                        echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-add-item">' . sprintf( esc_html__( 'Add item to %s', 'invoicing' ), esc_html( $invoice->get_label() ) ) . '</button>';
+                        echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-new-item">' . esc_html__( 'Create new item', 'invoicing' ) . '</button>';
+                        echo '&nbsp;' . '<button type="button" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">' . esc_html__( 'Recalculate Totals', 'invoicing' ) . '</button>';
 
                     }
                 ?>
@@ -397,72 +397,72 @@ 
             <?php foreach ( array_keys( $columns ) as $column ) : ?>
                 <td class="
 					<?php
-						echo esc_attr( $column );
-						echo 'total' == $column || 'qty' == $column ? ' hide-if-amount' : '';
-					?>
+                        echo esc_attr( $column );
+                        echo 'total' == $column || 'qty' == $column ? ' hide-if-amount' : '';
+                    ?>
 				">
                     <?php
                         switch ( $column ) {
-						case 'id':
-							echo (int) $item->get_id();
-							break;
-						case 'title':
-							printf(
-								'<a href="%s" target="_blank">%s</a>',
-								esc_url( get_edit_post_link( $item->get_id() ) ),
-								esc_html( $item->get_raw_name() )
-							);
-
-							$summary = apply_filters( 'getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice );
-							if ( $summary !== '' ) {
-								printf(
-									'<span class="meta">%s</span>',
-									wp_kses_post( wpautop( $summary ) )
-								);
-							}
-
-							printf(
-								'<input type="hidden" value="%s" name="getpaid_items[%s][name]" class="getpaid-recalculate-prices-on-change" />',
-								esc_attr( $item->get_raw_name() ),
-								(int) $item->get_id()
-							);
-
-							printf(
-								'<textarea style="display: none;" name="getpaid_items[%s][description]" class="getpaid-recalculate-prices-on-change">%s</textarea>',
-								(int) $item->get_id(),
-								esc_attr( $item->get_description() )
-							);
-
-							break;
-						case 'price':
-							printf(
-								'<input type="text" value="%s" name="getpaid_items[%s][price]" style="width: 100px;" class="getpaid-admin-invoice-item-price getpaid-recalculate-prices-on-change" />',
-								esc_attr( getpaid_unstandardize_amount( $item->get_price() ) ),
-								(int) $item->get_id()
-							);
-
-							break;
-						case 'qty':
-							printf(
-								'<input type="text" style="width: 100px;" value="%s" name="getpaid_items[%s][quantity]" class="getpaid-admin-invoice-item-quantity getpaid-recalculate-prices-on-change" />',
-								floatval( $item->get_quantity() ),
-								(int) $item->get_id()
-							);
-
-							break;
-						case 'total':
-							wpinv_the_price( $item->get_sub_total(), $invoice->get_currency() );
-
-							break;
-						case 'tax':
-							echo floatval( wpinv_round_amount( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
-
-							break;
-						case 'action':
-							if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
-								echo '<i class="fa fa-trash wpinv-item-remove"></i>';
+                        case 'id':
+                            echo (int) $item->get_id();
+                            break;
+                        case 'title':
+                            printf(
+                                '<a href="%s" target="_blank">%s</a>',
+                                esc_url( get_edit_post_link( $item->get_id() ) ),
+                                esc_html( $item->get_raw_name() )
+                            );
+
+                            $summary = apply_filters( 'getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice );
+                            if ( $summary !== '' ) {
+                                printf(
+                                    '<span class="meta">%s</span>',
+                                    wp_kses_post( wpautop( $summary ) )
+                                );
+                            }
+
+                            printf(
+                                '<input type="hidden" value="%s" name="getpaid_items[%s][name]" class="getpaid-recalculate-prices-on-change" />',
+                                esc_attr( $item->get_raw_name() ),
+                                (int) $item->get_id()
+                            );
+
+                            printf(
+                                '<textarea style="display: none;" name="getpaid_items[%s][description]" class="getpaid-recalculate-prices-on-change">%s</textarea>',
+                                (int) $item->get_id(),
+                                esc_attr( $item->get_description() )
+                            );
+
+                            break;
+                        case 'price':
+                            printf(
+                                '<input type="text" value="%s" name="getpaid_items[%s][price]" style="width: 100px;" class="getpaid-admin-invoice-item-price getpaid-recalculate-prices-on-change" />',
+                                esc_attr( getpaid_unstandardize_amount( $item->get_price() ) ),
+                                (int) $item->get_id()
+                            );
+
+                            break;
+                        case 'qty':
+                            printf(
+                                '<input type="text" style="width: 100px;" value="%s" name="getpaid_items[%s][quantity]" class="getpaid-admin-invoice-item-quantity getpaid-recalculate-prices-on-change" />',
+                                floatval( $item->get_quantity() ),
+                                (int) $item->get_id()
+                            );
+
+                            break;
+                        case 'total':
+                            wpinv_the_price( $item->get_sub_total(), $invoice->get_currency() );
+
+                            break;
+                        case 'tax':
+                            echo floatval( wpinv_round_amount( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
+
+                            break;
+                        case 'action':
+                            if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+                                echo '<i class="fa fa-trash wpinv-item-remove"></i>';
                                 }
-							break;
+                            break;
                         }
                         do_action( 'getpaid_admin_edit_invoice_item_' . $column, $item, $invoice );
                     ?>
@@ -473,10 +473,10 @@ 
     }
 
     /**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
     public static function output2( $post ) {
 
         // Prepare the invoice.

Spacing +168 added lines, -168 removed lines

@@ -7,7 +7,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -16,62 +16,62 @@ 
  */
 class GetPaid_Meta_Box_Invoice_Items {
 
-    public static function get_columns( $invoice ) {
+    public static function get_columns($invoice) {
         $use_taxes = $invoice->is_taxable() && wpinv_use_taxes();
         $columns   = array(
-            'id'     => __( 'ID', 'invoicing' ),
-            'title'  => __( 'Item', 'invoicing' ),
+            'id'     => __('ID', 'invoicing'),
+            'title'  => __('Item', 'invoicing'),
             'price'  => sprintf(
                 '<span class="getpaid-hide-if-hours getpaid-hide-if-quantity">%s</span>
                 <span class="getpaid-hide-if-hours hide-if-amount">%s</span>
                 <span class="getpaid-hide-if-quantity hide-if-amount">%s</span>',
-                __( 'Amount', 'invoicing' ),
-                __( 'Price', 'invoicing' ),
-                __( 'Rate', 'invoicing' )
+                __('Amount', 'invoicing'),
+                __('Price', 'invoicing'),
+                __('Rate', 'invoicing')
             ),
             'qty'    => sprintf(
                 '<span class="getpaid-hide-if-hours">%s</span><span class="getpaid-hide-if-quantity">%s</span>',
-                __( 'Quantity', 'invoicing' ),
-                __( 'Hours', 'invoicing' )
+                __('Quantity', 'invoicing'),
+                __('Hours', 'invoicing')
             ),
-            'total'  => __( 'Total', 'invoicing' ),
-            'tax'    => __( 'Tax (%)', 'invoicing' ),
+            'total'  => __('Total', 'invoicing'),
+            'tax'    => __('Tax (%)', 'invoicing'),
             'action' => '',
         );
 
-        if ( ! $use_taxes ) {
-            unset( $columns['tax'] );
+        if (!$use_taxes) {
+            unset($columns['tax']);
         }
 
         return $columns;
     }
 
-    public static function output( $post, $invoice = false ) {
+    public static function output($post, $invoice = false) {
 
-        if ( apply_filters( 'getpaid_use_new_invoice_items_metabox', false ) ) {
-            return self::output2( $post );
+        if (apply_filters('getpaid_use_new_invoice_items_metabox', false)) {
+            return self::output2($post);
         }
 
-        $post_id    = ! empty( $post->ID ) ? $post->ID : 0;
-        $invoice    = $invoice instanceof WPInv_Invoice ? $invoice : new WPInv_Invoice( $post_id );
+        $post_id    = !empty($post->ID) ? $post->ID : 0;
+        $invoice    = $invoice instanceof WPInv_Invoice ? $invoice : new WPInv_Invoice($post_id);
         $use_taxes  = $invoice->is_taxable() && wpinv_use_taxes();
-        $item_types = apply_filters( 'wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post );
-        $columns    = self::get_columns( $invoice );
-        $cols       = count( $columns );
+        $item_types = apply_filters('wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post);
+        $columns    = self::get_columns($invoice);
+        $cols       = count($columns);
         $class      = '';
 
-        unset( $item_types['adv'] );
-        unset( $item_types['package'] );
+        unset($item_types['adv']);
+        unset($item_types['package']);
 
-        if ( $invoice->is_paid() ) {
+        if ($invoice->is_paid()) {
             $class .= ' wpinv-paid';
         }
 
-        if ( $invoice->is_refunded() ) {
+        if ($invoice->is_refunded()) {
             $class .= ' wpinv-refunded';
         }
 
-        if ( $invoice->is_recurring() ) {
+        if ($invoice->is_recurring()) {
             $class .= ' wpi-recurring';
         }
 
@@ -87,26 +87,26 @@ 
 		);
     ?>
 
-        <div class="wpinv-items-wrap<?php echo esc_attr( $class ); ?>" id="wpinv_items_wrap" data-status="<?php echo esc_attr( $invoice->get_status() ); ?>">
+        <div class="wpinv-items-wrap<?php echo esc_attr($class); ?>" id="wpinv_items_wrap" data-status="<?php echo esc_attr($invoice->get_status()); ?>">
             <table id="wpinv_items" class="wpinv-items" cellspacing="0" cellpadding="0">
 
                 <thead>
                     <tr>
-                        <?php foreach ( $columns as $key => $label ) : ?>
+                        <?php foreach ($columns as $key => $label) : ?>
                             <th class="
                             <?php
-                            echo esc_attr( $key );
+                            echo esc_attr($key);
 							echo 'total' == $key || 'qty' == $key ? ' hide-if-amount' : '';
 							?>
-							"><?php echo wp_kses_post( $label ); ?></th>
+							"><?php echo wp_kses_post($label); ?></th>
                         <?php endforeach; ?>
                     </tr>
                 </thead>
 
                 <tbody class="wpinv-line-items">
                     <?php
-                        foreach ( $invoice->get_items() as $int => $item ) {
-						self::output_row( $columns, $item, $invoice, $int % 2 == 0 ? 'even' : 'odd' );
+                        foreach ($invoice->get_items() as $int => $item) {
+						self::output_row($columns, $item, $invoice, $int % 2 == 0 ? 'even' : 'odd');
                         }
                     ?>
                 </tbody>
@@ -123,7 +123,7 @@ 
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-name">
                                                     <span class="input-text-wrap">
-                                                        <input type="text" style="width: 100%" placeholder="<?php esc_attr_e( 'Item Name', 'invoicing' ); ?>" class="wpinv-quick-item-name" name="_wpinv_quick[name]">
+                                                        <input type="text" style="width: 100%" placeholder="<?php esc_attr_e('Item Name', 'invoicing'); ?>" class="wpinv-quick-item-name" name="_wpinv_quick[name]">
                                                     </span>
                                                 </label>
                                             </div>
@@ -131,8 +131,8 @@ 
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-price">
                                                     <span class="input-text-wrap">
-                                                    <input type="text" style="width: 200px" placeholder="<?php esc_attr_e( 'Item Price', 'invoicing' ); ?>" class="wpinv-quick-item-price" name="_wpinv_quick[price]">
-                                                        &times; <input type="text" style="width: 140px" placeholder="<?php esc_attr_e( 'Item Quantity', 'invoicing' ); ?>" class="wpinv-quick-item-qty" name="_wpinv_quick[qty]">
+                                                    <input type="text" style="width: 200px" placeholder="<?php esc_attr_e('Item Price', 'invoicing'); ?>" class="wpinv-quick-item-price" name="_wpinv_quick[price]">
+                                                        &times; <input type="text" style="width: 140px" placeholder="<?php esc_attr_e('Item Quantity', 'invoicing'); ?>" class="wpinv-quick-item-qty" name="_wpinv_quick[qty]">
                                                     </span>
                                                 </label>
                                             </div>
@@ -140,7 +140,7 @@ 
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-name">
                                                     <span class="input-text-wrap">
-                                                        <textarea rows="4" style="width: 100%" placeholder="<?php esc_attr_e( 'Item Description', 'invoicing' ); ?>" class="wpinv-quick-item-description" name="_wpinv_quick[description]"></textarea>
+                                                        <textarea rows="4" style="width: 100%" placeholder="<?php esc_attr_e('Item Description', 'invoicing'); ?>" class="wpinv-quick-item-description" name="_wpinv_quick[description]"></textarea>
                                                     </span>
                                                 </label>
                                             </div>
@@ -165,7 +165,7 @@ 
                                                 </label>
                                             </div>
 
-                                            <?php if ( $use_taxes ) : ?>
+                                            <?php if ($use_taxes) : ?>
                                                 <div class="wp-clearfix">
                                                     <label class="wpi-vat-rule">
                                                         <span class="input-text-wrap">
@@ -173,7 +173,7 @@ 
                                                                 wpinv_html_select(
                                                                     array(
 																		'options'          => array_merge(
-																			array( '' => __( 'Select VAT Rule', 'invoicing' ) ),
+																			array('' => __('Select VAT Rule', 'invoicing')),
 																			getpaid_get_tax_rules()
 																		),
 																		'name'             => '_wpinv_quick[vat_rule]',
@@ -195,7 +195,7 @@ 
                                                                 wpinv_html_select(
                                                                     array(
 																		'options'          => array_merge(
-																			array( '' => __( 'Select VAT Class', 'invoicing' ) ),
+																			array('' => __('Select VAT Class', 'invoicing')),
 																			getpaid_get_tax_classes()
 																		),
 																		'name'             => '_wpinv_quick[vat_class]',
@@ -219,7 +219,7 @@ 
                                                             'type'    => 'checkbox',
                                                             'name'    => '_wpinv_quick[one-time]',
                                                             'id'      => '_wpinv_quick-one-time',
-                                                            'label'   => __( "One time item (won't be saved to regular items list)", 'invoicing' ),
+                                                            'label'   => __("One time item (won't be saved to regular items list)", 'invoicing'),
                                                             'value'   => 1,
                                                             'no_wrap' => true,
                                                             'checked' => false,
@@ -243,29 +243,29 @@ 
                         </td>
                     </tr>
                     <tr class="totals">
-                        <td colspan="<?php echo ( (int) $cols - 4 ); ?>"></td>
+                        <td colspan="<?php echo ((int) $cols - 4); ?>"></td>
                         <td colspan="4">
                             <table cellspacing="0" cellpadding="0">
                                 <tr class="subtotal">
-                                    <td class="name"><?php esc_html_e( 'Sub Total:', 'invoicing' ); ?></td>
-                                    <td class="total"><?php wpinv_the_price( $invoice->get_subtotal(), $invoice->get_currency() ); ?></td>
+                                    <td class="name"><?php esc_html_e('Sub Total:', 'invoicing'); ?></td>
+                                    <td class="total"><?php wpinv_the_price($invoice->get_subtotal(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <tr class="discount">
-                                    <td class="name"><?php esc_html_e( 'Discount:', 'invoicing' ); ?></td>
-                                    <td class="total"><?php wpinv_the_price( $invoice->get_total_discount(), $invoice->get_currency() ); ?></td>
+                                    <td class="name"><?php esc_html_e('Discount:', 'invoicing'); ?></td>
+                                    <td class="total"><?php wpinv_the_price($invoice->get_total_discount(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
-                                <?php if ( $use_taxes ) : ?>
+                                <?php if ($use_taxes) : ?>
                                 <tr class="tax">
-                                    <td class="name"><?php esc_html_e( 'Tax:', 'invoicing' ); ?></td>
-                                    <td class="total"><?php wpinv_the_price( $invoice->get_total_tax(), $invoice->get_currency() ); ?></td>
+                                    <td class="name"><?php esc_html_e('Tax:', 'invoicing'); ?></td>
+                                    <td class="total"><?php wpinv_the_price($invoice->get_total_tax(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <?php endif; ?>
                                 <tr class="total">
-                                    <td class="name"><?php esc_html_e( 'Total:', 'invoicing' ); ?></td>
-                                    <td class="total"><?php wpinv_the_price( $invoice->get_total(), $invoice->get_currency() ); ?></td>
+                                    <td class="name"><?php esc_html_e('Total:', 'invoicing'); ?></td>
+                                    <td class="total"><?php wpinv_the_price($invoice->get_total(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
                             </table>
@@ -281,18 +281,18 @@ 
                      <div class="modal-dialog modal-dialog-centered" role="document">
                         <div class="modal-content">
                             <div class="modal-header">
-                                <h5 class="modal-title" id="getpaid-refund-invoice-modal-label"><?php esc_html_e( 'Refund Payment', 'invoicing' ); ?></h5>
-                                <button type="button" class="close btn-close" data-bs-dismiss="modal" data-dismiss="modal" aria-label="<?php esc_html_e( 'Close', 'invoicing' ); ?>">
-                                    <?php if ( empty( $GLOBALS['aui_bs5'] ) ) : ?>
+                                <h5 class="modal-title" id="getpaid-refund-invoice-modal-label"><?php esc_html_e('Refund Payment', 'invoicing'); ?></h5>
+                                <button type="button" class="close btn-close" data-bs-dismiss="modal" data-dismiss="modal" aria-label="<?php esc_html_e('Close', 'invoicing'); ?>">
+                                    <?php if (empty($GLOBALS['aui_bs5'])) : ?>
                                         <span aria-hidden="true">×</span>
                                     <?php endif; ?>
                                 </button>
                             </div>
                             <div class="modal-body">
 								<p>
-									<?php esc_html_e( 'Are you sure you want to refund this payment?', 'invoicing' ); ?>
+									<?php esc_html_e('Are you sure you want to refund this payment?', 'invoicing'); ?>
 								</p>
-								<?php if ( getpaid_payment_gateway_supports( $invoice->get_gateway(), 'refunds' ) ) : ?>
+								<?php if (getpaid_payment_gateway_supports($invoice->get_gateway(), 'refunds')) : ?>
 									<?php
 										aui()->input(
 											array(
@@ -301,7 +301,7 @@ 
 												'id'    => 'getpaid_refund_remote',
 												'label' => sprintf(
 													'Refund payment in %s',
-													wpinv_get_gateway_admin_label( $invoice->get_gateway() )
+													wpinv_get_gateway_admin_label($invoice->get_gateway())
 												),
 												'value' => 1,
 												'class' => 'getpaid-refund-field',
@@ -311,14 +311,14 @@ 
 									?>
 								<?php endif; ?>
 
-								<?php if ( getpaid_get_invoice_subscriptions( $invoice ) ) : ?>
+								<?php if (getpaid_get_invoice_subscriptions($invoice)) : ?>
 									<?php
 										aui()->input(
 											array(
 												'type'  => 'checkbox',
 												'name'  => 'getpaid_cancel_subscription',
 												'id'    => 'getpaid_cancel_subscription',
-												'label' => __( 'Cancel subscription', 'invoicing' ),
+												'label' => __('Cancel subscription', 'invoicing'),
 												'value' => 1,
 												'class' => 'getpaid-refund-field',
 											),
@@ -328,12 +328,12 @@ 
 								<?php endif; ?>
                             </div>
                             <div class="modal-footer">
-                                <button type="button" class="btn btn-secondary getpaid-cancel" data-bs-dismiss="modal" data-dismiss="modal"><?php esc_html_e( 'Cancel', 'invoicing' ); ?></button>
+                                <button type="button" class="btn btn-secondary getpaid-cancel" data-bs-dismiss="modal" data-dismiss="modal"><?php esc_html_e('Cancel', 'invoicing'); ?></button>
                                 <a
-									href="<?php echo esc_url_raw( $refund_url ); ?>"
-									data-href="<?php echo esc_url_raw( $refund_url ); ?>"
+									href="<?php echo esc_url_raw($refund_url); ?>"
+									data-href="<?php echo esc_url_raw($refund_url); ?>"
 									class="btn btn-primary getpaid-refund-payment-button"
-								><?php esc_html_e( 'Refund', 'invoicing' ); ?></a>
+								><?php esc_html_e('Refund', 'invoicing'); ?></a>
 								<script>
 									// Update the refund URL when the user changes the refund options.
 									jQuery( function( $ ) {
@@ -359,13 +359,13 @@ 
 
             <div class="wpinv-actions">
                 <?php
-                    if ( $invoice->is_paid() ) {
+                    if ($invoice->is_paid()) {
 
 						printf(
 							'<span class="bsui"><button type="button" class="button button-primary" data-toggle="modal" data-bs-toggle="modal" data-bs-target="#getpaid-refund-invoice-modal" data-target="#getpaid-refund-invoice-modal">%s</button></span>',
-							esc_html__( 'Refund', 'invoicing' )
+							esc_html__('Refund', 'invoicing')
 						);
-                    } elseif ( ! $invoice->is_refunded() ) {
+                    } elseif (!$invoice->is_refunded()) {
 						wpinv_item_dropdown(
 							array(
 								'name'           => 'wpinv_invoice_item',
@@ -375,66 +375,66 @@ 
 							)
 						);
 
-						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-add-item">' . sprintf( esc_html__( 'Add item to %s', 'invoicing' ), esc_html( $invoice->get_label() ) ) . '</button>';
-						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-new-item">' . esc_html__( 'Create new item', 'invoicing' ) . '</button>';
-						echo '&nbsp;' . '<button type="button" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">' . esc_html__( 'Recalculate Totals', 'invoicing' ) . '</button>';
+						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-add-item">' . sprintf(esc_html__('Add item to %s', 'invoicing'), esc_html($invoice->get_label())) . '</button>';
+						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-new-item">' . esc_html__('Create new item', 'invoicing') . '</button>';
+						echo '&nbsp;' . '<button type="button" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">' . esc_html__('Recalculate Totals', 'invoicing') . '</button>';
 
                     }
                 ?>
-                <?php do_action( 'wpinv_invoice_items_actions', $invoice ); ?>
+                <?php do_action('wpinv_invoice_items_actions', $invoice); ?>
             </div>
         </div>
         <?php
     }
 
-    public static function output_row( $columns, $item, $invoice, $class = 'even' ) {
+    public static function output_row($columns, $item, $invoice, $class = 'even') {
 
     ?>
-        <tr class="item item-<?php echo esc_attr( $class ); ?>" data-item-id="<?php echo esc_attr( $item->get_id() ); ?>">
-            <?php foreach ( array_keys( $columns ) as $column ) : ?>
+        <tr class="item item-<?php echo esc_attr($class); ?>" data-item-id="<?php echo esc_attr($item->get_id()); ?>">
+            <?php foreach (array_keys($columns) as $column) : ?>
                 <td class="
 					<?php
-						echo esc_attr( $column );
+						echo esc_attr($column);
 						echo 'total' == $column || 'qty' == $column ? ' hide-if-amount' : '';
 					?>
 				">
                     <?php
-                        switch ( $column ) {
+                        switch ($column) {
 						case 'id':
 							echo (int) $item->get_id();
 							break;
 						case 'title':
 							printf(
 								'<a href="%s" target="_blank">%s</a>',
-								esc_url( get_edit_post_link( $item->get_id() ) ),
-								esc_html( $item->get_raw_name() )
+								esc_url(get_edit_post_link($item->get_id())),
+								esc_html($item->get_raw_name())
 							);
 
-							$summary = apply_filters( 'getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice );
-							if ( $summary !== '' ) {
+							$summary = apply_filters('getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice);
+							if ($summary !== '') {
 								printf(
 									'<span class="meta">%s</span>',
-									wp_kses_post( wpautop( $summary ) )
+									wp_kses_post(wpautop($summary))
 								);
 							}
 
 							printf(
 								'<input type="hidden" value="%s" name="getpaid_items[%s][name]" class="getpaid-recalculate-prices-on-change" />',
-								esc_attr( $item->get_raw_name() ),
+								esc_attr($item->get_raw_name()),
 								(int) $item->get_id()
 							);
 
 							printf(
 								'<textarea style="display: none;" name="getpaid_items[%s][description]" class="getpaid-recalculate-prices-on-change">%s</textarea>',
 								(int) $item->get_id(),
-								esc_attr( $item->get_description() )
+								esc_attr($item->get_description())
 							);
 
 							break;
 						case 'price':
 							printf(
 								'<input type="text" value="%s" name="getpaid_items[%s][price]" style="width: 100px;" class="getpaid-admin-invoice-item-price getpaid-recalculate-prices-on-change" />',
-								esc_attr( getpaid_unstandardize_amount( $item->get_price() ) ),
+								esc_attr(getpaid_unstandardize_amount($item->get_price())),
 								(int) $item->get_id()
 							);
 
@@ -442,26 +442,26 @@ 
 						case 'qty':
 							printf(
 								'<input type="text" style="width: 100px;" value="%s" name="getpaid_items[%s][quantity]" class="getpaid-admin-invoice-item-quantity getpaid-recalculate-prices-on-change" />',
-								floatval( $item->get_quantity() ),
+								floatval($item->get_quantity()),
 								(int) $item->get_id()
 							);
 
 							break;
 						case 'total':
-							wpinv_the_price( $item->get_sub_total(), $invoice->get_currency() );
+							wpinv_the_price($item->get_sub_total(), $invoice->get_currency());
 
 							break;
 						case 'tax':
-							echo floatval( wpinv_round_amount( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
+							echo floatval(wpinv_round_amount(getpaid_get_invoice_tax_rate($invoice, $item), 2)) . '%';
 
 							break;
 						case 'action':
-							if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+							if (!$invoice->is_paid() && !$invoice->is_refunded()) {
 								echo '<i class="fa fa-trash wpinv-item-remove"></i>';
                                 }
 							break;
                         }
-                        do_action( 'getpaid_admin_edit_invoice_item_' . $column, $item, $invoice );
+                        do_action('getpaid_admin_edit_invoice_item_' . $column, $item, $invoice);
                     ?>
                 </td>
             <?php endforeach; ?>
@@ -474,10 +474,10 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output2( $post ) {
+    public static function output2($post) {
 
         // Prepare the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Invoice items.
         $items = $invoice->get_items();
@@ -485,28 +485,28 @@ 
         $totals = array(
 
             'subtotal' => array(
-                'label' => __( 'Items Subtotal', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_subtotal(), $invoice->get_currency() ),
+                'label' => __('Items Subtotal', 'invoicing'),
+                'value' => wpinv_price($invoice->get_subtotal(), $invoice->get_currency()),
             ),
 
             'discount' => array(
-                'label' => __( 'Total Discount', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total_discount(), $invoice->get_currency() ),
+                'label' => __('Total Discount', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total_discount(), $invoice->get_currency()),
             ),
 
             'tax'      => array(
-                'label' => __( 'Total Tax', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total_tax(), $invoice->get_currency() ),
+                'label' => __('Total Tax', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total_tax(), $invoice->get_currency()),
             ),
 
             'total'    => array(
-                'label' => __( 'Invoice Total', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total(), $invoice->get_currency() ),
+                'label' => __('Invoice Total', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total(), $invoice->get_currency()),
             ),
         );
 
-        if ( ! wpinv_use_taxes() ) {
-            unset( $totals['tax'] );
+        if (!wpinv_use_taxes()) {
+            unset($totals['tax']);
         }
 
         $item_args = array(
@@ -514,7 +514,7 @@ 
             'orderby'        => 'title',
             'order'          => 'ASC',
             'posts_per_page' => -1,
-            'post_status'    => array( 'publish' ),
+            'post_status'    => array('publish'),
             'meta_query'     => array(
                 array(
                     'key'     => '_wpinv_type',
@@ -542,10 +542,10 @@ 
             }
         </style>
 
-                <div class="bsui getpaid-invoice-items-inner <?php echo empty( $items ) ? 'no-items' : 'has-items'; ?> <?php echo $invoice->is_paid() || $invoice->is_refunded() ? 'not-editable' : 'editable'; ?>" style="margin-top: 1.5rem; padding: 0 12px 12px;">
+                <div class="bsui getpaid-invoice-items-inner <?php echo empty($items) ? 'no-items' : 'has-items'; ?> <?php echo $invoice->is_paid() || $invoice->is_refunded() ? 'not-editable' : 'editable'; ?>" style="margin-top: 1.5rem; padding: 0 12px 12px;">
 
-                    <?php if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) : ?>
-                        <?php do_action( 'wpinv_meta_box_before_invoice_template_row', $invoice->get_id() ); ?>
+                    <?php if (!$invoice->is_paid() && !$invoice->is_refunded()) : ?>
+                        <?php do_action('wpinv_meta_box_before_invoice_template_row', $invoice->get_id()); ?>
 
                         <div class="row">
                             <div class="col-12 col-sm-6">
@@ -554,15 +554,15 @@ 
                                         array(
                                             'id'          => 'wpinv_template',
                                             'name'        => 'wpinv_template',
-                                            'label'       => __( 'Template', 'invoicing' ),
+                                            'label'       => __('Template', 'invoicing'),
                                             'label_type'  => 'vertical',
-                                            'placeholder' => __( 'Choose a template', 'invoicing' ),
+                                            'placeholder' => __('Choose a template', 'invoicing'),
                                             'class'       => 'form-control-sm',
-                                            'value'       => $invoice->get_template( 'edit' ),
+                                            'value'       => $invoice->get_template('edit'),
                                             'options'     => array(
-                                                'quantity' => __( 'Quantity', 'invoicing' ),
-                                                'hours'    => __( 'Hours', 'invoicing' ),
-                                                'amount'   => __( 'Amount Only', 'invoicing' ),
+                                                'quantity' => __('Quantity', 'invoicing'),
+                                                'hours'    => __('Hours', 'invoicing'),
+                                                'amount'   => __('Amount Only', 'invoicing'),
                                             ),
                                             'data-allow-clear' => 'false',
                                             'select2'     => true,
@@ -579,11 +579,11 @@ 
                                         array(
                                             'id'          => 'wpinv_currency',
                                             'name'        => 'wpinv_currency',
-                                            'label'       => __( 'Currency', 'invoicing' ),
+                                            'label'       => __('Currency', 'invoicing'),
                                             'label_type'  => 'vertical',
-                                            'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
+                                            'placeholder' => __('Select Invoice Currency', 'invoicing'),
                                             'class'       => 'form-control-sm',
-                                            'value'       => $invoice->get_currency( 'edit' ),
+                                            'value'       => $invoice->get_currency('edit'),
                                             'required'    => false,
                                             'data-allow-clear' => 'false',
                                             'select2'     => true,
@@ -596,24 +596,24 @@ 
                             </div>
                         </div>
 
-                        <?php do_action( 'wpinv_meta_box_invoice_template_row', $invoice->get_id() ); ?>
+                        <?php do_action('wpinv_meta_box_invoice_template_row', $invoice->get_id()); ?>
                     <?php endif; ?>
 
                     <table cellpadding="0" cellspacing="0" class="getpaid_invoice_items">
                         <thead>
                             <tr>
-                                <th class="getpaid-item" colspan="2"><?php esc_html_e( 'Item', 'invoicing' ); ?></th>
+                                <th class="getpaid-item" colspan="2"><?php esc_html_e('Item', 'invoicing'); ?></th>
                                 <th class="getpaid-quantity hide-if-amount text-right">
-                                    <span class="getpaid-hide-if-hours"><?php esc_html_e( 'Quantity', 'invoicing' ); ?></span>
-                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e( 'Hours', 'invoicing' ); ?></span>
+                                    <span class="getpaid-hide-if-hours"><?php esc_html_e('Quantity', 'invoicing'); ?></span>
+                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e('Hours', 'invoicing'); ?></span>
                                 </th>
                                 <th class="getpaid-price hide-if-amount text-right">
-                                    <span class="getpaid-hide-if-hours"><?php esc_html_e( 'Price', 'invoicing' ); ?></span>
-                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e( 'Rate', 'invoicing' ); ?></span>
+                                    <span class="getpaid-hide-if-hours"><?php esc_html_e('Price', 'invoicing'); ?></span>
+                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e('Rate', 'invoicing'); ?></span>
                                 </th>
                                 <th class="getpaid-item-subtotal text-right">
-                                    <span class="getpaid-hide-if-hours getpaid-hide-if-quantity"><?php esc_html_e( 'Amount', 'invoicing' ); ?></span>
-                                    <span class="hide-if-amount"><?php esc_html_e( 'Total', 'invoicing' ); ?></span>
+                                    <span class="getpaid-hide-if-hours getpaid-hide-if-quantity"><?php esc_html_e('Amount', 'invoicing'); ?></span>
+                                    <span class="hide-if-amount"><?php esc_html_e('Total', 'invoicing'); ?></span>
                                 </th>
                                 <th class="getpaid-item-actions hide-if-not-editable" width="70px">&nbsp;</th>
                             </tr>
@@ -621,8 +621,8 @@ 
 		                <tbody class="getpaid_invoice_line_items">
                             <tr class="hide-if-has-items hide-if-not-editable">
                                 <td colspan="2" class="pt-4 pb-4">
-                                    <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php esc_html_e( 'Add Existing Items', 'invoicing' ); ?></button>
-                                    <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php esc_html_e( 'Create New Item', 'invoicing' ); ?></button>
+                                    <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php esc_html_e('Add Existing Items', 'invoicing'); ?></button>
+                                    <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php esc_html_e('Create New Item', 'invoicing'); ?></button>
                                 </td>
                                 <td class="hide-if-amount">&nbsp;</th>
                                 <td class="hide-if-amount">&nbsp;</th>
@@ -654,11 +654,11 @@ 
                             <div class="col-12 col-sm-6 offset-sm-6">
                                 <table class="getpaid-invoice-totals text-right w-100">
                                     <tbody>
-                                        <?php foreach ( apply_filters( 'getpaid_invoice_subtotal_rows', $totals, $invoice ) as $key => $data ) : ?>
-                                            <tr class="getpaid-totals-<?php echo esc_attr( $key ); ?>">
-                                                <td class="label"><?php echo esc_html( $data['label'] ); ?>:</td>
+                                        <?php foreach (apply_filters('getpaid_invoice_subtotal_rows', $totals, $invoice) as $key => $data) : ?>
+                                            <tr class="getpaid-totals-<?php echo esc_attr($key); ?>">
+                                                <td class="label"><?php echo esc_html($data['label']); ?>:</td>
                                                 <td width="1%"></td>
-                                                <td class="value"><?php echo wp_kses_post( $data['value'] ); ?></td>
+                                                <td class="value"><?php echo wp_kses_post($data['value']); ?></td>
                                             </tr>
                                         <?php endforeach; ?>
                                     </tbody>
@@ -671,18 +671,18 @@ 
                     <div class="getpaid-invoice-item-actions hide-if-no-items hide-if-not-editable">
                         <div class="row">
                             <div class="text-left col-12 col-sm-8">
-                                <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php esc_html_e( 'Add Existing Item', 'invoicing' ); ?></button>
-                                <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php esc_html_e( 'Create New Item', 'invoicing' ); ?></button>
-                                <?php do_action( 'getpaid-invoice-items-actions', $invoice ); ?>
+                                <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php esc_html_e('Add Existing Item', 'invoicing'); ?></button>
+                                <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php esc_html_e('Create New Item', 'invoicing'); ?></button>
+                                <?php do_action('getpaid-invoice-items-actions', $invoice); ?>
                             </div>
                             <div class="text-right col-12 col-sm-4">
-                                <button type="button" class="button button-primary recalculate-totals-button"><?php esc_html_e( 'Recalculate Totals', 'invoicing' ); ?></button>
+                                <button type="button" class="button button-primary recalculate-totals-button"><?php esc_html_e('Recalculate Totals', 'invoicing'); ?></button>
                             </div>
                         </div>
                     </div>
 
                     <div class="getpaid-invoice-item-actions hide-if-editable">
-                        <p class="description m-2 text-right text-muted"><?php esc_html_e( 'This invoice is no longer editable', 'invoicing' ); ?></p>
+                        <p class="description m-2 text-right text-muted"><?php esc_html_e('This invoice is no longer editable', 'invoicing'); ?></p>
                     </div>
 
                     <!-- Add items to an invoice -->
@@ -690,9 +690,9 @@ 
                         <div class="modal-dialog modal-dialog-centered" role="document">
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <h5 class="modal-title" id="getpaid-add-item-to-invoice-label"><?php esc_html_e( 'Add Item(s)', 'invoicing' ); ?></h5>
-                                    <button type="button" class="close btn-close" data-dismiss="modal" aria-label="<?php esc_html_e( 'Close', 'invoicing' ); ?>">
-                                        <?php if ( empty( $GLOBALS['aui_bs5'] ) ) : ?>
+                                    <h5 class="modal-title" id="getpaid-add-item-to-invoice-label"><?php esc_html_e('Add Item(s)', 'invoicing'); ?></h5>
+                                    <button type="button" class="close btn-close" data-dismiss="modal" aria-label="<?php esc_html_e('Close', 'invoicing'); ?>">
+                                        <?php if (empty($GLOBALS['aui_bs5'])) : ?>
                                             <span aria-hidden="true">×</span>
                                         <?php endif; ?>
                                     </button>
@@ -701,10 +701,10 @@ 
                                     <table class="widefat">
                                         <thead>
                                             <tr>
-                                                <th class="pl-0 text-left"><?php esc_html_e( 'Item', 'invoicing' ); ?></th>
+                                                <th class="pl-0 text-left"><?php esc_html_e('Item', 'invoicing'); ?></th>
                                                 <th class="pr-0 text-right hide-if-amount">
-                                                    <span class="getpaid-hide-if-hours"><?php esc_html_e( 'Quantity', 'invoicing' ); ?></span>
-                                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e( 'Hours', 'invoicing' ); ?></span>
+                                                    <span class="getpaid-hide-if-hours"><?php esc_html_e('Quantity', 'invoicing'); ?></span>
+                                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e('Hours', 'invoicing'); ?></span>
                                                 </th>
                                             </tr>
                                         </thead>
@@ -712,9 +712,9 @@ 
 								            <tr>
 									            <td class="pl-0 text-left">
                                                     <select class="regular-text getpaid-add-invoice-item-select">
-                                                        <option value="" selected="selected" disabled><?php esc_html_e( 'Select an item…', 'invoicing' ); ?></option>
-                                                        <?php foreach ( get_posts( $item_args ) as $item ) : ?>
-                                                        <option value="<?php echo (int) $item->ID; ?>"><?php echo esc_html( $item->post_title ); ?></option>
+                                                        <option value="" selected="selected" disabled><?php esc_html_e('Select an item…', 'invoicing'); ?></option>
+                                                        <?php foreach (get_posts($item_args) as $item) : ?>
+                                                        <option value="<?php echo (int) $item->ID; ?>"><?php echo esc_html($item->post_title); ?></option>
                                                         <?php endforeach; ?>
                                                     </select>
                                                 </td>
@@ -726,8 +726,8 @@ 
 						            </table>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e( 'Cancel', 'invoicing' ); ?></button>
-                                    <button type="button" class="btn btn-primary getpaid-add" data-dismiss="modal"><?php esc_html_e( 'Add', 'invoicing' ); ?></button>
+                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e('Cancel', 'invoicing'); ?></button>
+                                    <button type="button" class="btn btn-primary getpaid-add" data-dismiss="modal"><?php esc_html_e('Add', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>
@@ -738,9 +738,9 @@ 
                         <div class="modal-dialog modal-dialog-centered" role="document">
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <h5 class="modal-title" id="getpaid-create-invoice-item-label"><?php esc_html_e( 'Create Item', 'invoicing' ); ?></h5>
-                                    <button type="button" class="close btn-close" data-dismiss="modal" aria-label="<?php esc_html_e( 'Close', 'invoicing' ); ?>">
-                                        <?php if ( empty( $GLOBALS['aui_bs5'] ) ) : ?>
+                                    <h5 class="modal-title" id="getpaid-create-invoice-item-label"><?php esc_html_e('Create Item', 'invoicing'); ?></h5>
+                                    <button type="button" class="close btn-close" data-dismiss="modal" aria-label="<?php esc_html_e('Close', 'invoicing'); ?>">
+                                        <?php if (empty($GLOBALS['aui_bs5'])) : ?>
                                             <span aria-hidden="true">×</span>
                                         <?php endif; ?>
                                     </button>
@@ -749,27 +749,27 @@ 
                                     <div class="getpaid-create-item-div">
                                         <input type="hidden" name="id" value="new" class="form-control form-control-sm item-id">
                                         <label class="form-group mb-3 w-100">
-                                            <span><?php esc_html_e( 'Name', 'invoicing' ); ?></span>
-                                            <input type="text" name="name" placeholder="<?php esc_attr_e( 'Item Name', 'invoicing' ); ?>" class="form-control form-control-sm item-name">
+                                            <span><?php esc_html_e('Name', 'invoicing'); ?></span>
+                                            <input type="text" name="name" placeholder="<?php esc_attr_e('Item Name', 'invoicing'); ?>" class="form-control form-control-sm item-name">
                                         </label>
                                         <label class="form-group mb-3 w-100">
-                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php esc_html_e( 'Amount', 'invoicing' ); ?></span>
-                                            <span class="hide-if-amount"><?php esc_html_e( 'Price', 'invoicing' ); ?></span>
-                                            <input type="text" name="price" placeholder="<?php echo esc_attr( wpinv_sanitize_amount( 0 ) ); ?>" class="form-control form-control-sm item-price">
+                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php esc_html_e('Amount', 'invoicing'); ?></span>
+                                            <span class="hide-if-amount"><?php esc_html_e('Price', 'invoicing'); ?></span>
+                                            <input type="text" name="price" placeholder="<?php echo esc_attr(wpinv_sanitize_amount(0)); ?>" class="form-control form-control-sm item-price">
                                         </label>
                                         <label class="form-group mb-3 w-100 hide-if-amount">
-                                            <span><?php esc_html_e( 'Quantity', 'invoicing' ); ?></span>
+                                            <span><?php esc_html_e('Quantity', 'invoicing'); ?></span>
                                             <input type="text" name="quantity" placeholder="1" class="form-control form-control-sm item-quantity">
                                         </label>
                                         <label class="form-group mb-3 w-100">
-                                            <span><?php esc_html_e( 'Item Description', 'invoicing' ); ?></span>
-                                            <textarea name="description" placeholder="<?php esc_attr_e( 'Enter a description for this item', 'invoicing' ); ?>" class="form-control item-description"></textarea>
+                                            <span><?php esc_html_e('Item Description', 'invoicing'); ?></span>
+                                            <textarea name="description" placeholder="<?php esc_attr_e('Enter a description for this item', 'invoicing'); ?>" class="form-control item-description"></textarea>
                                         </label>
                                     </div>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e( 'Cancel', 'invoicing' ); ?></button>
-                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php esc_html_e( 'Create', 'invoicing' ); ?></button>
+                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e('Cancel', 'invoicing'); ?></button>
+                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php esc_html_e('Create', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>
@@ -780,9 +780,9 @@ 
                         <div class="modal-dialog modal-dialog-centered" role="document">
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <h5 class="modal-title" id="getpaid-edit-invoice-item-label"><?php esc_html_e( 'Edit Item', 'invoicing' ); ?></h5>
-                                    <button type="button" class="close close" data-dismiss="modal" aria-label="<?php esc_html_e( 'Close', 'invoicing' ); ?>">
-                                        <?php if ( empty( $GLOBALS['aui_bs5'] ) ) : ?>
+                                    <h5 class="modal-title" id="getpaid-edit-invoice-item-label"><?php esc_html_e('Edit Item', 'invoicing'); ?></h5>
+                                    <button type="button" class="close close" data-dismiss="modal" aria-label="<?php esc_html_e('Close', 'invoicing'); ?>">
+                                        <?php if (empty($GLOBALS['aui_bs5'])) : ?>
                                             <span aria-hidden="true">×</span>
                                         <?php endif; ?>
                                     </button>
@@ -791,27 +791,27 @@ 
                                     <div class="getpaid-edit-item-div">
                                         <input type="hidden" name="id" class="form-control form-control-sm item-id">
                                         <label class="form-group mb-3 w-100">
-                                            <span><?php esc_html_e( 'Name', 'invoicing' ); ?></span>
-                                            <input type="text" name="name" placeholder="<?php esc_attr_e( 'Item Name', 'invoicing' ); ?>" class="form-control form-control-sm item-name">
+                                            <span><?php esc_html_e('Name', 'invoicing'); ?></span>
+                                            <input type="text" name="name" placeholder="<?php esc_attr_e('Item Name', 'invoicing'); ?>" class="form-control form-control-sm item-name">
                                         </label>
                                         <label class="form-group mb-3 w-100">
-                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php esc_html_e( 'Amount', 'invoicing' ); ?></span>
-                                            <span class="hide-if-amount"><?php esc_html_e( 'Price', 'invoicing' ); ?></span>
-                                            <input type="text" name="price" placeholder="<?php wpinv_sanitize_amount( 0 ); ?>" class="form-control form-control-sm item-price">
+                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php esc_html_e('Amount', 'invoicing'); ?></span>
+                                            <span class="hide-if-amount"><?php esc_html_e('Price', 'invoicing'); ?></span>
+                                            <input type="text" name="price" placeholder="<?php wpinv_sanitize_amount(0); ?>" class="form-control form-control-sm item-price">
                                         </label>
                                         <label class="form-group mb-3 w-100 hide-if-amount">
-                                            <span><?php esc_html_e( 'Quantity', 'invoicing' ); ?></span>
+                                            <span><?php esc_html_e('Quantity', 'invoicing'); ?></span>
                                             <input type="text" name="quantity" placeholder="1" class="form-control form-control-sm item-quantity">
                                         </label>
                                         <label class="form-group mb-3 w-100">
-                                            <span><?php esc_html_e( 'Item Description', 'invoicing' ); ?></span>
-                                            <textarea name="description" placeholder="<?php esc_attr_e( 'Enter a description for this item', 'invoicing' ); ?>" class="form-control item-description"></textarea>
+                                            <span><?php esc_html_e('Item Description', 'invoicing'); ?></span>
+                                            <textarea name="description" placeholder="<?php esc_attr_e('Enter a description for this item', 'invoicing'); ?>" class="form-control item-description"></textarea>
                                         </label>
                                     </div>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e( 'Cancel', 'invoicing' ); ?></button>
-                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php esc_html_e( 'Save', 'invoicing' ); ?></button>
+                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e('Cancel', 'invoicing'); ?></button>
+                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php esc_html_e('Save', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>