AyeCode / invoicing

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

Spacing +32 added lines, -32 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -19,27 +19,27 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output( $post ) {
+    public static function output($post) {
 
         //Fetch the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Ensure that it is recurring.
-        if ( ! $invoice->is_recurring() ) {
+        if (!$invoice->is_recurring()) {
             return;
         }
 
         // Fetch the subscription.
-        $subscription = wpinv_get_subscription( $invoice );
+        $subscription = wpinv_get_subscription($invoice);
 
         ?>
-            <?php if ( empty( $subscription ) ): ?>
+            <?php if (empty($subscription)): ?>
                 <p class="wpi-meta-row">
                     <?php
                         echo
                             wp_sprintf(
-                                __( 'A new subscription will be created when the customer checks out and pays the invoice. %sView all subscriptions%s', 'invoicing' ),
-                                '<a href="' . admin_url( 'admin.php?page=wpinv-subscriptions' ).'">',
+                                __('A new subscription will be created when the customer checks out and pays the invoice. %sView all subscriptions%s', 'invoicing'),
+                                '<a href="' . admin_url('admin.php?page=wpinv-subscriptions') . '">',
                                 '</a>'
                             );
                     ?>
@@ -48,30 +48,30 @@ 
                 return; // If no subscription.
                 endif;
 
-                $frequency = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $subscription->period, $subscription->frequency );
-                $billing   = wpinv_price(wpinv_format_amount( $subscription->recurring_amount ), wpinv_get_invoice_currency_code( $subscription->parent_payment_id ) ) . ' / ' . $frequency;
-                $initial   = wpinv_price(wpinv_format_amount( $subscription->initial_amount ), wpinv_get_invoice_currency_code( $subscription->parent_payment_id ) );
-                $exipired  = strtotime( $subscription->expiration, current_time( 'timestamp' ) ) < current_time( 'timestamp' );
+                $frequency = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency($subscription->period, $subscription->frequency);
+                $billing   = wpinv_price(wpinv_format_amount($subscription->recurring_amount), wpinv_get_invoice_currency_code($subscription->parent_payment_id)) . ' / ' . $frequency;
+                $initial   = wpinv_price(wpinv_format_amount($subscription->initial_amount), wpinv_get_invoice_currency_code($subscription->parent_payment_id));
+                $exipired  = strtotime($subscription->expiration, current_time('timestamp')) < current_time('timestamp');
             ?>
 
-            <p class="wpi-meta-row wpi-sub-label <?php echo 'status-' . esc_attr( $subscription->status ); ?>">
+            <p class="wpi-meta-row wpi-sub-label <?php echo 'status-' . esc_attr($subscription->status); ?>">
                 <?php echo $invoice->is_renewal() ? _e('Renewal Invoice', 'invoicing') : _e('Recurring Invoice', 'invoicing'); ?>
             </p>
 
-            <?php if ( ! empty( $subscription->id ) ) : ?>
+            <?php if (!empty($subscription->id)) : ?>
                 <p class="wpi-meta-row wpi-sub-id">
-                    <label><?php _e( 'Subscription ID:', 'invoicing' ); ?></label>
-                    <a href="<?php echo esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $subscription->id ) ); ?>" title="<?php esc_attr_e( 'View or edit subscription', 'invoicing' ); ?>" target="_blank"><?php echo $subscription->id; ?></a>
+                    <label><?php _e('Subscription ID:', 'invoicing'); ?></label>
+                    <a href="<?php echo esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . $subscription->id)); ?>" title="<?php esc_attr_e('View or edit subscription', 'invoicing'); ?>" target="_blank"><?php echo $subscription->id; ?></a>
                 </p>
             <?php endif; ?>
 
             <p class="wpi-meta-row wpi-bill-cycle">
-                <label><?php _e( 'Billing Cycle:', 'invoicing'); ?> </label>
+                <label><?php _e('Billing Cycle:', 'invoicing'); ?> </label>
                 <?php
 
-                    if ( $subscription->recurring_amount != $subscription->initial_amount ) {
+                    if ($subscription->recurring_amount != $subscription->initial_amount) {
                         printf(
-                            _x( '%s then %s', 'Initial subscription amount then billing cycle and amount', 'invoicing' ),
+                            _x('%s then %s', 'Initial subscription amount then billing cycle and amount', 'invoicing'),
                             $initial,
                             $billing
                         );
@@ -83,38 +83,38 @@ 
             </p>
 
             <p class="wpi-meta-row wpi-billed-times">
-                <label><?php _e( 'Times Billed:', 'invoicing' ); ?></label>
-                <?php echo $subscription->get_times_billed() . ' / ' . ( ( $subscription->bill_times == 0 ) ? __( 'Until Cancelled', 'invoicing' ) : $subscription->bill_times ); ?>
+                <label><?php _e('Times Billed:', 'invoicing'); ?></label>
+                <?php echo $subscription->get_times_billed() . ' / ' . (($subscription->bill_times == 0) ? __('Until Cancelled', 'invoicing') : $subscription->bill_times); ?>
             </p>
 
             <p class="wpi-meta-row wpi-start-date">
-                <label><?php _e( 'Start Date:', 'invoicing' ); ?></label>
-                <?php echo date_i18n( get_option( 'date_format' ), strtotime( $subscription->created, current_time( 'timestamp' ) ) ); ?>
+                <label><?php _e('Start Date:', 'invoicing'); ?></label>
+                <?php echo date_i18n(get_option('date_format'), strtotime($subscription->created, current_time('timestamp'))); ?>
             </p>
 
             <p class="wpi-meta-row wpi-end-date">
-                <label><?php echo $exipired ? __( 'Expired On:', 'invoicing' ) : __( 'Renews On:', 'invoicing' ); ?></label>
-                <?php echo date_i18n( get_option( 'date_format' ), strtotime( $subscription->expiration, current_time( 'timestamp' ) ) ); ?>
+                <label><?php echo $exipired ? __('Expired On:', 'invoicing') : __('Renews On:', 'invoicing'); ?></label>
+                <?php echo date_i18n(get_option('date_format'), strtotime($subscription->expiration, current_time('timestamp'))); ?>
             </p>
 
-            <?php if ( $subscription->status ) { ?>
+            <?php if ($subscription->status) { ?>
                 <p class="wpi-meta-row wpi-sub-status">
-                    <label><?php _e( 'Subscription Status:', 'invoicing'); ?> </label><?php echo $subscription->get_status_label(); ?>
+                    <label><?php _e('Subscription Status:', 'invoicing'); ?> </label><?php echo $subscription->get_status_label(); ?>
                 </p>
             <?php } ?>
 
-            <?php if ( $invoice->is_renewal() ) { ?>
+            <?php if ($invoice->is_renewal()) { ?>
                 <p class="wpi-meta-row wpi-invoice-parent">
-                    <label><?php _e( 'Parent Invoice:', 'invoicing'); ?></label>
+                    <label><?php _e('Parent Invoice:', 'invoicing'); ?></label>
                     <?php
                         $parent = $invoice->get_parent_payment();
 
-                        if ( $parent->get_id() ) {
-                            $parent_url = esc_url( get_edit_post_link( $parent->get_id() ) );
+                        if ($parent->get_id()) {
+                            $parent_url = esc_url(get_edit_post_link($parent->get_id()));
                             $parent_id  = $parent->get_number();
                             echo "<a href='$parent_url'>$parent_id</a>";
                         } else {
-                            echo '<del>' . __( 'Deleted', 'invoicing' ) . '</del>';
+                            echo '<del>' . __('Deleted', 'invoicing') . '</del>';
                         }
                     ?>
 

includes/admin/subscriptions.php

Spacing +111 added lines, -111 removed lines

@@ -8,7 +8,7 @@ 
  */
 function wpinv_subscriptions_page() {
 
-	if ( ! empty( $_GET['id'] ) ) {
+	if (!empty($_GET['id'])) {
 
         wpinv_recurring_subscription_details();
 
@@ -19,7 +19,7 @@ 
 	<div class="wrap">
 
 		<h1>
-			<?php _e( 'Subscriptions', 'invoicing' ); ?>
+			<?php _e('Subscriptions', 'invoicing'); ?>
 		</h1>
 		<?php
 		$subscribers_table = new WPInv_Subscription_Reports_Table();
@@ -31,7 +31,7 @@ 
 			<input type="hidden" name="post_type" value="download" />
 			<input type="hidden" name="page" value="wpinv-subscriptions" />
 			<?php $subscribers_table->views(); ?>
-			<?php $subscribers_table->search_box( __( 'Search', 'wpinvoicing' ), 'subscriptions' ); ?>
+			<?php $subscribers_table->search_box(__('Search', 'wpinvoicing'), 'subscriptions'); ?>
 			<?php $subscribers_table->display(); ?>
 
 		</form>
@@ -49,34 +49,34 @@ 
 
 	$render = true;
 
-	if ( ! current_user_can( 'manage_invoicing' ) ) {
-		die( __( 'You are not permitted to view this data.', 'invoicing' ) );
+	if (!current_user_can('manage_invoicing')) {
+		die(__('You are not permitted to view this data.', 'invoicing'));
 	}
 
-	if ( ! isset( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
-        die( __( 'Invalid subscription ID Provided.', 'invoicing' ) );
+	if (!isset($_GET['id']) || !is_numeric($_GET['id'])) {
+        die(__('Invalid subscription ID Provided.', 'invoicing'));
 	}
 
 	$sub_id  = (int) $_GET['id'];
-	$sub     = new WPInv_Subscription( $sub_id );
+	$sub     = new WPInv_Subscription($sub_id);
 
-	if ( empty( $sub ) ) {
-		die( __( 'Invalid subscription ID Provided.', 'invoicing' ) );
+	if (empty($sub)) {
+		die(__('Invalid subscription ID Provided.', 'invoicing'));
 	}
 
 	?>
 	<div class="wrap">
-		<h2><?php _e( 'Subscription Details', 'invoicing' ); ?></h2>
+		<h2><?php _e('Subscription Details', 'invoicing'); ?></h2>
 
-		<?php if ( $sub ) : ?>
+		<?php if ($sub) : ?>
 
 			<div id="wpinv-item-card-wrapper">
 
-				<?php do_action( 'wpinv_subscription_card_top', $sub ); ?>
+				<?php do_action('wpinv_subscription_card_top', $sub); ?>
 
 				<div class="info-wrapper item-section">
 
-					<form id="edit-item-info" method="post" action="<?php echo admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $sub->id ); ?>">
+					<form id="edit-item-info" method="post" action="<?php echo admin_url('admin.php?page=wpinv-subscriptions&id=' . $sub->id); ?>">
 
 						<div class="item-info">
 
@@ -84,124 +84,124 @@ 
 								<tbody>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Billing Cycle:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Billing Cycle:', 'invoicing'); ?></label>
 										</td>
 										<td>
 											<?php
-											$frequency = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $sub->period, $sub->frequency );
-											$billing   = wpinv_price( wpinv_format_amount( $sub->recurring_amount ), wpinv_get_invoice_currency_code( $sub->parent_payment_id ) ) . ' / ' . $frequency;
-											$initial   = wpinv_price( wpinv_format_amount( $sub->initial_amount ), wpinv_get_invoice_currency_code( $sub->parent_payment_id ) );
-											printf( _x( '%s then %s', 'Initial subscription amount then billing cycle and amount', 'invoicing' ), $initial, $billing );
+											$frequency = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency($sub->period, $sub->frequency);
+											$billing   = wpinv_price(wpinv_format_amount($sub->recurring_amount), wpinv_get_invoice_currency_code($sub->parent_payment_id)) . ' / ' . $frequency;
+											$initial   = wpinv_price(wpinv_format_amount($sub->initial_amount), wpinv_get_invoice_currency_code($sub->parent_payment_id));
+											printf(_x('%s then %s', 'Initial subscription amount then billing cycle and amount', 'invoicing'), $initial, $billing);
 											?>
 										</td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Times Billed:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Times Billed:', 'invoicing'); ?></label>
 										</td>
-										<td><?php echo $sub->get_times_billed() . ' / ' . ( ( $sub->bill_times == 0 ) ? __( 'Until Cancelled', 'invoicing' ) : $sub->bill_times ); ?></td>
+										<td><?php echo $sub->get_times_billed() . ' / ' . (($sub->bill_times == 0) ? __('Until Cancelled', 'invoicing') : $sub->bill_times); ?></td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Customer:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Customer:', 'invoicing'); ?></label>
 										</td>
 										<td>
-											<?php $subscriber = get_userdata( $sub->customer_id ); ?>
-											<a href="<?php echo esc_url( get_edit_user_link( $sub->customer_id ) ); ?>" target="_blank"><?php echo ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email; ?></a>
+											<?php $subscriber = get_userdata($sub->customer_id); ?>
+											<a href="<?php echo esc_url(get_edit_user_link($sub->customer_id)); ?>" target="_blank"><?php echo !empty($subscriber->display_name) ? $subscriber->display_name : $subscriber->user_email; ?></a>
 										</td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Initial Invoice:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Initial Invoice:', 'invoicing'); ?></label>
 										</td>
 										<td>
-                                            <a target="_blank" title="<?php _e( 'View invoice', 'invoicing' ); ?>" href="<?php echo esc_url( get_permalink( $sub->parent_payment_id ) ); ?>"><?php echo wpinv_get_invoice_number( $sub->parent_payment_id ); ?></a>&nbsp;&nbsp;&nbsp;<?php echo wp_sprintf( __( '( ID: %s )', 'invoicing' ), '<a title="' . esc_attr( __( 'View invoice details', 'invoicing' ) ) . '" href="' . get_edit_post_link( $sub->parent_payment_id ) . '" target="_blank">' . $sub->parent_payment_id . '</a>' ); ?></td>
+                                            <a target="_blank" title="<?php _e('View invoice', 'invoicing'); ?>" href="<?php echo esc_url(get_permalink($sub->parent_payment_id)); ?>"><?php echo wpinv_get_invoice_number($sub->parent_payment_id); ?></a>&nbsp;&nbsp;&nbsp;<?php echo wp_sprintf(__('( ID: %s )', 'invoicing'), '<a title="' . esc_attr(__('View invoice details', 'invoicing')) . '" href="' . get_edit_post_link($sub->parent_payment_id) . '" target="_blank">' . $sub->parent_payment_id . '</a>'); ?></td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Item:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Item:', 'invoicing'); ?></label>
 										</td>
 										<td>
 											<?php
-                                            echo wpinv_item_dropdown( array(
+                                            echo wpinv_item_dropdown(array(
                                                 'name'              => 'product_id',
                                                 'id'                => 'wpinv_invoice_item',
                                                 'with_packages'     => false,
                                                 'show_recurring'    => true,
                                                 'selected'          => $sub->product_id,
                                                 'class'             => 'wpinv-sub-product-id wpi_select2',
-                                            ) );
+                                            ));
 
                                             ?>
-											<a href="<?php echo esc_url( add_query_arg( array(
+											<a href="<?php echo esc_url(add_query_arg(array(
 													'post'   => $sub->product_id,
 													'action' => 'edit'
-												), admin_url( 'post.php' ) ) ); ?>" target="_blank"><?php _e( 'View Item', 'invoicing' ) ; ?></a>
+												), admin_url('post.php'))); ?>" target="_blank"><?php _e('View Item', 'invoicing'); ?></a>
 										</td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Payment Method:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Payment Method:', 'invoicing'); ?></label>
 										</td>
-										<td><?php echo wpinv_get_gateway_admin_label( wpinv_get_payment_gateway( $sub->parent_payment_id ) ); ?></td>
+										<td><?php echo wpinv_get_gateway_admin_label(wpinv_get_payment_gateway($sub->parent_payment_id)); ?></td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Profile ID:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Profile ID:', 'invoicing'); ?></label>
 										</td>
 										<td>
 											<span class="wpinv-sub-profile-id">
-												<?php echo apply_filters( 'wpinv_subscription_profile_link_' . $sub->gateway, $sub->profile_id, $sub ); ?>
+												<?php echo apply_filters('wpinv_subscription_profile_link_' . $sub->gateway, $sub->profile_id, $sub); ?>
 											</span>
-											<input type="text" name="profile_id" class="hidden wpinv-sub-profile-id" value="<?php echo esc_attr( $sub->profile_id ); ?>" />
+											<input type="text" name="profile_id" class="hidden wpinv-sub-profile-id" value="<?php echo esc_attr($sub->profile_id); ?>" />
 											<span>&nbsp;&ndash;&nbsp;</span>
-											<a href="#" class="wpinv-edit-sub-profile-id"><?php _e( 'Edit', 'invoicing' ); ?></a>
+											<a href="#" class="wpinv-edit-sub-profile-id"><?php _e('Edit', 'invoicing'); ?></a>
 										</td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Transaction ID:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Transaction ID:', 'invoicing'); ?></label>
 										</td>
 										<td>
-											<span class="wpinv-sub-transaction-id"><?php echo apply_filters( 'wpinv_subscription_transaction_link_' . $sub->gateway, $sub->get_transaction_id(), $sub ); ?></span>
-											<input type="text" name="transaction_id" class="hidden wpinv-sub-transaction-id" value="<?php echo esc_attr( $sub->get_transaction_id() ); ?>" />
+											<span class="wpinv-sub-transaction-id"><?php echo apply_filters('wpinv_subscription_transaction_link_' . $sub->gateway, $sub->get_transaction_id(), $sub); ?></span>
+											<input type="text" name="transaction_id" class="hidden wpinv-sub-transaction-id" value="<?php echo esc_attr($sub->get_transaction_id()); ?>" />
 											<span>&nbsp;&ndash;&nbsp;</span>
-											<a href="#" class="wpinv-edit-sub-transaction-id"><?php _e( 'Edit', 'invoicing' ); ?></a>
+											<a href="#" class="wpinv-edit-sub-transaction-id"><?php _e('Edit', 'invoicing'); ?></a>
 										</td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Date Created:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Date Created:', 'invoicing'); ?></label>
 										</td>
-										<td><?php echo date_i18n( get_option( 'date_format' ), strtotime( $sub->created, current_time( 'timestamp' ) ) ); ?></td>
+										<td><?php echo date_i18n(get_option('date_format'), strtotime($sub->created, current_time('timestamp'))); ?></td>
 									</tr>
 									<tr>
 										<td class="row-title">
 											<label for="tablecell">
-												<?php if( 'trialling' == $sub->status ) : ?>
-													<?php _e( 'Trialling Until:', 'invoicing' ); ?>
+												<?php if ('trialling' == $sub->status) : ?>
+													<?php _e('Trialling Until:', 'invoicing'); ?>
 												<?php else: ?>
-													<?php _e( 'Expiration Date:', 'invoicing' ); ?>
+													<?php _e('Expiration Date:', 'invoicing'); ?>
 												<?php endif; ?>
 											</label>
 										</td>
 										<td>
-											<span class="wpinv-sub-expiration"><?php echo date_i18n( get_option( 'date_format' ), strtotime( $sub->expiration, current_time( 'timestamp' ) ) ); ?></span>
+											<span class="wpinv-sub-expiration"><?php echo date_i18n(get_option('date_format'), strtotime($sub->expiration, current_time('timestamp'))); ?></span>
 										</td>
 									</tr>
 									<tr>
 										<td class="row-title">
-											<label for="tablecell"><?php _e( 'Subscription Status:', 'invoicing' ); ?></label>
+											<label for="tablecell"><?php _e('Subscription Status:', 'invoicing'); ?></label>
 										</td>
 										<td>
 											<select name="status" class="wpi_select2">
-												<option value="pending"<?php selected( 'pending', $sub->status ); ?>><?php _e( 'Pending', 'invoicing' ); ?></option>
-												<option value="active"<?php selected( 'active', $sub->status ); ?>><?php _e( 'Active', 'invoicing' ); ?></option>
-												<option value="cancelled"<?php selected( 'cancelled', $sub->status ); ?>><?php _e( 'Cancelled', 'invoicing' ); ?></option>
-												<option value="expired"<?php selected( 'expired', $sub->status ); ?>><?php _e( 'Expired', 'invoicing' ); ?></option>
-												<option value="trialling"<?php selected( 'trialling', $sub->status ); ?>><?php _e( 'Trialling', 'invoicing' ); ?></option>
-												<option value="failing"<?php selected( 'failing', $sub->status ); ?>><?php _e( 'Failing', 'invoicing' ); ?></option>
-												<option value="completed"<?php selected( 'completed', $sub->status ); ?>><?php _e( 'Completed', 'invoicing' ); ?></option>
+												<option value="pending"<?php selected('pending', $sub->status); ?>><?php _e('Pending', 'invoicing'); ?></option>
+												<option value="active"<?php selected('active', $sub->status); ?>><?php _e('Active', 'invoicing'); ?></option>
+												<option value="cancelled"<?php selected('cancelled', $sub->status); ?>><?php _e('Cancelled', 'invoicing'); ?></option>
+												<option value="expired"<?php selected('expired', $sub->status); ?>><?php _e('Expired', 'invoicing'); ?></option>
+												<option value="trialling"<?php selected('trialling', $sub->status); ?>><?php _e('Trialling', 'invoicing'); ?></option>
+												<option value="failing"<?php selected('failing', $sub->status); ?>><?php _e('Failing', 'invoicing'); ?></option>
+												<option value="completed"<?php selected('completed', $sub->status); ?>><?php _e('Completed', 'invoicing'); ?></option>
 											</select>
 										</td>
 									</tr>
@@ -209,79 +209,79 @@ 
 							</table>
 						</div>
 						<div id="wpinv-sub-notices">
-							<div class="notice notice-info inline hidden" id="wpinv-sub-product-update-notice"><p><?php _e( 'Changing the product assigned will not automatically adjust any pricing.', 'invoicing' ); ?></p></div>
-							<div class="notice notice-warning inline hidden" id="wpinv-sub-profile-id-update-notice"><p><?php _e( 'Changing the profile ID can result in renewals not being processed. Do this with caution.', 'invoicing' ); ?></p></div>
+							<div class="notice notice-info inline hidden" id="wpinv-sub-product-update-notice"><p><?php _e('Changing the product assigned will not automatically adjust any pricing.', 'invoicing'); ?></p></div>
+							<div class="notice notice-warning inline hidden" id="wpinv-sub-profile-id-update-notice"><p><?php _e('Changing the profile ID can result in renewals not being processed. Do this with caution.', 'invoicing'); ?></p></div>
 						</div>
 						<div id="item-edit-actions" class="edit-item" style="float:right; margin: 10px 0 0; display: block;">
-							<?php wp_nonce_field( 'wpinv-recurring-update', 'wpinv-recurring-update-nonce', false, true ); ?>
-							<input type="submit" name="wpinv_update_subscription" id="wpinv_update_subscription" class="button button-primary" value="<?php _e( 'Update Subscription', 'invoicing' ); ?>"/>
-							<input type="hidden" name="sub_id" value="<?php echo absint( $sub->id ); ?>" />
-							<?php if( $sub->can_cancel() ) : ?>
-								<a class="button button-primary" href="<?php echo $sub->get_cancel_url(); ?>" ><?php _e( 'Cancel Subscription', 'invoicing' ); ?></a>
+							<?php wp_nonce_field('wpinv-recurring-update', 'wpinv-recurring-update-nonce', false, true); ?>
+							<input type="submit" name="wpinv_update_subscription" id="wpinv_update_subscription" class="button button-primary" value="<?php _e('Update Subscription', 'invoicing'); ?>"/>
+							<input type="hidden" name="sub_id" value="<?php echo absint($sub->id); ?>" />
+							<?php if ($sub->can_cancel()) : ?>
+								<a class="button button-primary" href="<?php echo $sub->get_cancel_url(); ?>" ><?php _e('Cancel Subscription', 'invoicing'); ?></a>
 							<?php endif; ?>
-							&nbsp;<input type="submit" name="wpinv_delete_subscription" class="wpinv-delete-subscription button" value="<?php _e( 'Delete Subscription', 'invoicing' ); ?>"/>
+							&nbsp;<input type="submit" name="wpinv_delete_subscription" class="wpinv-delete-subscription button" value="<?php _e('Delete Subscription', 'invoicing'); ?>"/>
 						</div>
 
 					</form>
 				</div>
 
-				<?php do_action( 'wpinv_subscription_before_stats', $sub ); ?>
+				<?php do_action('wpinv_subscription_before_stats', $sub); ?>
 
-				<?php do_action( 'wpinv_subscription_before_tables_wrapper', $sub ); ?>
+				<?php do_action('wpinv_subscription_before_tables_wrapper', $sub); ?>
 
 				<div id="item-tables-wrapper" class="item-section">
 
-					<?php do_action( 'wpinv_subscription_before_tables', $sub ); ?>
+					<?php do_action('wpinv_subscription_before_tables', $sub); ?>
 
-					<h3><?php _e( 'Renewal Payments:', 'invoicing' ); ?></h3>
+					<h3><?php _e('Renewal Payments:', 'invoicing'); ?></h3>
 					<?php $payments = $sub->get_child_payments(); ?>
-					<?php if ( 'manual' == $sub->gateway ) : ?>
-						<p><strong><?php _e( 'Note:', 'invoicing' ); ?></strong> <?php _e( 'Subscriptions purchased with the Test Payment gateway will not renew automatically.', 'invoicing' ); ?></p>
+					<?php if ('manual' == $sub->gateway) : ?>
+						<p><strong><?php _e('Note:', 'invoicing'); ?></strong> <?php _e('Subscriptions purchased with the Test Payment gateway will not renew automatically.', 'invoicing'); ?></p>
 					<?php endif; ?>
 					<table class="wp-list-table widefat striped payments">
 						<thead>
 						<tr>
-							<th><?php _e( 'ID', 'invoicing' ); ?></th>
-							<th><?php _e( 'Amount', 'invoicing' ); ?></th>
-							<th><?php _e( 'Date', 'invoicing' ); ?></th>
-							<th><?php _e( 'Status', 'invoicing' ); ?></th>
-                            <th><?php _e( 'Invoice', 'invoicing' ); ?></th>
-							<th class="column-wpi_actions"><?php _e( 'Actions', 'invoicing' ); ?></th>
+							<th><?php _e('ID', 'invoicing'); ?></th>
+							<th><?php _e('Amount', 'invoicing'); ?></th>
+							<th><?php _e('Date', 'invoicing'); ?></th>
+							<th><?php _e('Status', 'invoicing'); ?></th>
+                            <th><?php _e('Invoice', 'invoicing'); ?></th>
+							<th class="column-wpi_actions"><?php _e('Actions', 'invoicing'); ?></th>
 						</tr>
 						</thead>
 						<tbody>
-						<?php if ( ! empty( $payments ) ) : ?>
-							<?php foreach ( $payments as $payment ) : $invoice = wpinv_get_invoice( $payment->ID ); if ( empty( $invoice->ID ) ) continue; ?>
+						<?php if (!empty($payments)) : ?>
+							<?php foreach ($payments as $payment) : $invoice = wpinv_get_invoice($payment->ID); if (empty($invoice->ID)) continue; ?>
 								<tr>
 									<td><?php echo $payment->ID; ?></td>
-									<td><?php echo $invoice->get_total( true ); ?></td>
+									<td><?php echo $invoice->get_total(true); ?></td>
 									<td><?php echo $invoice->get_invoice_date(); ?></td>
-									<td><?php echo $invoice->get_status( true ); ?></td>
+									<td><?php echo $invoice->get_status(true); ?></td>
 									<td>
-										<a target="_blank" title="<?php _e( 'View invoice', 'invoicing' ); ?>" href="<?php echo esc_url( get_permalink( $payment->ID ) ); ?>"><?php echo $invoice->get_number(); ?></a>
-										<?php do_action( 'wpinv_subscription_payments_actions', $sub, $payment ); ?>
+										<a target="_blank" title="<?php _e('View invoice', 'invoicing'); ?>" href="<?php echo esc_url(get_permalink($payment->ID)); ?>"><?php echo $invoice->get_number(); ?></a>
+										<?php do_action('wpinv_subscription_payments_actions', $sub, $payment); ?>
 									</td>
 									<td class="column-wpi_actions">
-										<a title="<?php echo esc_attr( wp_sprintf( __( 'View details for invoice: %s', 'invoicing' ), $invoice->get_number() ) ); ?>" href="<?php echo get_edit_post_link( $payment->ID ); ?>"><?php _e( 'View Details', 'invoicing' ); ?>
+										<a title="<?php echo esc_attr(wp_sprintf(__('View details for invoice: %s', 'invoicing'), $invoice->get_number())); ?>" href="<?php echo get_edit_post_link($payment->ID); ?>"><?php _e('View Details', 'invoicing'); ?>
 										</a>
-										<?php do_action( 'wpinv_subscription_payments_actions', $sub, $payment ); ?>
+										<?php do_action('wpinv_subscription_payments_actions', $sub, $payment); ?>
 									</td>
 								</tr>
 							<?php endforeach; ?>
 						<?php else: ?>
 							<tr>
-								<td colspan="5"><?php _e( 'No Invoices Found.', 'invoicing' ); ?></td>
+								<td colspan="5"><?php _e('No Invoices Found.', 'invoicing'); ?></td>
 							</tr>
 						<?php endif; ?>
 						</tbody>
 						<tfoot></tfoot>
 					</table>
 
-					<?php do_action( 'wpinv_subscription_after_tables', $sub ); ?>
+					<?php do_action('wpinv_subscription_after_tables', $sub); ?>
 
 				</div>
 
-				<?php do_action( 'wpinv_subscription_card_bottom', $sub ); ?>
+				<?php do_action('wpinv_subscription_card_bottom', $sub); ?>
 			</div>
 
 		<?php endif; ?>
@@ -299,36 +299,36 @@ 
  */
 function wpinv_recurring_process_subscription_update() {
 
-	if( empty( $_POST['sub_id'] ) ) {
+	if (empty($_POST['sub_id'])) {
 		return;
 	}
 
-	if( empty( $_POST['wpinv_update_subscription'] ) ) {
+	if (empty($_POST['wpinv_update_subscription'])) {
 		return;
 	}
 
-	if( ! current_user_can( 'manage_invoicing') ) {
+	if (!current_user_can('manage_invoicing')) {
 		return;
 	}
 
-	if( ! wp_verify_nonce( $_POST['wpinv-recurring-update-nonce'], 'wpinv-recurring-update' ) ) {
-		wp_die( __( 'Nonce verification failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+	if (!wp_verify_nonce($_POST['wpinv-recurring-update-nonce'], 'wpinv-recurring-update')) {
+		wp_die(__('Nonce verification failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
 	}
 
-	$profile_id      = sanitize_text_field( $_POST['profile_id'] );
-	$transaction_id  = sanitize_text_field( $_POST['transaction_id'] );
-	$product_id      = absint( $_POST['product_id'] );
-	$subscription    = new WPInv_Subscription( absint( $_POST['sub_id'] ) );
-	$subscription->update( array(
-		'status'         => sanitize_text_field( $_POST['status'] ),
+	$profile_id      = sanitize_text_field($_POST['profile_id']);
+	$transaction_id  = sanitize_text_field($_POST['transaction_id']);
+	$product_id      = absint($_POST['product_id']);
+	$subscription    = new WPInv_Subscription(absint($_POST['sub_id']));
+	$subscription->update(array(
+		'status'         => sanitize_text_field($_POST['status']),
 		'profile_id'     => $profile_id,
 		'product_id'     => $product_id,
 		'transaction_id' => $transaction_id,
-	) );
+	));
 
-	$status = sanitize_text_field( $_POST['status'] );
+	$status = sanitize_text_field($_POST['status']);
 
-	switch( $status ) {
+	switch ($status) {
 
 		case 'cancelled' :
 
@@ -347,11 +347,11 @@ 
 
 	}
 
-	wp_redirect( admin_url( 'admin.php?page=wpinv-subscriptions&wpinv-message=updated&id=' . $subscription->id ) );
+	wp_redirect(admin_url('admin.php?page=wpinv-subscriptions&wpinv-message=updated&id=' . $subscription->id));
 	exit;
 
 }
-add_action( 'admin_init', 'wpinv_recurring_process_subscription_update', 1 );
+add_action('admin_init', 'wpinv_recurring_process_subscription_update', 1);
 
 /**
  * Handles subscription deletion
@@ -362,30 +362,30 @@ 
  */
 function wpinv_recurring_process_subscription_deletion() {
 
-	if( empty( $_POST['sub_id'] ) ) {
+	if (empty($_POST['sub_id'])) {
 		return;
 	}
 
-	if( empty( $_POST['wpinv_delete_subscription'] ) ) {
+	if (empty($_POST['wpinv_delete_subscription'])) {
 		return;
 	}
 
-	if( ! current_user_can( 'manage_invoicing') ) {
+	if (!current_user_can('manage_invoicing')) {
 		return;
 	}
 
-	if( ! wp_verify_nonce( $_POST['wpinv-recurring-update-nonce'], 'wpinv-recurring-update' ) ) {
-		wp_die( __( 'Nonce verification failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+	if (!wp_verify_nonce($_POST['wpinv-recurring-update-nonce'], 'wpinv-recurring-update')) {
+		wp_die(__('Nonce verification failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
 	}
 
-	$subscription = new WPInv_Subscription( absint( $_POST['sub_id'] ) );
+	$subscription = new WPInv_Subscription(absint($_POST['sub_id']));
 
-	delete_post_meta( $subscription->parent_payment_id, '_wpinv_subscription_payment' );
+	delete_post_meta($subscription->parent_payment_id, '_wpinv_subscription_payment');
 
 	$subscription->delete();
 
-	wp_redirect( admin_url( 'admin.php?page=wpinv-subscriptions&wpinv-message=deleted' ) );
+	wp_redirect(admin_url('admin.php?page=wpinv-subscriptions&wpinv-message=deleted'));
 	exit;
 
 }
-add_action( 'admin_init', 'wpinv_recurring_process_subscription_deletion', 2 );
+add_action('admin_init', 'wpinv_recurring_process_subscription_deletion', 2);

includes/admin/class-wpinv-subscriptions-list-table.php

Indentation +349 added lines, -349 removed lines

@@ -13,7 +13,7 @@ 
 
 // Load WP_List_Table if not loaded
 if( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -23,102 +23,102 @@ 
  */
 class WPInv_Subscription_Reports_Table extends WP_List_Table {
 
-	/**
-	 * Number of results to show per page
-	 *
-	 * @since       1.0.0
-	 */
-
-	public $per_page        = 20;
-	public $total_count     = 0;
-	public $active_count    = 0;
-	public $pending_count   = 0;
-	public $expired_count   = 0;
-	public $completed_count = 0;
-	public $trialling_count  = 0;
-	public $cancelled_count = 0;
-	public $failing_count   = 0;
-
-	/**
-	 * Get things started
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      void
-	 */
-	function __construct(){
-		global $status, $page;
-
-		// Set parent defaults
-		parent::__construct( array(
-			'singular'  => 'subscription',
-			'plural'    => 'subscriptions',
-			'ajax'      => false
-		) );
-
-		$this->get_subscription_counts();
-
-	}
-
-	/**
-	 * Retrieve the view types
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @return array $views All the views available
-	 */
-	public function get_views() {
-
-		$current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
-		$total_count     = '&nbsp;<span class="count">(' . $this->total_count    . ')</span>';
-		$active_count    = '&nbsp;<span class="count">(' . $this->active_count . ')</span>';
-		$pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
-		$expired_count   = '&nbsp;<span class="count">(' . $this->expired_count  . ')</span>';
-		$completed_count = '&nbsp;<span class="count">(' . $this->completed_count . ')</span>';
-		$trialling_count  = '&nbsp;<span class="count">(' . $this->trialling_count   . ')</span>';
-		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count   . ')</span>';
-		$failing_count   = '&nbsp;<span class="count">(' . $this->failing_count   . ')</span>';
-
-		$views = array(
-			'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array( 'status', 'paged' ) ), $current === 'all' || $current == '' ? ' class="current"' : '', __('All','invoicing' ) . $total_count ),
-			'active'    => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'active', 'paged' => FALSE ) ), $current === 'active' ? ' class="current"' : '', __('Active','invoicing' ) . $active_count ),
-			'pending'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'pending', 'paged' => FALSE ) ), $current === 'pending' ? ' class="current"' : '', __('Pending','invoicing' ) . $pending_count ),
-			'expired'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'expired', 'paged' => FALSE ) ), $current === 'expired' ? ' class="current"' : '', __('Expired','invoicing' ) . $expired_count ),
-			'completed' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'completed', 'paged' => FALSE ) ), $current === 'completed' ? ' class="current"' : '', __('Completed','invoicing' ) . $completed_count ),
-			'trialling'  => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'trialling', 'paged' => FALSE ) ), $current === 'trialling' ? ' class="current"' : '', __('Trialling','invoicing' ) . $trialling_count ),
-			'cancelled' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'cancelled', 'paged' => FALSE ) ), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled','invoicing' ) . $cancelled_count ),
-			'failing'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'failing', 'paged' => FALSE ) ), $current === 'failing' ? ' class="current"' : '', __('Failing','invoicing' ) . $failing_count ),
-		);
-
-		return apply_filters( 'wpinv_recurring_subscriptions_table_views', $views );
-	}
-
-	/**
-	 * Show the search field
-	 *
-	 * @since 2.5
-	 * @access public
-	 *
-	 * @param string $text Label for the search box
-	 * @param string $input_id ID of the search box
-	 *
-	 * @return void
-	 */
-	public function search_box( $text, $input_id ) {
-
-		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
-			return;
-		}
-
-		$input_id = $input_id . '-search-input';
-
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-		}
-
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
-		}
+    /**
+     * Number of results to show per page
+     *
+     * @since       1.0.0
+     */
+
+    public $per_page        = 20;
+    public $total_count     = 0;
+    public $active_count    = 0;
+    public $pending_count   = 0;
+    public $expired_count   = 0;
+    public $completed_count = 0;
+    public $trialling_count  = 0;
+    public $cancelled_count = 0;
+    public $failing_count   = 0;
+
+    /**
+     * Get things started
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      void
+     */
+    function __construct(){
+        global $status, $page;
+
+        // Set parent defaults
+        parent::__construct( array(
+            'singular'  => 'subscription',
+            'plural'    => 'subscriptions',
+            'ajax'      => false
+        ) );
+
+        $this->get_subscription_counts();
+
+    }
+
+    /**
+     * Retrieve the view types
+     *
+     * @access public
+     * @since 1.0.0
+     * @return array $views All the views available
+     */
+    public function get_views() {
+
+        $current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
+        $total_count     = '&nbsp;<span class="count">(' . $this->total_count    . ')</span>';
+        $active_count    = '&nbsp;<span class="count">(' . $this->active_count . ')</span>';
+        $pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
+        $expired_count   = '&nbsp;<span class="count">(' . $this->expired_count  . ')</span>';
+        $completed_count = '&nbsp;<span class="count">(' . $this->completed_count . ')</span>';
+        $trialling_count  = '&nbsp;<span class="count">(' . $this->trialling_count   . ')</span>';
+        $cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count   . ')</span>';
+        $failing_count   = '&nbsp;<span class="count">(' . $this->failing_count   . ')</span>';
+
+        $views = array(
+            'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array( 'status', 'paged' ) ), $current === 'all' || $current == '' ? ' class="current"' : '', __('All','invoicing' ) . $total_count ),
+            'active'    => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'active', 'paged' => FALSE ) ), $current === 'active' ? ' class="current"' : '', __('Active','invoicing' ) . $active_count ),
+            'pending'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'pending', 'paged' => FALSE ) ), $current === 'pending' ? ' class="current"' : '', __('Pending','invoicing' ) . $pending_count ),
+            'expired'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'expired', 'paged' => FALSE ) ), $current === 'expired' ? ' class="current"' : '', __('Expired','invoicing' ) . $expired_count ),
+            'completed' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'completed', 'paged' => FALSE ) ), $current === 'completed' ? ' class="current"' : '', __('Completed','invoicing' ) . $completed_count ),
+            'trialling'  => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'trialling', 'paged' => FALSE ) ), $current === 'trialling' ? ' class="current"' : '', __('Trialling','invoicing' ) . $trialling_count ),
+            'cancelled' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'cancelled', 'paged' => FALSE ) ), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled','invoicing' ) . $cancelled_count ),
+            'failing'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'failing', 'paged' => FALSE ) ), $current === 'failing' ? ' class="current"' : '', __('Failing','invoicing' ) . $failing_count ),
+        );
+
+        return apply_filters( 'wpinv_recurring_subscriptions_table_views', $views );
+    }
+
+    /**
+     * Show the search field
+     *
+     * @since 2.5
+     * @access public
+     *
+     * @param string $text Label for the search box
+     * @param string $input_id ID of the search box
+     *
+     * @return void
+     */
+    public function search_box( $text, $input_id ) {
+
+        if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
+            return;
+        }
+
+        $input_id = $input_id . '-search-input';
+
+        if ( ! empty( $_REQUEST['orderby'] ) ) {
+            echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+        }
+
+        if ( ! empty( $_REQUEST['order'] ) ) {
+            echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+        }
 ?>
 		<p class="search-box">
 			<?php do_action( 'wpinv_recurring_subscription_search_box' ); ?>
@@ -127,18 +127,18 @@ 
 			<?php submit_button( $text, 'button', false, false, array('ID' => 'search-submit') ); ?><br/>
 		</p>
 <?php
-	}
-
-	/**
-	 * Render most columns
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_default( $item, $column_name ) {
-		return $item->$column_name;
-	}
+    }
+
+    /**
+     * Render most columns
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_default( $item, $column_name ) {
+        return $item->$column_name;
+    }
 
     /**
      * Subscription id column
@@ -151,244 +151,244 @@ 
         return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" target="_blank">' . $item->id . '</a>';
     }
 
-	/**
-	 * Customer column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_customer_id( $item ) {
-		$subscriber = get_userdata( $item->customer_id );
-		$customer   = ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email;
-
-		return '<a href="' . esc_url( get_edit_user_link( $item->customer_id ) ) . '" target="_blank">' . $customer . '</a>';
-	}
-
-	/**
-	 * Status column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_status( $item ) {
-		return $item->get_status_label();
-	}
-
-	/**
-	 * Period column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_period( $item ) {
-
-		$period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->period,$item->frequency );
-
-		return wpinv_price( wpinv_format_amount( $item->recurring_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) ) . ' / ' . $period;
-	}
-
-	/**
-	 * Billing Times column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_bill_times( $item ) {
-		return $item->get_times_billed() . ' / ' . ( ( $item->bill_times == 0 ) ? __( 'Until Cancelled', 'invoicing' ) : $item->bill_times );
-	}
-
-	/**
-	 * Initial Amount column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_initial_amount( $item ) {
-		return wpinv_price( wpinv_format_amount( $item->initial_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) );
-	}
-
-	/**
-	 * Renewal date column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_renewal_date( $item ) {
-		return $renewal_date = ! empty( $item->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $item->expiration ) ) : __( 'N/A', 'invoicing' );
-	}
-
-	/**
-	 * Payment column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_parent_payment_id( $item ) {
-		return '<a href="' . get_edit_post_link( $item->parent_payment_id ) . '" target="_blank">' . wpinv_get_invoice_number( $item->parent_payment_id ) . '</a>';
-	}
-
-	/**
-	 * Product ID column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_product_id( $item ) {
-		return '<a href="' . esc_url( admin_url( 'post.php?action=edit&post=' . $item->product_id ) ) . '" target="_blank">' . get_the_title( $item->product_id ) . '</a>';
-	}
-
-	/**
-	 * Render the edit column
-	 *
-	 * @access      private
-	 * @since       2.0
-	 * @return      string
-	 */
-	function column_actions( $item ) {
-		return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" title="' . esc_attr( __( 'View or edit subscription', 'invoicing' ) ) . '" target="_blank">' . __( 'View', 'invoicing' ) . '</a>';
-	}
-
-
-	/**
-	 * Retrieve the table columns
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      array
-	 */
-
-	function get_columns(){
-		$columns = array(
-			'sub_id'            => __( 'ID', 'invoicing' ),
-			'customer_id'       => __( 'Customer', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
-			'period'            => __( 'Billing Cycle', 'invoicing' ),
-			'initial_amount'    => __( 'Initial Amount', 'invoicing' ),
-			'bill_times'        => __( 'Times Billed', 'invoicing' ),
-			'renewal_date'      => __( 'Renewal Date', 'invoicing' ),
-			'parent_payment_id' => __( 'Invoice', 'invoicing' ),
-			'product_id'        => __( 'Item', 'invoicing' ),
-			'actions'           => __( 'Actions', 'invoicing' ),
-		);
-
-		return apply_filters( 'wpinv_report_subscription_columns', $columns );
-	}
-
-	/**
-	 * Retrieve the current page number
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      int
-	 */
-	function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
-	}
-
-	/**
-	 * Retrieve the subscription counts
-	 *
-	 * @access public
-	 * @since 1.4
-	 * @return void
-	 */
-	public function get_subscription_counts() {
-
-		global $wp_query;
-
-		$db = new WPInv_Subscriptions_DB;
-
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
-
-		$this->total_count     = $db->count();
-		$this->active_count    = $db->count( array( 'status' => 'active', 'search' => $search ) );
-		$this->pending_count   = $db->count( array( 'status' => 'pending', 'search' => $search ) );
-		$this->expired_count   = $db->count( array( 'status' => 'expired', 'search' => $search ) );
-		$this->trialling_count  = $db->count( array( 'status' => 'trialling', 'search' => $search ) );
-		$this->cancelled_count = $db->count( array( 'status' => 'cancelled', 'search' => $search ) );
-		$this->completed_count = $db->count( array( 'status' => 'completed', 'search' => $search ) );
-		$this->failing_count   = $db->count( array( 'status' => 'failing', 'search' => $search ) );
-
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @uses        $this->_column_headers
-	 * @uses        $this->items
-	 * @uses        $this->get_columns()
-	 * @uses        $this->get_sortable_columns()
-	 * @uses        $this->get_pagenum()
-	 * @uses        $this->set_pagination_args()
-	 * @return      array
-	 */
-	function prepare_items() {
-
-		$columns  = $this->get_columns();
-		$hidden   = array(); // No hidden columns
-		$status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
-		$sortable = $this->get_sortable_columns();
-
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-
-		$current_page = $this->get_pagenum();
-
-		$db     = new WPInv_Subscriptions_DB;
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
-		$args   = array(
-			'number' => $this->per_page,
-			'offset' => $this->per_page * ( $this->get_paged() - 1 ),
-			'search' => $search
-		);
-
-		if ( 'any' !== $status ) {
-			$args['status'] = $status;
-		}
-
-		$this->items = $db->get_subscriptions( $args );
-
-		switch ( $status ) {
-			case 'active':
-				$total_items = $this->active_count;
-				break;
-			case 'pending':
-				$total_items = $this->pending_count;
-				break;
-			case 'expired':
-				$total_items = $this->expired_count;
-				break;
-			case 'cancelled':
-				$total_items = $this->cancelled_count;
-				break;
-			case 'failing':
-				$total_items = $this->failing_count;
-				break;
-			case 'trialling':
-				$total_items = $this->trialling_count;
-				break;
-			case 'completed':
-				$total_items = $this->completed_count;
-				break;
-			case 'any':
-			default:
-				$total_items = $this->total_count;
-				break;
-		}
-
-		$this->set_pagination_args( array(
-			'total_items' => $total_items,
-			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $total_items / $this->per_page )
-		) );
-	}
+    /**
+     * Customer column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_customer_id( $item ) {
+        $subscriber = get_userdata( $item->customer_id );
+        $customer   = ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email;
+
+        return '<a href="' . esc_url( get_edit_user_link( $item->customer_id ) ) . '" target="_blank">' . $customer . '</a>';
+    }
+
+    /**
+     * Status column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_status( $item ) {
+        return $item->get_status_label();
+    }
+
+    /**
+     * Period column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_period( $item ) {
+
+        $period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->period,$item->frequency );
+
+        return wpinv_price( wpinv_format_amount( $item->recurring_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) ) . ' / ' . $period;
+    }
+
+    /**
+     * Billing Times column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_bill_times( $item ) {
+        return $item->get_times_billed() . ' / ' . ( ( $item->bill_times == 0 ) ? __( 'Until Cancelled', 'invoicing' ) : $item->bill_times );
+    }
+
+    /**
+     * Initial Amount column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_initial_amount( $item ) {
+        return wpinv_price( wpinv_format_amount( $item->initial_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) );
+    }
+
+    /**
+     * Renewal date column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_renewal_date( $item ) {
+        return $renewal_date = ! empty( $item->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $item->expiration ) ) : __( 'N/A', 'invoicing' );
+    }
+
+    /**
+     * Payment column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_parent_payment_id( $item ) {
+        return '<a href="' . get_edit_post_link( $item->parent_payment_id ) . '" target="_blank">' . wpinv_get_invoice_number( $item->parent_payment_id ) . '</a>';
+    }
+
+    /**
+     * Product ID column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_product_id( $item ) {
+        return '<a href="' . esc_url( admin_url( 'post.php?action=edit&post=' . $item->product_id ) ) . '" target="_blank">' . get_the_title( $item->product_id ) . '</a>';
+    }
+
+    /**
+     * Render the edit column
+     *
+     * @access      private
+     * @since       2.0
+     * @return      string
+     */
+    function column_actions( $item ) {
+        return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" title="' . esc_attr( __( 'View or edit subscription', 'invoicing' ) ) . '" target="_blank">' . __( 'View', 'invoicing' ) . '</a>';
+    }
+
+
+    /**
+     * Retrieve the table columns
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      array
+     */
+
+    function get_columns(){
+        $columns = array(
+            'sub_id'            => __( 'ID', 'invoicing' ),
+            'customer_id'       => __( 'Customer', 'invoicing' ),
+            'status'            => __( 'Status', 'invoicing' ),
+            'period'            => __( 'Billing Cycle', 'invoicing' ),
+            'initial_amount'    => __( 'Initial Amount', 'invoicing' ),
+            'bill_times'        => __( 'Times Billed', 'invoicing' ),
+            'renewal_date'      => __( 'Renewal Date', 'invoicing' ),
+            'parent_payment_id' => __( 'Invoice', 'invoicing' ),
+            'product_id'        => __( 'Item', 'invoicing' ),
+            'actions'           => __( 'Actions', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpinv_report_subscription_columns', $columns );
+    }
+
+    /**
+     * Retrieve the current page number
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      int
+     */
+    function get_paged() {
+        return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+    }
+
+    /**
+     * Retrieve the subscription counts
+     *
+     * @access public
+     * @since 1.4
+     * @return void
+     */
+    public function get_subscription_counts() {
+
+        global $wp_query;
+
+        $db = new WPInv_Subscriptions_DB;
+
+        $search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+
+        $this->total_count     = $db->count();
+        $this->active_count    = $db->count( array( 'status' => 'active', 'search' => $search ) );
+        $this->pending_count   = $db->count( array( 'status' => 'pending', 'search' => $search ) );
+        $this->expired_count   = $db->count( array( 'status' => 'expired', 'search' => $search ) );
+        $this->trialling_count  = $db->count( array( 'status' => 'trialling', 'search' => $search ) );
+        $this->cancelled_count = $db->count( array( 'status' => 'cancelled', 'search' => $search ) );
+        $this->completed_count = $db->count( array( 'status' => 'completed', 'search' => $search ) );
+        $this->failing_count   = $db->count( array( 'status' => 'failing', 'search' => $search ) );
+
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     * @access      private
+     * @since       1.0.0
+     * @uses        $this->_column_headers
+     * @uses        $this->items
+     * @uses        $this->get_columns()
+     * @uses        $this->get_sortable_columns()
+     * @uses        $this->get_pagenum()
+     * @uses        $this->set_pagination_args()
+     * @return      array
+     */
+    function prepare_items() {
+
+        $columns  = $this->get_columns();
+        $hidden   = array(); // No hidden columns
+        $status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
+        $sortable = $this->get_sortable_columns();
+
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+
+        $current_page = $this->get_pagenum();
+
+        $db     = new WPInv_Subscriptions_DB;
+        $search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+        $args   = array(
+            'number' => $this->per_page,
+            'offset' => $this->per_page * ( $this->get_paged() - 1 ),
+            'search' => $search
+        );
+
+        if ( 'any' !== $status ) {
+            $args['status'] = $status;
+        }
+
+        $this->items = $db->get_subscriptions( $args );
+
+        switch ( $status ) {
+            case 'active':
+                $total_items = $this->active_count;
+                break;
+            case 'pending':
+                $total_items = $this->pending_count;
+                break;
+            case 'expired':
+                $total_items = $this->expired_count;
+                break;
+            case 'cancelled':
+                $total_items = $this->cancelled_count;
+                break;
+            case 'failing':
+                $total_items = $this->failing_count;
+                break;
+            case 'trialling':
+                $total_items = $this->trialling_count;
+                break;
+            case 'completed':
+                $total_items = $this->completed_count;
+                break;
+            case 'any':
+            default:
+                $total_items = $this->total_count;
+                break;
+        }
+
+        $this->set_pagination_args( array(
+            'total_items' => $total_items,
+            'per_page'    => $this->per_page,
+            'total_pages' => ceil( $total_items / $this->per_page )
+        ) );
+    }
 }

Spacing +83 added lines, -83 removed lines

@@ -8,11 +8,11 @@ 
 
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 
 // Load WP_List_Table if not loaded
-if( ! class_exists( 'WP_List_Table' ) ) {
+if (!class_exists('WP_List_Table')) {
 	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
@@ -35,7 +35,7 @@ 
 	public $pending_count   = 0;
 	public $expired_count   = 0;
 	public $completed_count = 0;
-	public $trialling_count  = 0;
+	public $trialling_count = 0;
 	public $cancelled_count = 0;
 	public $failing_count   = 0;
 
@@ -46,15 +46,15 @@ 
 	 * @since       1.0.0
 	 * @return      void
 	 */
-	function __construct(){
+	function __construct() {
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
+		parent::__construct(array(
 			'singular'  => 'subscription',
 			'plural'    => 'subscriptions',
 			'ajax'      => false
-		) );
+		));
 
 		$this->get_subscription_counts();
 
@@ -69,28 +69,28 @@ 
 	 */
 	public function get_views() {
 
-		$current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
-		$total_count     = '&nbsp;<span class="count">(' . $this->total_count    . ')</span>';
+		$current         = isset($_GET['status']) ? $_GET['status'] : '';
+		$total_count     = '&nbsp;<span class="count">(' . $this->total_count . ')</span>';
 		$active_count    = '&nbsp;<span class="count">(' . $this->active_count . ')</span>';
 		$pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
-		$expired_count   = '&nbsp;<span class="count">(' . $this->expired_count  . ')</span>';
+		$expired_count   = '&nbsp;<span class="count">(' . $this->expired_count . ')</span>';
 		$completed_count = '&nbsp;<span class="count">(' . $this->completed_count . ')</span>';
-		$trialling_count  = '&nbsp;<span class="count">(' . $this->trialling_count   . ')</span>';
-		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count   . ')</span>';
-		$failing_count   = '&nbsp;<span class="count">(' . $this->failing_count   . ')</span>';
+		$trialling_count = '&nbsp;<span class="count">(' . $this->trialling_count . ')</span>';
+		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count . ')</span>';
+		$failing_count   = '&nbsp;<span class="count">(' . $this->failing_count . ')</span>';
 
 		$views = array(
-			'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array( 'status', 'paged' ) ), $current === 'all' || $current == '' ? ' class="current"' : '', __('All','invoicing' ) . $total_count ),
-			'active'    => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'active', 'paged' => FALSE ) ), $current === 'active' ? ' class="current"' : '', __('Active','invoicing' ) . $active_count ),
-			'pending'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'pending', 'paged' => FALSE ) ), $current === 'pending' ? ' class="current"' : '', __('Pending','invoicing' ) . $pending_count ),
-			'expired'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'expired', 'paged' => FALSE ) ), $current === 'expired' ? ' class="current"' : '', __('Expired','invoicing' ) . $expired_count ),
-			'completed' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'completed', 'paged' => FALSE ) ), $current === 'completed' ? ' class="current"' : '', __('Completed','invoicing' ) . $completed_count ),
-			'trialling'  => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'trialling', 'paged' => FALSE ) ), $current === 'trialling' ? ' class="current"' : '', __('Trialling','invoicing' ) . $trialling_count ),
-			'cancelled' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'cancelled', 'paged' => FALSE ) ), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled','invoicing' ) . $cancelled_count ),
-			'failing'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'failing', 'paged' => FALSE ) ), $current === 'failing' ? ' class="current"' : '', __('Failing','invoicing' ) . $failing_count ),
+			'all'       => sprintf('<a href="%s"%s>%s</a>', remove_query_arg(array('status', 'paged')), $current === 'all' || $current == '' ? ' class="current"' : '', __('All', 'invoicing') . $total_count),
+			'active'    => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'active', 'paged' => FALSE)), $current === 'active' ? ' class="current"' : '', __('Active', 'invoicing') . $active_count),
+			'pending'   => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'pending', 'paged' => FALSE)), $current === 'pending' ? ' class="current"' : '', __('Pending', 'invoicing') . $pending_count),
+			'expired'   => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'expired', 'paged' => FALSE)), $current === 'expired' ? ' class="current"' : '', __('Expired', 'invoicing') . $expired_count),
+			'completed' => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'completed', 'paged' => FALSE)), $current === 'completed' ? ' class="current"' : '', __('Completed', 'invoicing') . $completed_count),
+			'trialling'  => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'trialling', 'paged' => FALSE)), $current === 'trialling' ? ' class="current"' : '', __('Trialling', 'invoicing') . $trialling_count),
+			'cancelled' => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'cancelled', 'paged' => FALSE)), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled', 'invoicing') . $cancelled_count),
+			'failing'   => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'failing', 'paged' => FALSE)), $current === 'failing' ? ' class="current"' : '', __('Failing', 'invoicing') . $failing_count),
 		);
 
-		return apply_filters( 'wpinv_recurring_subscriptions_table_views', $views );
+		return apply_filters('wpinv_recurring_subscriptions_table_views', $views);
 	}
 
 	/**
@@ -104,27 +104,27 @@ 
 	 *
 	 * @return void
 	 */
-	public function search_box( $text, $input_id ) {
+	public function search_box($text, $input_id) {
 
-		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
+		if (empty($_REQUEST['s']) && !$this->has_items()) {
 			return;
 		}
 
 		$input_id = $input_id . '-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		if (!empty($_REQUEST['orderby'])) {
+			echo '<input type="hidden" name="orderby" value="' . esc_attr($_REQUEST['orderby']) . '" />';
 		}
 
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		if (!empty($_REQUEST['order'])) {
+			echo '<input type="hidden" name="order" value="' . esc_attr($_REQUEST['order']) . '" />';
 		}
 ?>
 		<p class="search-box">
-			<?php do_action( 'wpinv_recurring_subscription_search_box' ); ?>
+			<?php do_action('wpinv_recurring_subscription_search_box'); ?>
 			<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 			<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-			<?php submit_button( $text, 'button', false, false, array('ID' => 'search-submit') ); ?><br/>
+			<?php submit_button($text, 'button', false, false, array('ID' => 'search-submit')); ?><br/>
 		</p>
 <?php
 	}
@@ -136,7 +136,7 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_default( $item, $column_name ) {
+	function column_default($item, $column_name) {
 		return $item->$column_name;
 	}
 
@@ -147,8 +147,8 @@ 
      * @since       1.0.0
      * @return      string
      */
-    function column_sub_id( $item ) {
-        return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" target="_blank">' . $item->id . '</a>';
+    function column_sub_id($item) {
+        return '<a href="' . esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . $item->id)) . '" target="_blank">' . $item->id . '</a>';
     }
 
 	/**
@@ -158,11 +158,11 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_customer_id( $item ) {
-		$subscriber = get_userdata( $item->customer_id );
-		$customer   = ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email;
+	function column_customer_id($item) {
+		$subscriber = get_userdata($item->customer_id);
+		$customer   = !empty($subscriber->display_name) ? $subscriber->display_name : $subscriber->user_email;
 
-		return '<a href="' . esc_url( get_edit_user_link( $item->customer_id ) ) . '" target="_blank">' . $customer . '</a>';
+		return '<a href="' . esc_url(get_edit_user_link($item->customer_id)) . '" target="_blank">' . $customer . '</a>';
 	}
 
 	/**
@@ -172,7 +172,7 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_status( $item ) {
+	function column_status($item) {
 		return $item->get_status_label();
 	}
 
@@ -183,11 +183,11 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_period( $item ) {
+	function column_period($item) {
 
-		$period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->period,$item->frequency );
+		$period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency($item->period, $item->frequency);
 
-		return wpinv_price( wpinv_format_amount( $item->recurring_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) ) . ' / ' . $period;
+		return wpinv_price(wpinv_format_amount($item->recurring_amount), wpinv_get_invoice_currency_code($item->parent_payment_id)) . ' / ' . $period;
 	}
 
 	/**
@@ -197,8 +197,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_bill_times( $item ) {
-		return $item->get_times_billed() . ' / ' . ( ( $item->bill_times == 0 ) ? __( 'Until Cancelled', 'invoicing' ) : $item->bill_times );
+	function column_bill_times($item) {
+		return $item->get_times_billed() . ' / ' . (($item->bill_times == 0) ? __('Until Cancelled', 'invoicing') : $item->bill_times);
 	}
 
 	/**
@@ -208,8 +208,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_initial_amount( $item ) {
-		return wpinv_price( wpinv_format_amount( $item->initial_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) );
+	function column_initial_amount($item) {
+		return wpinv_price(wpinv_format_amount($item->initial_amount), wpinv_get_invoice_currency_code($item->parent_payment_id));
 	}
 
 	/**
@@ -219,8 +219,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_renewal_date( $item ) {
-		return $renewal_date = ! empty( $item->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $item->expiration ) ) : __( 'N/A', 'invoicing' );
+	function column_renewal_date($item) {
+		return $renewal_date = !empty($item->expiration) ? date_i18n(get_option('date_format'), strtotime($item->expiration)) : __('N/A', 'invoicing');
 	}
 
 	/**
@@ -230,8 +230,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_parent_payment_id( $item ) {
-		return '<a href="' . get_edit_post_link( $item->parent_payment_id ) . '" target="_blank">' . wpinv_get_invoice_number( $item->parent_payment_id ) . '</a>';
+	function column_parent_payment_id($item) {
+		return '<a href="' . get_edit_post_link($item->parent_payment_id) . '" target="_blank">' . wpinv_get_invoice_number($item->parent_payment_id) . '</a>';
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_product_id( $item ) {
-		return '<a href="' . esc_url( admin_url( 'post.php?action=edit&post=' . $item->product_id ) ) . '" target="_blank">' . get_the_title( $item->product_id ) . '</a>';
+	function column_product_id($item) {
+		return '<a href="' . esc_url(admin_url('post.php?action=edit&post=' . $item->product_id)) . '" target="_blank">' . get_the_title($item->product_id) . '</a>';
 	}
 
 	/**
@@ -252,8 +252,8 @@ 
 	 * @since       2.0
 	 * @return      string
 	 */
-	function column_actions( $item ) {
-		return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" title="' . esc_attr( __( 'View or edit subscription', 'invoicing' ) ) . '" target="_blank">' . __( 'View', 'invoicing' ) . '</a>';
+	function column_actions($item) {
+		return '<a href="' . esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . $item->id)) . '" title="' . esc_attr(__('View or edit subscription', 'invoicing')) . '" target="_blank">' . __('View', 'invoicing') . '</a>';
 	}
 
 
@@ -265,21 +265,21 @@ 
 	 * @return      array
 	 */
 
-	function get_columns(){
+	function get_columns() {
 		$columns = array(
-			'sub_id'            => __( 'ID', 'invoicing' ),
-			'customer_id'       => __( 'Customer', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
-			'period'            => __( 'Billing Cycle', 'invoicing' ),
-			'initial_amount'    => __( 'Initial Amount', 'invoicing' ),
-			'bill_times'        => __( 'Times Billed', 'invoicing' ),
-			'renewal_date'      => __( 'Renewal Date', 'invoicing' ),
-			'parent_payment_id' => __( 'Invoice', 'invoicing' ),
-			'product_id'        => __( 'Item', 'invoicing' ),
-			'actions'           => __( 'Actions', 'invoicing' ),
+			'sub_id'            => __('ID', 'invoicing'),
+			'customer_id'       => __('Customer', 'invoicing'),
+			'status'            => __('Status', 'invoicing'),
+			'period'            => __('Billing Cycle', 'invoicing'),
+			'initial_amount'    => __('Initial Amount', 'invoicing'),
+			'bill_times'        => __('Times Billed', 'invoicing'),
+			'renewal_date'      => __('Renewal Date', 'invoicing'),
+			'parent_payment_id' => __('Invoice', 'invoicing'),
+			'product_id'        => __('Item', 'invoicing'),
+			'actions'           => __('Actions', 'invoicing'),
 		);
 
-		return apply_filters( 'wpinv_report_subscription_columns', $columns );
+		return apply_filters('wpinv_report_subscription_columns', $columns);
 	}
 
 	/**
@@ -290,7 +290,7 @@ 
 	 * @return      int
 	 */
 	function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -306,16 +306,16 @@ 
 
 		$db = new WPInv_Subscriptions_DB;
 
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+		$search = !empty($_GET['s']) ? sanitize_text_field($_GET['s']) : '';
 
 		$this->total_count     = $db->count();
-		$this->active_count    = $db->count( array( 'status' => 'active', 'search' => $search ) );
-		$this->pending_count   = $db->count( array( 'status' => 'pending', 'search' => $search ) );
-		$this->expired_count   = $db->count( array( 'status' => 'expired', 'search' => $search ) );
-		$this->trialling_count  = $db->count( array( 'status' => 'trialling', 'search' => $search ) );
-		$this->cancelled_count = $db->count( array( 'status' => 'cancelled', 'search' => $search ) );
-		$this->completed_count = $db->count( array( 'status' => 'completed', 'search' => $search ) );
-		$this->failing_count   = $db->count( array( 'status' => 'failing', 'search' => $search ) );
+		$this->active_count    = $db->count(array('status' => 'active', 'search' => $search));
+		$this->pending_count   = $db->count(array('status' => 'pending', 'search' => $search));
+		$this->expired_count   = $db->count(array('status' => 'expired', 'search' => $search));
+		$this->trialling_count = $db->count(array('status' => 'trialling', 'search' => $search));
+		$this->cancelled_count = $db->count(array('status' => 'cancelled', 'search' => $search));
+		$this->completed_count = $db->count(array('status' => 'completed', 'search' => $search));
+		$this->failing_count   = $db->count(array('status' => 'failing', 'search' => $search));
 
 	}
 
@@ -336,28 +336,28 @@ 
 
 		$columns  = $this->get_columns();
 		$hidden   = array(); // No hidden columns
-		$status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
+		$status   = isset($_GET['status']) ? $_GET['status'] : 'any';
 		$sortable = $this->get_sortable_columns();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$current_page = $this->get_pagenum();
 
 		$db     = new WPInv_Subscriptions_DB;
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+		$search = !empty($_GET['s']) ? sanitize_text_field($_GET['s']) : '';
 		$args   = array(
 			'number' => $this->per_page,
-			'offset' => $this->per_page * ( $this->get_paged() - 1 ),
+			'offset' => $this->per_page * ($this->get_paged() - 1),
 			'search' => $search
 		);
 
-		if ( 'any' !== $status ) {
+		if ('any' !== $status) {
 			$args['status'] = $status;
 		}
 
-		$this->items = $db->get_subscriptions( $args );
+		$this->items = $db->get_subscriptions($args);
 
-		switch ( $status ) {
+		switch ($status) {
 			case 'active':
 				$total_items = $this->active_count;
 				break;
@@ -385,10 +385,10 @@ 
 				break;
 		}
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $total_items / $this->per_page )
-		) );
+			'total_pages' => ceil($total_items / $this->per_page)
+		));
 	}
 }

includes/wpinv-subscription.php

Indentation +506 added lines, -506 removed lines

@@ -2,7 +2,7 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 
@@ -13,187 +13,187 @@ 
  */
 class WPInv_Subscription {
 
-	private $subs_db;
+    private $subs_db;
+
+    public $id                = 0;
+    public $customer_id       = 0;
+    public $period            = '';
+    public $initial_amount    = '';
+    public $recurring_amount  = '';
+    public $bill_times        = 0;
+    public $transaction_id    = '';
+    public $parent_payment_id = 0;
+    public $product_id        = 0;
+    public $created           = '0000-00-00 00:00:00';
+    public $expiration        = '0000-00-00 00:00:00';
+    public $trial_period      = '';
+    public $status            = 'pending';
+    public $profile_id        = '';
+    public $gateway           = '';
+    public $customer;
 
-	public $id                = 0;
-	public $customer_id       = 0;
-	public $period            = '';
-	public $initial_amount    = '';
-	public $recurring_amount  = '';
-	public $bill_times        = 0;
-	public $transaction_id    = '';
-	public $parent_payment_id = 0;
-	public $product_id        = 0;
-	public $created           = '0000-00-00 00:00:00';
-	public $expiration        = '0000-00-00 00:00:00';
-	public $trial_period      = '';
-	public $status            = 'pending';
-	public $profile_id        = '';
-	public $gateway           = '';
-	public $customer;
-
-	/**
-	 * Get us started
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
+    /**
+     * Get us started
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
 
-		$this->subs_db = new WPInv_Subscriptions_DB;
+        $this->subs_db = new WPInv_Subscriptions_DB;
 
-		if( $_by_profile_id ) {
+        if( $_by_profile_id ) {
 
-			$_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
+            $_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
 
-			if( empty( $_sub ) ) {
-				return false;
-			}
+            if( empty( $_sub ) ) {
+                return false;
+            }
 
-			$_id_or_object = $_sub;
+            $_id_or_object = $_sub;
 
-		}
+        }
 
-		return $this->setup_subscription( $_id_or_object );
-	}
+        return $this->setup_subscription( $_id_or_object );
+    }
 
-	/**
-	 * Setup the subscription object
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	private function setup_subscription( $id_or_object = 0 ) {
+    /**
+     * Setup the subscription object
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    private function setup_subscription( $id_or_object = 0 ) {
 
-		if( empty( $id_or_object ) ) {
-			return false;
-		}
+        if( empty( $id_or_object ) ) {
+            return false;
+        }
 
-		if( is_numeric( $id_or_object ) ) {
+        if( is_numeric( $id_or_object ) ) {
 
-			$sub = $this->subs_db->get( $id_or_object );
+            $sub = $this->subs_db->get( $id_or_object );
 
-		} elseif( is_object( $id_or_object ) ) {
+        } elseif( is_object( $id_or_object ) ) {
 
-			$sub = $id_or_object;
+            $sub = $id_or_object;
 
-		}
+        }
 
-		if( empty( $sub ) ) {
-			return false;
-		}
+        if( empty( $sub ) ) {
+            return false;
+        }
 
-		foreach( $sub as $key => $value ) {
-			$this->$key = $value;
-		}
+        foreach( $sub as $key => $value ) {
+            $this->$key = $value;
+        }
 
-		$this->customer = get_userdata( $this->customer_id );
-		$this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
+        $this->customer = get_userdata( $this->customer_id );
+        $this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
 
-		do_action( 'wpinv_recurring_setup_subscription', $this );
+        do_action( 'wpinv_recurring_setup_subscription', $this );
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Magic __get function to dispatch a call to retrieve a private property
-	 *
-	 * @since 1.0.0
-	 */
-	public function __get( $key ) {
+    /**
+     * Magic __get function to dispatch a call to retrieve a private property
+     *
+     * @since 1.0.0
+     */
+    public function __get( $key ) {
 
-		if( method_exists( $this, 'get_' . $key ) ) {
+        if( method_exists( $this, 'get_' . $key ) ) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+            return call_user_func( array( $this, 'get_' . $key ) );
 
-		} else {
+        } else {
 
-			return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+            return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Creates a subscription
-	 *
-	 * @since  1.0.0
-	 * @param  array  $data Array of attributes for a subscription
-	 * @return mixed  false if data isn't passed and class not instantiated for creation
-	 */
-	public function create( $data = array() ) {
+    /**
+     * Creates a subscription
+     *
+     * @since  1.0.0
+     * @param  array  $data Array of attributes for a subscription
+     * @return mixed  false if data isn't passed and class not instantiated for creation
+     */
+    public function create( $data = array() ) {
 
-		if ( $this->id != 0 ) {
-			return false;
-		}
+        if ( $this->id != 0 ) {
+            return false;
+        }
 
-		$defaults = array(
-			'customer_id'       => 0,
-			'frequency'         => '',
-			'period'            => '',
-			'initial_amount'    => '',
-			'recurring_amount'  => '',
-			'bill_times'        => 0,
-			'parent_payment_id' => 0,
-			'product_id'        => 0,
-			'created'           => '',
-			'expiration'        => '',
-			'status'            => '',
-			'profile_id'        => '',
-		);
+        $defaults = array(
+            'customer_id'       => 0,
+            'frequency'         => '',
+            'period'            => '',
+            'initial_amount'    => '',
+            'recurring_amount'  => '',
+            'bill_times'        => 0,
+            'parent_payment_id' => 0,
+            'product_id'        => 0,
+            'created'           => '',
+            'expiration'        => '',
+            'status'            => '',
+            'profile_id'        => '',
+        );
 
-		$args = wp_parse_args( $data, $defaults );
+        $args = wp_parse_args( $data, $defaults );
 
-		if( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
+        if( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
 
-			if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
+            if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
 
-				// Force an active subscription to expired if expiration date is in the past
-				$args['status'] = 'expired';
+                // Force an active subscription to expired if expiration date is in the past
+                $args['status'] = 'expired';
 
-			}
-		}
+            }
+        }
 
-		do_action( 'wpinv_subscription_pre_create', $args );
+        do_action( 'wpinv_subscription_pre_create', $args );
 
-		$id = $this->subs_db->insert( $args, 'subscription' );
+        $id = $this->subs_db->insert( $args, 'subscription' );
 
-		do_action( 'wpinv_subscription_post_create', $id, $args );
+        do_action( 'wpinv_subscription_post_create', $id, $args );
 
-		return $this->setup_subscription( $id );
+        return $this->setup_subscription( $id );
 
-	}
+    }
 
-	/**
-	 * Updates a subscription
-	 *
-	 * @since  1.0.0
-	 * @param  array $args Array of fields to update
-	 * @return bool
-	 */
-	public function update( $args = array() ) {
+    /**
+     * Updates a subscription
+     *
+     * @since  1.0.0
+     * @param  array $args Array of fields to update
+     * @return bool
+     */
+    public function update( $args = array() ) {
 
-		$ret = $this->subs_db->update( $this->id, $args );
+        $ret = $this->subs_db->update( $this->id, $args );
 
-		do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
+        do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
 
-		if ( $ret && isset( $args['profile_id'] ) ) {
-			update_post_meta( $this->parent_payment_id, 'subscription_id', $args['profile_id'] );
-		}
+        if ( $ret && isset( $args['profile_id'] ) ) {
+            update_post_meta( $this->parent_payment_id, 'subscription_id', $args['profile_id'] );
+        }
 
-		return $ret;
+        return $ret;
 
-	}
+    }
 
-	/**
-	 * Delete the subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function delete() {
-		return $this->subs_db->delete( $this->id );
-	}
+    /**
+     * Delete the subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function delete() {
+        return $this->subs_db->delete( $this->id );
+    }
 
     /**
      * Retrieves the parent payment ID
@@ -262,57 +262,57 @@ 
      *
      * @since  2.4
      * @param  array $args Array of values for the payment, including amount and transaction ID
-	 * @param  WPInv_Invoice $invoice
+     * @param  WPInv_Invoice $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();
+        // Are we creating a new invoice?
+        if ( empty( $invoice ) ) {
+            $invoice = $this->create_payment();
 
-			if ( empty( $invoice ) ) {
-				return false;
-			}
+            if ( empty( $invoice ) ) {
+                return false;
+            }
 
-			$invoice->set_status( 'wpi-renewal' );
+            $invoice->set_status( 'wpi-renewal' );
 
-		}
+        }
 
-		// 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->save();
+        $invoice->save();
 
-		if ( ! $invoice->get_id() ) {
-			return 0;
-		}
+        if ( ! $invoice->get_id() ) {
+            return 0;
+        }
 
-		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->parent_payment_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
@@ -321,196 +321,196 @@ 
      */
     public function create_payment() {
 
-		// Do we have a parent invoice?
+        // Do we have a parent invoice?
         if ( ! $this->parent_payment_id ) {
             return false;
         }
 
-		// Ensure that the parent invoice is available.
+        // Ensure that the parent invoice is available.
         $parent_invoice = wpinv_get_invoice( $this->parent_payment_id );
         if ( empty( $parent_invoice ) ) {
             return false;
         }
 
-		// Duplicate the parent invoice.
-		$invoice = new WPInv_Invoice();
-		$invoice->set_props( $parent_invoice->get_data() );
-		$invoice->set_id( 0 );
-		$invoice->set_parent_id( $parent_invoice->get_parent() );
-		$invoice->set_transaction_id( '' );
-		$invoice->set_key( $invoice->generate_key( 'renewal_' ) );
-		$invoice->set_number( '' );
-		$invoice->set_completed_date( '' );
-		$invoice->set_status( 'wpi-pending' );
-		$invoice->recalculate_total();
-		$invoice->save();
-
-		return $invoice->get_id() ? $invoice : false;
-    }
-
-	/**
-	 * Retrieves the transaction ID from the subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function get_transaction_id() {
-
-		if( empty( $this->transaction_id ) ) {
-
-			$txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
-
-			if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
-				$this->set_transaction_id( $txn_id );
-			}
-
-		}
-
-		return $this->transaction_id;
-
-	}
-
-	/**
-	 * Stores the transaction ID for the subscription purchase
-	 *
-	 * @since  1.0.0.4
-	 * @return bool
-	 */
-	public function set_transaction_id( $txn_id = '' ) {
-		$this->update( array( 'transaction_id' => $txn_id ) );
-		$this->transaction_id = $txn_id;
-	}
-
-	/**
-	 * Renews a subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function renew() {
-
-		// Calculate new expiration
-		$expires        = $this->get_expiration_time();
-		$base_date      = $expires > current_time( 'timestamp' ) ? $expires : current_time( 'timestamp' );
-		$frequency      = isset( $this->frequency ) ? $this->frequency : 1;
-		$new_expiration = strtotime( "+ {$frequency} {$this->period}", strtotime( $base_date ) );
-		$new_expiration = apply_filters( 'wpinv_subscription_renewal_expiration', date( 'Y-m-d H:i:s', $new_expiration ), $this->id, $this );
-
-		do_action( 'wpinv_subscription_pre_renew', $this->id, $new_expiration, $this );
-
-		$this->status = 'active';
-		$times_billed = $this->get_times_billed();
-
-		// Complete subscription if applicable
-		if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
-			$this->complete();
-			$this->status = 'completed';
-			return;
-		}
-
-		$args = array(
-			'expiration' => $new_expiration,
-			'status'     => $this->status,
-		);
+        // Duplicate the parent invoice.
+        $invoice = new WPInv_Invoice();
+        $invoice->set_props( $parent_invoice->get_data() );
+        $invoice->set_id( 0 );
+        $invoice->set_parent_id( $parent_invoice->get_parent() );
+        $invoice->set_transaction_id( '' );
+        $invoice->set_key( $invoice->generate_key( 'renewal_' ) );
+        $invoice->set_number( '' );
+        $invoice->set_completed_date( '' );
+        $invoice->set_status( 'wpi-pending' );
+        $invoice->recalculate_total();
+        $invoice->save();
+
+        return $invoice->get_id() ? $invoice : false;
+    }
+
+    /**
+     * Retrieves the transaction ID from the subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function get_transaction_id() {
+
+        if( empty( $this->transaction_id ) ) {
+
+            $txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
+
+            if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
+                $this->set_transaction_id( $txn_id );
+            }
+
+        }
+
+        return $this->transaction_id;
+
+    }
+
+    /**
+     * Stores the transaction ID for the subscription purchase
+     *
+     * @since  1.0.0.4
+     * @return bool
+     */
+    public function set_transaction_id( $txn_id = '' ) {
+        $this->update( array( 'transaction_id' => $txn_id ) );
+        $this->transaction_id = $txn_id;
+    }
+
+    /**
+     * Renews a subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function renew() {
+
+        // Calculate new expiration
+        $expires        = $this->get_expiration_time();
+        $base_date      = $expires > current_time( 'timestamp' ) ? $expires : current_time( 'timestamp' );
+        $frequency      = isset( $this->frequency ) ? $this->frequency : 1;
+        $new_expiration = strtotime( "+ {$frequency} {$this->period}", strtotime( $base_date ) );
+        $new_expiration = apply_filters( 'wpinv_subscription_renewal_expiration', date( 'Y-m-d H:i:s', $new_expiration ), $this->id, $this );
+
+        do_action( 'wpinv_subscription_pre_renew', $this->id, $new_expiration, $this );
+
+        $this->status = 'active';
+        $times_billed = $this->get_times_billed();
+
+        // Complete subscription if applicable
+        if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
+            $this->complete();
+            $this->status = 'completed';
+            return;
+        }
+
+        $args = array(
+            'expiration' => $new_expiration,
+            'status'     => $this->status,
+        );
 
         $this->subs_db->update( $this->id, $args );
 
-		$this->expiration = $new_expiration;
+        $this->expiration = $new_expiration;
 
-		do_action( 'wpinv_subscription_post_renew', $this->id, $new_expiration, $this );
-		do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
+        do_action( 'wpinv_subscription_post_renew', $this->id, $new_expiration, $this );
+        do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as completed
-	 *
-	 * Subscription is completed when the number of payments matches the billing_times field
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function complete() {
+    /**
+     * Marks a subscription as completed
+     *
+     * Subscription is completed when the number of payments matches the billing_times field
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function complete() {
 
-		// Only mark a subscription as complete if it's not already cancelled.
-		if ( 'cancelled' === $this->status ) {
-			return;
-		}
+        // Only mark a subscription as complete if it's not already cancelled.
+        if ( 'cancelled' === $this->status ) {
+            return;
+        }
 
-		$args = array(
-			'status' => 'completed'
-		);
+        $args = array(
+            'status' => 'completed'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'completed';
+            $this->status = 'completed';
 
-			do_action( 'wpinv_subscription_completed', $this->id, $this );
+            do_action( 'wpinv_subscription_completed', $this->id, $this );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as expired
-	 *
-	 * Subscription is completed when the billing times is reached
-	 *
-	 * @since  1.0.0
-	 * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
-	 * @return void
-	 */
-	public function expire( $check_expiration = false ) {
+    /**
+     * Marks a subscription as expired
+     *
+     * Subscription is completed when the billing times is reached
+     *
+     * @since  1.0.0
+     * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
+     * @return void
+     */
+    public function expire( $check_expiration = false ) {
 
-		$expiration = $this->expiration;
+        $expiration = $this->expiration;
 
-		if( $check_expiration ) {
+        if( $check_expiration ) {
 
-			// check_expiration() updates $this->expiration so compare to $expiration above
+            // check_expiration() updates $this->expiration so compare to $expiration above
 
-			if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
+            if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
 
-				return false; // Do not mark as expired since real expiration date is in the future
-			}
+                return false; // Do not mark as expired since real expiration date is in the future
+            }
 
-		}
+        }
 
-		$args = array(
-			'status' => 'expired'
-		);
+        $args = array(
+            'status' => 'expired'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'expired';
+            $this->status = 'expired';
 
-			do_action( 'wpinv_subscription_expired', $this->id, $this );
+            do_action( 'wpinv_subscription_expired', $this->id, $this );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as failing
-	 *
-	 * @since  2.4.2
-	 * @return void
-	 */
-	public function failing() {
+    /**
+     * Marks a subscription as failing
+     *
+     * @since  2.4.2
+     * @return void
+     */
+    public function failing() {
 
-		$args = array(
-			'status' => 'failing'
-		);
+        $args = array(
+            'status' => 'failing'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'failing';
+            $this->status = 'failing';
 
-			do_action( 'wpinv_subscription_failing', $this->id, $this );
-			do_action( 'wpinv_recurring_payment_failed', $this );
+            do_action( 'wpinv_subscription_failing', $this->id, $this );
+            do_action( 'wpinv_recurring_payment_failed', $this );
 
-		}
+        }
 
-	}
+    }
 
     /**
      * Marks a subscription as cancelled
@@ -544,22 +544,22 @@ 
         }
     }
 
-	/**
-	 * Determines if subscription can be cancelled
-	 *
-	 * This method is filtered by payment gateways in order to return true on subscriptions
-	 * that can be cancelled with a profile ID through the merchant processor
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function can_cancel() {
+    /**
+     * Determines if subscription can be cancelled
+     *
+     * This method is filtered by payment gateways in order to return true on subscriptions
+     * that can be cancelled with a profile ID through the merchant processor
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function can_cancel() {
         $ret = false;
-	    if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
+        if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
             $ret = true;
         }
-		return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
-	}
+        return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
+    }
 
     /**
      * Returns an array of subscription statuses that can be cancelled
@@ -572,197 +572,197 @@ 
         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() {
+    /**
+     * Retrieves the URL to cancel subscription
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_cancel_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
+        $url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
 
-		return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
-	}
+        return apply_filters( 'wpinv_subscription_cancel_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() {
+    /**
+     * 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( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
-
-		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 void
-	 */
-	public function get_update_url() {
-
-		$url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
-
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
-	}
-
-	/**
-	 * Determines if subscription is active
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function is_active() {
-
-		$ret = false;
-
-		if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
-			$ret = true;
-		}
-
-		return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
-
-	}
-
-	/**
-	 * Determines if subscription is expired
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function is_expired() {
-
-		$ret = false;
-
-		if ( $this->status == 'expired' ) {
-
-			$ret = true;
-
-		} elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
-
-			$ret        = false;
-			$expiration = $this->get_expiration_time();
-
-			if( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
-				$ret = true;
-
-				if ( 'active' === $this->status || $this->status == 'trialling'  ) {
-					$this->expire();
-				}
-			}
-
-		}
-
-		return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
-
-	}
-
-	/**
-	 * Retrieves the expiration date
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_expiration() {
-		return $this->expiration;
-	}
-
-	/**
-	 * Retrieves the expiration date in a timestamp
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_expiration_time() {
-		return strtotime( $this->expiration, current_time( 'timestamp' ) );
-	}
-
-	/**
-	 * Retrieves the subscription status
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_status() {
-
-		// Monitor for page load delays on pages with large subscription lists (IE: Subscriptions table in admin)
-		$this->is_expired();
-		return $this->status;
-	}
-
-	/**
-	 * Retrieves the subscription status label
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_status_label() {
+        return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+    }
 
-		switch( $this->get_status() ) {
-			case 'active' :
-				$status = __( 'Active', 'invoicing' );
-				break;
+    /**
+     * Retrieves the URL to renew a subscription
+     *
+     * @since  2.5
+     * @return string
+     */
+    public function get_renew_url() {
 
-			case 'cancelled' :
-				$status = __( 'Cancelled', 'invoicing' );
-				break;
-
-			case 'expired' :
-				$status = __( 'Expired', 'invoicing' );
-				break;
+        $url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
 
-			case 'pending' :
-				$status = __( 'Pending', 'invoicing' );
-				break;
+        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 );
+    }
 
-			case 'failing' :
-				$status = __( 'Failing', 'invoicing' );
-				break;
+    /**
+     * Retrieves the URL to update subscription
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function get_update_url() {
+
+        $url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
+
+        return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+    }
+
+    /**
+     * Determines if subscription is active
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function is_active() {
+
+        $ret = false;
+
+        if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
+            $ret = true;
+        }
+
+        return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
+
+    }
+
+    /**
+     * Determines if subscription is expired
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function is_expired() {
+
+        $ret = false;
+
+        if ( $this->status == 'expired' ) {
+
+            $ret = true;
+
+        } elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
+
+            $ret        = false;
+            $expiration = $this->get_expiration_time();
+
+            if( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
+                $ret = true;
+
+                if ( 'active' === $this->status || $this->status == 'trialling'  ) {
+                    $this->expire();
+                }
+            }
+
+        }
 
-			case 'trialling' :
-				$status = __( 'Trialling', 'invoicing' );
-				break;
-
-			case 'completed' :
-				$status = __( 'Completed', 'invoicing' );
-				break;
-
-			default:
-				$status = ucfirst( $this->get_status() );
-				break;
-		}
+        return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
 
-		return $status;
-	}
+    }
+
+    /**
+     * Retrieves the expiration date
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_expiration() {
+        return $this->expiration;
+    }
+
+    /**
+     * Retrieves the expiration date in a timestamp
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_expiration_time() {
+        return strtotime( $this->expiration, current_time( 'timestamp' ) );
+    }
+
+    /**
+     * Retrieves the subscription status
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_status() {
+
+        // Monitor for page load delays on pages with large subscription lists (IE: Subscriptions table in admin)
+        $this->is_expired();
+        return $this->status;
+    }
+
+    /**
+     * Retrieves the subscription status label
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_status_label() {
+
+        switch( $this->get_status() ) {
+            case 'active' :
+                $status = __( 'Active', 'invoicing' );
+                break;
+
+            case 'cancelled' :
+                $status = __( 'Cancelled', 'invoicing' );
+                break;
+
+            case 'expired' :
+                $status = __( 'Expired', 'invoicing' );
+                break;
+
+            case 'pending' :
+                $status = __( 'Pending', 'invoicing' );
+                break;
+
+            case 'failing' :
+                $status = __( 'Failing', 'invoicing' );
+                break;
+
+            case 'trialling' :
+                $status = __( 'Trialling', 'invoicing' );
+                break;
+
+            case 'completed' :
+                $status = __( 'Completed', 'invoicing' );
+                break;
+
+            default:
+                $status = ucfirst( $this->get_status() );
+                break;
+        }
+
+        return $status;
+    }
 
     /**
      * Retrieves the subscription status label
@@ -827,7 +827,7 @@ 
      * @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 );
     }
 

Spacing +143 added lines, -143 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -38,15 +38,15 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
+	function __construct($_id_or_object = 0, $_by_profile_id = false) {
 
 		$this->subs_db = new WPInv_Subscriptions_DB;
 
-		if( $_by_profile_id ) {
+		if ($_by_profile_id) {
 
-			$_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
+			$_sub = $this->subs_db->get_by('profile_id', $_id_or_object);
 
-			if( empty( $_sub ) ) {
+			if (empty($_sub)) {
 				return false;
 			}
 
@@ -54,7 +54,7 @@ 
 
 		}
 
-		return $this->setup_subscription( $_id_or_object );
+		return $this->setup_subscription($_id_or_object);
 	}
 
 	/**
@@ -63,34 +63,34 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	private function setup_subscription( $id_or_object = 0 ) {
+	private function setup_subscription($id_or_object = 0) {
 
-		if( empty( $id_or_object ) ) {
+		if (empty($id_or_object)) {
 			return false;
 		}
 
-		if( is_numeric( $id_or_object ) ) {
+		if (is_numeric($id_or_object)) {
 
-			$sub = $this->subs_db->get( $id_or_object );
+			$sub = $this->subs_db->get($id_or_object);
 
-		} elseif( is_object( $id_or_object ) ) {
+		} elseif (is_object($id_or_object)) {
 
 			$sub = $id_or_object;
 
 		}
 
-		if( empty( $sub ) ) {
+		if (empty($sub)) {
 			return false;
 		}
 
-		foreach( $sub as $key => $value ) {
+		foreach ($sub as $key => $value) {
 			$this->$key = $value;
 		}
 
-		$this->customer = get_userdata( $this->customer_id );
-		$this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
+		$this->customer = get_userdata($this->customer_id);
+		$this->gateway  = wpinv_get_payment_gateway($this->parent_payment_id);
 
-		do_action( 'wpinv_recurring_setup_subscription', $this );
+		do_action('wpinv_recurring_setup_subscription', $this);
 
 		return $this;
 	}
@@ -100,15 +100,15 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	public function __get( $key ) {
+	public function __get($key) {
 
-		if( method_exists( $this, 'get_' . $key ) ) {
+		if (method_exists($this, 'get_' . $key)) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+			return call_user_func(array($this, 'get_' . $key));
 
 		} else {
 
-			return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+			return new WP_Error('wpinv-subscription-invalid-property', sprintf(__('Can\'t get property %s', 'invoicing'), $key));
 
 		}
 
@@ -121,9 +121,9 @@ 
 	 * @param  array  $data Array of attributes for a subscription
 	 * @return mixed  false if data isn't passed and class not instantiated for creation
 	 */
-	public function create( $data = array() ) {
+	public function create($data = array()) {
 
-		if ( $this->id != 0 ) {
+		if ($this->id != 0) {
 			return false;
 		}
 
@@ -142,11 +142,11 @@ 
 			'profile_id'        => '',
 		);
 
-		$args = wp_parse_args( $data, $defaults );
+		$args = wp_parse_args($data, $defaults);
 
-		if( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
+		if ($args['expiration'] && strtotime('NOW', current_time('timestamp')) > strtotime($args['expiration'], current_time('timestamp'))) {
 
-			if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
+			if ('active' == $args['status'] || 'trialling' == $args['status']) {
 
 				// Force an active subscription to expired if expiration date is in the past
 				$args['status'] = 'expired';
@@ -154,13 +154,13 @@ 
 			}
 		}
 
-		do_action( 'wpinv_subscription_pre_create', $args );
+		do_action('wpinv_subscription_pre_create', $args);
 
-		$id = $this->subs_db->insert( $args, 'subscription' );
+		$id = $this->subs_db->insert($args, 'subscription');
 
-		do_action( 'wpinv_subscription_post_create', $id, $args );
+		do_action('wpinv_subscription_post_create', $id, $args);
 
-		return $this->setup_subscription( $id );
+		return $this->setup_subscription($id);
 
 	}
 
@@ -171,14 +171,14 @@ 
 	 * @param  array $args Array of fields to update
 	 * @return bool
 	 */
-	public function update( $args = array() ) {
+	public function update($args = array()) {
 
-		$ret = $this->subs_db->update( $this->id, $args );
+		$ret = $this->subs_db->update($this->id, $args);
 
-		do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
+		do_action('wpinv_recurring_update_subscription', $this->id, $args, $this);
 
-		if ( $ret && isset( $args['profile_id'] ) ) {
-			update_post_meta( $this->parent_payment_id, 'subscription_id', $args['profile_id'] );
+		if ($ret && isset($args['profile_id'])) {
+			update_post_meta($this->parent_payment_id, 'subscription_id', $args['profile_id']);
 		}
 
 		return $ret;
@@ -192,7 +192,7 @@ 
 	 * @return bool
 	 */
 	public function delete() {
-		return $this->subs_db->delete( $this->id );
+		return $this->subs_db->delete($this->id);
 	}
 
     /**
@@ -212,14 +212,14 @@ 
      * @return array
      */
     public function get_child_payments() {
-        $payments = get_posts( array(
+        $payments = get_posts(array(
             'post_parent'    => (int) $this->parent_payment_id,
             'posts_per_page' => '999',
-            'post_status'    => array( 'publish', 'wpi-processing', 'wpi-renewal' ),
+            'post_status'    => array('publish', 'wpi-processing', 'wpi-renewal'),
             'orderby'        => 'ID',
             'order'          => 'DESC',
             'post_type'      => 'wpi_invoice'
-        ) );
+        ));
 
         return $payments;
     }
@@ -232,9 +232,9 @@ 
      */
     public function get_total_payments() {
         $child_payments = $this->get_child_payments();
-        $total_payments = !empty( $child_payments ) ? count( $child_payments ) : 0;
+        $total_payments = !empty($child_payments) ? count($child_payments) : 0;
 
-        if ( 'pending' != $this->status ) {
+        if ('pending' != $this->status) {
                 $total_payments++;
         }
 
@@ -248,9 +248,9 @@ 
      * @return int
      */
     public function get_times_billed() {
-        $times_billed = (int)$this->get_total_payments();
+        $times_billed = (int) $this->get_total_payments();
 
-        if ( ! empty( $this->trial_period ) && $times_billed > 0 ) {
+        if (!empty($this->trial_period) && $times_billed > 0) {
             $times_billed--;
         }
 
@@ -265,49 +265,49 @@ 
 	 * @param  WPInv_Invoice $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 ) ) {
+		if (empty($invoice)) {
 			$invoice = $this->create_payment();
 
-			if ( empty( $invoice ) ) {
+			if (empty($invoice)) {
 				return false;
 			}
 
-			$invoice->set_status( 'wpi-renewal' );
+			$invoice->set_status('wpi-renewal');
 
 		}
 
 		// 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->save();
 
-		if ( ! $invoice->get_id() ) {
+		if (!$invoice->get_id()) {
 			return 0;
 		}
 
-		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->parent_payment_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->parent_payment_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();
 	}
@@ -322,26 +322,26 @@ 
     public function create_payment() {
 
 		// Do we have a parent invoice?
-        if ( ! $this->parent_payment_id ) {
+        if (!$this->parent_payment_id) {
             return false;
         }
 
 		// Ensure that the parent invoice is available.
-        $parent_invoice = wpinv_get_invoice( $this->parent_payment_id );
-        if ( empty( $parent_invoice ) ) {
+        $parent_invoice = wpinv_get_invoice($this->parent_payment_id);
+        if (empty($parent_invoice)) {
             return false;
         }
 
 		// Duplicate the parent invoice.
 		$invoice = new WPInv_Invoice();
-		$invoice->set_props( $parent_invoice->get_data() );
-		$invoice->set_id( 0 );
-		$invoice->set_parent_id( $parent_invoice->get_parent() );
-		$invoice->set_transaction_id( '' );
-		$invoice->set_key( $invoice->generate_key( 'renewal_' ) );
-		$invoice->set_number( '' );
-		$invoice->set_completed_date( '' );
-		$invoice->set_status( 'wpi-pending' );
+		$invoice->set_props($parent_invoice->get_data());
+		$invoice->set_id(0);
+		$invoice->set_parent_id($parent_invoice->get_parent());
+		$invoice->set_transaction_id('');
+		$invoice->set_key($invoice->generate_key('renewal_'));
+		$invoice->set_number('');
+		$invoice->set_completed_date('');
+		$invoice->set_status('wpi-pending');
 		$invoice->recalculate_total();
 		$invoice->save();
 
@@ -356,12 +356,12 @@ 
 	 */
 	public function get_transaction_id() {
 
-		if( empty( $this->transaction_id ) ) {
+		if (empty($this->transaction_id)) {
 
-			$txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
+			$txn_id = wpinv_get_payment_transaction_id($this->parent_payment_id);
 
-			if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
-				$this->set_transaction_id( $txn_id );
+			if (!empty($txn_id) && (int) $this->parent_payment_id !== (int) $txn_id) {
+				$this->set_transaction_id($txn_id);
 			}
 
 		}
@@ -376,8 +376,8 @@ 
 	 * @since  1.0.0.4
 	 * @return bool
 	 */
-	public function set_transaction_id( $txn_id = '' ) {
-		$this->update( array( 'transaction_id' => $txn_id ) );
+	public function set_transaction_id($txn_id = '') {
+		$this->update(array('transaction_id' => $txn_id));
 		$this->transaction_id = $txn_id;
 	}
 
@@ -391,18 +391,18 @@ 
 
 		// Calculate new expiration
 		$expires        = $this->get_expiration_time();
-		$base_date      = $expires > current_time( 'timestamp' ) ? $expires : current_time( 'timestamp' );
-		$frequency      = isset( $this->frequency ) ? $this->frequency : 1;
-		$new_expiration = strtotime( "+ {$frequency} {$this->period}", strtotime( $base_date ) );
-		$new_expiration = apply_filters( 'wpinv_subscription_renewal_expiration', date( 'Y-m-d H:i:s', $new_expiration ), $this->id, $this );
+		$base_date      = $expires > current_time('timestamp') ? $expires : current_time('timestamp');
+		$frequency      = isset($this->frequency) ? $this->frequency : 1;
+		$new_expiration = strtotime("+ {$frequency} {$this->period}", strtotime($base_date));
+		$new_expiration = apply_filters('wpinv_subscription_renewal_expiration', date('Y-m-d H:i:s', $new_expiration), $this->id, $this);
 
-		do_action( 'wpinv_subscription_pre_renew', $this->id, $new_expiration, $this );
+		do_action('wpinv_subscription_pre_renew', $this->id, $new_expiration, $this);
 
 		$this->status = 'active';
 		$times_billed = $this->get_times_billed();
 
 		// Complete subscription if applicable
-		if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
+		if ($this->bill_times > 0 && $times_billed >= $this->bill_times) {
 			$this->complete();
 			$this->status = 'completed';
 			return;
@@ -413,12 +413,12 @@ 
 			'status'     => $this->status,
 		);
 
-        $this->subs_db->update( $this->id, $args );
+        $this->subs_db->update($this->id, $args);
 
 		$this->expiration = $new_expiration;
 
-		do_action( 'wpinv_subscription_post_renew', $this->id, $new_expiration, $this );
-		do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
+		do_action('wpinv_subscription_post_renew', $this->id, $new_expiration, $this);
+		do_action('wpinv_recurring_set_subscription_status', $this->id, $this->status, $this);
 
 	}
 
@@ -433,7 +433,7 @@ 
 	public function complete() {
 
 		// Only mark a subscription as complete if it's not already cancelled.
-		if ( 'cancelled' === $this->status ) {
+		if ('cancelled' === $this->status) {
 			return;
 		}
 
@@ -441,11 +441,11 @@ 
 			'status' => 'completed'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'completed';
 
-			do_action( 'wpinv_subscription_completed', $this->id, $this );
+			do_action('wpinv_subscription_completed', $this->id, $this);
 
 		}
 
@@ -460,15 +460,15 @@ 
 	 * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
 	 * @return void
 	 */
-	public function expire( $check_expiration = false ) {
+	public function expire($check_expiration = false) {
 
 		$expiration = $this->expiration;
 
-		if( $check_expiration ) {
+		if ($check_expiration) {
 
 			// check_expiration() updates $this->expiration so compare to $expiration above
 
-			if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
+			if ($expiration < $this->get_expiration() && current_time('timestamp') < $this->get_expiration_time()) {
 
 				return false; // Do not mark as expired since real expiration date is in the future
 			}
@@ -479,11 +479,11 @@ 
 			'status' => 'expired'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'expired';
 
-			do_action( 'wpinv_subscription_expired', $this->id, $this );
+			do_action('wpinv_subscription_expired', $this->id, $this);
 
 		}
 
@@ -501,12 +501,12 @@ 
 			'status' => 'failing'
 		);
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+		if ($this->subs_db->update($this->id, $args)) {
 
 			$this->status = 'failing';
 
-			do_action( 'wpinv_subscription_failing', $this->id, $this );
-			do_action( 'wpinv_recurring_payment_failed', $this );
+			do_action('wpinv_subscription_failing', $this->id, $this);
+			do_action('wpinv_recurring_payment_failed', $this);
 
 		}
 
@@ -519,7 +519,7 @@ 
      * @return void
      */
     public function cancel() {
-        if ( 'cancelled' === $this->status ) {
+        if ('cancelled' === $this->status) {
             return; // Already cancelled
         }
 
@@ -527,20 +527,20 @@ 
             'status' => 'cancelled'
         );
 
-        if ( $this->subs_db->update( $this->id, $args ) ) {
-            if ( is_user_logged_in() ) {
-                $userdata = get_userdata( get_current_user_id() );
+        if ($this->subs_db->update($this->id, $args)) {
+            if (is_user_logged_in()) {
+                $userdata = get_userdata(get_current_user_id());
                 $user     = $userdata->display_name;
             } else {
-                $user = __( 'gateway', 'invoicing' );
+                $user = __('gateway', 'invoicing');
             }
 
-            $note = sprintf( __( 'Subscription has been cancelled by %s', 'invoicing' ), $user );
-            wpinv_insert_payment_note( $this->parent_payment_id, $note, '', '', true );
+            $note = sprintf(__('Subscription has been cancelled by %s', 'invoicing'), $user);
+            wpinv_insert_payment_note($this->parent_payment_id, $note, '', '', true);
 
             $this->status = 'cancelled';
 
-            do_action( 'wpinv_subscription_cancelled', $this->id, $this );
+            do_action('wpinv_subscription_cancelled', $this->id, $this);
         }
     }
 
@@ -555,10 +555,10 @@ 
 	 */
 	public function can_cancel() {
         $ret = false;
-	    if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
+	    if ($this->gateway === 'manual' || in_array($this->status, $this->get_cancellable_statuses())) {
             $ret = true;
         }
-		return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
+		return apply_filters('wpinv_subscription_can_cancel', $ret, $this);
 	}
 
     /**
@@ -569,7 +569,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'));
     }
 
 	/**
@@ -580,9 +580,9 @@ 
 	 */
 	public function get_cancel_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
+		$url = wp_nonce_url(add_query_arg(array('wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id)), 'wpinv-recurring-cancel');
 
-		return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+		return apply_filters('wpinv_subscription_cancel_url', $url, $this);
 	}
 
 	/**
@@ -596,7 +596,7 @@ 
 	 */
 	public function can_renew() {
 
-		return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+		return apply_filters('wpinv_subscription_can_renew', true, $this);
 	}
 
 	/**
@@ -607,9 +607,9 @@ 
 	 */
 	public function get_renew_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
+		$url = wp_nonce_url(add_query_arg(array('wpinv_action' => 'renew_subscription', 'sub_id' => $this->id)), 'wpinv-recurring-renew');
 
-		return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
+		return apply_filters('wpinv_subscription_renew_url', $url, $this);
 	}
 
 	/**
@@ -619,7 +619,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);
 	}
 
 	/**
@@ -630,9 +630,9 @@ 
 	 */
 	public function get_update_url() {
 
-		$url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
+		$url = add_query_arg(array('action' => 'update', 'subscription_id' => $this->id));
 
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+		return apply_filters('wpinv_subscription_update_url', $url, $this);
 	}
 
 	/**
@@ -645,11 +645,11 @@ 
 
 		$ret = false;
 
-		if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
+		if (!$this->is_expired() && ($this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling')) {
 			$ret = true;
 		}
 
-		return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
+		return apply_filters('wpinv_subscription_is_active', $ret, $this->id, $this);
 
 	}
 
@@ -663,26 +663,26 @@ 
 
 		$ret = false;
 
-		if ( $this->status == 'expired' ) {
+		if ($this->status == 'expired') {
 
 			$ret = true;
 
-		} elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
+		} elseif ('active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling') {
 
 			$ret        = false;
 			$expiration = $this->get_expiration_time();
 
-			if( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
+			if ($expiration && strtotime('NOW', current_time('timestamp')) > $expiration) {
 				$ret = true;
 
-				if ( 'active' === $this->status || $this->status == 'trialling'  ) {
+				if ('active' === $this->status || $this->status == 'trialling') {
 					$this->expire();
 				}
 			}
 
 		}
 
-		return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
+		return apply_filters('wpinv_subscription_is_expired', $ret, $this->id, $this);
 
 	}
 
@@ -703,7 +703,7 @@ 
 	 * @return int
 	 */
 	public function get_expiration_time() {
-		return strtotime( $this->expiration, current_time( 'timestamp' ) );
+		return strtotime($this->expiration, current_time('timestamp'));
 	}
 
 	/**
@@ -727,37 +727,37 @@ 
 	 */
 	public function get_status_label() {
 
-		switch( $this->get_status() ) {
+		switch ($this->get_status()) {
 			case 'active' :
-				$status = __( 'Active', 'invoicing' );
+				$status = __('Active', 'invoicing');
 				break;
 
 			case 'cancelled' :
-				$status = __( 'Cancelled', 'invoicing' );
+				$status = __('Cancelled', 'invoicing');
 				break;
 
 			case 'expired' :
-				$status = __( 'Expired', 'invoicing' );
+				$status = __('Expired', 'invoicing');
 				break;
 
 			case 'pending' :
-				$status = __( 'Pending', 'invoicing' );
+				$status = __('Pending', 'invoicing');
 				break;
 
 			case 'failing' :
-				$status = __( 'Failing', 'invoicing' );
+				$status = __('Failing', 'invoicing');
 				break;
 
 			case 'trialling' :
-				$status = __( 'Trialling', 'invoicing' );
+				$status = __('Trialling', 'invoicing');
 				break;
 
 			case 'completed' :
-				$status = __( 'Completed', 'invoicing' );
+				$status = __('Completed', 'invoicing');
 				break;
 
 			default:
-				$status = ucfirst( $this->get_status() );
+				$status = ucfirst($this->get_status());
 				break;
 		}
 
@@ -772,51 +772,51 @@ 
      */
     public function get_status_label_html() {
 
-        switch( $get_status = $this->get_status() ) {
+        switch ($get_status = $this->get_status()) {
             case 'active' :
-                $status = __( 'Active', 'invoicing' );
+                $status = __('Active', 'invoicing');
                 $class = 'label-info';
                 break;
 
             case 'cancelled' :
-                $status = __( 'Cancelled', 'invoicing' );
+                $status = __('Cancelled', 'invoicing');
                 $class = 'label-danger';
                 break;
 
             case 'expired' :
-                $status = __( 'Expired', 'invoicing' );
+                $status = __('Expired', 'invoicing');
                 $class = 'label-default';
                 break;
 
             case 'pending' :
-                $status = __( 'Pending', 'invoicing' );
+                $status = __('Pending', 'invoicing');
                 $class = 'label-primary';
                 break;
 
             case 'failing' :
-                $status = __( 'Failing', 'invoicing' );
+                $status = __('Failing', 'invoicing');
                 $class = 'label-danger';
                 break;
 
             case 'trialling' :
-                $status = __( 'Trialling', 'invoicing' );
+                $status = __('Trialling', 'invoicing');
                 $class = 'label-info';
                 break;
 
             case 'completed' :
-                $status = __( 'Completed', 'invoicing' );
+                $status = __('Completed', 'invoicing');
                 $class = 'label-success';
                 break;
 
             default:
-                $status = ucfirst( $this->get_status() );
+                $status = ucfirst($this->get_status());
                 $class = 'label-default';
                 break;
         }
 
         $label = '<span class="sub-status label label-sub-' . $get_status . ' ' . $class . '">' . $status . '</span>';
 
-        return apply_filters( 'wpinv_subscription_status_label_html', $label, $get_status, $status );
+        return apply_filters('wpinv_subscription_status_label_html', $label, $get_status, $status);
     }
 
     /**
@@ -826,9 +826,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);
     }
 
 }

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

Spacing +25 added lines, -25 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Manual Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'subscription' );
+    protected $supports = array('subscription');
 
     /**
 	 * Payment method order.
@@ -39,10 +39,10 @@ 
 	public function __construct() {
         parent::__construct();
 
-        $this->title        = __( 'Manual Payment', 'invoicing' );
-        $this->method_title = __( 'Manual Payment', 'invoicing' );
+        $this->title        = __('Manual Payment', 'invoicing');
+        $this->method_title = __('Manual Payment', 'invoicing');
 
-        add_action( 'wpinv_renew_manual_subscription_profile', array( $this, 'renew_manual_subscription_profile' ) );
+        add_action('wpinv_renew_manual_subscription_profile', array($this, 'renew_manual_subscription_profile'));
     }
 
     /**
@@ -54,16 +54,16 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Mark it as paid.
         $invoice->mark_paid();
 
         // (Maybe) set recurring hooks.
-        $this->start_manual_subscription_profile( $invoice );
+        $this->start_manual_subscription_profile($invoice);
 
         // Send to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
     
@@ -73,19 +73,19 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	public function start_manual_subscription_profile( $invoice ) {
+	public function start_manual_subscription_profile($invoice) {
 
         // Retrieve the subscription.
-        $subscription = wpinv_get_subscription( $invoice );
-        if ( empty( $subscription ) ) {
+        $subscription = wpinv_get_subscription($invoice);
+        if (empty($subscription)) {
             return;
         }
 
         // Schedule an action to run when the subscription expires.
         $action_id = as_schedule_single_action(
-            strtotime( $subscription->expiration ),
+            strtotime($subscription->expiration),
             'wpinv_renew_manual_subscription_profile',
-            array( $invoice->get_id() ),
+            array($invoice->get_id()),
             'invoicing'
         );
 
@@ -105,16 +105,16 @@ 
 	 *
 	 * @param int $invoice_id Invoice.
 	 */
-	public function renew_manual_subscription_profile( $invoice_id ) {
+	public function renew_manual_subscription_profile($invoice_id) {
 
         // Retrieve the subscription.
-        $subscription = wpinv_get_subscription( $invoice_id );
-        if ( empty( $subscription ) ) {
+        $subscription = wpinv_get_subscription($invoice_id);
+        if (empty($subscription)) {
             return;
         }
 
         // Abort if it is canceled or complete.
-        if ( $subscription->status == 'completed' || $subscription->status == 'cancelled' ) {
+        if ($subscription->status == 'completed' || $subscription->status == 'cancelled') {
             return;
         }
 
@@ -122,34 +122,34 @@ 
         $times_billed = $subscription->get_times_billed();
         $max_bills    = $subscription->bill_times;
 
-        if ( empty( $max_bills ) || $max_bills > $times_billed ) {
+        if (empty($max_bills) || $max_bills > $times_billed) {
 
             // Retrieve the invoice.
-            $invoice = new WPInv_Invoice( $invoice_id );
+            $invoice = new WPInv_Invoice($invoice_id);
 
             // Renew the subscription.
-            $subscription->add_payment( array(
+            $subscription->add_payment(array(
                 'amount'         => $subscription->recurring_amount,
                 'transaction_id' => $invoice->generate_key(),
                 'gateway'        => $this->id
-            ) );
+            ));
 
         }
 
         // Renew/Complete the subscription.
         $subscription->renew();
 
-        if ( 'completed' != $subscription->status ) {
+        if ('completed' != $subscription->status) {
 
             // Schedule an action to run when the subscription expires.
             $action_id = as_schedule_single_action(
-                strtotime( $subscription->expiration ),
+                strtotime($subscription->expiration),
                 'wpinv_renew_manual_subscription_profile',
-                array( $invoice_id ),
+                array($invoice_id),
                 'invoicing'
             );
 
-            $subscription->update( array( 'profile_id' => $action_id, ) );
+            $subscription->update(array('profile_id' => $action_id,));
 
         }
 

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

Spacing +174 added lines, -174 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Paypal Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'subscription', 'sandbox' );
+    protected $supports = array('subscription', 'sandbox');
 
     /**
 	 * Payment method order.
@@ -59,7 +59,7 @@ 
 	 *
 	 * @var array
 	 */
-	public $currencies = array( 'AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR' );
+	public $currencies = array('AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR');
 
     /**
 	 * URL to view a transaction.
@@ -80,13 +80,13 @@ 
 	 */
 	public function __construct() {
 
-        $this->title                = __( 'PayPal Standard', 'invoicing' );
-        $this->method_title         = __( 'PayPal Standard', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed to PayPal', 'invoicing' );
-        $this->notify_url           = wpinv_get_ipn_url( $this->id );
+        $this->title                = __('PayPal Standard', 'invoicing');
+        $this->method_title         = __('PayPal Standard', 'invoicing');
+        $this->checkout_button_text = __('Proceed to PayPal', 'invoicing');
+        $this->notify_url           = wpinv_get_ipn_url($this->id);
 
-        add_filter( 'getpaid_paypal_args', array( $this, 'process_subscription' ), 10, 2 );
-        add_filter( 'wpinv_gateway_description', array( $this, 'sandbox_notice' ), 10, 2 );
+        add_filter('getpaid_paypal_args', array($this, 'process_subscription'), 10, 2);
+        add_filter('wpinv_gateway_description', array($this, 'sandbox_notice'), 10, 2);
 
         parent::__construct();
     }
@@ -100,16 +100,16 @@ 
 	 * @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) {
 
         // Get redirect url.
-        $paypal_redirect = $this->get_request_url( $invoice );
+        $paypal_redirect = $this->get_request_url($invoice);
 
         // Add a note about the request url.
         $invoice->add_note(
             sprintf(
-                __( 'Redirecting to PayPal: %s', 'invoicing' ),
-                esc_url( $paypal_redirect )
+                __('Redirecting to PayPal: %s', 'invoicing'),
+                esc_url($paypal_redirect)
             ),
             false,
             false,
@@ -117,7 +117,7 @@ 
         );
 
         // Redirect to PayPal
-        wp_redirect( $paypal_redirect );
+        wp_redirect($paypal_redirect);
         exit;
 
     }
@@ -128,21 +128,21 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return string
 	 */
-	public function get_request_url( $invoice ) {
+	public function get_request_url($invoice) {
 
         // Endpoint for this request
-		$this->endpoint    = $this->is_sandbox( $invoice ) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
+		$this->endpoint = $this->is_sandbox($invoice) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
 
         // Retrieve paypal args.
-        $paypal_args       = map_deep( $this->get_paypal_args( $invoice ), 'urlencode' );
+        $paypal_args = map_deep($this->get_paypal_args($invoice), 'urlencode');
 
-        if ( $invoice->is_recurring() ) {
+        if ($invoice->is_recurring()) {
             $paypal_args['bn'] = 'GetPaid_Subscribe_WPS_US';
         } else {
             $paypal_args['bn'] = 'GetPaid_ShoppingCart_WPS_US';
         }
 
-        return add_query_arg( $paypal_args, $this->endpoint );
+        return add_query_arg($paypal_args, $this->endpoint);
 
 	}
 
@@ -152,25 +152,25 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_paypal_args( $invoice ) {
+	protected function get_paypal_args($invoice) {
 
         // Whether or not to send the line items as one item.
-		$force_one_line_item = apply_filters( 'getpaid_paypal_force_one_line_item', false, $invoice );
+		$force_one_line_item = apply_filters('getpaid_paypal_force_one_line_item', false, $invoice);
 
-		if ( $invoice->is_recurring() || ( wpinv_use_taxes() && wpinv_prices_include_tax() ) ) {
+		if ($invoice->is_recurring() || (wpinv_use_taxes() && wpinv_prices_include_tax())) {
 			$force_one_line_item = true;
 		}
 
 		$paypal_args = apply_filters(
 			'getpaid_paypal_args',
 			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, $force_one_line_item )
+				$this->get_transaction_args($invoice),
+				$this->get_line_item_args($invoice, $force_one_line_item)
 			),
 			$invoice
 		);
 
-		return $this->fix_request_length( $invoice, $paypal_args );
+		return $this->fix_request_length($invoice, $paypal_args);
     }
 
     /**
@@ -179,11 +179,11 @@ 
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_transaction_args( $invoice ) {
+	protected function get_transaction_args($invoice) {
 
 		return array(
             'cmd'           => '_cart',
-            'business'      => wpinv_get_option( 'paypal_email', false ),
+            'business'      => wpinv_get_option('paypal_email', false),
             'no_shipping'   => '1',
             'shipping'      => '0',
             'no_note'       => '1',
@@ -191,16 +191,16 @@ 
             'rm'            => is_ssl() ? 2 : 1,
             'upload'        => 1,
             'currency_code' => $invoice->get_currency(), // https://developer.paypal.com/docs/nvp-soap-api/currency-codes/#paypal
-            'return'        => esc_url_raw( $this->get_return_url( $invoice ) ),
-            'cancel_return' => esc_url_raw( $invoice->get_checkout_payment_url() ),
-            'notify_url'    => getpaid_limit_length( $this->notify_url, 255 ),
-            'invoice'       => getpaid_limit_length( $invoice->get_number(), 127 ),
+            'return'        => esc_url_raw($this->get_return_url($invoice)),
+            'cancel_return' => esc_url_raw($invoice->get_checkout_payment_url()),
+            'notify_url'    => getpaid_limit_length($this->notify_url, 255),
+            'invoice'       => getpaid_limit_length($invoice->get_number(), 127),
             'custom'        => $invoice->get_id(),
-            'first_name'    => getpaid_limit_length( $invoice->get_first_name(), 32 ),
-            'last_name'     => getpaid_limit_length( $invoice->get_last_name(), 64 ),
-            'country'       => getpaid_limit_length( $invoice->get_country(), 2 ),
-            'email'         => getpaid_limit_length( $invoice->get_email(), 127 ),
-            'cbt'           => get_bloginfo( 'name' )
+            'first_name'    => getpaid_limit_length($invoice->get_first_name(), 32),
+            'last_name'     => getpaid_limit_length($invoice->get_last_name(), 64),
+            'country'       => getpaid_limit_length($invoice->get_country(), 2),
+            'email'         => getpaid_limit_length($invoice->get_email(), 127),
+            'cbt'           => get_bloginfo('name')
         );
 
     }
@@ -212,30 +212,30 @@ 
 	 * @param  bool     $force_one_line_item Create only one item for this invoice.
 	 * @return array
 	 */
-	protected function get_line_item_args( $invoice, $force_one_line_item = false ) {
+	protected function get_line_item_args($invoice, $force_one_line_item = false) {
 
         // Maybe send invoice as a single item.
-		if ( $force_one_line_item ) {
-            return $this->get_line_item_args_single_item( $invoice );
+		if ($force_one_line_item) {
+            return $this->get_line_item_args_single_item($invoice);
         }
 
         // Send each line item individually.
         $line_item_args = array();
 
         // Prepare line items.
-        $this->prepare_line_items( $invoice );
+        $this->prepare_line_items($invoice);
 
         // Add taxes to the cart
-        if ( wpinv_use_taxes() && $invoice->is_taxable() ) {
-            $line_item_args['tax_cart'] = wpinv_sanitize_amount( (float) $invoice->get_total_tax(), 2 );
+        if (wpinv_use_taxes() && $invoice->is_taxable()) {
+            $line_item_args['tax_cart'] = wpinv_sanitize_amount((float) $invoice->get_total_tax(), 2);
         }
 
         // Add discount.
-        if ( $invoice->get_total_discount() > 0 ) {
-            $line_item_args['discount_amount_cart'] = wpinv_sanitize_amount( (float) $invoice->get_total_discount(), 2 );
+        if ($invoice->get_total_discount() > 0) {
+            $line_item_args['discount_amount_cart'] = wpinv_sanitize_amount((float) $invoice->get_total_discount(), 2);
         }
 
-		return array_merge( $line_item_args, $this->get_line_items() );
+		return array_merge($line_item_args, $this->get_line_items());
 
     }
 
@@ -245,11 +245,11 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_line_item_args_single_item( $invoice ) {
+	protected function get_line_item_args_single_item($invoice) {
 		$this->delete_line_items();
 
-        $item_name = sprintf( __( 'Invoice #%s', 'invoicing' ), $invoice->get_number() );
-		$this->add_line_item( $item_name, 1, wpinv_sanitize_amount( (float) $invoice->get_total(), 2 ), $invoice->get_id() );
+        $item_name = sprintf(__('Invoice #%s', 'invoicing'), $invoice->get_number());
+		$this->add_line_item($item_name, 1, wpinv_sanitize_amount((float) $invoice->get_total(), 2), $invoice->get_id());
 
 		return $this->get_line_items();
     }
@@ -273,19 +273,19 @@ 
 	 *
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 */
-	protected function prepare_line_items( $invoice ) {
+	protected function prepare_line_items($invoice) {
 		$this->delete_line_items();
 
 		// Items.
-		foreach ( $invoice->get_items() as $item ) {
+		foreach ($invoice->get_items() as $item) {
 			$amount   = $invoice->get_template() == 'amount' ? $item->get_price() : $item->get_sub_total();
 			$quantity = $invoice->get_template() == 'amount' ? 1 : $item->get_quantity();
-			$this->add_line_item( $item->get_raw_name(), $quantity, $amount, $item->get_id() );
+			$this->add_line_item($item->get_raw_name(), $quantity, $amount, $item->get_id());
         }
 
         // Fees.
-		foreach ( $invoice->get_fees() as $fee => $data ) {
-            $this->add_line_item( $fee, 1, $data['amount'] );
+		foreach ($invoice->get_fees() as $fee => $data) {
+            $this->add_line_item($fee, 1, $data['amount']);
         }
 
     }
@@ -298,15 +298,15 @@ 
 	 * @param  float  $amount Amount.
 	 * @param  string $item_number Item number.
 	 */
-	protected function add_line_item( $item_name, $quantity = 1, $amount = 0.0, $item_number = '' ) {
-		$index = ( count( $this->line_items ) / 4 ) + 1;
+	protected function add_line_item($item_name, $quantity = 1, $amount = 0.0, $item_number = '') {
+		$index = (count($this->line_items) / 4) + 1;
 
 		$item = apply_filters(
 			'getpaid_paypal_line_item',
 			array(
-				'item_name'   => html_entity_decode( getpaid_limit_length( $item_name ? wp_strip_all_tags( $item_name ) : __( 'Item', 'invoicing' ), 127 ), ENT_NOQUOTES, 'UTF-8' ),
+				'item_name'   => html_entity_decode(getpaid_limit_length($item_name ? wp_strip_all_tags($item_name) : __('Item', 'invoicing'), 127), ENT_NOQUOTES, 'UTF-8'),
 				'quantity'    => (int) $quantity,
-				'amount'      => wpinv_sanitize_amount( (float) $amount, 2 ),
+				'amount'      => wpinv_sanitize_amount((float) $amount, 2),
 				'item_number' => $item_number,
 			),
 			$item_name,
@@ -315,12 +315,12 @@ 
 			$item_number
 		);
 
-		$this->line_items[ 'item_name_' . $index ]   = getpaid_limit_length( $item['item_name'], 127 );
-        $this->line_items[ 'quantity_' . $index ]    = $item['quantity'];
+		$this->line_items['item_name_' . $index] = getpaid_limit_length($item['item_name'], 127);
+        $this->line_items['quantity_' . $index] = $item['quantity'];
         
         // The price or amount of the product, service, or contribution, not including shipping, handling, or tax.
-		$this->line_items[ 'amount_' . $index ]      = $item['amount'];
-		$this->line_items[ 'item_number_' . $index ] = getpaid_limit_length( $item['item_number'], 127 );
+		$this->line_items['amount_' . $index]      = $item['amount'];
+		$this->line_items['item_number_' . $index] = getpaid_limit_length($item['item_number'], 127);
     }
 
     /**
@@ -332,19 +332,19 @@ 
 	 * @param array    $paypal_args Arguments sent to Paypal in the request.
 	 * @return array
 	 */
-	protected function fix_request_length( $invoice, $paypal_args ) {
+	protected function fix_request_length($invoice, $paypal_args) {
 		$max_paypal_length = 2083;
-		$query_candidate   = http_build_query( $paypal_args, '', '&' );
+		$query_candidate   = http_build_query($paypal_args, '', '&');
 
-		if ( strlen( $this->endpoint . $query_candidate ) <= $max_paypal_length ) {
+		if (strlen($this->endpoint . $query_candidate) <= $max_paypal_length) {
 			return $paypal_args;
 		}
 
 		return apply_filters(
 			'getpaid_paypal_args',
 			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, true )
+				$this->get_transaction_args($invoice),
+				$this->get_line_item_args($invoice, true)
 			),
 			$invoice
 		);
@@ -357,10 +357,10 @@ 
 	 * @param  array $paypal_args PayPal args.
 	 * @param  WPInv_Invoice    $invoice Invoice object.
 	 */
-	public function process_subscription( $paypal_args, $invoice ) {
+	public function process_subscription($paypal_args, $invoice) {
 
         // Make sure this is a subscription.
-        if ( ! $invoice->is_recurring() || ! $subscription = wpinv_get_subscription( $invoice ) ) {
+        if (!$invoice->is_recurring() || !$subscription = wpinv_get_subscription($invoice)) {
             return $paypal_args;
         }
 
@@ -368,17 +368,17 @@ 
         $paypal_args['cmd'] = '_xclick-subscriptions';
 
         // Subscription name.
-        $paypal_args['item_name'] = sprintf( __( 'Invoice #%s', 'invoicing' ), $invoice->get_number() );
+        $paypal_args['item_name'] = sprintf(__('Invoice #%s', 'invoicing'), $invoice->get_number());
 
         // Get subscription args.
-        $period                 = strtoupper( substr( $subscription->period, 0, 1) );
+        $period                 = strtoupper(substr($subscription->period, 0, 1));
         $interval               = (int) $subscription->frequency;
         $bill_times             = (int) $subscription->bill_times;
-        $initial_amount         = (float) wpinv_sanitize_amount( $invoice->get_initial_total(), 2 );
-        $recurring_amount       = (float) wpinv_sanitize_amount( $invoice->get_recurring_total(), 2 );
-        $subscription_item      = $invoice->get_recurring( true );
+        $initial_amount         = (float) wpinv_sanitize_amount($invoice->get_initial_total(), 2);
+        $recurring_amount       = (float) wpinv_sanitize_amount($invoice->get_recurring_total(), 2);
+        $subscription_item      = $invoice->get_recurring(true);
 
-        if ( $subscription_item->has_free_trial() ) {
+        if ($subscription_item->has_free_trial()) {
 
             $paypal_args['a1'] = 0 == $initial_amount ? 0 : $initial_amount;
 
@@ -388,28 +388,28 @@ 
 			// Trial period.
 			$paypal_args['t1'] = $subscription_item->get_trial_period();
 
-        } else if ( $initial_amount != $recurring_amount ) {
+        } else if ($initial_amount != $recurring_amount) {
 
             // No trial period, but initial amount includes a sign-up fee and/or other items, so charge it as a separate period.
 
-            if ( 1 == $bill_times ) {
+            if (1 == $bill_times) {
                 $param_number = 3;
             } else {
                 $param_number = 1;
             }
 
-            $paypal_args[ 'a' . $param_number ] = $initial_amount ? 0 : $initial_amount;
+            $paypal_args['a' . $param_number] = $initial_amount ? 0 : $initial_amount;
 
             // Sign Up interval
-            $paypal_args[ 'p' . $param_number ] = $interval;
+            $paypal_args['p' . $param_number] = $interval;
 
             // Sign Up unit of duration
-            $paypal_args[ 't' . $param_number ] = $period;
+            $paypal_args['t' . $param_number] = $period;
 
         }
 
         // We have a recurring payment
-		if ( ! isset( $param_number ) || 1 == $param_number ) {
+		if (!isset($param_number) || 1 == $param_number) {
 
 			// Subscription price
 			$paypal_args['a3'] = $recurring_amount;
@@ -423,7 +423,7 @@ 
         }
         
         // Recurring payments
-		if ( 1 == $bill_times || ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() && 2 == $bill_times ) ) {
+		if (1 == $bill_times || ($initial_amount != $recurring_amount && !$subscription_item->has_free_trial() && 2 == $bill_times)) {
 
 			// Non-recurring payments
 			$paypal_args['src'] = 0;
@@ -432,15 +432,15 @@ 
 
 			$paypal_args['src'] = 1;
 
-			if ( $bill_times > 0 ) {
+			if ($bill_times > 0) {
 
 				// An initial period is being used to charge a sign-up fee
-				if ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() ) {
+				if ($initial_amount != $recurring_amount && !$subscription_item->has_free_trial()) {
 					$bill_times--;
 				}
 
                 // Make sure it's not over the max of 52
-                $paypal_args['srt'] = ( $bill_times <= 52 ? absint( $bill_times ) : 52 );
+                $paypal_args['srt'] = ($bill_times <= 52 ? absint($bill_times) : 52);
 
 			}
         }
@@ -449,10 +449,10 @@ 
         $paypal_args['rm'] = 2;
         
         // Get rid of redudant items.
-        foreach ( array( 'item_name_1', 'quantity_1', 'amount_1', 'item_number_1' ) as $arg ) {
+        foreach (array('item_name_1', 'quantity_1', 'amount_1', 'item_number_1') as $arg) {
 
-            if ( isset( $paypal_args[ $arg ] ) ) {
-                unset( $paypal_args[ $arg ] );
+            if (isset($paypal_args[$arg])) {
+                unset($paypal_args[$arg]);
             }
 
         }
@@ -473,25 +473,25 @@ 
 	public function verify_ipn() {
 
         // Validate the IPN.
-        if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-		    wp_die( 'PayPal IPN Request Failure', 'PayPal IPN', array( 'response' => 500 ) );
+        if (empty($_POST) || !$this->validate_ipn()) {
+		    wp_die('PayPal IPN Request Failure', 'PayPal IPN', array('response' => 500));
 		}
 
         // Process the IPN.
-        $posted  = wp_unslash( $_POST );
-        $invoice = wpinv_get_invoice( $posted['custom'] );
+        $posted  = wp_unslash($_POST);
+        $invoice = wpinv_get_invoice($posted['custom']);
 
-        if ( $invoice && $this->id == $invoice->get_gateway() ) {
+        if ($invoice && $this->id == $invoice->get_gateway()) {
 
-			$posted['payment_status'] = strtolower( $posted['payment_status'] );
+			$posted['payment_status'] = strtolower($posted['payment_status']);
 
-            wpinv_error_log( 'Found invoice #' . $invoice->get_number() );
-            wpinv_error_log( 'Payment status:' . $posted['payment_status'] );
+            wpinv_error_log('Found invoice #' . $invoice->get_number());
+            wpinv_error_log('Payment status:' . $posted['payment_status']);
 
-			if ( method_exists( $this, 'ipn_txn_' . $posted['txn_type'] ) ) {
-				call_user_func( array( $this, 'ipn_txn_' . $posted['txn_type'] ), $invoice, $posted );
+			if (method_exists($this, 'ipn_txn_' . $posted['txn_type'])) {
+				call_user_func(array($this, 'ipn_txn_' . $posted['txn_type']), $invoice, $posted);
             } else {
-                wpinv_error_log( 'Aborting, Invalid type:' . $posted['txn_type'] );
+                wpinv_error_log('Aborting, Invalid type:' . $posted['txn_type']);
             }
 
         }
@@ -505,10 +505,10 @@ 
 	 */
 	public function validate_ipn() {
 
-		wpinv_error_log( 'Validating PayPal IPN response' );
+		wpinv_error_log('Validating PayPal IPN response');
 
 		// Get received values from post data.
-		$validate_ipn        = wp_unslash( $_POST );
+		$validate_ipn        = wp_unslash($_POST);
 		$validate_ipn['cmd'] = '_notify-validate';
 
 		// Send back post vars to paypal.
@@ -522,18 +522,18 @@ 
 		);
 
 		// Post back to get a response.
-		$response = wp_safe_remote_post( $this->is_sandbox() ? 'https://www.sandbox.paypal.com/cgi-bin/webscr' : 'https://www.paypal.com/cgi-bin/webscr', $params );
+		$response = wp_safe_remote_post($this->is_sandbox() ? 'https://www.sandbox.paypal.com/cgi-bin/webscr' : 'https://www.paypal.com/cgi-bin/webscr', $params);
 
         // Check to see if the request was valid.
-		if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 && strstr( $response['body'], 'VERIFIED' ) ) {
-            wpinv_error_log( $response['body'], 'Received valid response from PayPal IPN' );
+		if (!is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 && strstr($response['body'], 'VERIFIED')) {
+            wpinv_error_log($response['body'], 'Received valid response from PayPal IPN');
 			return true;
         }
 
-        if ( is_wp_error( $response ) ) {
-            wpinv_error_log( $response->get_error_message(), 'Received invalid response from PayPal IPN' );
+        if (is_wp_error($response)) {
+            wpinv_error_log($response->get_error_message(), 'Received invalid response from PayPal IPN');
         } else {
-            wpinv_error_log( $response['body'], 'Received invalid response from PayPal IPN' );
+            wpinv_error_log($response['body'], 'Received invalid response from PayPal IPN');
         }
 
         return false;
@@ -546,12 +546,12 @@ 
 	 * @param WPInv_Invoice $invoice          Invoice object.
 	 * @param string   $currency currency to validate.
 	 */
-	protected function validate_ipn_currency( $invoice, $currency ) {
-		if ( strtolower( $invoice->get_currency() ) !== strtolower( $currency ) ) {
-            wpinv_record_gateway_error( 'IPN Error', "Currencies do not match: {$currency} instead of {$invoice->get_currency()}" );
+	protected function validate_ipn_currency($invoice, $currency) {
+		if (strtolower($invoice->get_currency()) !== strtolower($currency)) {
+            wpinv_record_gateway_error('IPN Error', "Currencies do not match: {$currency} instead of {$invoice->get_currency()}");
 
 			/* translators: %s: currency code. */
-			$invoice->update_status( 'wpi-processing', sprintf( __( 'Validation error: PayPal currencies do not match (code %s).', 'invoicing' ), $currency ) );
+			$invoice->update_status('wpi-processing', sprintf(__('Validation error: PayPal currencies do not match (code %s).', 'invoicing'), $currency));
 			exit;
 		}
 	}
@@ -562,12 +562,12 @@ 
 	 * @param WPInv_Invoice $invoice          Invoice object.
 	 * @param float   $amount amount to validate.
 	 */
-	protected function validate_ipn_amount( $invoice, $amount ) {
-		if ( number_format( $invoice->get_total(), 2, '.', '' ) !== number_format( $amount, 2, '.', '' ) ) {
-            wpinv_record_gateway_error( 'IPN Error', "Amounts do not match: {$amount} instead of {$invoice->get_total()}" );
+	protected function validate_ipn_amount($invoice, $amount) {
+		if (number_format($invoice->get_total(), 2, '.', '') !== number_format($amount, 2, '.', '')) {
+            wpinv_record_gateway_error('IPN Error', "Amounts do not match: {$amount} instead of {$invoice->get_total()}");
 
 			/* translators: %s: Amount. */
-			$invoice->update_status( 'wpi-processing', sprintf( __( 'Validation error: PayPal amounts do not match (gross %s).', 'invoicing' ), $amount ) );
+			$invoice->update_status('wpi-processing', sprintf(__('Validation error: PayPal amounts do not match (gross %s).', 'invoicing'), $amount));
 			exit;
 		}
 	}
@@ -578,14 +578,14 @@ 
 	 * @param WPInv_Invoice $invoice          Invoice object.
 	 * @param string   $receiver_email Email to validate.
 	 */
-	protected function validate_ipn_receiver_email( $invoice, $receiver_email ) {
-        $paypal_email = wpinv_get_option( 'paypal_email' );
+	protected function validate_ipn_receiver_email($invoice, $receiver_email) {
+        $paypal_email = wpinv_get_option('paypal_email');
 
-		if ( strcasecmp( trim( $receiver_email ), trim( $paypal_email ) ) !== 0 ) {
-            wpinv_record_gateway_error( 'IPN Error', "IPN Response is for another account: {$receiver_email}. Your email is {$paypal_email}" );
+		if (strcasecmp(trim($receiver_email), trim($paypal_email)) !== 0) {
+            wpinv_record_gateway_error('IPN Error', "IPN Response is for another account: {$receiver_email}. Your email is {$paypal_email}");
 
 			/* translators: %s: email address . */
-			$invoice->update_status( 'wpi-processing', sprintf( __( 'Validation error: PayPal IPN response from a different email address (%s).', 'invoicing' ), $receiver_email ) );
+			$invoice->update_status('wpi-processing', sprintf(__('Validation error: PayPal IPN response from a different email address (%s).', 'invoicing'), $receiver_email));
 			exit;
         }
 
@@ -597,57 +597,57 @@ 
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 * @param array    $posted Posted data.
 	 */
-	protected function ipn_txn_web_accept( $invoice, $posted ) {
+	protected function ipn_txn_web_accept($invoice, $posted) {
 
         // Collect payment details
-        $payment_status = strtolower( $posted['payment_status'] );
-        $business_email = isset( $posted['business'] ) && is_email( $posted['business'] ) ? trim( $posted['business'] ) : trim( $posted['receiver_email'] );
+        $payment_status = strtolower($posted['payment_status']);
+        $business_email = isset($posted['business']) && is_email($posted['business']) ? trim($posted['business']) : trim($posted['receiver_email']);
 
-        $this->validate_ipn_receiver_email( $invoice, $business_email );
-        $this->validate_ipn_currency( $invoice, $posted['mc_currency'] );
+        $this->validate_ipn_receiver_email($invoice, $business_email);
+        $this->validate_ipn_currency($invoice, $posted['mc_currency']);
 
         // Update the transaction id.
-        if ( ! empty( $posted['txn_id'] ) ) {
-            $invoice->set_transaction_id( wpinv_clean( $posted['txn_id'] ) );
+        if (!empty($posted['txn_id'])) {
+            $invoice->set_transaction_id(wpinv_clean($posted['txn_id']));
             $invoice->save();
         }
 
         // Process a refund.
-        if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+        if ($payment_status == 'refunded' || $payment_status == 'reversed') {
 
-            update_post_meta( $invoice->get_id(), 'refunded_remotely', 1 );
+            update_post_meta($invoice->get_id(), 'refunded_remotely', 1);
 
-            if ( ! $invoice->is_refunded() ) {
-                $invoice->update_status( 'wpi-refunded', $posted['reason_code'] );
+            if (!$invoice->is_refunded()) {
+                $invoice->update_status('wpi-refunded', $posted['reason_code']);
             }
 
             exit;
         }
 
         // Process payments.
-        if ( $payment_status == 'completed' ) {
+        if ($payment_status == 'completed') {
 
-            if ( $invoice->is_paid() && 'wpi_processing' != $invoice->get_status() ) {
-                wpinv_error_log( 'Aborting, Invoice #' . $invoice->get_number() . ' is already complete.' );
+            if ($invoice->is_paid() && 'wpi_processing' != $invoice->get_status()) {
+                wpinv_error_log('Aborting, Invoice #' . $invoice->get_number() . ' is already complete.');
                 exit;
             }
 
-            $this->validate_ipn_amount( $invoice, $posted['mc_gross'] );
+            $this->validate_ipn_amount($invoice, $posted['mc_gross']);
 
-            if ( 'completed' === $payment_status || 'pending' === $payment_status ) {
+            if ('completed' === $payment_status || 'pending' === $payment_status) {
 
                 $note = '';
 
-                if ( ! empty( $posted['mc_fee'] ) ) {
-                    $note = sprintf( __( 'PayPal Transaction Fee %s', 'invoicing' ), wpinv_clean( $posted['mc_fee'] ) );
+                if (!empty($posted['mc_fee'])) {
+                    $note = sprintf(__('PayPal Transaction Fee %s', 'invoicing'), wpinv_clean($posted['mc_fee']));
                 }
 
-                $invoice->mark_paid( ( ! empty( $posted['txn_id'] ) ? wpinv_clean( $posted['txn_id'] ) : '' ), $note );
+                $invoice->mark_paid((!empty($posted['txn_id']) ? wpinv_clean($posted['txn_id']) : ''), $note);
 
             } else {
 
                 /* translators: %s: pending reason. */
-                $invoice->update_status( 'wpi_processing', sprintf( __( 'Payment pending (%s).', 'invoicing' ), $posted['pending_reason'] ) );
+                $invoice->update_status('wpi_processing', sprintf(__('Payment pending (%s).', 'invoicing'), $posted['pending_reason']));
 
             }
 
@@ -658,7 +658,7 @@ 
         // Process failures.
 
         /* translators: %s: payment status. */
-		$invoice->update_status( 'wpi-failed', sprintf( __( 'Payment %s via IPN.', 'invoicing' ), wpinv_clean( $posted['payment_status'] ) ) );
+		$invoice->update_status('wpi-failed', sprintf(__('Payment %s via IPN.', 'invoicing'), wpinv_clean($posted['payment_status'])));
 
 	}
 
@@ -668,8 +668,8 @@ 
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 * @param array    $posted Posted data.
 	 */
-	protected function ipn_txn_cart( $invoice, $posted ) {
-		$this->ipn_txn_web_accept( $invoice, $posted );
+	protected function ipn_txn_cart($invoice, $posted) {
+		$this->ipn_txn_web_accept($invoice, $posted);
     }
 
     /**
@@ -678,39 +678,39 @@ 
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 * @param array    $posted Posted data.
 	 */
-	protected function ipn_txn_subscr_signup( $invoice, $posted ) {
+	protected function ipn_txn_subscr_signup($invoice, $posted) {
 
         // Make sure the invoice has a subscription.
-        $subscription = wpinv_get_subscription( $invoice );
+        $subscription = wpinv_get_subscription($invoice);
 
-        if ( empty( $subscription ) ) {
-            wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found' );
+        if (empty($subscription)) {
+            wpinv_error_log('Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found');
         }
 
         // Update the subscription ids.
         $subscription->update(
             array(
-                'profile_id' => sanitize_text_field( $posted['subscr_id'] ),
+                'profile_id' => sanitize_text_field($posted['subscr_id']),
             )
         );
 
         // Set the transaction id.
-        if ( ! empty( $posted['txn_id'] ) ) {
-            $invoice->set_transaction_id( $posted['txn_id'] );
+        if (!empty($posted['txn_id'])) {
+            $invoice->set_transaction_id($posted['txn_id']);
         }
 
         // Update the payment status.
         $invoice->mark_paid();
 
-        $invoice->add_note( sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ) , $posted['subscr_id'] ), false, false, true );
+        $invoice->add_note(sprintf(__('PayPal Subscription ID: %s', 'invoicing'), $posted['subscr_id']), false, false, true);
 
         // Update the subscription duration.
-        $duration = strtotime( $subscription->expiration ) - strtotime( $subscription->created );
+        $duration = strtotime($subscription->expiration) - strtotime($subscription->created);
         $subscription->update( 
             array(
                 'status'     => 'trialling' == $subscription->status ? 'trialling' : 'active',
-                'created'    => current_time( 'mysql' ),
-                'expiration' => date( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) ),
+                'created'    => current_time('mysql'),
+                'expiration' => date('Y-m-d H:i:s', (current_time('timestamp') + $duration)),
             )
         );
 
@@ -722,25 +722,25 @@ 
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 * @param array    $posted Posted data.
 	 */
-	protected function ipn_txn_subscr_payment( $invoice, $posted ) {
+	protected function ipn_txn_subscr_payment($invoice, $posted) {
 
         // Make sure the invoice has a subscription.
-        $subscription = wpinv_get_subscription( $invoice );
+        $subscription = wpinv_get_subscription($invoice);
 
-        if ( empty( $subscription ) ) {
-            wpinv_error_log( 'Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found' );
+        if (empty($subscription)) {
+            wpinv_error_log('Aborting, Subscription for the invoice ' . $invoice->get_id() . ' not found');
         }
 
-        $this->validate_ipn_currency( $invoice, $posted['mc_currency'] );
+        $this->validate_ipn_currency($invoice, $posted['mc_currency']);
 
         // Abort if the payment is already recorded.
-        if ( wpinv_get_id_by_transaction_id( $posted['txn_id'] ) ) {
+        if (wpinv_get_id_by_transaction_id($posted['txn_id'])) {
             return;
         }
 
         // Abort if this is the first payment.
-        if ( date( 'Ynd', $subscription->created ) == date( 'Ynd', strtotime( $posted['payment_date'] ) ) ) {
-            $invoice->set_transaction_id( $posted['txn_id'] );
+        if (date('Ynd', $subscription->created) == date('Ynd', strtotime($posted['payment_date']))) {
+            $invoice->set_transaction_id($posted['txn_id']);
             $invoice->save();
             return;
         }
@@ -751,14 +751,14 @@ 
             'gateway'        => $this->id,
         );
 
-        $invoice = wpinv_get_invoice( $subscription->add_payment( $args ) );
+        $invoice = wpinv_get_invoice($subscription->add_payment($args));
 
-        if ( empty( $invoice ) ) {
+        if (empty($invoice)) {
             return;
         }
 
-        $invoice->add_note( wp_sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $posted['txn_id'] ), false, false, true );
-        $invoice->add_note( wp_sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ) , $posted['subscr_id'] ), false, false, true );
+        $invoice->add_note(wp_sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $posted['txn_id']), false, false, true);
+        $invoice->add_note(wp_sprintf(__('PayPal Subscription ID: %s', 'invoicing'), $posted['subscr_id']), false, false, true);
 
         $subscription->renew();
 
@@ -770,9 +770,9 @@ 
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 * @param array    $posted Posted data.
 	 */
-	protected function ipn_txn_subscr_cancel( $invoice, $posted ) {
+	protected function ipn_txn_subscr_cancel($invoice, $posted) {
 
-        if ( $subscription = wpinv_get_subscription( $invoice ) ) {
+        if ($subscription = wpinv_get_subscription($invoice)) {
             $subscription->cancel();
         }
 
@@ -784,9 +784,9 @@ 
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 * @param array    $posted Posted data.
 	 */
-	protected function ipn_txn_subscr_eot( $invoice, $posted ) {
+	protected function ipn_txn_subscr_eot($invoice, $posted) {
 
-        if ( $subscription = wpinv_get_subscription( $invoice ) ) {
+        if ($subscription = wpinv_get_subscription($invoice)) {
             $subscription->complete();
         }
 
@@ -798,9 +798,9 @@ 
 	 * @param WPInv_Invoice $invoice  Invoice object.
 	 * @param array    $posted Posted data.
 	 */
-	protected function ipn_txn_subscr_failed( $invoice, $posted ) {
+	protected function ipn_txn_subscr_failed($invoice, $posted) {
 
-        if ( $subscription = wpinv_get_subscription( $invoice ) ) {
+        if ($subscription = wpinv_get_subscription($invoice)) {
             $subscription->failing();
         }
 
@@ -809,10 +809,10 @@ 
     /**
      * Displays a notice on the checkout page if sandbox is enabled.
      */
-    public function sandbox_notice( $description, $gateway ) {
-        if ( 'paypal' == $gateway && wpinv_is_test_mode( 'paypal' ) ) {
+    public function sandbox_notice($description, $gateway) {
+        if ('paypal' == $gateway && wpinv_is_test_mode('paypal')) {
             $description .= '<br>' . sprintf(
-                __( 'SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing' ),
+                __('SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing'),
                 '<a href="https://developer.paypal.com/docs/classic/lifecycle/ug_sandbox/">',
                 '</a>'
             );

includes/wpinv-item-functions.php

Spacing +264 added lines, -264 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( $field );
+    if ('id' == strtolower($field)) {
+        return wpinv_get_item_by_id($field);
     }
 
-    $id = WPInv_Item::get_item_id_by_field( $value, strtolower( $field ), $type );
-    return $id ? wpinv_get_item( $id ) : false;
+    $id = WPInv_Item::get_item_id_by_field($value, strtolower($field), $type);
+    return $id ? wpinv_get_item($id) : false;
 
 }
 
@@ -41,22 +41,22 @@ 
  * @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->get_id() ? $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' ),
+    $args = wp_parse_args($args, array(
+        'status'         => array('publish'),
+        'limit'          => get_option('posts_per_page'),
         'page'           => 1,
         'exclude'        => array(),
         'orderby'        => 'date',
@@ -65,7 +65,7 @@ 
         'meta_query'     => array(),
         'return'         => 'objects',
         'paginate'       => false,
-    ) );
+    ));
 
     $wp_query_args = array(
         'post_type'      => 'wpi_item',
@@ -75,26 +75,26 @@ 
         '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',
         );
     }
@@ -102,17 +102,17 @@ 
     $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,
@@ -124,12 +124,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();
 }
@@ -139,128 +139,128 @@ 
  * 
  * @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();
 }
 
-function wpinv_is_recurring_item( $item_id = 0 ) {
-    if( empty( $item_id ) ) {
+function wpinv_is_recurring_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_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( wpinv_format_amount( $price ) );
+    $price = wpinv_get_item_price($item_id);
+    $price = wpinv_price(wpinv_format_amount($price));
     
-    return apply_filters( 'wpinv_item_price', $price, $item_id );
+    return apply_filters('wpinv_item_price', $price, $item_id);
 }
 
-function wpinv_item_show_price( $item_id = 0, $echo = true ) {
-    if ( empty( $item_id ) ) {
+function wpinv_item_show_price($item_id = 0, $echo = true) {
+    if (empty($item_id)) {
         $item_id = get_the_ID();
     }
 
-    $price = wpinv_item_price( $item_id );
+    $price = wpinv_item_price($item_id);
 
-    $price           = apply_filters( 'wpinv_item_price', wpinv_sanitize_amount( $price ), $item_id );
+    $price           = apply_filters('wpinv_item_price', wpinv_sanitize_amount($price), $item_id);
     $formatted_price = '<span class="wpinv_price" id="wpinv_item_' . $item_id . '">' . $price . '</span>';
-    $formatted_price = apply_filters( 'wpinv_item_price_after_html', $formatted_price, $item_id, $price );
+    $formatted_price = apply_filters('wpinv_item_price_after_html', $formatted_price, $item_id, $price);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $formatted_price;
     } else {
         return $formatted_price;
     }
 }
 
-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_record_item_in_log( $item_id = 0, $file_id, $user_info, $ip, $invoice_id ) {
+function wpinv_record_item_in_log($item_id = 0, $file_id, $user_info, $ip, $invoice_id) {
     global $wpinv_logs;
     
-    if ( empty( $wpinv_logs ) ) {
+    if (empty($wpinv_logs)) {
         return false;
     }
 
@@ -269,278 +269,278 @@ 
         'log_type'		=> 'wpi_item'
     );
 
-    $user_id = isset( $user_info['user_id'] ) ? $user_info['user_id'] : (int) -1;
+    $user_id = isset($user_info['user_id']) ? $user_info['user_id'] : (int) -1;
 
     $log_meta = array(
         'user_info'	=> $user_info,
         'user_id'	=> $user_id,
-        'file_id'	=> (int)$file_id,
+        'file_id'	=> (int) $file_id,
         'ip'		=> $ip,
         'invoice_id'=> $invoice_id,
     );
 
-    $wpinv_logs->insert_log( $log_data, $log_meta );
+    $wpinv_logs->insert_log($log_data, $log_meta);
 }
 
-function wpinv_remove_item_logs_on_delete( $item_id = 0 ) {
-    if ( 'wpi_item' !== get_post_type( $item_id ) )
+function wpinv_remove_item_logs_on_delete($item_id = 0) {
+    if ('wpi_item' !== get_post_type($item_id))
         return;
 
     global $wpinv_logs;
     
-    if ( empty( $wpinv_logs ) ) {
+    if (empty($wpinv_logs)) {
         return false;
     }
 
     // Remove all log entries related to this item
-    $wpinv_logs->delete_logs( $item_id );
+    $wpinv_logs->delete_logs($item_id);
 }
-add_action( 'delete_post', 'wpinv_remove_item_logs_on_delete' );
+add_action('delete_post', 'wpinv_remove_item_logs_on_delete');
 
-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 ) {
-    if ( $post_ids ) {
-        $args = array( 'post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num, 'fields' => 'ids' );
+function wpinv_get_random_items($num = 3, $post_ids = true) {
+    if ($post_ids) {
+        $args = array('post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num, 'fields' => 'ids');
     } else {
-        $args = array( 'post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num );
+        $args = array('post_type' => 'wpi_item', 'orderby' => 'rand', 'post_count' => $num);
     }
     
-    $args  = apply_filters( 'wpinv_get_random_items', $args );
+    $args = apply_filters('wpinv_get_random_items', $args);
     
-    return get_posts( $args );
+    return get_posts($args);
 }
 
-function wpinv_get_item_token( $url = '' ) {
+function wpinv_get_item_token($url = '') {
     $args    = array();
-    $hash    = apply_filters( 'wpinv_get_url_token_algorithm', 'sha256' );
-    $secret  = apply_filters( 'wpinv_get_url_token_secret', hash( $hash, wp_salt() ) );
+    $hash    = apply_filters('wpinv_get_url_token_algorithm', 'sha256');
+    $secret  = apply_filters('wpinv_get_url_token_secret', hash($hash, wp_salt()));
 
-    $parts   = parse_url( $url );
+    $parts   = parse_url($url);
     $options = array();
 
-    if ( isset( $parts['query'] ) ) {
-        wp_parse_str( $parts['query'], $query_args );
+    if (isset($parts['query'])) {
+        wp_parse_str($parts['query'], $query_args);
 
-        if ( ! empty( $query_args['o'] ) ) {
-            $options = explode( ':', rawurldecode( $query_args['o'] ) );
+        if (!empty($query_args['o'])) {
+            $options = explode(':', rawurldecode($query_args['o']));
 
-            if ( in_array( 'ip', $options ) ) {
+            if (in_array('ip', $options)) {
                 $args['ip'] = wpinv_get_ip();
             }
 
-            if ( in_array( 'ua', $options ) ) {
+            if (in_array('ua', $options)) {
                 $ua = wpinv_get_user_agent();
-                $args['user_agent'] = rawurlencode( $ua );
+                $args['user_agent'] = rawurlencode($ua);
             }
         }
     }
 
-    $args = apply_filters( 'wpinv_get_url_token_args', $args, $url, $options );
+    $args = apply_filters('wpinv_get_url_token_args', $args, $url, $options);
 
     $args['secret'] = $secret;
     $args['token']  = false;
 
-    $url   = add_query_arg( $args, $url );
-    $parts = parse_url( $url );
+    $url   = add_query_arg($args, $url);
+    $parts = parse_url($url);
 
-    if ( ! isset( $parts['path'] ) ) {
+    if (!isset($parts['path'])) {
         $parts['path'] = '';
     }
 
-    $token = md5( $parts['path'] . '?' . $parts['query'] );
+    $token = md5($parts['path'] . '?' . $parts['query']);
 
     return $token;
 }
 
-function wpinv_validate_url_token( $url = '' ) {
+function wpinv_validate_url_token($url = '') {
     $ret   = false;
-    $parts = parse_url( $url );
+    $parts = parse_url($url);
 
-    if ( isset( $parts['query'] ) ) {
-        wp_parse_str( $parts['query'], $query_args );
+    if (isset($parts['query'])) {
+        wp_parse_str($parts['query'], $query_args);
 
-        $allowed = apply_filters( 'wpinv_url_token_allowed_params', array(
+        $allowed = apply_filters('wpinv_url_token_allowed_params', array(
             'item',
             'ttl',
             'token'
-        ) );
+        ));
 
         $remove = array();
 
-        foreach( $query_args as $key => $value ) {
-            if( false === in_array( $key, $allowed ) ) {
+        foreach ($query_args as $key => $value) {
+            if (false === in_array($key, $allowed)) {
                 $remove[] = $key;
             }
         }
 
-        if( ! empty( $remove ) ) {
-            $url = remove_query_arg( $remove, $url );
+        if (!empty($remove)) {
+            $url = remove_query_arg($remove, $url);
         }
 
-        if ( isset( $query_args['ttl'] ) && current_time( 'timestamp' ) > $query_args['ttl'] ) {
-            wp_die( apply_filters( 'wpinv_item_link_expired_text', __( 'Sorry but your item link has expired.', 'invoicing' ) ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+        if (isset($query_args['ttl']) && current_time('timestamp') > $query_args['ttl']) {
+            wp_die(apply_filters('wpinv_item_link_expired_text', __('Sorry but your item link has expired.', 'invoicing')), __('Error', 'invoicing'), array('response' => 403));
         }
 
-        if ( isset( $query_args['token'] ) && $query_args['token'] == wpinv_get_item_token( $url ) ) {
+        if (isset($query_args['token']) && $query_args['token'] == wpinv_get_item_token($url)) {
             $ret = true;
         }
 
     }
 
-    return apply_filters( 'wpinv_validate_url_token', $ret, $url, $query_args );
+    return apply_filters('wpinv_validate_url_token', $ret, $url, $query_args);
 }
 
-function wpinv_item_in_cart( $item_id = 0, $options = array() ) {
+function wpinv_item_in_cart($item_id = 0, $options = array()) {
     $cart_items = wpinv_get_cart_contents();
 
     $ret = false;
 
-    if ( is_array( $cart_items ) ) {
-        foreach ( $cart_items as $item ) {
-            if ( $item['id'] == $item_id ) {
+    if (is_array($cart_items)) {
+        foreach ($cart_items as $item) {
+            if ($item['id'] == $item_id) {
                 $ret = true;
                 break;
             }
         }
     }
 
-    return (bool) apply_filters( 'wpinv_item_in_cart', $ret, $item_id, $options );
+    return (bool) apply_filters('wpinv_item_in_cart', $ret, $item_id, $options);
 }
 
-function wpinv_get_cart_item_tax( $item_id = 0, $subtotal = '', $options = array() ) {
+function wpinv_get_cart_item_tax($item_id = 0, $subtotal = '', $options = array()) {
     $tax = 0;
-    if ( ! wpinv_item_is_tax_exclusive( $item_id ) ) {
-        $country = !empty( $_POST['country'] ) ? $_POST['country'] : false;
-        $state   = isset( $_POST['state'] ) ? $_POST['state'] : '';
+    if (!wpinv_item_is_tax_exclusive($item_id)) {
+        $country = !empty($_POST['country']) ? $_POST['country'] : false;
+        $state   = isset($_POST['state']) ? $_POST['state'] : '';
 
-        $tax = wpinv_calculate_tax( $subtotal, $country, $state, $item_id );
+        $tax = wpinv_calculate_tax($subtotal, $country, $state, $item_id);
     }
 
-    return apply_filters( 'wpinv_get_cart_item_tax', $tax, $item_id, $subtotal, $options );
+    return apply_filters('wpinv_get_cart_item_tax', $tax, $item_id, $subtotal, $options);
 }
 
-function wpinv_cart_item_price( $item, $currency = '' ) {
+function wpinv_cart_item_price($item, $currency = '') {
 
-    if( empty( $currency ) ) {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
 
-    $item_id    = isset( $item['id'] ) ? $item['id'] : 0;
-    $price      = isset( $item['item_price'] ) ? wpinv_round_amount( $item['item_price'] ) : 0;
-    $tax        = wpinv_price( wpinv_format_amount( $item['tax'] ) );
+    $item_id    = isset($item['id']) ? $item['id'] : 0;
+    $price      = isset($item['item_price']) ? wpinv_round_amount($item['item_price']) : 0;
+    $tax        = wpinv_price(wpinv_format_amount($item['tax']));
     
-    if ( !wpinv_is_free_item( $item_id ) && !wpinv_item_is_tax_exclusive( $item_id ) ) {
-        if ( wpinv_prices_show_tax_on_checkout() && !wpinv_prices_include_tax() ) {
+    if (!wpinv_is_free_item($item_id) && !wpinv_item_is_tax_exclusive($item_id)) {
+        if (wpinv_prices_show_tax_on_checkout() && !wpinv_prices_include_tax()) {
             $price += $tax;
         }
         
-        if( !wpinv_prices_show_tax_on_checkout() && wpinv_prices_include_tax() ) {
+        if (!wpinv_prices_show_tax_on_checkout() && wpinv_prices_include_tax()) {
             $price -= $tax;
         }        
     }
 
-    $price = wpinv_price( wpinv_format_amount( $price ), $currency );
+    $price = wpinv_price(wpinv_format_amount($price), $currency);
 
-    return apply_filters( 'wpinv_cart_item_price_label', $price, $item );
+    return apply_filters('wpinv_cart_item_price_label', $price, $item);
 }
 
-function wpinv_cart_item_subtotal( $item, $currency = '' ) {
+function wpinv_cart_item_subtotal($item, $currency = '') {
 
-    if( empty( $currency ) ) {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
 
-    $subtotal   = isset( $item['subtotal'] ) ? $item['subtotal'] : 0;
-    $subtotal   = wpinv_price( wpinv_format_amount( $subtotal ), $currency );
+    $subtotal   = isset($item['subtotal']) ? $item['subtotal'] : 0;
+    $subtotal   = wpinv_price(wpinv_format_amount($subtotal), $currency);
 
-    return apply_filters( 'wpinv_cart_item_subtotal_label', $subtotal, $item );
+    return apply_filters('wpinv_cart_item_subtotal_label', $subtotal, $item);
 }
 
-function wpinv_cart_item_tax( $item, $currency = '' ) {
+function wpinv_cart_item_tax($item, $currency = '') {
     $tax        = '';
     $tax_rate   = '';
 
-    if( empty( $currency ) ) {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
     
-    if ( isset( $item['tax'] ) && $item['tax'] > 0 && $item['subtotal'] > 0 ) {
-        $tax      = wpinv_price( wpinv_format_amount( $item['tax'] ), $currency );
-        $tax_rate = !empty( $item['vat_rate'] ) ? $item['vat_rate'] : ( $item['tax'] / $item['subtotal'] ) * 100;
-        $tax_rate = $tax_rate > 0 ? (float)wpinv_round_amount( $tax_rate, 4 ) : '';
+    if (isset($item['tax']) && $item['tax'] > 0 && $item['subtotal'] > 0) {
+        $tax      = wpinv_price(wpinv_format_amount($item['tax']), $currency);
+        $tax_rate = !empty($item['vat_rate']) ? $item['vat_rate'] : ($item['tax'] / $item['subtotal']) * 100;
+        $tax_rate = $tax_rate > 0 ? (float) wpinv_round_amount($tax_rate, 4) : '';
         $tax_rate = $tax_rate != '' ? ' <small class="tax-rate normal small">(' . $tax_rate . '%)</small>' : '';
     }
     
-    $tax        = $tax . $tax_rate;
+    $tax = $tax . $tax_rate;
     
-    if ( $tax === '' ) {
+    if ($tax === '') {
         $tax = 0; // Zero tax
     }
 
-    return apply_filters( 'wpinv_cart_item_tax_label', $tax, $item );
+    return apply_filters('wpinv_cart_item_tax_label', $tax, $item);
 }
 
-function wpinv_get_cart_item_price( $item_id = 0, $cart_item = array(), $options = array(), $remove_tax_from_inclusive = false ) {
+function wpinv_get_cart_item_price($item_id = 0, $cart_item = array(), $options = array(), $remove_tax_from_inclusive = false) {
     $price = 0;
     
     // Set custom price
-    if ( isset( $cart_item['custom_price'] ) && $cart_item['custom_price'] !== '' ) {
+    if (isset($cart_item['custom_price']) && $cart_item['custom_price'] !== '') {
         $price = $cart_item['custom_price'];
     } else {
-        $variable_prices = wpinv_has_variable_prices( $item_id );
+        $variable_prices = wpinv_has_variable_prices($item_id);
 
-        if ( $variable_prices ) {
-            $prices = wpinv_get_variable_prices( $item_id );
+        if ($variable_prices) {
+            $prices = wpinv_get_variable_prices($item_id);
 
-            if ( $prices ) {
-                if( ! empty( $options ) ) {
-                    $price = isset( $prices[ $options['price_id'] ] ) ? $prices[ $options['price_id'] ]['amount'] : false;
+            if ($prices) {
+                if (!empty($options)) {
+                    $price = isset($prices[$options['price_id']]) ? $prices[$options['price_id']]['amount'] : false;
                 } else {
                     $price = false;
                 }
             }
         }
 
-        if( ! $variable_prices || false === $price ) {
-            if($cart_item['item_price'] > 0){
+        if (!$variable_prices || false === $price) {
+            if ($cart_item['item_price'] > 0) {
                 $price = $cart_item['item_price'];
             } else {
                 // Get the standard Item price if not using variable prices
-                $price = wpinv_get_item_price( $item_id );
+                $price = wpinv_get_item_price($item_id);
             }
         }
     }
 
-    if ( $remove_tax_from_inclusive && wpinv_prices_include_tax() ) {
-        $price -= wpinv_get_cart_item_tax( $item_id, $price, $options );
+    if ($remove_tax_from_inclusive && wpinv_prices_include_tax()) {
+        $price -= wpinv_get_cart_item_tax($item_id, $price, $options);
     }
 
-    return apply_filters( 'wpinv_cart_item_price', $price, $item_id, $cart_item, $options, $remove_tax_from_inclusive );
+    return apply_filters('wpinv_cart_item_price', $price, $item_id, $cart_item, $options, $remove_tax_from_inclusive);
 }
 
-function wpinv_get_cart_item_price_id( $item = array() ) {
-    if( isset( $item['item_number'] ) ) {
-        $price_id = isset( $item['item_number']['options']['price_id'] ) ? $item['item_number']['options']['price_id'] : null;
+function wpinv_get_cart_item_price_id($item = array()) {
+    if (isset($item['item_number'])) {
+        $price_id = isset($item['item_number']['options']['price_id']) ? $item['item_number']['options']['price_id'] : null;
     } else {
-        $price_id = isset( $item['options']['price_id'] ) ? $item['options']['price_id'] : null;
+        $price_id = isset($item['options']['price_id']) ? $item['options']['price_id'] : null;
     }
     return $price_id;
 }
 
-function wpinv_get_cart_item_price_name( $item = array() ) {
-    $price_id = (int)wpinv_get_cart_item_price_id( $item );
-    $prices   = wpinv_get_variable_prices( $item['id'] );
-    $name     = ! empty( $prices[ $price_id ] ) ? $prices[ $price_id ]['name'] : '';
-    return apply_filters( 'wpinv_get_cart_item_price_name', $name, $item['id'], $price_id, $item );
+function wpinv_get_cart_item_price_name($item = array()) {
+    $price_id = (int) wpinv_get_cart_item_price_id($item);
+    $prices   = wpinv_get_variable_prices($item['id']);
+    $name     = !empty($prices[$price_id]) ? $prices[$price_id]['name'] : '';
+    return apply_filters('wpinv_get_cart_item_price_name', $name, $item['id'], $price_id, $item);
 }
 
-function wpinv_get_cart_item_name( $item = array() ) {
-    $item_title = !empty( $item['name'] ) ? $item['name'] : get_the_title( $item['id'] );
+function wpinv_get_cart_item_name($item = array()) {
+    $item_title = !empty($item['name']) ? $item['name'] : get_the_title($item['id']);
 
-    if ( empty( $item_title ) ) {
+    if (empty($item_title)) {
         $item_title = $item['id'];
     }
 
@@ -550,23 +550,23 @@ 
     }
     */
 
-    return apply_filters( 'wpinv_get_cart_item_name', $item_title, $item['id'], $item );
+    return apply_filters('wpinv_get_cart_item_name', $item_title, $item['id'], $item);
 }
 
-function wpinv_has_variable_prices( $item_id = 0 ) {
+function wpinv_has_variable_prices($item_id = 0) {
     return false;
 }
 
-function wpinv_get_item_position_in_cart( $item_id = 0, $options = array() ) {
+function wpinv_get_item_position_in_cart($item_id = 0, $options = array()) {
     $cart_items = wpinv_get_cart_contents();
 
-    if ( !is_array( $cart_items ) ) {
+    if (!is_array($cart_items)) {
         return false; // Empty cart
     } else {
-        foreach ( $cart_items as $position => $item ) {
-            if ( $item['id'] == $item_id ) {
-                if ( isset( $options['price_id'] ) && isset( $item['options']['price_id'] ) ) {
-                    if ( (int) $options['price_id'] == (int) $item['options']['price_id'] ) {
+        foreach ($cart_items as $position => $item) {
+            if ($item['id'] == $item_id) {
+                if (isset($options['price_id']) && isset($item['options']['price_id'])) {
+                    if ((int) $options['price_id'] == (int) $item['options']['price_id']) {
                         return $position;
                     }
                 } else {
@@ -579,80 +579,80 @@ 
     return false; // Not found
 }
 
-function wpinv_get_cart_item_quantity( $item ) {
-    if ( wpinv_item_quantities_enabled() ) {
-        $quantity = !empty( $item['quantity'] ) && (int)$item['quantity'] > 0 ? absint( $item['quantity'] ) : 1;
+function wpinv_get_cart_item_quantity($item) {
+    if (wpinv_item_quantities_enabled()) {
+        $quantity = !empty($item['quantity']) && (int) $item['quantity'] > 0 ? absint($item['quantity']) : 1;
     } else {
         $quantity = 1;
     }
     
-    if ( $quantity < 1 ) {
+    if ($quantity < 1) {
         $quantity = 1;
     }
     
-    return apply_filters( 'wpinv_get_cart_item_quantity', $quantity, $item );
+    return apply_filters('wpinv_get_cart_item_quantity', $quantity, $item);
 }
 
-function wpinv_get_item_suffix( $item, $html = true ) {
-    if ( empty( $item ) ) {
+function wpinv_get_item_suffix($item, $html = true) {
+    if (empty($item)) {
         return NULL;
     }
     
-    if ( is_int( $item ) ) {
-        $item = new WPInv_Item( $item );
+    if (is_int($item)) {
+        $item = new WPInv_Item($item);
     }
     
-    if ( !( is_object( $item ) && is_a( $item, 'WPInv_Item' ) ) ) {
+    if (!(is_object($item) && is_a($item, 'WPInv_Item'))) {
         return NULL;
     }
     
-    $suffix = $item->is_recurring() ? ' <span class="wpi-suffix">' . __( '(r)', 'invoicing' ) . '</span>' : '';
+    $suffix = $item->is_recurring() ? ' <span class="wpi-suffix">' . __('(r)', 'invoicing') . '</span>' : '';
     
-    if ( !$html && $suffix ) {
-        $suffix = strip_tags( $suffix );
+    if (!$html && $suffix) {
+        $suffix = strip_tags($suffix);
     }
     
-    return apply_filters( 'wpinv_get_item_suffix', $suffix, $item, $html );
+    return apply_filters('wpinv_get_item_suffix', $suffix, $item, $html);
 }
 
-function wpinv_remove_item( $item = 0, $force_delete = false ) {
-    if ( empty( $item ) ) {
+function wpinv_remove_item($item = 0, $force_delete = false) {
+    if (empty($item)) {
         return NULL;
     }
     
-    if ( is_int( $item ) ) {
-        $item = new WPInv_Item( $item );
+    if (is_int($item)) {
+        $item = new WPInv_Item($item);
     }
     
-    if ( !( is_object( $item ) && is_a( $item, 'WPInv_Item' ) ) ) {
+    if (!(is_object($item) && is_a($item, 'WPInv_Item'))) {
         return NULL;
     }
     
-    do_action( 'wpinv_pre_delete_item', $item );
+    do_action('wpinv_pre_delete_item', $item);
 
-    wp_delete_post( $item->ID, $force_delete );
+    wp_delete_post($item->ID, $force_delete);
 
-    do_action( 'wpinv_post_delete_item', $item );
+    do_action('wpinv_post_delete_item', $item);
 }
 
-function wpinv_can_delete_item( $post_id ) {
+function wpinv_can_delete_item($post_id) {
     $return = wpinv_current_user_can_manage_invoicing() ? true : false;
     
-    if ( $return && wpinv_item_in_use( $post_id ) ) {
+    if ($return && wpinv_item_in_use($post_id)) {
         $return = false; // Don't delete item already use in invoices.
     }
     
-    return apply_filters( 'wpinv_can_delete_item', $return, $post_id );
+    return apply_filters('wpinv_can_delete_item', $return, $post_id);
 }
 
 function wpinv_admin_action_delete() {
     $screen = get_current_screen();
     
-    if ( !empty( $screen->post_type ) && $screen->post_type == 'wpi_item' && !empty( $_REQUEST['post'] ) && is_array( $_REQUEST['post'] ) ) {
+    if (!empty($screen->post_type) && $screen->post_type == 'wpi_item' && !empty($_REQUEST['post']) && is_array($_REQUEST['post'])) {
         $post_ids = array();
         
-        foreach ( $_REQUEST['post'] as $post_id ) {
-            if ( !wpinv_can_delete_item( $post_id ) ) {
+        foreach ($_REQUEST['post'] as $post_id) {
+            if (!wpinv_can_delete_item($post_id)) {
                 continue;
             }
             
@@ -662,39 +662,39 @@ 
         $_REQUEST['post'] = $post_ids;
     }
 }
-add_action( 'admin_action_trash', 'wpinv_admin_action_delete', -10 );
-add_action( 'admin_action_delete', 'wpinv_admin_action_delete', -10 );
+add_action('admin_action_trash', 'wpinv_admin_action_delete', -10);
+add_action('admin_action_delete', 'wpinv_admin_action_delete', -10);
 
-function wpinv_check_delete_item( $check, $post, $force_delete ) {
-    if ( $post->post_type == 'wpi_item' ) {
-        if ( $force_delete && !wpinv_can_delete_item( $post->ID ) ) {
+function wpinv_check_delete_item($check, $post, $force_delete) {
+    if ($post->post_type == 'wpi_item') {
+        if ($force_delete && !wpinv_can_delete_item($post->ID)) {
             return true;
         }
     }
     
     return $check;
 }
-add_filter( 'pre_delete_post', 'wpinv_check_delete_item', 10, 3 );
+add_filter('pre_delete_post', 'wpinv_check_delete_item', 10, 3);
 
-function wpinv_item_in_use( $item_id ) {
+function wpinv_item_in_use($item_id) {
     global $wpdb, $wpi_items_in_use;
     
-    if ( !$item_id > 0 ) {
+    if (!$item_id > 0) {
         return false;
     }
     
-    if ( !empty( $wpi_items_in_use ) ) {
-        if ( isset( $wpi_items_in_use[$item_id] ) ) {
+    if (!empty($wpi_items_in_use)) {
+        if (isset($wpi_items_in_use[$item_id])) {
             return $wpi_items_in_use[$item_id];
         }
     } else {
         $wpi_items_in_use = array();
     }
     
-    $statuses   = array_keys( wpinv_get_invoice_statuses( true, true ) );
+    $statuses = array_keys(wpinv_get_invoice_statuses(true, true));
     
-    $query  = "SELECT p.ID FROM " . $wpdb->posts . " AS p INNER JOIN " . $wpdb->postmeta . " AS pm ON p.ID = pm.post_id WHERE p.post_type = 'wpi_invoice' AND p.post_status IN( '" . implode( "','", $statuses ) . "' ) AND pm.meta_key = '_wpinv_item_ids' AND FIND_IN_SET( '" . (int)$item_id . "', pm.meta_value )";
-    $in_use = $wpdb->get_var( $query ) > 0 ? true : false;
+    $query  = "SELECT p.ID FROM " . $wpdb->posts . " AS p INNER JOIN " . $wpdb->postmeta . " AS pm ON p.ID = pm.post_id WHERE p.post_type = 'wpi_invoice' AND p.post_status IN( '" . implode("','", $statuses) . "' ) AND pm.meta_key = '_wpinv_item_ids' AND FIND_IN_SET( '" . (int) $item_id . "', pm.meta_value )";
+    $in_use = $wpdb->get_var($query) > 0 ? true : false;
     
     $wpi_items_in_use[$item_id] = $in_use;
     
@@ -737,45 +737,45 @@ 
  * @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;
@@ -787,14 +787,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',
@@ -803,11 +803,11 @@ 
         'Y' => 'year',
     );
 
-    if ( ! isset( $periods[ $period ] ) ) {
+    if (!isset($periods[$period])) {
         $period = 'D';
     }
 
-    return $full ? $periods[ $period ] : $period;
+    return $full ? $periods[$period] : $period;
 
 }
 
@@ -816,51 +816,51 @@ 
  * 
  * @param WPInv_Item $item
  */
-function getpaid_item_recurring_price_help_text( $item, $currency = '' ) {
+function getpaid_item_recurring_price_help_text($item, $currency = '') {
 
     // Abort if it is not recurring.
-    if ( ! $item->is_recurring() ) {
+    if (!$item->is_recurring()) {
         return '';
     }
 
-    $initial_price   = wpinv_price( wpinv_sanitize_amount( $item->get_initial_price() ), $currency );
-    $recurring_price = wpinv_price( wpinv_sanitize_amount( $item->get_recurring_price() ), $currency );
-    $period          = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->get_recurring_period(), $item->get_recurring_interval() );
-    $period          = str_replace( '1 ', '', strtolower( $period ) );
+    $initial_price   = wpinv_price(wpinv_sanitize_amount($item->get_initial_price()), $currency);
+    $recurring_price = wpinv_price(wpinv_sanitize_amount($item->get_recurring_price()), $currency);
+    $period          = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency($item->get_recurring_period(), $item->get_recurring_interval());
+    $period          = str_replace('1 ', '', strtolower($period));
 
     // For free trial items.
-    if ( $item->has_free_trial() ) {
-        $trial_period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->get_trial_period(), $item->get_trial_interval() );
+    if ($item->has_free_trial()) {
+        $trial_period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency($item->get_trial_period(), $item->get_trial_interval());
 
-        if ( 0 == $item->get_initial_price() ) {
+        if (0 == $item->get_initial_price()) {
             return sprintf(
-                __( 'Free for %s then %s every %s', 'invoicing' ),
-                strtolower( $trial_period ),
+                __('Free for %s then %s every %s', 'invoicing'),
+                strtolower($trial_period),
                 $recurring_price,
                 $period
             );
         }
 
         return sprintf(
-            __( '%s for %s then %s every %s', 'invoicing' ),
+            __('%s for %s then %s every %s', 'invoicing'),
             $initial_price,
-            strtolower( $trial_period ),
+            strtolower($trial_period),
             $recurring_price,
             $period
         );
 
     }
 
-    if ( $initial_price == $recurring_price ) {
+    if ($initial_price == $recurring_price) {
         return sprintf(
-            __( '%s every %s', 'invoicing' ),
+            __('%s every %s', 'invoicing'),
             $recurring_price,
             $period
         );
     }
 
     return sprintf(
-        __( '%s for %s then %s every %s', 'invoicing' ),
+        __('%s for %s then %s every %s', 'invoicing'),
         $initial_price,
         $period,
         $recurring_price,

Braces +3 added lines, -2 removed lines

@@ -283,8 +283,9 @@
 }
 
 function wpinv_remove_item_logs_on_delete( $item_id = 0 ) {
-    if ( 'wpi_item' !== get_post_type( $item_id ) )
-        return;
+    if ( 'wpi_item' !== get_post_type( $item_id ) ) {
+            return;
+    }
 
     global $wpinv_logs;
     

includes/class-wpinv-item.php

Indentation +701 added lines, -701 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -10,30 +10,30 @@ 
 class WPInv_Item  extends GetPaid_Data {
 
     /**
-	 * Which data store to load.
-	 *
-	 * @var string
-	 */
+     * Which data store to load.
+     *
+     * @var string
+     */
     protected $data_store_name = 'item';
 
     /**
-	 * This is the name of this object type.
-	 *
-	 * @var string
-	 */
-	protected $object_type = 'item';
+     * This is the name of this object type.
+     *
+     * @var string
+     */
+    protected $object_type = 'item';
 
     /**
-	 * Item Data array. This is the core item data exposed in APIs.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $data = array(
-		'parent_id'            => 0,
-		'status'               => 'draft',
-		'version'              => '',
-		'date_created'         => null,
+     * Item Data array. This is the core item data exposed in APIs.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $data = array(
+        'parent_id'            => 0,
+        'status'               => 'draft',
+        'version'              => '',
+        'date_created'         => null,
         'date_modified'        => null,
         'name'                 => '',
         'description'          => '',
@@ -58,13 +58,13 @@ 
     );
 
     /**
-	 * Stores meta in cache for future reads.
-	 *
-	 * A group must be set to to enable caching.
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'getpaid_items';
+     * Stores meta in cache for future reads.
+     *
+     * A group must be set to to enable caching.
+     *
+     * @var string
+     */
+    protected $cache_group = 'getpaid_items';
 
     /**
      * Stores a reference to the original WP_Post object
@@ -74,37 +74,37 @@ 
     protected $post = null;
 
     /**
-	 * Get the item if ID is passed, otherwise the item is new and empty.
-	 *
-	 * @param  int|object|WPInv_Item|WP_Post $item Item to read.
-	 */
-	public function __construct( $item = 0 ) {
-		parent::__construct( $item );
-
-		if ( ! empty( $item ) && is_numeric( $item ) && 'wpi_item' == get_post_type( $item ) ) {
-			$this->set_id( $item );
-		} elseif ( $item instanceof self ) {
-			$this->set_id( $item->get_id() );
-		} elseif ( ! empty( $item->ID ) ) {
-			$this->set_id( $item->ID );
-		} elseif ( is_scalar( $item ) && $item_id = self::get_item_id_by_field( $item, 'custom_id' ) ) {
-			$this->set_id( $item_id );
-		} elseif ( is_scalar( $item ) && $item_id = self::get_item_id_by_field( $item, 'name' ) ) {
-			$this->set_id( $item_id );
-		} else {
-			$this->set_object_read( true );
-		}
+     * Get the item if ID is passed, otherwise the item is new and empty.
+     *
+     * @param  int|object|WPInv_Item|WP_Post $item Item to read.
+     */
+    public function __construct( $item = 0 ) {
+        parent::__construct( $item );
+
+        if ( ! empty( $item ) && is_numeric( $item ) && 'wpi_item' == get_post_type( $item ) ) {
+            $this->set_id( $item );
+        } elseif ( $item instanceof self ) {
+            $this->set_id( $item->get_id() );
+        } elseif ( ! empty( $item->ID ) ) {
+            $this->set_id( $item->ID );
+        } elseif ( is_scalar( $item ) && $item_id = self::get_item_id_by_field( $item, 'custom_id' ) ) {
+            $this->set_id( $item_id );
+        } elseif ( is_scalar( $item ) && $item_id = self::get_item_id_by_field( $item, 'name' ) ) {
+            $this->set_id( $item_id );
+        } else {
+            $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 ) {
+        if ( $this->get_id() > 0 ) {
             $this->post = get_post( $this->get_id() );
             $this->ID   = $this->get_id();
-			$this->data_store->read( $this );
+            $this->data_store->read( $this );
         }
 
-	}
+    }
 
     /*
 	|--------------------------------------------------------------------------
@@ -122,379 +122,379 @@ 
     */
 
     /**
-	 * Get parent item ID.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_parent_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'parent_id', $context );
+     * Get parent item ID.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_parent_id( $context = 'view' ) {
+        return (int) $this->get_prop( 'parent_id', $context );
     }
 
     /**
-	 * Get item 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 item 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 plugin version when the item was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_version( $context = 'view' ) {
-		return $this->get_prop( 'version', $context );
+     * Get plugin version when the item was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_version( $context = 'view' ) {
+        return $this->get_prop( 'version', $context );
     }
 
     /**
-	 * Get date when the item was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_prop( 'date_created', $context );
+     * Get date when the item was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created( $context = 'view' ) {
+        return $this->get_prop( 'date_created', $context );
     }
 
     /**
-	 * Get GMT date when the item was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created_gmt( $context = 'view' ) {
+     * Get GMT date when the item 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;
+        return $date;
     }
 
     /**
-	 * Get date when the item was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_modified( $context = 'view' ) {
-		return $this->get_prop( 'date_modified', $context );
+     * Get date when the item was last modified.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_modified( $context = 'view' ) {
+        return $this->get_prop( 'date_modified', $context );
     }
 
     /**
-	 * Get GMT date when the item was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_modified_gmt( $context = 'view' ) {
+     * Get GMT date when the item was last modified.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_modified_gmt( $context = 'view' ) {
         $date = $this->get_date_modified( $context );
 
         if ( $date ) {
             $date = get_gmt_from_date( $date );
         }
-		return $date;
+        return $date;
     }
 
     /**
-	 * Get the item name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_name( $context = 'view' ) {
-		return $this->get_prop( 'name', $context );
+     * Get the item name.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_name( $context = 'view' ) {
+        return $this->get_prop( 'name', $context );
     }
 
     /**
-	 * Alias of self::get_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_title( $context = 'view' ) {
-		return $this->get_name( $context );
+     * Alias of self::get_name().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_title( $context = 'view' ) {
+        return $this->get_name( $context );
     }
 
     /**
-	 * Get the item description.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_description( $context = 'view' ) {
-		return $this->get_prop( 'description', $context );
+     * Get the item description.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_description( $context = 'view' ) {
+        return $this->get_prop( 'description', $context );
     }
 
     /**
-	 * Alias of self::get_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_excerpt( $context = 'view' ) {
-		return $this->get_description( $context );
+     * Alias of self::get_description().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_excerpt( $context = 'view' ) {
+        return $this->get_description( $context );
     }
 
     /**
-	 * Alias of self::get_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_summary( $context = 'view' ) {
-		return $this->get_description( $context );
+     * Alias of self::get_description().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_summary( $context = 'view' ) {
+        return $this->get_description( $context );
     }
 
     /**
-	 * Get the owner of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_author( $context = 'view' ) {
-		return (int) $this->get_prop( 'author', $context );
+     * Get the owner of the item.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_author( $context = 'view' ) {
+        return (int) $this->get_prop( 'author', $context );
     }
 
     /**
-	 * Get the price of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_price( $context = 'view' ) {
+     * Get the price of the item.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_price( $context = 'view' ) {
         return wpinv_sanitize_amount( $this->get_prop( 'price', $context ) );
-	}
+    }
 	
-	/**
-	 * Get the inital price of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_initial_price( $context = 'view' ) {
+    /**
+     * Get the inital price of the item.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_initial_price( $context = 'view' ) {
 
-		$price = (float) $this->get_price( $context );
+        $price = (float) $this->get_price( $context );
 
-		if ( $this->has_free_trial() ) {
-			$price = 0;
-		}
+        if ( $this->has_free_trial() ) {
+            $price = 0;
+        }
 
         return wpinv_sanitize_amount( apply_filters( 'wpinv_get_initial_item_price', $price, $this ) );
     }
 
     /**
-	 * Returns a formated price.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
+     * Returns a formated price.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
     public function get_the_price() {
         return wpinv_price( wpinv_format_amount( $this->get_price() ) );
-	}
-
-	/**
-	 * Returns the formated initial price.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
+    }
+
+    /**
+     * Returns the formated initial price.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
     public function get_the_initial_price() {
         return wpinv_price( wpinv_format_amount( $this->get_initial_price() ) );
     }
 
     /**
-	 * Get the VAT rule of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_vat_rule( $context = 'view' ) {
+     * Get the VAT rule of the item.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_vat_rule( $context = 'view' ) {
         return $this->get_prop( 'vat_rule', $context );
     }
 
     /**
-	 * Get the VAT class of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_vat_class( $context = 'view' ) {
+     * Get the VAT class of the item.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_vat_class( $context = 'view' ) {
         return $this->get_prop( 'vat_class', $context );
     }
 
     /**
-	 * Get the type of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_type( $context = 'view' ) {
+     * Get the type of the item.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_type( $context = 'view' ) {
         return $this->get_prop( 'type', $context );
     }
 
     /**
-	 * Get the custom id of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_custom_id( $context = 'view' ) {
+     * Get the custom id of the item.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_custom_id( $context = 'view' ) {
         return $this->get_prop( 'custom_id', $context );
     }
 
     /**
-	 * Get the custom name of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_custom_name( $context = 'view' ) {
+     * Get the custom name of the item.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_custom_name( $context = 'view' ) {
         return $this->get_prop( 'custom_name', $context );
     }
 
     /**
-	 * Get the custom singular name of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_custom_singular_name( $context = 'view' ) {
+     * Get the custom singular name of the item.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_custom_singular_name( $context = 'view' ) {
         return $this->get_prop( 'custom_singular_name', $context );
     }
 
     /**
-	 * Checks if an item is editable..
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_is_editable( $context = 'view' ) {
+     * Checks if an item is editable..
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_is_editable( $context = 'view' ) {
         return (int) $this->get_prop( 'is_editable', $context );
     }
 
     /**
-	 * Alias of self::get_is_editable().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_editable( $context = 'view' ) {
-		return $this->get_is_editable( $context );
+     * Alias of self::get_is_editable().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_editable( $context = 'view' ) {
+        return $this->get_is_editable( $context );
     }
 
     /**
-	 * Checks if dynamic pricing is enabled.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_is_dynamic_pricing( $context = 'view' ) {
+     * Checks if dynamic pricing is enabled.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_is_dynamic_pricing( $context = 'view' ) {
         return (int) $this->get_prop( 'is_dynamic_pricing', $context );
     }
 
     /**
-	 * Returns the minimum price if dynamic pricing is enabled.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_minimum_price( $context = 'view' ) {
+     * Returns the minimum price if dynamic pricing is enabled.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_minimum_price( $context = 'view' ) {
         return wpinv_sanitize_amount( $this->get_prop( 'minimum_price', $context ) );
     }
 
     /**
-	 * Checks if this is a recurring item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_is_recurring( $context = 'view' ) {
+     * Checks if this is a recurring item.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_is_recurring( $context = 'view' ) {
         return (int) $this->get_prop( 'is_recurring', $context );
-	}
+    }
 	
-	/**
-	 * Get the recurring price of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_recurring_price( $context = 'view' ) {
-		$price = $this->get_price( $context );
+    /**
+     * Get the recurring price of the item.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_recurring_price( $context = 'view' ) {
+        $price = $this->get_price( $context );
         return wpinv_sanitize_amount( apply_filters( 'wpinv_get_recurring_item_price', $price, $this->ID ) );
-	}
-
-	/**
-	 * Get the first renewal date (in timestamps) of the item.
-	 *
-	 * @since 1.0.19
-	 * @return int
-	 */
-	public function get_first_renewal_date() {
-
-		$periods = array(
-			'D' => 'days',
-			'W' => 'weeks',
-			'M' => 'months',
-			'Y' => 'years',
-		);
-
-		$period   = $this->get_recurring_period();
-		$interval = $this->get_recurring_interval();
-
-		if ( $this->has_free_trial() ) {
-			$period   = $this->get_trial_period();
-			$interval = $this->get_trial_interval();
-		}
-
-		$period       = $periods[ $period ];
-		$interval     = empty( $interval ) ? 1 : $interval;
-		$next_renewal = strtotime( "+$interval $period", current_time( 'timestamp' ) );
+    }
+
+    /**
+     * Get the first renewal date (in timestamps) of the item.
+     *
+     * @since 1.0.19
+     * @return int
+     */
+    public function get_first_renewal_date() {
+
+        $periods = array(
+            'D' => 'days',
+            'W' => 'weeks',
+            'M' => 'months',
+            'Y' => 'years',
+        );
+
+        $period   = $this->get_recurring_period();
+        $interval = $this->get_recurring_interval();
+
+        if ( $this->has_free_trial() ) {
+            $period   = $this->get_trial_period();
+            $interval = $this->get_trial_interval();
+        }
+
+        $period       = $periods[ $period ];
+        $interval     = empty( $interval ) ? 1 : $interval;
+        $next_renewal = strtotime( "+$interval $period", current_time( 'timestamp' ) );
         return apply_filters( 'wpinv_get_first_renewal_date', $next_renewal, $this );
     }
 
     /**
-	 * Get the recurring period.
-	 *
-	 * @since 1.0.19
-	 * @param  bool $full Return abbreviation or in full.
-	 * @return string
-	 */
-	public function get_recurring_period( $full = false ) {
+     * Get the recurring period.
+     *
+     * @since 1.0.19
+     * @param  bool $full Return abbreviation or in full.
+     * @return string
+     */
+    public function get_recurring_period( $full = false ) {
         $period = $this->get_prop( 'recurring_period', 'view' );
 
         if ( $full && ! is_bool( $full ) ) {
@@ -505,63 +505,63 @@ 
     }
 
     /**
-	 * Get the recurring interval.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_recurring_interval( $context = 'view' ) {
-		$interval = absint( $this->get_prop( 'recurring_interval', $context ) );
+     * Get the recurring interval.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_recurring_interval( $context = 'view' ) {
+        $interval = absint( $this->get_prop( 'recurring_interval', $context ) );
 
-		if ( $interval < 1 ) {
-			$interval = 1;
-		}
+        if ( $interval < 1 ) {
+            $interval = 1;
+        }
 
         return $interval;
     }
 
     /**
-	 * Get the recurring limit.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_recurring_limit( $context = 'view' ) {
+     * Get the recurring limit.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_recurring_limit( $context = 'view' ) {
         return (int) $this->get_prop( 'recurring_limit', $context );
     }
 
     /**
-	 * Checks if we have a free trial.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_is_free_trial( $context = 'view' ) {
+     * Checks if we have a free trial.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_is_free_trial( $context = 'view' ) {
         return (int) $this->get_prop( 'is_free_trial', $context );
     }
 
     /**
-	 * Alias for self::get_is_free_trial().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_free_trial( $context = 'view' ) {
+     * Alias for self::get_is_free_trial().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_free_trial( $context = 'view' ) {
         return $this->get_is_free_trial( $context );
     }
 
     /**
-	 * Get the trial period.
-	 *
-	 * @since 1.0.19
-	 * @param  bool $full Return abbreviation or in full.
-	 * @return string
-	 */
-	public function get_trial_period( $full = false ) {
+     * Get the trial period.
+     *
+     * @since 1.0.19
+     * @param  bool $full Return abbreviation or in full.
+     * @return string
+     */
+    public function get_trial_period( $full = false ) {
         $period = $this->get_prop( 'trial_period', 'view' );
 
         if ( $full && ! is_bool( $full ) ) {
@@ -572,104 +572,104 @@ 
     }
 
     /**
-	 * Get the trial interval.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_trial_interval( $context = 'view' ) {
+     * Get the trial interval.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_trial_interval( $context = 'view' ) {
         return (int) $this->get_prop( 'trial_interval', $context );
-	}
+    }
 	
-	/**
-	 * Get the item's edit url.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_edit_url() {
+    /**
+     * Get the item's edit url.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_edit_url() {
         return get_edit_post_link( $this->get_id() );
-	}
-
-	/**
-	 * Given an item's name/custom id, it returns its id.
-	 *
-	 *
-	 * @static
-	 * @param string $value The item name or custom id.
-	 * @param string $field Either name or custom_id.
-	 * @param string $type in case you need to search for a given type.
-	 * @since 1.0.15
-	 * @return int
-	 */
-	public static function get_item_id_by_field( $value, $field = 'custom_id', $type = '' ) {
-
-		// Trim the value.
-		$value = trim( $value );
-
-		if ( empty( $value ) ) {
-			return 0;
-		}
+    }
+
+    /**
+     * Given an item's name/custom id, it returns its id.
+     *
+     *
+     * @static
+     * @param string $value The item name or custom id.
+     * @param string $field Either name or custom_id.
+     * @param string $type in case you need to search for a given type.
+     * @since 1.0.15
+     * @return int
+     */
+    public static function get_item_id_by_field( $value, $field = 'custom_id', $type = '' ) {
+
+        // Trim the value.
+        $value = trim( $value );
+
+        if ( empty( $value ) ) {
+            return 0;
+        }
 
         // Valid fields.
         $fields = array( 'custom_id', 'name', 'slug' );
 
-		// Ensure a field has been passed.
-		if ( empty( $field ) || ! in_array( $field, $fields ) ) {
-			return 0;
-		}
-
-		if ( $field == 'name' ) {
-			$field = 'slug';
-		} 
-
-		// Maybe retrieve from the cache.
-		$item_id = wp_cache_get( $value, "getpaid_{$type}_item_{$field}s_to_item_ids" );
-		if ( ! empty( $item_id ) ) {
-			return $item_id;
-		}
-
-		// Fetch from the db.
-		if ( $field =='slug' ) {
-			$items = get_posts(
-				array(
-					'post_type'      => 'wpi_item',
-					'name'           => $value,
-					'posts_per_page' => 1,
-					'post_status'    => 'any',
-				)
-			);
-		}
-
-		if ( $field =='custom_id' ) {
-			$items = get_posts(
-				array(
-					'post_type'      => 'wpi_item',
-					'posts_per_page' => 1,
-					'post_status'    => 'any',
-					'meta_query'     => array(
-						array(
-							'key'   => '_wpinv_type',
-                			'value' => $type,
-						),
-						array(
-							'key'   => '_wpinv_custom_id',
-                			'value' => $type,
-						)
-					)
-				)
-			);
-		}
-
-		if ( empty( $items ) ) {
-			return 0;
-		}
-
-		// Update the cache with our data
-		wp_cache_set( $value, $items[0]->ID, "getpaid_{$type}_item_{$field}s_to_item_ids" );
-
-		return $items[0]->ID;
+        // Ensure a field has been passed.
+        if ( empty( $field ) || ! in_array( $field, $fields ) ) {
+            return 0;
+        }
+
+        if ( $field == 'name' ) {
+            $field = 'slug';
+        } 
+
+        // Maybe retrieve from the cache.
+        $item_id = wp_cache_get( $value, "getpaid_{$type}_item_{$field}s_to_item_ids" );
+        if ( ! empty( $item_id ) ) {
+            return $item_id;
+        }
+
+        // Fetch from the db.
+        if ( $field =='slug' ) {
+            $items = get_posts(
+                array(
+                    'post_type'      => 'wpi_item',
+                    'name'           => $value,
+                    'posts_per_page' => 1,
+                    'post_status'    => 'any',
+                )
+            );
+        }
+
+        if ( $field =='custom_id' ) {
+            $items = get_posts(
+                array(
+                    'post_type'      => 'wpi_item',
+                    'posts_per_page' => 1,
+                    'post_status'    => 'any',
+                    'meta_query'     => array(
+                        array(
+                            'key'   => '_wpinv_type',
+                            'value' => $type,
+                        ),
+                        array(
+                            'key'   => '_wpinv_custom_id',
+                            'value' => $type,
+                        )
+                    )
+                )
+            );
+        }
+
+        if ( empty( $items ) ) {
+            return 0;
+        }
+
+        // Update the cache with our data
+        wp_cache_set( $value, $items[0]->ID, "getpaid_{$type}_item_{$field}s_to_item_ids" );
+
+        return $items[0]->ID;
     }
 
     /**
@@ -702,52 +702,52 @@ 
     */
 
     /**
-	 * Set parent order ID.
-	 *
-	 * @since 1.0.19
-	 */
-	public function set_parent_id( $value ) {
-		if ( $value && ( $value === $this->get_id() || ! get_post( $value ) ) ) {
-			return;
-		}
-		$this->set_prop( 'parent_id', absint( $value ) );
-	}
-
-    /**
-	 * Sets item status.
-	 *
-	 * @since 1.0.19
-	 * @param  string $status New status.
-	 * @return array details of change.
-	 */
-	public function set_status( $status ) {
+     * Set parent order ID.
+     *
+     * @since 1.0.19
+     */
+    public function set_parent_id( $value ) {
+        if ( $value && ( $value === $this->get_id() || ! get_post( $value ) ) ) {
+            return;
+        }
+        $this->set_prop( 'parent_id', absint( $value ) );
+    }
+
+    /**
+     * Sets item status.
+     *
+     * @since 1.0.19
+     * @param  string $status New status.
+     * @return array details of change.
+     */
+    public function set_status( $status ) {
         $old_status = $this->get_status();
 
         $this->set_prop( 'status', $status );
 
-		return array(
-			'from' => $old_status,
-			'to'   => $status,
-		);
+        return array(
+            'from' => $old_status,
+            'to'   => $status,
+        );
     }
 
     /**
-	 * Set plugin version when the item was created.
-	 *
-	 * @since 1.0.19
-	 */
-	public function set_version( $value ) {
-		$this->set_prop( 'version', $value );
+     * Set plugin version when the item was created.
+     *
+     * @since 1.0.19
+     */
+    public function set_version( $value ) {
+        $this->set_prop( 'version', $value );
     }
 
     /**
-	 * Set date when the item was created.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date when the item was created.
+     *
+     * @since 1.0.19
+     * @param string $value Value to set.
      * @return bool Whether or not the date was set.
-	 */
-	public function set_date_created( $value ) {
+     */
+    public function set_date_created( $value ) {
         $date = strtotime( $value );
 
         if ( $date ) {
@@ -760,13 +760,13 @@ 
     }
 
     /**
-	 * Set date when the item was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date when the item was last modified.
+     *
+     * @since 1.0.19
+     * @param string $value Value to set.
      * @return bool Whether or not the date was set.
-	 */
-	public function set_date_modified( $value ) {
+     */
+    public function set_date_modified( $value ) {
         $date = strtotime( $value );
 
         if ( $date ) {
@@ -779,105 +779,105 @@ 
     }
 
     /**
-	 * Set the item name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_name( $value ) {
+     * Set the item name.
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_name( $value ) {
         $name = sanitize_text_field( $value );
-		$this->set_prop( 'name', $name );
+        $this->set_prop( 'name', $name );
     }
 
     /**
-	 * Alias of self::set_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_title( $value ) {
-		$this->set_name( $value );
+     * Alias of self::set_name().
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_title( $value ) {
+        $this->set_name( $value );
     }
 
     /**
-	 * Set the item description.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New description.
-	 */
-	public function set_description( $value ) {
+     * Set the item description.
+     *
+     * @since 1.0.19
+     * @param  string $value New description.
+     */
+    public function set_description( $value ) {
         $description = wp_kses_post( $value );
-		return $this->set_prop( 'description', $description );
+        return $this->set_prop( 'description', $description );
     }
 
     /**
-	 * Alias of self::set_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New description.
-	 */
-	public function set_excerpt( $value ) {
-		$this->set_description( $value );
+     * Alias of self::set_description().
+     *
+     * @since 1.0.19
+     * @param  string $value New description.
+     */
+    public function set_excerpt( $value ) {
+        $this->set_description( $value );
     }
 
     /**
-	 * Alias of self::set_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New description.
-	 */
-	public function set_summary( $value ) {
-		$this->set_description( $value );
+     * Alias of self::set_description().
+     *
+     * @since 1.0.19
+     * @param  string $value New description.
+     */
+    public function set_summary( $value ) {
+        $this->set_description( $value );
     }
 
     /**
-	 * Set the owner of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value New author.
-	 */
-	public function set_author( $value ) {
-		$this->set_prop( 'author', (int) $value );
+     * Set the owner of the item.
+     *
+     * @since 1.0.19
+     * @param  int $value New author.
+     */
+    public function set_author( $value ) {
+        $this->set_prop( 'author', (int) $value );
     }
 
     /**
-	 * Set the price of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value New price.
-	 */
-	public function set_price( $value ) {
+     * Set the price of the item.
+     *
+     * @since 1.0.19
+     * @param  float $value New price.
+     */
+    public function set_price( $value ) {
         $this->set_prop( 'price', (float) wpinv_sanitize_amount( $value ) );
     }
 
     /**
-	 * Set the VAT rule of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value new rule.
-	 */
-	public function set_vat_rule( $value ) {
+     * Set the VAT rule of the item.
+     *
+     * @since 1.0.19
+     * @param  string $value new rule.
+     */
+    public function set_vat_rule( $value ) {
         $this->set_prop( 'vat_rule', $value );
     }
 
     /**
-	 * Set the VAT class of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value new class.
-	 */
-	public function set_vat_class( $value ) {
+     * Set the VAT class of the item.
+     *
+     * @since 1.0.19
+     * @param  string $value new class.
+     */
+    public function set_vat_class( $value ) {
         $this->set_prop( 'vat_class', $value );
     }
 
     /**
-	 * Set the type of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value new item type.
-	 * @return string
-	 */
-	public function set_type( $value ) {
+     * Set the type of the item.
+     *
+     * @since 1.0.19
+     * @param  string $value new item type.
+     * @return string
+     */
+    public function set_type( $value ) {
 
         if ( empty( $value ) ) {
             $value = 'custom';
@@ -887,134 +887,134 @@ 
     }
 
     /**
-	 * Set the custom id of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value new custom id.
-	 */
-	public function set_custom_id( $value ) {
+     * Set the custom id of the item.
+     *
+     * @since 1.0.19
+     * @param  string $value new custom id.
+     */
+    public function set_custom_id( $value ) {
         $this->set_prop( 'custom_id', $value );
     }
 
     /**
-	 * Set the custom name of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value new custom name.
-	 */
-	public function set_custom_name( $value ) {
+     * Set the custom name of the item.
+     *
+     * @since 1.0.19
+     * @param  string $value new custom name.
+     */
+    public function set_custom_name( $value ) {
         $this->set_prop( 'custom_name', $value );
     }
 
     /**
-	 * Set the custom singular name of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value new custom singular name.
-	 */
-	public function set_custom_singular_name( $value ) {
+     * Set the custom singular name of the item.
+     *
+     * @since 1.0.19
+     * @param  string $value new custom singular name.
+     */
+    public function set_custom_singular_name( $value ) {
         $this->set_prop( 'custom_singular_name', $value );
     }
 
     /**
-	 * Sets if an item is editable..
-	 *
-	 * @since 1.0.19
-	 * @param  int|bool $value whether or not the item is editable.
-	 */
-	public function set_is_editable( $value ) {
-		if ( is_numeric( $value ) ) {
-			$this->set_prop( 'is_editable', (int) $value );
-		}
+     * Sets if an item is editable..
+     *
+     * @since 1.0.19
+     * @param  int|bool $value whether or not the item is editable.
+     */
+    public function set_is_editable( $value ) {
+        if ( is_numeric( $value ) ) {
+            $this->set_prop( 'is_editable', (int) $value );
+        }
     }
 
     /**
-	 * Sets if dynamic pricing is enabled.
-	 *
-	 * @since 1.0.19
-	 * @param  int|bool $value whether or not dynamic pricing is allowed.
-	 */
-	public function set_is_dynamic_pricing( $value ) {
+     * Sets if dynamic pricing is enabled.
+     *
+     * @since 1.0.19
+     * @param  int|bool $value whether or not dynamic pricing is allowed.
+     */
+    public function set_is_dynamic_pricing( $value ) {
         $this->set_prop( 'is_dynamic_pricing', (int) $value );
     }
 
     /**
-	 * Sets the minimum price if dynamic pricing is enabled.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value minimum price.
-	 */
-	public function set_minimum_price( $value ) {
+     * Sets the minimum price if dynamic pricing is enabled.
+     *
+     * @since 1.0.19
+     * @param  float $value minimum price.
+     */
+    public function set_minimum_price( $value ) {
         $this->set_prop( 'minimum_price',  (float) wpinv_sanitize_amount( $value ) );
     }
 
     /**
-	 * Sets if this is a recurring item.
-	 *
-	 * @since 1.0.19
-	 * @param  int|bool $value whether or not dynamic pricing is allowed.
-	 */
-	public function set_is_recurring( $value ) {
+     * Sets if this is a recurring item.
+     *
+     * @since 1.0.19
+     * @param  int|bool $value whether or not dynamic pricing is allowed.
+     */
+    public function set_is_recurring( $value ) {
         $this->set_prop( 'is_recurring', (int) $value );
     }
 
     /**
-	 * Set the recurring period.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value new period.
-	 */
-	public function set_recurring_period( $value ) {
+     * Set the recurring period.
+     *
+     * @since 1.0.19
+     * @param  string $value new period.
+     */
+    public function set_recurring_period( $value ) {
         $this->set_prop( 'recurring_period', $value );
     }
 
     /**
-	 * Set the recurring interval.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value recurring interval.
-	 */
-	public function set_recurring_interval( $value ) {
+     * Set the recurring interval.
+     *
+     * @since 1.0.19
+     * @param  int $value recurring interval.
+     */
+    public function set_recurring_interval( $value ) {
         return $this->set_prop( 'recurring_interval', (int) $value );
     }
 
     /**
-	 * Get the recurring limit.
-	 * @since 1.0.19
-	 * @param  int $value The recurring limit.
-	 * @return int
-	 */
-	public function set_recurring_limit( $value ) {
+     * Get the recurring limit.
+     * @since 1.0.19
+     * @param  int $value The recurring limit.
+     * @return int
+     */
+    public function set_recurring_limit( $value ) {
         $this->set_prop( 'recurring_limit', (int) $value );
     }
 
     /**
-	 * Checks if we have a free trial.
-	 *
-	 * @since 1.0.19
-	 * @param  int|bool $value whether or not it has a free trial.
-	 */
-	public function set_is_free_trial( $value ) {
+     * Checks if we have a free trial.
+     *
+     * @since 1.0.19
+     * @param  int|bool $value whether or not it has a free trial.
+     */
+    public function set_is_free_trial( $value ) {
         $this->set_prop( 'is_free_trial', (int) $value );
     }
 
     /**
-	 * Set the trial period.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value trial period.
-	 */
-	public function set_trial_period( $value ) {
+     * Set the trial period.
+     *
+     * @since 1.0.19
+     * @param  string $value trial period.
+     */
+    public function set_trial_period( $value ) {
         $this->set_prop( 'trial_period', $value );
     }
 
     /**
-	 * Set the trial interval.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value trial interval.
-	 */
-	public function set_trial_interval( $value ) {
+     * Set the trial interval.
+     *
+     * @since 1.0.19
+     * @param  int $value trial interval.
+     */
+    public function set_trial_interval( $value ) {
         $this->set_prop( 'trial_interval', $value );
     }
 
@@ -1022,17 +1022,17 @@ 
      * Create an item. For backwards compatibilty.
      * 
      * @deprecated
-	 * @return int item id
+     * @return int item id
      */
     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();
 
     }
 
@@ -1040,7 +1040,7 @@ 
      * Updates an item. For backwards compatibilty.
      * 
      * @deprecated
-	 * @return int item id
+     * @return int item id
      */
     public function update( $data = array() ) {
         return $this->create( $data );
@@ -1056,84 +1056,84 @@ 
 	*/
 
     /**
-	 * Checks whether the item has enabled dynamic pricing.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function user_can_set_their_price() {
+     * Checks whether the item has enabled dynamic pricing.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function user_can_set_their_price() {
         return (bool) $this->get_is_dynamic_pricing();
-	}
+    }
 	
-	/**
-	 * Checks whether the item is recurring.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_recurring() {
+    /**
+     * Checks whether the item is recurring.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_recurring() {
         return (bool) $this->get_is_recurring();
     }
 
     /**
-	 * Checks whether the item has a free trial.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+     * Checks whether the item has a free trial.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function has_free_trial() {
         $has_trial = $this->is_recurring() && (bool) $this->get_free_trial() ? true : false;
         return (bool) apply_filters( 'wpinv_item_has_free_trial', $has_trial, $this->ID, $this );
     }
 
     /**
-	 * Checks whether the item is free.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+     * Checks whether the item is free.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function is_free() {
         $is_free   = $this->get_price() == 0;
         return (bool) apply_filters( 'wpinv_is_free_item', $is_free, $this->ID, $this );
     }
 
     /**
-	 * Checks the item status against a passed in status.
-	 *
-	 * @param array|string $status Status to check.
-	 * @return bool
-	 */
-	public function has_status( $status ) {
-		$has_status = ( is_array( $status ) && in_array( $this->get_status(), $status, true ) ) || $this->get_status() === $status;
-		return (bool) apply_filters( 'getpaid_item_has_status', $has_status, $this, $status );
+     * Checks the item status against a passed in status.
+     *
+     * @param array|string $status Status to check.
+     * @return bool
+     */
+    public function has_status( $status ) {
+        $has_status = ( is_array( $status ) && in_array( $this->get_status(), $status, true ) ) || $this->get_status() === $status;
+        return (bool) apply_filters( 'getpaid_item_has_status', $has_status, $this, $status );
     }
 
     /**
-	 * Checks the item type against a passed in types.
-	 *
-	 * @param array|string $type Type to check.
-	 * @return bool
-	 */
-	public function is_type( $type ) {
-		$is_type = ( is_array( $type ) && in_array( $this->get_type(), $type, true ) ) || $this->get_type() === $type;
-		return (bool) apply_filters( 'getpaid_item_is_type', $is_type, $this, $type );
-	}
+     * Checks the item type against a passed in types.
+     *
+     * @param array|string $type Type to check.
+     * @return bool
+     */
+    public function is_type( $type ) {
+        $is_type = ( is_array( $type ) && in_array( $this->get_type(), $type, true ) ) || $this->get_type() === $type;
+        return (bool) apply_filters( 'getpaid_item_is_type', $is_type, $this, $type );
+    }
 
     /**
-	 * Checks whether the item is editable.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+     * Checks whether the item is editable.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function is_editable() {
         $is_editable = $this->get_is_editable();
         return (bool) apply_filters( 'wpinv_item_is_editable', $is_editable, $this->ID, $this );
-	}
+    }
 
-	/**
-	 * Returns an array of cart fees.
-	 */
-	public function get_fees( $type = 'fee', $item_id = 0 ) {
+    /**
+     * Returns an array of cart fees.
+     */
+    public function get_fees( $type = 'fee', $item_id = 0 ) {
         global $wpi_session;
         
         $fees = $wpi_session->get( 'wpi_cart_fees' );
@@ -1177,11 +1177,11 @@ 
     }
 
     /**
-	 * Checks whether the item is purchasable.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+     * Checks whether the item is purchasable.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function can_purchase() {
         $can_purchase = null !== $this->get_id();
 
@@ -1193,11 +1193,11 @@ 
     }
 
     /**
-	 * Checks whether the item supports dynamic pricing.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+     * Checks whether the item supports dynamic pricing.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function supports_dynamic_pricing() {
         return (bool) apply_filters( 'wpinv_item_supports_dynamic_pricing', true, $this );
     }

Spacing +224 added lines, -224 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -78,30 +78,30 @@ 
 	 *
 	 * @param  int|object|WPInv_Item|WP_Post $item Item to read.
 	 */
-	public function __construct( $item = 0 ) {
-		parent::__construct( $item );
-
-		if ( ! empty( $item ) && is_numeric( $item ) && 'wpi_item' == get_post_type( $item ) ) {
-			$this->set_id( $item );
-		} elseif ( $item instanceof self ) {
-			$this->set_id( $item->get_id() );
-		} elseif ( ! empty( $item->ID ) ) {
-			$this->set_id( $item->ID );
-		} elseif ( is_scalar( $item ) && $item_id = self::get_item_id_by_field( $item, 'custom_id' ) ) {
-			$this->set_id( $item_id );
-		} elseif ( is_scalar( $item ) && $item_id = self::get_item_id_by_field( $item, 'name' ) ) {
-			$this->set_id( $item_id );
+	public function __construct($item = 0) {
+		parent::__construct($item);
+
+		if (!empty($item) && is_numeric($item) && 'wpi_item' == get_post_type($item)) {
+			$this->set_id($item);
+		} elseif ($item instanceof self) {
+			$this->set_id($item->get_id());
+		} elseif (!empty($item->ID)) {
+			$this->set_id($item->ID);
+		} elseif (is_scalar($item) && $item_id = self::get_item_id_by_field($item, 'custom_id')) {
+			$this->set_id($item_id);
+		} elseif (is_scalar($item) && $item_id = self::get_item_id_by_field($item, 'name')) {
+			$this->set_id($item_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->post = get_post( $this->get_id() );
+		if ($this->get_id() > 0) {
+            $this->post = get_post($this->get_id());
             $this->ID   = $this->get_id();
-			$this->data_store->read( $this );
+			$this->data_store->read($this);
         }
 
 	}
@@ -128,8 +128,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_parent_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'parent_id', $context );
+	public function get_parent_id($context = 'view') {
+		return (int) $this->get_prop('parent_id', $context);
     }
 
     /**
@@ -139,8 +139,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);
     }
 
     /**
@@ -150,8 +150,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_version( $context = 'view' ) {
-		return $this->get_prop( 'version', $context );
+	public function get_version($context = 'view') {
+		return $this->get_prop('version', $context);
     }
 
     /**
@@ -161,8 +161,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_prop( 'date_created', $context );
+	public function get_date_created($context = 'view') {
+		return $this->get_prop('date_created', $context);
     }
 
     /**
@@ -172,11 +172,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;
     }
@@ -188,8 +188,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_modified( $context = 'view' ) {
-		return $this->get_prop( 'date_modified', $context );
+	public function get_date_modified($context = 'view') {
+		return $this->get_prop('date_modified', $context);
     }
 
     /**
@@ -199,11 +199,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_modified_gmt( $context = 'view' ) {
-        $date = $this->get_date_modified( $context );
+	public function get_date_modified_gmt($context = 'view') {
+        $date = $this->get_date_modified($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
     }
@@ -215,8 +215,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_name( $context = 'view' ) {
-		return $this->get_prop( 'name', $context );
+	public function get_name($context = 'view') {
+		return $this->get_prop('name', $context);
     }
 
     /**
@@ -226,8 +226,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_title( $context = 'view' ) {
-		return $this->get_name( $context );
+	public function get_title($context = 'view') {
+		return $this->get_name($context);
     }
 
     /**
@@ -237,8 +237,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_description( $context = 'view' ) {
-		return $this->get_prop( 'description', $context );
+	public function get_description($context = 'view') {
+		return $this->get_prop('description', $context);
     }
 
     /**
@@ -248,8 +248,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_excerpt( $context = 'view' ) {
-		return $this->get_description( $context );
+	public function get_excerpt($context = 'view') {
+		return $this->get_description($context);
     }
 
     /**
@@ -259,8 +259,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_summary( $context = 'view' ) {
-		return $this->get_description( $context );
+	public function get_summary($context = 'view') {
+		return $this->get_description($context);
     }
 
     /**
@@ -270,8 +270,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_author( $context = 'view' ) {
-		return (int) $this->get_prop( 'author', $context );
+	public function get_author($context = 'view') {
+		return (int) $this->get_prop('author', $context);
     }
 
     /**
@@ -281,8 +281,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_price( $context = 'view' ) {
-        return wpinv_sanitize_amount( $this->get_prop( 'price', $context ) );
+	public function get_price($context = 'view') {
+        return wpinv_sanitize_amount($this->get_prop('price', $context));
 	}
 	
 	/**
@@ -292,15 +292,15 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_initial_price( $context = 'view' ) {
+	public function get_initial_price($context = 'view') {
 
-		$price = (float) $this->get_price( $context );
+		$price = (float) $this->get_price($context);
 
-		if ( $this->has_free_trial() ) {
+		if ($this->has_free_trial()) {
 			$price = 0;
 		}
 
-        return wpinv_sanitize_amount( apply_filters( 'wpinv_get_initial_item_price', $price, $this ) );
+        return wpinv_sanitize_amount(apply_filters('wpinv_get_initial_item_price', $price, $this));
     }
 
     /**
@@ -311,7 +311,7 @@ 
 	 * @return string
 	 */
     public function get_the_price() {
-        return wpinv_price( wpinv_format_amount( $this->get_price() ) );
+        return wpinv_price(wpinv_format_amount($this->get_price()));
 	}
 
 	/**
@@ -322,7 +322,7 @@ 
 	 * @return string
 	 */
     public function get_the_initial_price() {
-        return wpinv_price( wpinv_format_amount( $this->get_initial_price() ) );
+        return wpinv_price(wpinv_format_amount($this->get_initial_price()));
     }
 
     /**
@@ -332,8 +332,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_vat_rule( $context = 'view' ) {
-        return $this->get_prop( 'vat_rule', $context );
+	public function get_vat_rule($context = 'view') {
+        return $this->get_prop('vat_rule', $context);
     }
 
     /**
@@ -343,8 +343,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_vat_class( $context = 'view' ) {
-        return $this->get_prop( 'vat_class', $context );
+	public function get_vat_class($context = 'view') {
+        return $this->get_prop('vat_class', $context);
     }
 
     /**
@@ -354,8 +354,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_type( $context = 'view' ) {
-        return $this->get_prop( 'type', $context );
+	public function get_type($context = 'view') {
+        return $this->get_prop('type', $context);
     }
 
     /**
@@ -365,8 +365,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_custom_id( $context = 'view' ) {
-        return $this->get_prop( 'custom_id', $context );
+	public function get_custom_id($context = 'view') {
+        return $this->get_prop('custom_id', $context);
     }
 
     /**
@@ -376,8 +376,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_custom_name( $context = 'view' ) {
-        return $this->get_prop( 'custom_name', $context );
+	public function get_custom_name($context = 'view') {
+        return $this->get_prop('custom_name', $context);
     }
 
     /**
@@ -387,8 +387,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_custom_singular_name( $context = 'view' ) {
-        return $this->get_prop( 'custom_singular_name', $context );
+	public function get_custom_singular_name($context = 'view') {
+        return $this->get_prop('custom_singular_name', $context);
     }
 
     /**
@@ -398,8 +398,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_is_editable( $context = 'view' ) {
-        return (int) $this->get_prop( 'is_editable', $context );
+	public function get_is_editable($context = 'view') {
+        return (int) $this->get_prop('is_editable', $context);
     }
 
     /**
@@ -409,8 +409,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_editable( $context = 'view' ) {
-		return $this->get_is_editable( $context );
+	public function get_editable($context = 'view') {
+		return $this->get_is_editable($context);
     }
 
     /**
@@ -420,8 +420,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_is_dynamic_pricing( $context = 'view' ) {
-        return (int) $this->get_prop( 'is_dynamic_pricing', $context );
+	public function get_is_dynamic_pricing($context = 'view') {
+        return (int) $this->get_prop('is_dynamic_pricing', $context);
     }
 
     /**
@@ -431,8 +431,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_minimum_price( $context = 'view' ) {
-        return wpinv_sanitize_amount( $this->get_prop( 'minimum_price', $context ) );
+	public function get_minimum_price($context = 'view') {
+        return wpinv_sanitize_amount($this->get_prop('minimum_price', $context));
     }
 
     /**
@@ -442,8 +442,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_is_recurring( $context = 'view' ) {
-        return (int) $this->get_prop( 'is_recurring', $context );
+	public function get_is_recurring($context = 'view') {
+        return (int) $this->get_prop('is_recurring', $context);
 	}
 	
 	/**
@@ -453,9 +453,9 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_recurring_price( $context = 'view' ) {
-		$price = $this->get_price( $context );
-        return wpinv_sanitize_amount( apply_filters( 'wpinv_get_recurring_item_price', $price, $this->ID ) );
+	public function get_recurring_price($context = 'view') {
+		$price = $this->get_price($context);
+        return wpinv_sanitize_amount(apply_filters('wpinv_get_recurring_item_price', $price, $this->ID));
 	}
 
 	/**
@@ -476,15 +476,15 @@ 
 		$period   = $this->get_recurring_period();
 		$interval = $this->get_recurring_interval();
 
-		if ( $this->has_free_trial() ) {
+		if ($this->has_free_trial()) {
 			$period   = $this->get_trial_period();
 			$interval = $this->get_trial_interval();
 		}
 
-		$period       = $periods[ $period ];
-		$interval     = empty( $interval ) ? 1 : $interval;
-		$next_renewal = strtotime( "+$interval $period", current_time( 'timestamp' ) );
-        return apply_filters( 'wpinv_get_first_renewal_date', $next_renewal, $this );
+		$period       = $periods[$period];
+		$interval     = empty($interval) ? 1 : $interval;
+		$next_renewal = strtotime("+$interval $period", current_time('timestamp'));
+        return apply_filters('wpinv_get_first_renewal_date', $next_renewal, $this);
     }
 
     /**
@@ -494,14 +494,14 @@ 
 	 * @param  bool $full Return abbreviation or in full.
 	 * @return string
 	 */
-	public function get_recurring_period( $full = false ) {
-        $period = $this->get_prop( 'recurring_period', 'view' );
+	public function get_recurring_period($full = false) {
+        $period = $this->get_prop('recurring_period', 'view');
 
-        if ( $full && ! is_bool( $full ) ) {
+        if ($full && !is_bool($full)) {
             $full = false;
         }
 
-        return getpaid_sanitize_recurring_period( $period, $full );
+        return getpaid_sanitize_recurring_period($period, $full);
     }
 
     /**
@@ -511,10 +511,10 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_recurring_interval( $context = 'view' ) {
-		$interval = absint( $this->get_prop( 'recurring_interval', $context ) );
+	public function get_recurring_interval($context = 'view') {
+		$interval = absint($this->get_prop('recurring_interval', $context));
 
-		if ( $interval < 1 ) {
+		if ($interval < 1) {
 			$interval = 1;
 		}
 
@@ -528,8 +528,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_recurring_limit( $context = 'view' ) {
-        return (int) $this->get_prop( 'recurring_limit', $context );
+	public function get_recurring_limit($context = 'view') {
+        return (int) $this->get_prop('recurring_limit', $context);
     }
 
     /**
@@ -539,8 +539,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_is_free_trial( $context = 'view' ) {
-        return (int) $this->get_prop( 'is_free_trial', $context );
+	public function get_is_free_trial($context = 'view') {
+        return (int) $this->get_prop('is_free_trial', $context);
     }
 
     /**
@@ -550,8 +550,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_free_trial( $context = 'view' ) {
-        return $this->get_is_free_trial( $context );
+	public function get_free_trial($context = 'view') {
+        return $this->get_is_free_trial($context);
     }
 
     /**
@@ -561,14 +561,14 @@ 
 	 * @param  bool $full Return abbreviation or in full.
 	 * @return string
 	 */
-	public function get_trial_period( $full = false ) {
-        $period = $this->get_prop( 'trial_period', 'view' );
+	public function get_trial_period($full = false) {
+        $period = $this->get_prop('trial_period', 'view');
 
-        if ( $full && ! is_bool( $full ) ) {
+        if ($full && !is_bool($full)) {
             $full = false;
         }
 
-        return getpaid_sanitize_recurring_period( $period, $full );
+        return getpaid_sanitize_recurring_period($period, $full);
     }
 
     /**
@@ -578,8 +578,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_trial_interval( $context = 'view' ) {
-        return (int) $this->get_prop( 'trial_interval', $context );
+	public function get_trial_interval($context = 'view') {
+        return (int) $this->get_prop('trial_interval', $context);
 	}
 	
 	/**
@@ -589,7 +589,7 @@ 
 	 * @return string
 	 */
 	public function get_edit_url() {
-        return get_edit_post_link( $this->get_id() );
+        return get_edit_post_link($this->get_id());
 	}
 
 	/**
@@ -603,35 +603,35 @@ 
 	 * @since 1.0.15
 	 * @return int
 	 */
-	public static function get_item_id_by_field( $value, $field = 'custom_id', $type = '' ) {
+	public static function get_item_id_by_field($value, $field = 'custom_id', $type = '') {
 
 		// Trim the value.
-		$value = trim( $value );
+		$value = trim($value);
 
-		if ( empty( $value ) ) {
+		if (empty($value)) {
 			return 0;
 		}
 
         // Valid fields.
-        $fields = array( 'custom_id', 'name', 'slug' );
+        $fields = array('custom_id', 'name', 'slug');
 
 		// Ensure a field has been passed.
-		if ( empty( $field ) || ! in_array( $field, $fields ) ) {
+		if (empty($field) || !in_array($field, $fields)) {
 			return 0;
 		}
 
-		if ( $field == 'name' ) {
+		if ($field == 'name') {
 			$field = 'slug';
 		} 
 
 		// Maybe retrieve from the cache.
-		$item_id = wp_cache_get( $value, "getpaid_{$type}_item_{$field}s_to_item_ids" );
-		if ( ! empty( $item_id ) ) {
+		$item_id = wp_cache_get($value, "getpaid_{$type}_item_{$field}s_to_item_ids");
+		if (!empty($item_id)) {
 			return $item_id;
 		}
 
 		// Fetch from the db.
-		if ( $field =='slug' ) {
+		if ($field == 'slug') {
 			$items = get_posts(
 				array(
 					'post_type'      => 'wpi_item',
@@ -642,7 +642,7 @@ 
 			);
 		}
 
-		if ( $field =='custom_id' ) {
+		if ($field == 'custom_id') {
 			$items = get_posts(
 				array(
 					'post_type'      => 'wpi_item',
@@ -662,12 +662,12 @@ 
 			);
 		}
 
-		if ( empty( $items ) ) {
+		if (empty($items)) {
 			return 0;
 		}
 
 		// Update the cache with our data
-		wp_cache_set( $value, $items[0]->ID, "getpaid_{$type}_item_{$field}s_to_item_ids" );
+		wp_cache_set($value, $items[0]->ID, "getpaid_{$type}_item_{$field}s_to_item_ids");
 
 		return $items[0]->ID;
     }
@@ -675,19 +675,19 @@ 
     /**
      * Margic method for retrieving a property.
      */
-    public function __get( $key ) {
+    public function __get($key) {
 
         // Check if we have a helper method for that.
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            return call_user_func( array( $this, 'get_' . $key ) );
+        if (method_exists($this, 'get_' . $key)) {
+            return call_user_func(array($this, 'get_' . $key));
         }
 
         // Check if the key is in the associated $post object.
-        if ( ! empty( $this->post ) && isset( $this->post->$key ) ) {
+        if (!empty($this->post) && isset($this->post->$key)) {
             return $this->post->$key;
         }
 
-        return $this->get_prop( $key );
+        return $this->get_prop($key);
 
     }
 
@@ -706,11 +706,11 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function set_parent_id( $value ) {
-		if ( $value && ( $value === $this->get_id() || ! get_post( $value ) ) ) {
+	public function set_parent_id($value) {
+		if ($value && ($value === $this->get_id() || !get_post($value))) {
 			return;
 		}
-		$this->set_prop( 'parent_id', absint( $value ) );
+		$this->set_prop('parent_id', absint($value));
 	}
 
     /**
@@ -720,10 +720,10 @@ 
 	 * @param  string $status New status.
 	 * @return array details of change.
 	 */
-	public function set_status( $status ) {
+	public function set_status($status) {
         $old_status = $this->get_status();
 
-        $this->set_prop( 'status', $status );
+        $this->set_prop('status', $status);
 
 		return array(
 			'from' => $old_status,
@@ -736,8 +736,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function set_version( $value ) {
-		$this->set_prop( 'version', $value );
+	public function set_version($value) {
+		$this->set_prop('version', $value);
     }
 
     /**
@@ -747,11 +747,11 @@ 
 	 * @param string $value Value to set.
      * @return bool Whether or not the date was set.
 	 */
-	public function set_date_created( $value ) {
-        $date = strtotime( $value );
+	public function set_date_created($value) {
+        $date = strtotime($value);
 
-        if ( $date ) {
-            $this->set_prop( 'date_created', date( 'Y-m-d H:i:s', $date ) );
+        if ($date) {
+            $this->set_prop('date_created', date('Y-m-d H:i:s', $date));
             return true;
         }
 
@@ -766,11 +766,11 @@ 
 	 * @param string $value Value to set.
      * @return bool Whether or not the date was set.
 	 */
-	public function set_date_modified( $value ) {
-        $date = strtotime( $value );
+	public function set_date_modified($value) {
+        $date = strtotime($value);
 
-        if ( $date ) {
-            $this->set_prop( 'date_modified', date( 'Y-m-d H:i:s', $date ) );
+        if ($date) {
+            $this->set_prop('date_modified', date('Y-m-d H:i:s', $date));
             return true;
         }
 
@@ -784,9 +784,9 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New name.
 	 */
-	public function set_name( $value ) {
-        $name = sanitize_text_field( $value );
-		$this->set_prop( 'name', $name );
+	public function set_name($value) {
+        $name = sanitize_text_field($value);
+		$this->set_prop('name', $name);
     }
 
     /**
@@ -795,8 +795,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New name.
 	 */
-	public function set_title( $value ) {
-		$this->set_name( $value );
+	public function set_title($value) {
+		$this->set_name($value);
     }
 
     /**
@@ -805,9 +805,9 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New description.
 	 */
-	public function set_description( $value ) {
-        $description = wp_kses_post( $value );
-		return $this->set_prop( 'description', $description );
+	public function set_description($value) {
+        $description = wp_kses_post($value);
+		return $this->set_prop('description', $description);
     }
 
     /**
@@ -816,8 +816,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New description.
 	 */
-	public function set_excerpt( $value ) {
-		$this->set_description( $value );
+	public function set_excerpt($value) {
+		$this->set_description($value);
     }
 
     /**
@@ -826,8 +826,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New description.
 	 */
-	public function set_summary( $value ) {
-		$this->set_description( $value );
+	public function set_summary($value) {
+		$this->set_description($value);
     }
 
     /**
@@ -836,8 +836,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value New author.
 	 */
-	public function set_author( $value ) {
-		$this->set_prop( 'author', (int) $value );
+	public function set_author($value) {
+		$this->set_prop('author', (int) $value);
     }
 
     /**
@@ -846,8 +846,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value New price.
 	 */
-	public function set_price( $value ) {
-        $this->set_prop( 'price', (float) wpinv_sanitize_amount( $value ) );
+	public function set_price($value) {
+        $this->set_prop('price', (float) wpinv_sanitize_amount($value));
     }
 
     /**
@@ -856,8 +856,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value new rule.
 	 */
-	public function set_vat_rule( $value ) {
-        $this->set_prop( 'vat_rule', $value );
+	public function set_vat_rule($value) {
+        $this->set_prop('vat_rule', $value);
     }
 
     /**
@@ -866,8 +866,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value new class.
 	 */
-	public function set_vat_class( $value ) {
-        $this->set_prop( 'vat_class', $value );
+	public function set_vat_class($value) {
+        $this->set_prop('vat_class', $value);
     }
 
     /**
@@ -877,13 +877,13 @@ 
 	 * @param  string $value new item type.
 	 * @return string
 	 */
-	public function set_type( $value ) {
+	public function set_type($value) {
 
-        if ( empty( $value ) ) {
+        if (empty($value)) {
             $value = 'custom';
         }
 
-        $this->set_prop( 'type', $value );
+        $this->set_prop('type', $value);
     }
 
     /**
@@ -892,8 +892,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value new custom id.
 	 */
-	public function set_custom_id( $value ) {
-        $this->set_prop( 'custom_id', $value );
+	public function set_custom_id($value) {
+        $this->set_prop('custom_id', $value);
     }
 
     /**
@@ -902,8 +902,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value new custom name.
 	 */
-	public function set_custom_name( $value ) {
-        $this->set_prop( 'custom_name', $value );
+	public function set_custom_name($value) {
+        $this->set_prop('custom_name', $value);
     }
 
     /**
@@ -912,8 +912,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value new custom singular name.
 	 */
-	public function set_custom_singular_name( $value ) {
-        $this->set_prop( 'custom_singular_name', $value );
+	public function set_custom_singular_name($value) {
+        $this->set_prop('custom_singular_name', $value);
     }
 
     /**
@@ -922,9 +922,9 @@ 
 	 * @since 1.0.19
 	 * @param  int|bool $value whether or not the item is editable.
 	 */
-	public function set_is_editable( $value ) {
-		if ( is_numeric( $value ) ) {
-			$this->set_prop( 'is_editable', (int) $value );
+	public function set_is_editable($value) {
+		if (is_numeric($value)) {
+			$this->set_prop('is_editable', (int) $value);
 		}
     }
 
@@ -934,8 +934,8 @@ 
 	 * @since 1.0.19
 	 * @param  int|bool $value whether or not dynamic pricing is allowed.
 	 */
-	public function set_is_dynamic_pricing( $value ) {
-        $this->set_prop( 'is_dynamic_pricing', (int) $value );
+	public function set_is_dynamic_pricing($value) {
+        $this->set_prop('is_dynamic_pricing', (int) $value);
     }
 
     /**
@@ -944,8 +944,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value minimum price.
 	 */
-	public function set_minimum_price( $value ) {
-        $this->set_prop( 'minimum_price',  (float) wpinv_sanitize_amount( $value ) );
+	public function set_minimum_price($value) {
+        $this->set_prop('minimum_price', (float) wpinv_sanitize_amount($value));
     }
 
     /**
@@ -954,8 +954,8 @@ 
 	 * @since 1.0.19
 	 * @param  int|bool $value whether or not dynamic pricing is allowed.
 	 */
-	public function set_is_recurring( $value ) {
-        $this->set_prop( 'is_recurring', (int) $value );
+	public function set_is_recurring($value) {
+        $this->set_prop('is_recurring', (int) $value);
     }
 
     /**
@@ -964,8 +964,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value new period.
 	 */
-	public function set_recurring_period( $value ) {
-        $this->set_prop( 'recurring_period', $value );
+	public function set_recurring_period($value) {
+        $this->set_prop('recurring_period', $value);
     }
 
     /**
@@ -974,8 +974,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value recurring interval.
 	 */
-	public function set_recurring_interval( $value ) {
-        return $this->set_prop( 'recurring_interval', (int) $value );
+	public function set_recurring_interval($value) {
+        return $this->set_prop('recurring_interval', (int) $value);
     }
 
     /**
@@ -984,8 +984,8 @@ 
 	 * @param  int $value The recurring limit.
 	 * @return int
 	 */
-	public function set_recurring_limit( $value ) {
-        $this->set_prop( 'recurring_limit', (int) $value );
+	public function set_recurring_limit($value) {
+        $this->set_prop('recurring_limit', (int) $value);
     }
 
     /**
@@ -994,8 +994,8 @@ 
 	 * @since 1.0.19
 	 * @param  int|bool $value whether or not it has a free trial.
 	 */
-	public function set_is_free_trial( $value ) {
-        $this->set_prop( 'is_free_trial', (int) $value );
+	public function set_is_free_trial($value) {
+        $this->set_prop('is_free_trial', (int) $value);
     }
 
     /**
@@ -1004,8 +1004,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value trial period.
 	 */
-	public function set_trial_period( $value ) {
-        $this->set_prop( 'trial_period', $value );
+	public function set_trial_period($value) {
+        $this->set_prop('trial_period', $value);
     }
 
     /**
@@ -1014,8 +1014,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value trial interval.
 	 */
-	public function set_trial_interval( $value ) {
-        $this->set_prop( 'trial_interval', $value );
+	public function set_trial_interval($value) {
+        $this->set_prop('trial_interval', $value);
     }
 
     /**
@@ -1024,11 +1024,11 @@ 
      * @deprecated
 	 * @return int item id
      */
-    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.
@@ -1042,8 +1042,8 @@ 
      * @deprecated
 	 * @return int item id
      */
-    public function update( $data = array() ) {
-        return $this->create( $data );
+    public function update($data = array()) {
+        return $this->create($data);
     }
 
     /*
@@ -1083,7 +1083,7 @@ 
 	 */
     public function has_free_trial() {
         $has_trial = $this->is_recurring() && (bool) $this->get_free_trial() ? true : false;
-        return (bool) apply_filters( 'wpinv_item_has_free_trial', $has_trial, $this->ID, $this );
+        return (bool) apply_filters('wpinv_item_has_free_trial', $has_trial, $this->ID, $this);
     }
 
     /**
@@ -1093,8 +1093,8 @@ 
 	 * @return bool
 	 */
     public function is_free() {
-        $is_free   = $this->get_price() == 0;
-        return (bool) apply_filters( 'wpinv_is_free_item', $is_free, $this->ID, $this );
+        $is_free = $this->get_price() == 0;
+        return (bool) apply_filters('wpinv_is_free_item', $is_free, $this->ID, $this);
     }
 
     /**
@@ -1103,9 +1103,9 @@ 
 	 * @param array|string $status Status to check.
 	 * @return bool
 	 */
-	public function has_status( $status ) {
-		$has_status = ( is_array( $status ) && in_array( $this->get_status(), $status, true ) ) || $this->get_status() === $status;
-		return (bool) apply_filters( 'getpaid_item_has_status', $has_status, $this, $status );
+	public function has_status($status) {
+		$has_status = (is_array($status) && in_array($this->get_status(), $status, true)) || $this->get_status() === $status;
+		return (bool) apply_filters('getpaid_item_has_status', $has_status, $this, $status);
     }
 
     /**
@@ -1114,9 +1114,9 @@ 
 	 * @param array|string $type Type to check.
 	 * @return bool
 	 */
-	public function is_type( $type ) {
-		$is_type = ( is_array( $type ) && in_array( $this->get_type(), $type, true ) ) || $this->get_type() === $type;
-		return (bool) apply_filters( 'getpaid_item_is_type', $is_type, $this, $type );
+	public function is_type($type) {
+		$is_type = (is_array($type) && in_array($this->get_type(), $type, true)) || $this->get_type() === $type;
+		return (bool) apply_filters('getpaid_item_is_type', $is_type, $this, $type);
 	}
 
     /**
@@ -1127,53 +1127,53 @@ 
 	 */
     public function is_editable() {
         $is_editable = $this->get_is_editable();
-        return (bool) apply_filters( 'wpinv_item_is_editable', $is_editable, $this->ID, $this );
+        return (bool) apply_filters('wpinv_item_is_editable', $is_editable, $this->ID, $this);
 	}
 
 	/**
 	 * Returns an array of cart fees.
 	 */
-	public function get_fees( $type = 'fee', $item_id = 0 ) {
+	public function get_fees($type = 'fee', $item_id = 0) {
         global $wpi_session;
         
-        $fees = $wpi_session->get( 'wpi_cart_fees' );
+        $fees = $wpi_session->get('wpi_cart_fees');
 
-        if ( ! wpinv_get_cart_contents() ) {
+        if (!wpinv_get_cart_contents()) {
             // We can only get item type fees when the cart is empty
             $type = 'custom';
         }
 
-        if ( ! empty( $fees ) && ! empty( $type ) && 'all' !== $type ) {
-            foreach( $fees as $key => $fee ) {
-                if( ! empty( $fee['type'] ) && $type != $fee['type'] ) {
-                    unset( $fees[ $key ] );
+        if (!empty($fees) && !empty($type) && 'all' !== $type) {
+            foreach ($fees as $key => $fee) {
+                if (!empty($fee['type']) && $type != $fee['type']) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        if ( ! empty( $fees ) && ! empty( $item_id ) ) {
+        if (!empty($fees) && !empty($item_id)) {
             // Remove fees that don't belong to the specified Item
-            foreach ( $fees as $key => $fee ) {
-                if ( (int) $item_id !== (int)$fee['custom_id'] ) {
-                    unset( $fees[ $key ] );
+            foreach ($fees as $key => $fee) {
+                if ((int) $item_id !== (int) $fee['custom_id']) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        if ( ! empty( $fees ) ) {
+        if (!empty($fees)) {
             // Remove fees that belong to a specific item but are not in the cart
-            foreach( $fees as $key => $fee ) {
-                if( empty( $fee['custom_id'] ) ) {
+            foreach ($fees as $key => $fee) {
+                if (empty($fee['custom_id'])) {
                     continue;
                 }
 
-                if ( !wpinv_item_in_cart( $fee['custom_id'] ) ) {
-                    unset( $fees[ $key ] );
+                if (!wpinv_item_in_cart($fee['custom_id'])) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        return ! empty( $fees ) ? $fees : array();
+        return !empty($fees) ? $fees : array();
     }
 
     /**
@@ -1185,11 +1185,11 @@ 
     public function can_purchase() {
         $can_purchase = null !== $this->get_id();
 
-        if ( ! current_user_can( 'edit_post', $this->ID ) && $this->post_status != 'publish' ) {
+        if (!current_user_can('edit_post', $this->ID) && $this->post_status != 'publish') {
             $can_purchase = false;
         }
 
-        return (bool) apply_filters( 'wpinv_can_purchase_item', $can_purchase, $this );
+        return (bool) apply_filters('wpinv_can_purchase_item', $can_purchase, $this);
     }
 
     /**
@@ -1199,6 +1199,6 @@ 
 	 * @return bool
 	 */
     public function supports_dynamic_pricing() {
-        return (bool) apply_filters( 'wpinv_item_supports_dynamic_pricing', true, $this );
+        return (bool) apply_filters('wpinv_item_supports_dynamic_pricing', true, $this);
     }
 }

includes/class-wpinv-privacy-exporters.php

Spacing +52 added lines, -52 removed lines

@@ -3,7 +3,7 @@ 
  * Personal data exporters.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WPInv_Privacy_Exporters Class.
@@ -17,38 +17,38 @@ 
      * @param int    $page  Page.
      * @return array An array of invoice data in name value pairs
      */
-    public static function customer_invoice_data_exporter( $email_address, $page ) {
+    public static function customer_invoice_data_exporter($email_address, $page) {
         $done           = false;
         $page           = (int) $page;
         $data_to_export = array();
 
-        $user           = get_user_by( 'email', $email_address );
-        if ( ! $user instanceof WP_User ) {
+        $user           = get_user_by('email', $email_address);
+        if (!$user instanceof WP_User) {
             return array(
                 'data' => $data_to_export,
                 'done' => true,
             );
         }
 
-        $args    = array(
+        $args = array(
             'limit'    => 30,
             'page'     => $page,
             'user'     => $user->ID,
         );
 
-        $invoices = wpinv_get_invoices( $args );
+        $invoices = wpinv_get_invoices($args);
 
-        if ( 0 < count( $invoices ) ) {
-            foreach ( $invoices as $invoice ) {
+        if (0 < count($invoices)) {
+            foreach ($invoices as $invoice) {
                 $data_to_export[] = array(
                     'group_id'          => 'customer_invoices',
-                    'group_label'       => __( 'Invoicing Data', 'invoicing' ),
-                    'group_description' => __( 'Customer invoicing data.', 'invoicing' ),
+                    'group_label'       => __('Invoicing Data', 'invoicing'),
+                    'group_description' => __('Customer invoicing data.', 'invoicing'),
                     'item_id'           => "wpinv-{$invoice->ID}",
-                    'data'              => self::get_customer_invoice_data( $invoice ),
+                    'data'              => self::get_customer_invoice_data($invoice),
                 );
             }
-            $done = 30 > count( $invoices );
+            $done = 30 > count($invoices);
         } else {
             $done = true;
         }
@@ -66,59 +66,59 @@ 
      * @param WPInv_Invoice $invoice invoice object.
      * @return array
      */
-    public static function get_customer_invoice_data( $invoice ) {
+    public static function get_customer_invoice_data($invoice) {
         $personal_data = array();
 
         $props_to_export = array(
-            'number'               => __( 'Invoice Number', 'invoicing' ),
-            'created_date'         => __( 'Invoice Date', 'invoicing' ),
-            'status'               => __( 'Invoice Status', 'invoicing' ),
-            'total'                => __( 'Invoice Total', 'invoicing' ),
-            'items'                => __( 'Invoice Items', 'invoicing' ),
-            'first_name'           => __( 'First Name', 'invoicing' ),
-            'last_name'            => __( 'Last Name', 'invoicing' ),
-            'email'                => __( 'Email Address', 'invoicing' ),
-            '_wpinv_company'       => __( 'Company', 'invoicing' ),
-            'phone'                => __( 'Phone Number', 'invoicing' ),
-            'address'              => __( 'Address', 'invoicing' ),
-            '_wpinv_city'          => __( 'City', 'invoicing' ),
-            '_wpinv_country'       => __( 'Country', 'invoicing' ),
-            '_wpinv_state'         => __( 'State', 'invoicing' ),
-            '_wpinv_zip'           => __( 'Zip Code', 'invoicing' ),
+            'number'               => __('Invoice Number', 'invoicing'),
+            'created_date'         => __('Invoice Date', 'invoicing'),
+            'status'               => __('Invoice Status', 'invoicing'),
+            'total'                => __('Invoice Total', 'invoicing'),
+            'items'                => __('Invoice Items', 'invoicing'),
+            'first_name'           => __('First Name', 'invoicing'),
+            'last_name'            => __('Last Name', 'invoicing'),
+            'email'                => __('Email Address', 'invoicing'),
+            '_wpinv_company'       => __('Company', 'invoicing'),
+            'phone'                => __('Phone Number', 'invoicing'),
+            'address'              => __('Address', 'invoicing'),
+            '_wpinv_city'          => __('City', 'invoicing'),
+            '_wpinv_country'       => __('Country', 'invoicing'),
+            '_wpinv_state'         => __('State', 'invoicing'),
+            '_wpinv_zip'           => __('Zip Code', 'invoicing'),
         );
 
-        $subscription = wpinv_get_subscription( $invoice );
+        $subscription = wpinv_get_subscription($invoice);
         $period = $initial_amt = $bill_times = $billed = $renewal_date = '';
 
-        if ( $invoice->is_recurring() && !empty( $subscription ) ) {
-            $frequency = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $subscription->period,$subscription->frequency );
-            $period = wpinv_price( wpinv_format_amount( $subscription->recurring_amount ), wpinv_get_invoice_currency_code( $subscription->parent_payment_id ) ) . ' / ' . $frequency;
-            $initial_amt = wpinv_price( wpinv_format_amount( $subscription->initial_amount ), wpinv_get_invoice_currency_code( $subscription->parent_payment_id ) );
-            $bill_times = $subscription->get_times_billed() . ' / ' . ( ( $subscription->bill_times == 0 ) ? __( 'Until Cancelled', 'invoicing' ) : $subscription->bill_times );
-            $renewal_date = ! empty( $subscription->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $subscription->expiration ) ) : __( 'N/A', 'invoicing' );
-
-            $props_to_export['period'] = __( 'Billing Cycle', 'invoicing' );
-            $props_to_export['initial_amount'] = __( 'Initial Amount', 'invoicing' );
-            $props_to_export['bill_times'] = __( 'Times Billed', 'invoicing' );
-            $props_to_export['renewal_date'] = __( 'Renewal Date', 'invoicing' );
+        if ($invoice->is_recurring() && !empty($subscription)) {
+            $frequency = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency($subscription->period, $subscription->frequency);
+            $period = wpinv_price(wpinv_format_amount($subscription->recurring_amount), wpinv_get_invoice_currency_code($subscription->parent_payment_id)) . ' / ' . $frequency;
+            $initial_amt = wpinv_price(wpinv_format_amount($subscription->initial_amount), wpinv_get_invoice_currency_code($subscription->parent_payment_id));
+            $bill_times = $subscription->get_times_billed() . ' / ' . (($subscription->bill_times == 0) ? __('Until Cancelled', 'invoicing') : $subscription->bill_times);
+            $renewal_date = !empty($subscription->expiration) ? date_i18n(get_option('date_format'), strtotime($subscription->expiration)) : __('N/A', 'invoicing');
+
+            $props_to_export['period'] = __('Billing Cycle', 'invoicing');
+            $props_to_export['initial_amount'] = __('Initial Amount', 'invoicing');
+            $props_to_export['bill_times'] = __('Times Billed', 'invoicing');
+            $props_to_export['renewal_date'] = __('Renewal Date', 'invoicing');
         }
 
-        $props_to_export['ip'] = __( 'IP Address', 'invoicing' );
-        $props_to_export['view_url'] = __( 'Invoice Link', 'invoicing' );
+        $props_to_export['ip'] = __('IP Address', 'invoicing');
+        $props_to_export['view_url'] = __('Invoice Link', 'invoicing');
 
-        $props_to_export = apply_filters( 'wpinv_privacy_export_invoice_personal_data_props', $props_to_export, $invoice, $subscription);
+        $props_to_export = apply_filters('wpinv_privacy_export_invoice_personal_data_props', $props_to_export, $invoice, $subscription);
 
-        foreach ( $props_to_export as $prop => $name ) {
+        foreach ($props_to_export as $prop => $name) {
             $value = '';
 
-            switch ( $prop ) {
+            switch ($prop) {
                 case 'items':
                     $item_names = array();
-                    foreach ( $invoice->get_cart_details() as $key => $cart_item ) {
-                        $item_quantity  = $cart_item['quantity'] > 0 ? absint( $cart_item['quantity'] ) : 1;
+                    foreach ($invoice->get_cart_details() as $key => $cart_item) {
+                        $item_quantity = $cart_item['quantity'] > 0 ? absint($cart_item['quantity']) : 1;
                         $item_names[] = $cart_item['name'] . ' x ' . $item_quantity;
                     }
-                    $value = implode( ', ', $item_names );
+                    $value = implode(', ', $item_names);
                     break;
                 case 'status':
                     $value = $invoice->get_status(true);
@@ -139,7 +139,7 @@ 
                     $value = $renewal_date;
                     break;
                 default:
-                    if ( is_callable( array( $invoice, 'get_' . $prop ) ) ) {
+                    if (is_callable(array($invoice, 'get_' . $prop))) {
                         $value = $invoice->{"get_$prop"}();
                     } else {
                         $value = $invoice->get_meta($prop);
@@ -147,9 +147,9 @@ 
                     break;
             }
 
-            $value = apply_filters( 'wpi_privacy_export_invoice_personal_data_prop', $value, $prop, $invoice );
+            $value = apply_filters('wpi_privacy_export_invoice_personal_data_prop', $value, $prop, $invoice);
 
-            if ( $value ) {
+            if ($value) {
                 $personal_data[] = array(
                     'name'  => $name,
                     'value' => $value,
@@ -158,7 +158,7 @@ 
 
         }
 
-        $personal_data = apply_filters( 'wpinv_privacy_export_invoice_personal_data', $personal_data, $invoice );
+        $personal_data = apply_filters('wpinv_privacy_export_invoice_personal_data', $personal_data, $invoice);
 
         return $personal_data;