AyeCode / invoicing

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' : $sub->bill_times ); ?></td>
+										<td><?php echo $sub->get_times_billed() . ' / ' . (($sub->bill_times == 0) ? 'Until Cancelled' : $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/admin-pages.php

Spacing +147 added lines, -147 removed lines

@@ -1,47 +1,47 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-add_filter( 'manage_wpi_discount_posts_columns', 'wpinv_discount_columns' );
-function wpinv_discount_columns( $existing_columns ) {
+add_filter('manage_wpi_discount_posts_columns', 'wpinv_discount_columns');
+function wpinv_discount_columns($existing_columns) {
     $columns                = array();
     $columns['cb']          = $existing_columns['cb'];
-    $columns['name']        = __( 'Name', 'invoicing' );
-    $columns['code']        = __( 'Code', 'invoicing' );
-    $columns['amount']      = __( 'Amount', 'invoicing' );
-    $columns['usage']       = __( 'Usage / Limit', 'invoicing' );
-    $columns['start_date']  = __( 'Start Date', 'invoicing' );
-    $columns['expiry_date'] = __( 'Expiry Date', 'invoicing' );
-    $columns['status']      = __( 'Status', 'invoicing' );
+    $columns['name']        = __('Name', 'invoicing');
+    $columns['code']        = __('Code', 'invoicing');
+    $columns['amount']      = __('Amount', 'invoicing');
+    $columns['usage']       = __('Usage / Limit', 'invoicing');
+    $columns['start_date']  = __('Start Date', 'invoicing');
+    $columns['expiry_date'] = __('Expiry Date', 'invoicing');
+    $columns['status']      = __('Status', 'invoicing');
 
     return $columns;
 }
 
-add_action( 'manage_wpi_discount_posts_custom_column', 'wpinv_discount_custom_column' );
-function wpinv_discount_custom_column( $column ) {
+add_action('manage_wpi_discount_posts_custom_column', 'wpinv_discount_custom_column');
+function wpinv_discount_custom_column($column) {
     global $post;
     
     $discount = $post;
 
-    switch ( $column ) {
+    switch ($column) {
         case 'name' :
-            echo get_the_title( $discount->ID );
+            echo get_the_title($discount->ID);
         break;
         case 'code' :
-            echo wpinv_get_discount_code( $discount->ID );
+            echo wpinv_get_discount_code($discount->ID);
         break;
         case 'amount' :
-            echo wpinv_format_discount_rate( wpinv_get_discount_type( $discount->ID ), wpinv_get_discount_amount( $discount->ID ) );
+            echo wpinv_format_discount_rate(wpinv_get_discount_type($discount->ID), wpinv_get_discount_amount($discount->ID));
         break;
         case 'usage_limit' :
-            echo wpinv_get_discount_uses( $discount->ID );
+            echo wpinv_get_discount_uses($discount->ID);
         break;
         case 'usage' :
-            $usage = wpinv_get_discount_uses( $discount->ID ) . ' / ';
-            if ( wpinv_get_discount_max_uses( $discount->ID ) ) {
-                $usage .= wpinv_get_discount_max_uses( $discount->ID );
+            $usage = wpinv_get_discount_uses($discount->ID) . ' / ';
+            if (wpinv_get_discount_max_uses($discount->ID)) {
+                $usage .= wpinv_get_discount_max_uses($discount->ID);
             } else {
                 $usage .= ' &infin;';
             }
@@ -49,8 +49,8 @@ 
             echo $usage;
         break;
         case 'start_date' :
-            if ( $start_date = wpinv_get_discount_start_date( $discount->ID ) ) {
-                $value = date_i18n( get_option( 'date_format' ) . ' @ ' . get_option( 'time_format' ), strtotime( $start_date ) );
+            if ($start_date = wpinv_get_discount_start_date($discount->ID)) {
+                $value = date_i18n(get_option('date_format') . ' @ ' . get_option('time_format'), strtotime($start_date));
             } else {
                 $value = '-';
             }
@@ -58,163 +58,163 @@ 
             echo $value;
         break;
         case 'expiry_date' :
-            if ( $expiration = wpinv_get_discount_expiration( $discount->ID ) ) {
-                $value = date_i18n( get_option( 'date_format' ) . ' @ ' . get_option( 'time_format' ), strtotime( $expiration ) );
+            if ($expiration = wpinv_get_discount_expiration($discount->ID)) {
+                $value = date_i18n(get_option('date_format') . ' @ ' . get_option('time_format'), strtotime($expiration));
             } else {
-                $value = __( 'Never', 'invoicing' );
+                $value = __('Never', 'invoicing');
             }
                 
             echo $value;
         break;
         break;
         case 'description' :
-            echo wp_kses_post( $post->post_excerpt );
+            echo wp_kses_post($post->post_excerpt);
         break;
         case 'status' :
-            $status = wpinv_is_discount_expired( $discount->ID ) ? 'expired' : $discount->post_status;
+            $status = wpinv_is_discount_expired($discount->ID) ? 'expired' : $discount->post_status;
             
-            echo wpinv_discount_status( $status );
+            echo wpinv_discount_status($status);
         break;
     }
 }
 
-add_filter( 'post_row_actions', 'wpinv_post_row_actions', 9999, 2 );
-function wpinv_post_row_actions( $actions, $post ) {
-    $post_type = !empty( $post->post_type ) ? $post->post_type : '';
+add_filter('post_row_actions', 'wpinv_post_row_actions', 9999, 2);
+function wpinv_post_row_actions($actions, $post) {
+    $post_type = !empty($post->post_type) ? $post->post_type : '';
     
-    if ( $post_type == 'wpi_invoice' ) {
+    if ($post_type == 'wpi_invoice') {
         $actions = array();
     }
     
-    if ( $post_type == 'wpi_discount' ) {
-        $actions = wpinv_discount_row_actions( $post, $actions );
+    if ($post_type == 'wpi_discount') {
+        $actions = wpinv_discount_row_actions($post, $actions);
     }
     
     return $actions;
 }
 
-function wpinv_discount_row_actions( $discount, $row_actions ) {
-    $row_actions  = array();
-    $edit_link = get_edit_post_link( $discount->ID );
-    $row_actions['edit'] = '<a href="' . esc_url( $edit_link ) . '">' . __( 'Edit', 'invoicing' ) . '</a>';
+function wpinv_discount_row_actions($discount, $row_actions) {
+    $row_actions = array();
+    $edit_link = get_edit_post_link($discount->ID);
+    $row_actions['edit'] = '<a href="' . esc_url($edit_link) . '">' . __('Edit', 'invoicing') . '</a>';
 
-    if( in_array( strtolower( $discount->post_status ),  array(  'publish' ) ) ) {
-        $row_actions['deactivate'] = '<a href="' . esc_url( wp_nonce_url( add_query_arg( array( 'wpi_action' => 'deactivate_discount', 'discount' => $discount->ID ) ), 'wpinv_discount_nonce' ) ) . '">' . __( 'Deactivate', 'invoicing' ) . '</a>';
-    } elseif( in_array( strtolower( $discount->post_status ),  array( 'pending', 'draft' ) ) ) {
-        $row_actions['activate'] = '<a href="' . esc_url( wp_nonce_url( add_query_arg( array( 'wpi_action' => 'activate_discount', 'discount' => $discount->ID ) ), 'wpinv_discount_nonce' ) ) . '">' . __( 'Activate', 'invoicing' ) . '</a>';
+    if (in_array(strtolower($discount->post_status), array('publish'))) {
+        $row_actions['deactivate'] = '<a href="' . esc_url(wp_nonce_url(add_query_arg(array('wpi_action' => 'deactivate_discount', 'discount' => $discount->ID)), 'wpinv_discount_nonce')) . '">' . __('Deactivate', 'invoicing') . '</a>';
+    } elseif (in_array(strtolower($discount->post_status), array('pending', 'draft'))) {
+        $row_actions['activate'] = '<a href="' . esc_url(wp_nonce_url(add_query_arg(array('wpi_action' => 'activate_discount', 'discount' => $discount->ID)), 'wpinv_discount_nonce')) . '">' . __('Activate', 'invoicing') . '</a>';
     }
 
-    if ( wpinv_get_discount_uses( $discount->ID ) > 0 ) {
-        if ( isset( $row_actions['delete'] ) ) {
-            unset( $row_actions['delete'] ); // Don't delete used discounts.
+    if (wpinv_get_discount_uses($discount->ID) > 0) {
+        if (isset($row_actions['delete'])) {
+            unset($row_actions['delete']); // Don't delete used discounts.
         }
     } else {
-        $row_actions['delete'] = '<a href="' . esc_url( wp_nonce_url( add_query_arg( array( 'wpi_action' => 'delete_discount', 'discount' => $discount->ID ) ), 'wpinv_discount_nonce' ) ) . '">' . __( 'Delete', 'invoicing' ) . '</a>';
+        $row_actions['delete'] = '<a href="' . esc_url(wp_nonce_url(add_query_arg(array('wpi_action' => 'delete_discount', 'discount' => $discount->ID)), 'wpinv_discount_nonce')) . '">' . __('Delete', 'invoicing') . '</a>';
     }
     
 
-    $row_actions = apply_filters( 'wpinv_discount_row_actions', $row_actions, $discount );
+    $row_actions = apply_filters('wpinv_discount_row_actions', $row_actions, $discount);
 
     return $row_actions;
 }
 
-add_filter( 'list_table_primary_column', 'wpinv_table_primary_column', 10, 2 );
-function wpinv_table_primary_column( $default, $screen_id ) {
-    if ( 'edit-wpi_invoice' === $screen_id ) {
+add_filter('list_table_primary_column', 'wpinv_table_primary_column', 10, 2);
+function wpinv_table_primary_column($default, $screen_id) {
+    if ('edit-wpi_invoice' === $screen_id) {
         return 'name';
     }
     
     return $default;
 }
 
-function wpinv_discount_bulk_actions( $actions, $display = false ) {    
-    if ( !$display ) {
+function wpinv_discount_bulk_actions($actions, $display = false) {    
+    if (!$display) {
         return array();
     }
     
     $actions = array(
-        'activate'   => __( 'Activate', 'invoicing' ),
-        'deactivate' => __( 'Deactivate', 'invoicing' ),
-        'delete'     => __( 'Delete', 'invoicing' ),
+        'activate'   => __('Activate', 'invoicing'),
+        'deactivate' => __('Deactivate', 'invoicing'),
+        'delete'     => __('Delete', 'invoicing'),
     );
     $two = '';
     $which = 'top';
     echo '</div><div class="alignleft actions bulkactions">';
-    echo '<label for="bulk-action-selector-' . esc_attr( $which ) . '" class="screen-reader-text">' . __( 'Select bulk action' ) . '</label>';
-    echo '<select name="action' . $two . '" id="bulk-action-selector-' . esc_attr( $which ) . "\">";
-    echo '<option value="-1">' . __( 'Bulk Actions' ) . "</option>";
+    echo '<label for="bulk-action-selector-' . esc_attr($which) . '" class="screen-reader-text">' . __('Select bulk action') . '</label>';
+    echo '<select name="action' . $two . '" id="bulk-action-selector-' . esc_attr($which) . "\">";
+    echo '<option value="-1">' . __('Bulk Actions') . "</option>";
 
-    foreach ( $actions as $name => $title ) {
+    foreach ($actions as $name => $title) {
         $class = 'edit' === $name ? ' class="hide-if-no-js"' : '';
 
         echo "" . '<option value="' . $name . '"' . $class . '>' . $title . "</option>";
     }
     echo "</select>";
 
-    submit_button( __( 'Apply' ), 'action', '', false, array( 'id' => "doaction$two" ) );
+    submit_button(__('Apply'), 'action', '', false, array('id' => "doaction$two"));
     
     echo '</div><div class="alignleft actions">';
 }
-add_filter( 'bulk_actions-edit-wpi_discount', 'wpinv_discount_bulk_actions', 10 );
+add_filter('bulk_actions-edit-wpi_discount', 'wpinv_discount_bulk_actions', 10);
 
-function wpinv_disable_months_dropdown( $disable, $post_type ) {
-    if ( $post_type == 'wpi_discount' ) {
+function wpinv_disable_months_dropdown($disable, $post_type) {
+    if ($post_type == 'wpi_discount') {
         $disable = true;
     }
     
     return $disable;
 }
-add_filter( 'disable_months_dropdown', 'wpinv_disable_months_dropdown', 10, 2 );
+add_filter('disable_months_dropdown', 'wpinv_disable_months_dropdown', 10, 2);
 
 function wpinv_restrict_manage_posts() {
     global $typenow;
 
-    if( 'wpi_discount' == $typenow ) {
+    if ('wpi_discount' == $typenow) {
         wpinv_discount_filters();
     }
 }
-add_action( 'restrict_manage_posts', 'wpinv_restrict_manage_posts', 10 );
+add_action('restrict_manage_posts', 'wpinv_restrict_manage_posts', 10);
 
 function wpinv_discount_filters() {
-    echo wpinv_discount_bulk_actions( array(), true );
+    echo wpinv_discount_bulk_actions(array(), true);
     
     ?>
     <select name="discount_type" id="dropdown_wpinv_discount_type">
-        <option value=""><?php _e( 'Show all types', 'invoicing' ); ?></option>
+        <option value=""><?php _e('Show all types', 'invoicing'); ?></option>
         <?php
             $types = wpinv_get_discount_types();
 
-            foreach ( $types as $name => $type ) {
-                echo '<option value="' . esc_attr( $name ) . '"';
+            foreach ($types as $name => $type) {
+                echo '<option value="' . esc_attr($name) . '"';
 
-                if ( isset( $_GET['discount_type'] ) )
-                    selected( $name, $_GET['discount_type'] );
+                if (isset($_GET['discount_type']))
+                    selected($name, $_GET['discount_type']);
 
-                echo '>' . esc_html__( $type, 'invoicing' ) . '</option>';
+                echo '>' . esc_html__($type, 'invoicing') . '</option>';
             }
         ?>
     </select>
     <?php
 }
 
-function wpinv_request( $vars ) {
+function wpinv_request($vars) {
     global $typenow, $wp_query, $wp_post_statuses;
 
-    if ( 'wpi_invoice' === $typenow ) {
-        if ( !isset( $vars['post_status'] ) ) {
+    if ('wpi_invoice' === $typenow) {
+        if (!isset($vars['post_status'])) {
             $post_statuses = wpinv_get_invoice_statuses();
 
-            foreach ( $post_statuses as $status => $value ) {
-                if ( isset( $wp_post_statuses[ $status ] ) && false === $wp_post_statuses[ $status ]->show_in_admin_all_list ) {
-                    unset( $post_statuses[ $status ] );
+            foreach ($post_statuses as $status => $value) {
+                if (isset($wp_post_statuses[$status]) && false === $wp_post_statuses[$status]->show_in_admin_all_list) {
+                    unset($post_statuses[$status]);
                 }
             }
 
-            $vars['post_status'] = array_keys( $post_statuses );
+            $vars['post_status'] = array_keys($post_statuses);
         }
         
-        if ( isset( $vars['orderby'] ) ) {
-            if ( 'amount' == $vars['orderby'] ) {
+        if (isset($vars['orderby'])) {
+            if ('amount' == $vars['orderby']) {
                 $vars = array_merge(
                     $vars,
                     array(
@@ -222,7 +222,7 @@ 
                         'orderby'  => 'meta_value_num'
                     )
                 );
-            } else if ( 'customer' == $vars['orderby'] ) {
+            } else if ('customer' == $vars['orderby']) {
                 $vars = array_merge(
                     $vars,
                     array(
@@ -230,7 +230,7 @@ 
                         'orderby'  => 'meta_value'
                     )
                 );
-            } else if ( 'number' == $vars['orderby'] ) {
+            } else if ('number' == $vars['orderby']) {
                 $vars = array_merge(
                     $vars,
                     array(
@@ -238,7 +238,7 @@ 
                         'orderby'  => 'meta_value'
                     )
                 );
-            } else if ( 'payment_date' == $vars['orderby'] ) {
+            } else if ('payment_date' == $vars['orderby']) {
                 $vars = array_merge(
                     $vars,
                     array(
@@ -248,9 +248,9 @@ 
                 );
             }
         }
-    } else if ( 'wpi_item' == $typenow ) {
+    } else if ('wpi_item' == $typenow) {
         // Check if 'orderby' is set to "price"
-        if ( isset( $vars['orderby'] ) && 'price' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'price' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -261,7 +261,7 @@ 
         }
 
         // Check if "orderby" is set to "vat_rule"
-        if ( isset( $vars['orderby'] ) && 'vat_rule' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'vat_rule' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -272,7 +272,7 @@ 
         }
 
         // Check if "orderby" is set to "vat_class"
-        if ( isset( $vars['orderby'] ) && 'vat_class' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'vat_class' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -283,7 +283,7 @@ 
         }
         
         // Check if "orderby" is set to "type"
-        if ( isset( $vars['orderby'] ) && 'type' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'type' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -294,7 +294,7 @@ 
         }
         
         // Check if "orderby" is set to "recurring"
-        if ( isset( $vars['orderby'] ) && 'recurring' == $vars['orderby'] ) {
+        if (isset($vars['orderby']) && 'recurring' == $vars['orderby']) {
             $vars = array_merge(
                 $vars,
                 array(
@@ -304,104 +304,104 @@ 
             );
         }
 
-        $meta_query = !empty( $vars['meta_query'] ) ? $vars['meta_query'] : array();
+        $meta_query = !empty($vars['meta_query']) ? $vars['meta_query'] : array();
         // Filter vat rule type
-        if ( isset( $_GET['vat_rule'] ) && $_GET['vat_rule'] !== '' ) {
+        if (isset($_GET['vat_rule']) && $_GET['vat_rule'] !== '') {
             $meta_query[] = array(
                     'key'   => '_wpinv_vat_rule',
-                    'value' => sanitize_text_field( $_GET['vat_rule'] ),
+                    'value' => sanitize_text_field($_GET['vat_rule']),
                     'compare' => '='
                 );
         }
         
         // Filter vat class
-        if ( isset( $_GET['vat_class'] ) && $_GET['vat_class'] !== '' ) {
+        if (isset($_GET['vat_class']) && $_GET['vat_class'] !== '') {
             $meta_query[] = array(
                     'key'   => '_wpinv_vat_class',
-                    'value' => sanitize_text_field( $_GET['vat_class'] ),
+                    'value' => sanitize_text_field($_GET['vat_class']),
                     'compare' => '='
                 );
         }
         
         // Filter item type
-        if ( isset( $_GET['type'] ) && $_GET['type'] !== '' ) {
+        if (isset($_GET['type']) && $_GET['type'] !== '') {
             $meta_query[] = array(
                     'key'   => '_wpinv_type',
-                    'value' => sanitize_text_field( $_GET['type'] ),
+                    'value' => sanitize_text_field($_GET['type']),
                     'compare' => '='
                 );
         }
         
-        if ( !empty( $meta_query ) ) {
+        if (!empty($meta_query)) {
             $vars['meta_query'] = $meta_query;
         }
-    } else if ( 'wpi_discount' == $typenow ) {
-        $meta_query = !empty( $vars['meta_query'] ) ? $vars['meta_query'] : array();
+    } else if ('wpi_discount' == $typenow) {
+        $meta_query = !empty($vars['meta_query']) ? $vars['meta_query'] : array();
         // Filter vat rule type
-        if ( isset( $_GET['discount_type'] ) && $_GET['discount_type'] !== '' ) {
+        if (isset($_GET['discount_type']) && $_GET['discount_type'] !== '') {
             $meta_query[] = array(
                     'key'   => '_wpi_discount_type',
-                    'value' => sanitize_text_field( $_GET['discount_type'] ),
+                    'value' => sanitize_text_field($_GET['discount_type']),
                     'compare' => '='
                 );
         }
         
-        if ( !empty( $meta_query ) ) {
+        if (!empty($meta_query)) {
             $vars['meta_query'] = $meta_query;
         }
     }
 
     return $vars;
 }
-add_filter( 'request', 'wpinv_request' );
+add_filter('request', 'wpinv_request');
 
-function wpinv_item_type_class( $classes, $class, $post_id ) {
+function wpinv_item_type_class($classes, $class, $post_id) {
     global $pagenow, $typenow;
 
-    if ( $pagenow == 'edit.php' && $typenow == 'wpi_item' && get_post_type( $post_id ) == $typenow ) {
-        if ( $type = get_post_meta( $post_id, '_wpinv_type', true ) ) {
-            $classes[] = 'wpi-type-' . sanitize_html_class( $type );
+    if ($pagenow == 'edit.php' && $typenow == 'wpi_item' && get_post_type($post_id) == $typenow) {
+        if ($type = get_post_meta($post_id, '_wpinv_type', true)) {
+            $classes[] = 'wpi-type-' . sanitize_html_class($type);
         }
         
-        if ( !wpinv_item_is_editable( $post_id ) ) {
+        if (!wpinv_item_is_editable($post_id)) {
             $classes[] = 'wpi-editable-n';
         }
     }
     return $classes;
 }
-add_filter( 'post_class', 'wpinv_item_type_class', 10, 3 );
+add_filter('post_class', 'wpinv_item_type_class', 10, 3);
 
 function wpinv_check_quick_edit() {
     global $pagenow, $current_screen, $wpinv_item_screen;
 
-    if ( $pagenow == 'edit.php' && !empty( $current_screen->post_type ) ) {
-        if ( empty( $wpinv_item_screen ) ) {
-            if ( $current_screen->post_type == 'wpi_item' ) {
+    if ($pagenow == 'edit.php' && !empty($current_screen->post_type)) {
+        if (empty($wpinv_item_screen)) {
+            if ($current_screen->post_type == 'wpi_item') {
                 $wpinv_item_screen = 'y';
             } else {
                 $wpinv_item_screen = 'n';
             }
         }
 
-        if ( $wpinv_item_screen == 'y' && $pagenow == 'edit.php' ) {
-            add_filter( 'post_row_actions', 'wpinv_item_disable_quick_edit', 10, 2 );
-            add_filter( 'page_row_actions', 'wpinv_item_disable_quick_edit', 10, 2 );
+        if ($wpinv_item_screen == 'y' && $pagenow == 'edit.php') {
+            add_filter('post_row_actions', 'wpinv_item_disable_quick_edit', 10, 2);
+            add_filter('page_row_actions', 'wpinv_item_disable_quick_edit', 10, 2);
         }
     }
 }
-add_action( 'admin_head', 'wpinv_check_quick_edit', 10 );
+add_action('admin_head', 'wpinv_check_quick_edit', 10);
 
-function wpinv_item_disable_quick_edit( $actions = array(), $row = null ) {
-    if ( isset( $actions['inline hide-if-no-js'] ) ) {
-        unset( $actions['inline hide-if-no-js'] );
+function wpinv_item_disable_quick_edit($actions = array(), $row = null) {
+    if (isset($actions['inline hide-if-no-js'])) {
+        unset($actions['inline hide-if-no-js']);
     }
     
-    if ( !empty( $row->post_type ) && $row->post_type == 'wpi_item' && !wpinv_item_is_editable( $row ) ) {
-        if ( isset( $actions['trash'] ) ) {
-            unset( $actions['trash'] );
+    if (!empty($row->post_type) && $row->post_type == 'wpi_item' && !wpinv_item_is_editable($row)) {
+        if (isset($actions['trash'])) {
+            unset($actions['trash']);
         }
-        if ( isset( $actions['delete'] ) ) {
-            unset( $actions['delete'] );
+        if (isset($actions['delete'])) {
+            unset($actions['delete']);
         }
     }
 
@@ -418,19 +418,19 @@ 
  * @param int $post_parent (default: 0) Parent for the new page
  * @return int page ID
  */
-function wpinv_create_page( $slug, $option = '', $page_title = '', $page_content = '', $post_parent = 0 ) {
+function wpinv_create_page($slug, $option = '', $page_title = '', $page_content = '', $post_parent = 0) {
     global $wpdb;
 
-    $option_value = wpinv_get_option( $option );
+    $option_value = wpinv_get_option($option);
 
-    if ( $option_value > 0 && ( $page_object = get_post( $option_value ) ) ) {
-        if ( 'page' === $page_object->post_type && ! in_array( $page_object->post_status, array( 'pending', 'trash', 'future', 'auto-draft' ) ) ) {
+    if ($option_value > 0 && ($page_object = get_post($option_value))) {
+        if ('page' === $page_object->post_type && !in_array($page_object->post_status, array('pending', 'trash', 'future', 'auto-draft'))) {
             // Valid page is already in place
             return $page_object->ID;
         }
     }
 
-    if(!empty($post_parent)){
+    if (!empty($post_parent)) {
         $page = get_page_by_path($post_parent);
         if ($page) {
             $post_parent = $page->ID;
@@ -439,40 +439,40 @@ 
         }
     }
 
-    if ( strlen( $page_content ) > 0 ) {
+    if (strlen($page_content) > 0) {
         // Search for an existing page with the specified page content (typically a shortcode)
-        $valid_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_content LIKE %s LIMIT 1;", "%{$page_content}%" ) );
+        $valid_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_content LIKE %s LIMIT 1;", "%{$page_content}%"));
     } else {
         // Search for an existing page with the specified page slug
-        $valid_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' )  AND post_name = %s LIMIT 1;", $slug ) );
+        $valid_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' )  AND post_name = %s LIMIT 1;", $slug));
     }
 
-    $valid_page_found = apply_filters( 'wpinv_create_page_id', $valid_page_found, $slug, $page_content );
+    $valid_page_found = apply_filters('wpinv_create_page_id', $valid_page_found, $slug, $page_content);
 
-    if ( $valid_page_found ) {
-        if ( $option ) {
-            wpinv_update_option( $option, $valid_page_found );
+    if ($valid_page_found) {
+        if ($option) {
+            wpinv_update_option($option, $valid_page_found);
         }
         return $valid_page_found;
     }
 
     // Search for a matching valid trashed page
-    if ( strlen( $page_content ) > 0 ) {
+    if (strlen($page_content) > 0) {
         // Search for an existing page with the specified page content (typically a shortcode)
-        $trashed_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_content LIKE %s LIMIT 1;", "%{$page_content}%" ) );
+        $trashed_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_content LIKE %s LIMIT 1;", "%{$page_content}%"));
     } else {
         // Search for an existing page with the specified page slug
-        $trashed_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_name = %s LIMIT 1;", $slug ) );
+        $trashed_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_name = %s LIMIT 1;", $slug));
     }
 
-    if ( $trashed_page_found ) {
+    if ($trashed_page_found) {
         $page_id   = $trashed_page_found;
         $page_data = array(
             'ID'             => $page_id,
             'post_status'    => 'publish',
             'post_parent'    => $post_parent,
         );
-        wp_update_post( $page_data );
+        wp_update_post($page_data);
     } else {
         $page_data = array(
             'post_status'    => 'publish',
@@ -484,11 +484,11 @@ 
             'post_parent'    => $post_parent,
             'comment_status' => 'closed',
         );
-        $page_id = wp_insert_post( $page_data );
+        $page_id = wp_insert_post($page_data);
     }
 
-    if ( $option ) {
-        wpinv_update_option( $option, (int)$page_id );
+    if ($option) {
+        wpinv_update_option($option, (int) $page_id);
     }
 
     return $page_id;

includes/admin/meta-boxes/class-mb-invoice-items.php

Spacing +164 added lines, -164 removed lines

@@ -1,47 +1,47 @@ 
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Meta_Box_Items {
-    public static function output( $post ) {
+    public static function output($post) {
         global $wpinv_euvat, $ajax_cart_details;
 
-        $post_id            = !empty( $post->ID ) ? $post->ID : 0;
-        $invoice            = new WPInv_Invoice( $post_id );
+        $post_id            = !empty($post->ID) ? $post->ID : 0;
+        $invoice            = new WPInv_Invoice($post_id);
         $ajax_cart_details  = $invoice->get_cart_details();
-        $subtotal           = $invoice->get_subtotal( true );
+        $subtotal           = $invoice->get_subtotal(true);
         $discount_raw       = $invoice->get_discount();
-        $discount           = wpinv_price( $discount_raw, $invoice->get_currency() );
+        $discount           = wpinv_price($discount_raw, $invoice->get_currency());
         $discounts          = $discount_raw > 0 ? $invoice->get_discounts() : '';
-        $tax                = $invoice->get_tax( true );
-        $total              = $invoice->get_total( true );
+        $tax                = $invoice->get_tax(true);
+        $total              = $invoice->get_total(true);
         $item_quantities    = wpinv_item_quantities_enabled();
         $use_taxes          = wpinv_use_taxes();
-        if ( !$use_taxes && (float)$invoice->get_tax() > 0 ) {
+        if (!$use_taxes && (float) $invoice->get_tax() > 0) {
             $use_taxes = true;
         }
-        $item_types         = apply_filters( 'wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post );
+        $item_types         = apply_filters('wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post);
         $is_recurring       = $invoice->is_recurring();
         $post_type_object   = get_post_type_object($invoice->post_type);
         $type_title         = $post_type_object->labels->singular_name;
 
         $cols = 5;
-        if ( $item_quantities ) {
+        if ($item_quantities) {
             $cols++;
         }
-        if ( $use_taxes ) {
+        if ($use_taxes) {
             $cols++;
         }
         $class = '';
-        if ( $invoice->is_paid() ) {
+        if ($invoice->is_paid()) {
             $class .= ' wpinv-paid';
         }
-        if ( $invoice->is_refunded() ) {
+        if ($invoice->is_refunded()) {
             $class .= ' wpinv-refunded';
         }
-        if ( $is_recurring ) {
+        if ($is_recurring) {
             $class .= ' wpi-recurring';
         }
         ?>
@@ -49,21 +49,21 @@ 
             <table id="wpinv_items" class="wpinv-items" cellspacing="0" cellpadding="0">
                 <thead>
                     <tr>
-                        <th class="id"><?php _e( 'ID', 'invoicing' );?></th>
-                        <th class="title"><?php _e( 'Item', 'invoicing' );?></th>
-                        <th class="price"><?php _e( 'Price', 'invoicing' );?></th>
-                        <?php if ( $item_quantities ) { ?>
-                        <th class="qty"><?php _e( 'Qty', 'invoicing' );?></th>
+                        <th class="id"><?php _e('ID', 'invoicing'); ?></th>
+                        <th class="title"><?php _e('Item', 'invoicing'); ?></th>
+                        <th class="price"><?php _e('Price', 'invoicing'); ?></th>
+                        <?php if ($item_quantities) { ?>
+                        <th class="qty"><?php _e('Qty', 'invoicing'); ?></th>
                         <?php } ?>
-                        <th class="total"><?php _e( 'Total', 'invoicing' );?></th>
-                        <?php if ( $use_taxes ) { ?>
-                        <th class="tax"><?php _e( 'Tax (%)', 'invoicing' );?></th>
+                        <th class="total"><?php _e('Total', 'invoicing'); ?></th>
+                        <?php if ($use_taxes) { ?>
+                        <th class="tax"><?php _e('Tax (%)', 'invoicing'); ?></th>
                         <?php } ?>
                         <th class="action"></th>
                     </tr>
                 </thead>
                 <tbody class="wpinv-line-items">
-                    <?php echo wpinv_admin_get_line_items( $invoice ); ?>
+                    <?php echo wpinv_admin_get_line_items($invoice); ?>
                 </tbody>
                 <tfoot class="wpinv-totals">
                     <tr>
@@ -74,45 +74,45 @@ 
                                         <td class="id">
                                         </td>
                                         <td class="title">
-                                            <input type="text" class="regular-text" placeholder="<?php _e( 'Item Name', 'invoicing' ); ?>" value="" name="_wpinv_quick[name]">
-                                            <?php if ( $wpinv_euvat->allow_vat_rules() ) { ?>
+                                            <input type="text" class="regular-text" placeholder="<?php _e('Item Name', 'invoicing'); ?>" value="" name="_wpinv_quick[name]">
+                                            <?php if ($wpinv_euvat->allow_vat_rules()) { ?>
                                             <div class="wp-clearfix">
                                                 <label class="wpi-vat-rule">
-                                                    <span class="title"><?php _e( 'VAT rule type', 'invoicing' );?></span>
+                                                    <span class="title"><?php _e('VAT rule type', 'invoicing'); ?></span>
                                                     <span class="input-text-wrap">
-                                                        <?php echo wpinv_html_select( array(
+                                                        <?php echo wpinv_html_select(array(
                                                             'options'          => $wpinv_euvat->get_rules(),
                                                             'name'             => '_wpinv_quick[vat_rule]',
                                                             'id'               => '_wpinv_quick_vat_rule',
                                                             'show_option_all'  => false,
                                                             'show_option_none' => false,
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-vat-rule wpi_select2',
-                                                        ) ); ?>
+                                                        )); ?>
                                                     </span>
                                                 </label>
                                             </div>
-                                            <?php } if ( $wpinv_euvat->allow_vat_classes() ) { ?>
+                                            <?php } if ($wpinv_euvat->allow_vat_classes()) { ?>
                                             <div class="wp-clearfix">
                                                 <label class="wpi-vat-class">
-                                                    <span class="title"><?php _e( 'VAT class', 'invoicing' );?></span>
+                                                    <span class="title"><?php _e('VAT class', 'invoicing'); ?></span>
                                                     <span class="input-text-wrap">
-                                                        <?php echo wpinv_html_select( array(
+                                                        <?php echo wpinv_html_select(array(
                                                             'options'          => $wpinv_euvat->get_all_classes(),
                                                             'name'             => '_wpinv_quick[vat_class]',
                                                             'id'               => '_wpinv_quick_vat_class',
                                                             'show_option_all'  => false,
                                                             'show_option_none' => false,
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-vat-class wpi_select2',
-                                                        ) ); ?>
+                                                        )); ?>
                                                     </span>
                                                 </label>
                                             </div>
                                             <?php } ?>
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-type">
-                                                    <span class="title"><?php _e( 'Item type', 'invoicing' );?></span>
+                                                    <span class="title"><?php _e('Item type', 'invoicing'); ?></span>
                                                     <span class="input-text-wrap">
-                                                        <?php echo wpinv_html_select( array(
+                                                        <?php echo wpinv_html_select(array(
                                                             'options'          => $item_types,
                                                             'name'             => '_wpinv_quick[type]',
                                                             'id'               => '_wpinv_quick_type',
@@ -120,7 +120,7 @@ 
                                                             'show_option_all'  => false,
                                                             'show_option_none' => false,
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-type wpi_select2',
-                                                        ) ); ?>
+                                                        )); ?>
                                                     </span>
                                                 </label>
                                             </div>
@@ -133,11 +133,11 @@ 
                                             </div>
                                         </td>
                                         <td class="price"><input type="text" placeholder="0.00" class="wpi-field-price wpi-price" name="_wpinv_quick[price]" /></td>
-                                        <?php if ( $item_quantities ) { ?>
+                                        <?php if ($item_quantities) { ?>
                                         <td class="qty"><input type="number" class="small-text" step="1" min="1" value="1" name="_wpinv_quick[qty]" /></td>
                                         <?php } ?>
                                         <td class="total"></td>
-                                        <?php if ( $use_taxes ) { ?>
+                                        <?php if ($use_taxes) { ?>
                                         <td class="tax"></td>
                                         <?php } ?>
                                         <td class="action"></td>
@@ -150,29 +150,29 @@ 
                         <td colspan="<?php echo $cols; ?>"></td>
                     </tr>
                     <tr class="totals">
-                        <td colspan="<?php echo ( $cols - 4 ); ?>"></td>
+                        <td colspan="<?php echo ($cols - 4); ?>"></td>
                         <td colspan="4">
                             <table cellspacing="0" cellpadding="0">
                                 <tr class="subtotal">
-                                    <td class="name"><?php _e( 'Sub Total:', 'invoicing' );?></td>
-                                    <td class="total"><?php echo $subtotal;?></td>
+                                    <td class="name"><?php _e('Sub Total:', 'invoicing'); ?></td>
+                                    <td class="total"><?php echo $subtotal; ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <tr class="discount">
-                                    <td class="name"><?php wpinv_get_discount_label( wpinv_discount_code( $invoice->ID ) ); ?>:</td>
-                                    <td class="total"><?php echo wpinv_discount( $invoice->ID, true, true ); ?></td>
+                                    <td class="name"><?php wpinv_get_discount_label(wpinv_discount_code($invoice->ID)); ?>:</td>
+                                    <td class="total"><?php echo wpinv_discount($invoice->ID, true, true); ?></td>
                                     <td class="action"></td>
                                 </tr>
-                                <?php if ( $use_taxes ) { ?>
+                                <?php if ($use_taxes) { ?>
                                 <tr class="tax">
-                                    <td class="name"><?php _e( 'Tax:', 'invoicing' );?></td>
-                                    <td class="total"><?php echo $tax;?></td>
+                                    <td class="name"><?php _e('Tax:', 'invoicing'); ?></td>
+                                    <td class="total"><?php echo $tax; ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <?php } ?>
                                 <tr class="total">
-                                    <td class="name"><?php echo apply_filters( 'wpinv_invoice_items_total_label', __( 'Invoice Total:', 'invoicing' ), $invoice );?></td>
-                                    <td class="total"><?php echo $total;?></td>
+                                    <td class="name"><?php echo apply_filters('wpinv_invoice_items_total_label', __('Invoice Total:', 'invoicing'), $invoice); ?></td>
+                                    <td class="total"><?php echo $total; ?></td>
                                     <td class="action"></td>
                                 </tr>
                             </table>
@@ -183,90 +183,90 @@ 
             <div class="wpinv-actions">
                 <?php ob_start(); ?>
                 <?php
-                    if ( !$invoice->is_paid() && !$invoice->is_refunded() ) {
-                        if ( !$invoice->is_recurring() ) {
-                            echo wpinv_item_dropdown( array(
+                    if (!$invoice->is_paid() && !$invoice->is_refunded()) {
+                        if (!$invoice->is_recurring()) {
+                            echo wpinv_item_dropdown(array(
                                 'name'             => 'wpinv_invoice_item',
                                 'id'               => 'wpinv_invoice_item',
                                 'show_recurring'   => true,
                                 'class'            => 'wpi_select2',
-                            ) );
+                            ));
                     ?>
-                <input type="button" value="<?php echo sprintf(esc_attr__( 'Add item to %s', 'invoicing'), $type_title); ?>" class="button button-primary" id="wpinv-add-item"><input type="button" value="<?php esc_attr_e( 'Create new item', 'invoicing' );?>" class="button button-primary" id="wpinv-new-item"><?php } ?><input type="button" value="<?php esc_attr_e( 'Recalculate Totals', 'invoicing' );?>" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">
+                <input type="button" value="<?php echo sprintf(esc_attr__('Add item to %s', 'invoicing'), $type_title); ?>" class="button button-primary" id="wpinv-add-item"><input type="button" value="<?php esc_attr_e('Create new item', 'invoicing'); ?>" class="button button-primary" id="wpinv-new-item"><?php } ?><input type="button" value="<?php esc_attr_e('Recalculate Totals', 'invoicing'); ?>" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">
                     <?php } ?>
-                <?php do_action( 'wpinv_invoice_items_actions', $invoice ); ?>
-                <?php $item_actions = ob_get_clean(); echo apply_filters( 'wpinv_invoice_items_actions_content', $item_actions, $invoice, $post ); ?>
+                <?php do_action('wpinv_invoice_items_actions', $invoice); ?>
+                <?php $item_actions = ob_get_clean(); echo apply_filters('wpinv_invoice_items_actions_content', $item_actions, $invoice, $post); ?>
             </div>
         </div>
         <?php
     }
 
-    public static function prices( $post ) {        
+    public static function prices($post) {        
         $symbol         = wpinv_currency_symbol();
         $position       = wpinv_currency_position();
-        $item           = new WPInv_Item( $post->ID );
+        $item           = new WPInv_Item($post->ID);
 
         $price                = $item->get_price();
         $is_dynamic_pricing   = $item->get_is_dynamic_pricing();
         $minimum_price        = $item->get_minimum_price();
         $is_recurring         = $item->is_recurring();
         $period               = $item->get_recurring_period();
-        $interval             = absint( $item->get_recurring_interval() );
-        $times                = absint( $item->get_recurring_limit() );
+        $interval             = absint($item->get_recurring_interval());
+        $times                = absint($item->get_recurring_limit());
         $free_trial           = $item->has_free_trial();
         $trial_interval       = $item->get_trial_interval();
         $trial_period         = $item->get_trial_period();
 
         $intervals            = array();
-        for ( $i = 1; $i <= 90; $i++ ) {
+        for ($i = 1; $i <= 90; $i++) {
             $intervals[$i] = $i;
         }
 
-        $interval       = $interval > 0 ? $interval : 1;
+        $interval = $interval > 0 ? $interval : 1;
 
         $class = $is_recurring ? 'wpinv-recurring-y' : 'wpinv-recurring-n';
 
         $minimum_price_style = 'margin-left: 24px;';
-        if(! $is_dynamic_pricing ) {
+        if (!$is_dynamic_pricing) {
             $minimum_price_style .= 'display: none;';
         }
 
         ?>
-        <p class="wpinv-row-prices"><?php echo ( $position != 'right' ? $symbol . '&nbsp;' : '' );?><input type="text" maxlength="12" placeholder="<?php echo wpinv_sanitize_amount( 0 ); ?>" value="<?php echo $price;?>" id="wpinv_item_price" name="wpinv_item_price" class="medium-text wpi-field-price wpi-price" <?php disabled( $item->is_editable(), false ); ?> /><?php echo ( $position == 'right' ? '&nbsp;' . $symbol : '' );?><input type="hidden" name="wpinv_vat_meta_box_nonce" value="<?php echo wp_create_nonce( 'wpinv_item_meta_box_save' ) ;?>" />
-        <?php do_action( 'wpinv_prices_metabox_price', $item ); ?>
+        <p class="wpinv-row-prices"><?php echo ($position != 'right' ? $symbol . '&nbsp;' : ''); ?><input type="text" maxlength="12" placeholder="<?php echo wpinv_sanitize_amount(0); ?>" value="<?php echo $price; ?>" id="wpinv_item_price" name="wpinv_item_price" class="medium-text wpi-field-price wpi-price" <?php disabled($item->is_editable(), false); ?> /><?php echo ($position == 'right' ? '&nbsp;' . $symbol : ''); ?><input type="hidden" name="wpinv_vat_meta_box_nonce" value="<?php echo wp_create_nonce('wpinv_item_meta_box_save'); ?>" />
+        <?php do_action('wpinv_prices_metabox_price', $item); ?>
         </p>
 
-    <?php if( $item->supports_dynamic_pricing() ) { ?>
+    <?php if ($item->supports_dynamic_pricing()) { ?>
 
         <p class="wpinv-row-name-your-price">
             <label>
-                <input type="checkbox" name="wpinv_name_your_price" id="wpinv_name_your_price" value="1" <?php checked( 1, $is_dynamic_pricing ); ?> />
-                <?php echo apply_filters( 'wpinv_name_your_price_toggle_text', __( 'User can set a custom price', 'invoicing' ) ); ?>
+                <input type="checkbox" name="wpinv_name_your_price" id="wpinv_name_your_price" value="1" <?php checked(1, $is_dynamic_pricing); ?> />
+                <?php echo apply_filters('wpinv_name_your_price_toggle_text', __('User can set a custom price', 'invoicing')); ?>
             </label>
-            <?php do_action( 'wpinv_prices_metabox_name_your_price_field', $item ); ?>
+            <?php do_action('wpinv_prices_metabox_name_your_price_field', $item); ?>
         </p>
 
         <p class="wpinv-row-minimum-price" style="<?php echo $minimum_price_style; ?>">
             <label>
-                <?php _e( 'Minimum Price', 'invoicing' ); ?>
-                <?php echo ( $position != 'right' ? $symbol . '&nbsp;' : '' );?><input type="text" maxlength="12" placeholder="<?php echo wpinv_sanitize_amount( 0 ); ?>" value="<?php echo $minimum_price;?>" id="wpinv_minimum_price" name="wpinv_minimum_price" class="medium-text wpi-field-price" <?php disabled( $item->is_editable(), false ); ?> /><?php echo ( $position == 'right' ? '&nbsp;' . $symbol : '' );?>
+                <?php _e('Minimum Price', 'invoicing'); ?>
+                <?php echo ($position != 'right' ? $symbol . '&nbsp;' : ''); ?><input type="text" maxlength="12" placeholder="<?php echo wpinv_sanitize_amount(0); ?>" value="<?php echo $minimum_price; ?>" id="wpinv_minimum_price" name="wpinv_minimum_price" class="medium-text wpi-field-price" <?php disabled($item->is_editable(), false); ?> /><?php echo ($position == 'right' ? '&nbsp;' . $symbol : ''); ?>
             </label>
 
-            <?php do_action( 'wpinv_prices_metabox_minimum_price_field', $item ); ?>
+            <?php do_action('wpinv_prices_metabox_minimum_price_field', $item); ?>
         </p>
 
     <?php } ?>
 
         <p class="wpinv-row-is-recurring">
             <label for="wpinv_is_recurring">
-                <input type="checkbox" name="wpinv_is_recurring" id="wpinv_is_recurring" value="1" <?php checked( 1, $is_recurring ); ?> />
-                <?php echo apply_filters( 'wpinv_is_recurring_toggle_text', __( 'Is Recurring Item?', 'invoicing' ) ); ?>
+                <input type="checkbox" name="wpinv_is_recurring" id="wpinv_is_recurring" value="1" <?php checked(1, $is_recurring); ?> />
+                <?php echo apply_filters('wpinv_is_recurring_toggle_text', __('Is Recurring Item?', 'invoicing')); ?>
             </label>
-            <?php do_action( 'wpinv_prices_metabox_is_recurring_field', $item ); ?>
+            <?php do_action('wpinv_prices_metabox_is_recurring_field', $item); ?>
         </p>
-        <p class="wpinv-row-recurring-fields <?php echo $class;?>">
-            <label class="wpinv-period" for="wpinv_recurring_period"><?php _e( 'Recurring', 'invoicing' );?> <select class="wpinv-select wpi_select2" id="wpinv_recurring_period" name="wpinv_recurring_period"><option value="D" data-text="<?php esc_attr_e( 'day(s)', 'invoicing' ); ?>" <?php selected( 'D', $period );?>><?php _e( 'Daily', 'invoicing' ); ?></option><option value="W" data-text="<?php esc_attr_e( 'week(s)', 'invoicing' ); ?>" <?php selected( 'W', $period );?>><?php _e( 'Weekly', 'invoicing' ); ?></option><option value="M" data-text="<?php esc_attr_e( 'month(s)', 'invoicing' ); ?>" <?php selected( 'M', $period );?>><?php _e( 'Monthly', 'invoicing' ); ?></option><option value="Y" data-text="<?php esc_attr_e( 'year(s)', 'invoicing' ); ?>" <?php selected( 'Y', $period );?>><?php _e( 'Yearly', 'invoicing' ); ?></option></select></label>
-            <label class="wpinv-interval" for="wpinv_recurring_interval"> <?php _e( 'at every', 'invoicing' );?> <?php echo wpinv_html_select( array(
+        <p class="wpinv-row-recurring-fields <?php echo $class; ?>">
+            <label class="wpinv-period" for="wpinv_recurring_period"><?php _e('Recurring', 'invoicing'); ?> <select class="wpinv-select wpi_select2" id="wpinv_recurring_period" name="wpinv_recurring_period"><option value="D" data-text="<?php esc_attr_e('day(s)', 'invoicing'); ?>" <?php selected('D', $period); ?>><?php _e('Daily', 'invoicing'); ?></option><option value="W" data-text="<?php esc_attr_e('week(s)', 'invoicing'); ?>" <?php selected('W', $period); ?>><?php _e('Weekly', 'invoicing'); ?></option><option value="M" data-text="<?php esc_attr_e('month(s)', 'invoicing'); ?>" <?php selected('M', $period); ?>><?php _e('Monthly', 'invoicing'); ?></option><option value="Y" data-text="<?php esc_attr_e('year(s)', 'invoicing'); ?>" <?php selected('Y', $period); ?>><?php _e('Yearly', 'invoicing'); ?></option></select></label>
+            <label class="wpinv-interval" for="wpinv_recurring_interval"> <?php _e('at every', 'invoicing'); ?> <?php echo wpinv_html_select(array(
                 'options'          => $intervals,
                 'name'             => 'wpinv_recurring_interval',
                 'id'               => 'wpinv_recurring_interval',
@@ -274,30 +274,30 @@ 
                 'show_option_all'  => false,
                 'show_option_none' => false,
                 'class'            => 'wpi_select2',
-            ) ); ?> <span id="wpinv_interval_text"><?php _e( 'day(s)', 'invoicing' );?></span></label>
-            <label class="wpinv-times" for="wpinv_recurring_limit"> <?php _e( 'for', 'invoicing' );?> <input class="small-text" type="number" value="<?php echo $times;?>" size="4" id="wpinv_recurring_limit" name="wpinv_recurring_limit" step="1" min="0"> <?php _e( 'time(s) <i>(select 0 for recurring forever until cancelled</i>)', 'invoicing' );?></label>
+            )); ?> <span id="wpinv_interval_text"><?php _e('day(s)', 'invoicing'); ?></span></label>
+            <label class="wpinv-times" for="wpinv_recurring_limit"> <?php _e('for', 'invoicing'); ?> <input class="small-text" type="number" value="<?php echo $times; ?>" size="4" id="wpinv_recurring_limit" name="wpinv_recurring_limit" step="1" min="0"> <?php _e('time(s) <i>(select 0 for recurring forever until cancelled</i>)', 'invoicing'); ?></label>
             <span class="clear wpi-trial-clr"></span>
             <label class="wpinv-free-trial" for="wpinv_free_trial">
-                <input type="checkbox" name="wpinv_free_trial" id="wpinv_free_trial" value="1" <?php checked( true, (bool)$free_trial ); ?> /> 
-                <?php echo __( 'Offer free trial for', 'invoicing' ); ?>
+                <input type="checkbox" name="wpinv_free_trial" id="wpinv_free_trial" value="1" <?php checked(true, (bool) $free_trial); ?> /> 
+                <?php echo __('Offer free trial for', 'invoicing'); ?>
             </label>
             <label class="wpinv-trial-interval" for="wpinv_trial_interval">
-                <input class="small-text" type="number" value="<?php echo $trial_interval;?>" size="4" id="wpinv_trial_interval" name="wpinv_trial_interval" step="1" min="1"> <select class="wpinv-select wpi_select2" id="wpinv_trial_period" name="wpinv_trial_period"><option value="D" <?php selected( 'D', $trial_period );?>><?php _e( 'day(s)', 'invoicing' ); ?></option><option value="W" <?php selected( 'W', $trial_period );?>><?php _e( 'week(s)', 'invoicing' ); ?></option><option value="M" <?php selected( 'M', $trial_period );?>><?php _e( 'month(s)', 'invoicing' ); ?></option><option value="Y" <?php selected( 'Y', $trial_period );?>><?php _e( 'year(s)', 'invoicing' ); ?></option></select>
+                <input class="small-text" type="number" value="<?php echo $trial_interval; ?>" size="4" id="wpinv_trial_interval" name="wpinv_trial_interval" step="1" min="1"> <select class="wpinv-select wpi_select2" id="wpinv_trial_period" name="wpinv_trial_period"><option value="D" <?php selected('D', $trial_period); ?>><?php _e('day(s)', 'invoicing'); ?></option><option value="W" <?php selected('W', $trial_period); ?>><?php _e('week(s)', 'invoicing'); ?></option><option value="M" <?php selected('M', $trial_period); ?>><?php _e('month(s)', 'invoicing'); ?></option><option value="Y" <?php selected('Y', $trial_period); ?>><?php _e('year(s)', 'invoicing'); ?></option></select>
             </label>
-            <?php do_action( 'wpinv_prices_metabox_recurring_fields', $item ); ?>
+            <?php do_action('wpinv_prices_metabox_recurring_fields', $item); ?>
         </p>
-        <input type="hidden" id="_wpi_current_type" value="<?php echo wpinv_get_item_type( $post->ID ); ?>" />
-        <?php do_action( 'wpinv_item_price_field', $post->ID ); ?>
+        <input type="hidden" id="_wpi_current_type" value="<?php echo wpinv_get_item_type($post->ID); ?>" />
+        <?php do_action('wpinv_item_price_field', $post->ID); ?>
         <?php
     }
 
-    public static function vat_rules( $post ) {
+    public static function vat_rules($post) {
         global $wpinv_euvat;
 
-        $rule_type = $wpinv_euvat->get_item_rule( $post->ID );
+        $rule_type = $wpinv_euvat->get_item_rule($post->ID);
         ?>
-        <p><label for="wpinv_vat_rules"><strong><?php _e( 'Select how VAT rules will be applied:', 'invoicing' );?></strong></label>&nbsp;&nbsp;&nbsp;
-        <?php echo wpinv_html_select( array(
+        <p><label for="wpinv_vat_rules"><strong><?php _e('Select how VAT rules will be applied:', 'invoicing'); ?></strong></label>&nbsp;&nbsp;&nbsp;
+        <?php echo wpinv_html_select(array(
                     'options'          => $wpinv_euvat->get_rules(),
                     'name'             => 'wpinv_vat_rules',
                     'id'               => 'wpinv_vat_rules',
@@ -305,19 +305,19 @@ 
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpinv-vat-rules wpi_select2',
-                ) ); ?>
+                )); ?>
         </p>
-        <p class="wpi-m0"><?php _e( 'When you select physical product rules, only consumers and businesses in your country will be charged VAT.  The VAT rate used will be the rate in your country.', 'invoicing' ); ?></p>
-        <p class="wpi-m0"><?php _e( 'If you select Digital product rules, VAT will be charged at the rate that applies in the country of the consumer.  Only businesses in your country will be charged VAT.', 'invoicing' ); ?></p>
+        <p class="wpi-m0"><?php _e('When you select physical product rules, only consumers and businesses in your country will be charged VAT.  The VAT rate used will be the rate in your country.', 'invoicing'); ?></p>
+        <p class="wpi-m0"><?php _e('If you select Digital product rules, VAT will be charged at the rate that applies in the country of the consumer.  Only businesses in your country will be charged VAT.', 'invoicing'); ?></p>
         <?php
     }
 
-    public static function vat_classes( $post ) {
+    public static function vat_classes($post) {
         global $wpinv_euvat;
         
-        $vat_class = $wpinv_euvat->get_item_class( $post->ID );
+        $vat_class = $wpinv_euvat->get_item_class($post->ID);
         ?>
-        <p><?php echo wpinv_html_select( array(
+        <p><?php echo wpinv_html_select(array(
                     'options'          => $wpinv_euvat->get_all_classes(),
                     'name'             => 'wpinv_vat_class',
                     'id'               => 'wpinv_vat_class',
@@ -325,18 +325,18 @@ 
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpinv-vat-class wpi_select2',
-                ) ); ?>
+                )); ?>
         </p>
-        <p class="wpi-m0"><?php _e( 'Select the VAT rate class to use for this invoice item.', 'invoicing' ); ?></p>
+        <p class="wpi-m0"><?php _e('Select the VAT rate class to use for this invoice item.', 'invoicing'); ?></p>
         <?php
     }
 
-    public static function item_info( $post ) {
-        $item_type = wpinv_get_item_type( $post->ID );
-        do_action( 'wpinv_item_info_metabox_before', $post );
+    public static function item_info($post) {
+        $item_type = wpinv_get_item_type($post->ID);
+        do_action('wpinv_item_info_metabox_before', $post);
         ?>
-        <p><label for="wpinv_item_type"><strong><?php _e( 'Type:', 'invoicing' );?></strong></label>&nbsp;&nbsp;&nbsp;
-        <?php echo wpinv_html_select( array(
+        <p><label for="wpinv_item_type"><strong><?php _e('Type:', 'invoicing'); ?></strong></label>&nbsp;&nbsp;&nbsp;
+        <?php echo wpinv_html_select(array(
                     'options'          => wpinv_get_item_types(),
                     'name'             => 'wpinv_item_type',
                     'id'               => 'wpinv_item_type',
@@ -344,114 +344,114 @@ 
                     'show_option_all'  => false,
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-medium wpinv-item-type',
-                ) ); ?>
+                )); ?>
         </p>
-        <p class="wpi-m0"><?php _e( 'Select item type.', 'invoicing' );?><br><?php _e( '<b>Standard:</b> Standard item type', 'invoicing' );?><br><?php _e( '<b>Fee:</b> Like Registration Fee, Sign up Fee etc.', 'invoicing' );?></p>
+        <p class="wpi-m0"><?php _e('Select item type.', 'invoicing'); ?><br><?php _e('<b>Standard:</b> Standard item type', 'invoicing'); ?><br><?php _e('<b>Fee:</b> Like Registration Fee, Sign up Fee etc.', 'invoicing'); ?></p>
         <?php
-        do_action( 'wpinv_item_info_metabox_after', $post );
+        do_action('wpinv_item_info_metabox_after', $post);
     }
 
-    public static function meta_values( $post ) {
-        $meta_keys = apply_filters( 'wpinv_show_meta_values_for_keys', array(
+    public static function meta_values($post) {
+        $meta_keys = apply_filters('wpinv_show_meta_values_for_keys', array(
             'type',
             'custom_id'
-        ) );
+        ));
 
-        if ( empty( $meta_keys ) ) {
+        if (empty($meta_keys)) {
             return;
         }
 
-        do_action( 'wpinv_meta_values_metabox_before', $post );
+        do_action('wpinv_meta_values_metabox_before', $post);
 
-        foreach ( $meta_keys as $meta_key ) {
+        foreach ($meta_keys as $meta_key) {
             ?>
-            <p class="wpi-mtb05"><label><strong><?php echo $meta_key; ?></strong>: <?php echo get_post_meta( $post->ID, '_wpinv_' . $meta_key, true ); ?></label></p>
+            <p class="wpi-mtb05"><label><strong><?php echo $meta_key; ?></strong>: <?php echo get_post_meta($post->ID, '_wpinv_' . $meta_key, true); ?></label></p>
             <?php 
         }
 
-        do_action( 'wpinv_meta_values_metabox_after', $post );
+        do_action('wpinv_meta_values_metabox_after', $post);
     }
 
-    public static function save( $post_id, $data, $post ) {
-        $invoice        = new WPInv_Invoice( $post_id );
+    public static function save($post_id, $data, $post) {
+        $invoice        = new WPInv_Invoice($post_id);
 
         // Billing
-        $first_name     = sanitize_text_field( $data['wpinv_first_name'] );
-        $last_name      = sanitize_text_field( $data['wpinv_last_name'] );
-        $company        = sanitize_text_field( $data['wpinv_company'] );
-        $vat_number     = sanitize_text_field( $data['wpinv_vat_number'] );
-        $phone          = sanitize_text_field( $data['wpinv_phone'] );
-        $address        = sanitize_text_field( $data['wpinv_address'] );
-        $city           = sanitize_text_field( $data['wpinv_city'] );
-        $zip            = sanitize_text_field( $data['wpinv_zip'] );
-        $country        = sanitize_text_field( $data['wpinv_country'] );
-        $state          = sanitize_text_field( $data['wpinv_state'] );
+        $first_name     = sanitize_text_field($data['wpinv_first_name']);
+        $last_name      = sanitize_text_field($data['wpinv_last_name']);
+        $company        = sanitize_text_field($data['wpinv_company']);
+        $vat_number     = sanitize_text_field($data['wpinv_vat_number']);
+        $phone          = sanitize_text_field($data['wpinv_phone']);
+        $address        = sanitize_text_field($data['wpinv_address']);
+        $city           = sanitize_text_field($data['wpinv_city']);
+        $zip            = sanitize_text_field($data['wpinv_zip']);
+        $country        = sanitize_text_field($data['wpinv_country']);
+        $state          = sanitize_text_field($data['wpinv_state']);
 
         // Details
-        $status         = sanitize_text_field( $data['wpinv_status'] );
-        $old_status     = !empty( $data['original_post_status'] ) ? sanitize_text_field( $data['original_post_status'] ) : $status;
-        $number         = sanitize_text_field( $data['wpinv_number'] );
-        $due_date       = isset( $data['wpinv_due_date'] ) ? sanitize_text_field( $data['wpinv_due_date'] ) : '';
+        $status         = sanitize_text_field($data['wpinv_status']);
+        $old_status     = !empty($data['original_post_status']) ? sanitize_text_field($data['original_post_status']) : $status;
+        $number         = sanitize_text_field($data['wpinv_number']);
+        $due_date       = isset($data['wpinv_due_date']) ? sanitize_text_field($data['wpinv_due_date']) : '';
         //$discounts      = sanitize_text_field( $data['wpinv_discounts'] );
         //$discount       = sanitize_text_field( $data['wpinv_discount'] );
 
-        $ip             = $invoice->get_ip() ? $invoice->get_ip() : wpinv_get_ip();
-
-        $invoice->set( 'due_date', $due_date );
-        $invoice->set( 'first_name', $first_name );
-        $invoice->set( 'last_name', $last_name );
-        $invoice->set( 'company', $company );
-        $invoice->set( 'vat_number', $vat_number );
-        $invoice->set( 'phone', $phone );
-        $invoice->set( 'address', $address );
-        $invoice->set( 'city', $city );
-        $invoice->set( 'zip', $zip );
-        $invoice->set( 'country', $country );
-        $invoice->set( 'state', $state );
-        $invoice->set( 'status', $status );
+        $ip = $invoice->get_ip() ? $invoice->get_ip() : wpinv_get_ip();
+
+        $invoice->set('due_date', $due_date);
+        $invoice->set('first_name', $first_name);
+        $invoice->set('last_name', $last_name);
+        $invoice->set('company', $company);
+        $invoice->set('vat_number', $vat_number);
+        $invoice->set('phone', $phone);
+        $invoice->set('address', $address);
+        $invoice->set('city', $city);
+        $invoice->set('zip', $zip);
+        $invoice->set('country', $country);
+        $invoice->set('state', $state);
+        $invoice->set('status', $status);
         //$invoice->set( 'number', $number );
         //$invoice->set( 'discounts', $discounts );
         //$invoice->set( 'discount', $discount );
-        $invoice->set( 'ip', $ip );
+        $invoice->set('ip', $ip);
         $invoice->old_status = $_POST['original_post_status'];
         $invoice->currency = wpinv_get_currency();
-        if ( !empty( $data['wpinv_gateway'] ) ) {
-            $invoice->set( 'gateway', sanitize_text_field( $data['wpinv_gateway'] ) );
+        if (!empty($data['wpinv_gateway'])) {
+            $invoice->set('gateway', sanitize_text_field($data['wpinv_gateway']));
         }
         $saved = $invoice->save();
 
         // Check for payment notes
-        if ( !empty( $data['invoice_note'] ) ) {
-            $note               = wp_kses( $data['invoice_note'], array() );
-            $note_type          = sanitize_text_field( $data['invoice_note_type'] );
+        if (!empty($data['invoice_note'])) {
+            $note               = wp_kses($data['invoice_note'], array());
+            $note_type          = sanitize_text_field($data['invoice_note_type']);
             $is_customer_note   = $note_type == 'customer' ? 1 : 0;
 
-            wpinv_insert_payment_note( $invoice->ID, $note, $is_customer_note );
+            wpinv_insert_payment_note($invoice->ID, $note, $is_customer_note);
         }
 
         // Update user address if empty.
-        if ( $saved && !empty( $invoice ) ) {
-            if ( $user_id = $invoice->get_user_id() ) {
-                $user_address = wpinv_get_user_address( $user_id, false );
+        if ($saved && !empty($invoice)) {
+            if ($user_id = $invoice->get_user_id()) {
+                $user_address = wpinv_get_user_address($user_id, false);
 
                 if (empty($user_address['first_name'])) {
-                    update_user_meta( $user_id, '_wpinv_first_name', $first_name );
-                    update_user_meta( $user_id, '_wpinv_last_name', $last_name );
+                    update_user_meta($user_id, '_wpinv_first_name', $first_name);
+                    update_user_meta($user_id, '_wpinv_last_name', $last_name);
                 } else if (empty($user_address['last_name']) && $user_address['first_name'] == $first_name) {
-                    update_user_meta( $user_id, '_wpinv_last_name', $last_name );
+                    update_user_meta($user_id, '_wpinv_last_name', $last_name);
                 }
 
                 if (empty($user_address['address']) || empty($user_address['city']) || empty($user_address['state']) || empty($user_address['country'])) {
-                    update_user_meta( $user_id, '_wpinv_address', $address );
-                    update_user_meta( $user_id, '_wpinv_city', $city );
-                    update_user_meta( $user_id, '_wpinv_state', $state );
-                    update_user_meta( $user_id, '_wpinv_country', $country );
-                    update_user_meta( $user_id, '_wpinv_zip', $zip );
-                    update_user_meta( $user_id, '_wpinv_phone', $phone );
+                    update_user_meta($user_id, '_wpinv_address', $address);
+                    update_user_meta($user_id, '_wpinv_city', $city);
+                    update_user_meta($user_id, '_wpinv_state', $state);
+                    update_user_meta($user_id, '_wpinv_country', $country);
+                    update_user_meta($user_id, '_wpinv_zip', $zip);
+                    update_user_meta($user_id, '_wpinv_phone', $phone);
                 }
             }
 
-            do_action( 'wpinv_invoice_metabox_saved', $invoice );
+            do_action('wpinv_invoice_metabox_saved', $invoice);
         }
 
         return $saved;

includes/admin/wpinv-upgrade-functions.php

Spacing +68 added lines, -68 removed lines

@@ -11,49 +11,49 @@ 
  * @since 1.0.0
 */
 function wpinv_automatic_upgrade() {
-    $wpi_version = get_option( 'wpinv_version' );
+    $wpi_version = get_option('wpinv_version');
 
-    if ( $wpi_version == WPINV_VERSION ) {
+    if ($wpi_version == WPINV_VERSION) {
         return;
     }
     
-    if ( version_compare( $wpi_version, '0.0.5', '<' ) ) {
+    if (version_compare($wpi_version, '0.0.5', '<')) {
         wpinv_v005_upgrades();
     }
     
-    if ( version_compare( $wpi_version, '1.0.3', '<' ) ) {
+    if (version_compare($wpi_version, '1.0.3', '<')) {
         wpinv_v110_upgrades();
     }
     
-    update_option( 'wpinv_version', WPINV_VERSION );
+    update_option('wpinv_version', WPINV_VERSION);
 }
-add_action( 'admin_init', 'wpinv_automatic_upgrade' );
+add_action('admin_init', 'wpinv_automatic_upgrade');
 
 function wpinv_v005_upgrades() {
     global $wpdb;
     
     // Invoices status
-    $results = $wpdb->get_results( "SELECT ID FROM " . $wpdb->posts . " WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
-    if ( !empty( $results ) ) {
-        $wpdb->query( "UPDATE " . $wpdb->posts . " SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+    $results = $wpdb->get_results("SELECT ID FROM " . $wpdb->posts . " WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
+    if (!empty($results)) {
+        $wpdb->query("UPDATE " . $wpdb->posts . " SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
         
         // Clean post cache
-        foreach ( $results as $row ) {
-            clean_post_cache( $row->ID );
+        foreach ($results as $row) {
+            clean_post_cache($row->ID);
         }
     }
     
     // Item meta key changes
     $query = "SELECT DISTINCT post_id FROM " . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
-    $results = $wpdb->get_results( $query );
+    $results = $wpdb->get_results($query);
     
-    if ( !empty( $results ) ) {
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
+    if (!empty($results)) {
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )");
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'");
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'");
         
-        foreach ( $results as $row ) {
-            clean_post_cache( $row->post_id );
+        foreach ($results as $row) {
+            clean_post_cache($row->post_id);
         }
     }
 
@@ -74,79 +74,79 @@ 
 function wpinv_convert_old_subscriptions() {
     global $wpdb;
 
-    $query = "SELECT ". $wpdb->posts .".ID FROM ". $wpdb->posts ." INNER JOIN ". $wpdb->postmeta ." ON ( ". $wpdb->posts .".ID = ". $wpdb->postmeta .".post_id ) WHERE 1=1  AND ". $wpdb->postmeta .".meta_key = '_wpinv_subscr_status' AND (". $wpdb->postmeta .".meta_value = 'pending' OR ". $wpdb->postmeta .".meta_value = 'active' OR ". $wpdb->postmeta .".meta_value = 'cancelled' OR ". $wpdb->postmeta .".meta_value = 'completed' OR ". $wpdb->postmeta .".meta_value = 'expired' OR ". $wpdb->postmeta .".meta_value = 'trialling' OR ". $wpdb->postmeta .".meta_value = 'failing') AND ". $wpdb->posts .".post_type = 'wpi_invoice' GROUP BY ". $wpdb->posts .".ID ORDER BY ". $wpdb->posts .".ID ASC";
+    $query = "SELECT " . $wpdb->posts . ".ID FROM " . $wpdb->posts . " INNER JOIN " . $wpdb->postmeta . " ON ( " . $wpdb->posts . ".ID = " . $wpdb->postmeta . ".post_id ) WHERE 1=1  AND " . $wpdb->postmeta . ".meta_key = '_wpinv_subscr_status' AND (" . $wpdb->postmeta . ".meta_value = 'pending' OR " . $wpdb->postmeta . ".meta_value = 'active' OR " . $wpdb->postmeta . ".meta_value = 'cancelled' OR " . $wpdb->postmeta . ".meta_value = 'completed' OR " . $wpdb->postmeta . ".meta_value = 'expired' OR " . $wpdb->postmeta . ".meta_value = 'trialling' OR " . $wpdb->postmeta . ".meta_value = 'failing') AND " . $wpdb->posts . ".post_type = 'wpi_invoice' GROUP BY " . $wpdb->posts . ".ID ORDER BY " . $wpdb->posts . ".ID ASC";
 
-    $results = $wpdb->get_results( $query );
+    $results = $wpdb->get_results($query);
 
-    if ( empty( $results ) ) {
+    if (empty($results)) {
         return;
     }
 
-    foreach ( $results as $row ) {
-        $invoice = new WPInv_Invoice( $row->ID );
+    foreach ($results as $row) {
+        $invoice = new WPInv_Invoice($row->ID);
 
-        if ( empty( $invoice->ID ) ) {
+        if (empty($invoice->ID)) {
             continue;
         }
 
-        if ( $invoice->has_status( 'wpi-renewal' ) ) {
+        if ($invoice->has_status('wpi-renewal')) {
             continue;
         }
         
-        $item = $invoice->get_recurring( true );
+        $item = $invoice->get_recurring(true);
 
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             continue;
         }
 
         $is_free_trial          = $invoice->is_free_trial();
-        $profile_id             = get_post_meta( $invoice->ID, '_wpinv_subscr_profile_id', true );
-        $subscription_status    = get_post_meta( $invoice->ID, '_wpinv_subscr_status', true );
+        $profile_id             = get_post_meta($invoice->ID, '_wpinv_subscr_profile_id', true);
+        $subscription_status    = get_post_meta($invoice->ID, '_wpinv_subscr_status', true);
         $transaction_id         = $invoice->get_transaction_id();
 
         // Last invoice
-        $query          = "SELECT ID, post_date FROM ". $wpdb->posts ." WHERE post_type = 'wpi_invoice' AND post_parent = '" . $invoice->ID . "' ORDER BY ID DESC LIMIT 1";
-        $last_payment   = $wpdb->get_row( $query );
+        $query          = "SELECT ID, post_date FROM " . $wpdb->posts . " WHERE post_type = 'wpi_invoice' AND post_parent = '" . $invoice->ID . "' ORDER BY ID DESC LIMIT 1";
+        $last_payment   = $wpdb->get_row($query);
 
-        if ( !empty( $last_payment ) ) {
-            $invoice_date       = $last_payment->post_date;
+        if (!empty($last_payment)) {
+            $invoice_date = $last_payment->post_date;
             
-            $meta_profile_id     = get_post_meta( $last_payment->ID, '_wpinv_subscr_profile_id', true );
-            $meta_transaction_id = get_post_meta( $last_payment->ID, '_wpinv_transaction_id', true );
+            $meta_profile_id     = get_post_meta($last_payment->ID, '_wpinv_subscr_profile_id', true);
+            $meta_transaction_id = get_post_meta($last_payment->ID, '_wpinv_transaction_id', true);
 
-            if ( !empty( $meta_profile_id ) ) {
-                $profile_id  = $meta_profile_id;
+            if (!empty($meta_profile_id)) {
+                $profile_id = $meta_profile_id;
             }
 
-            if ( !empty( $meta_transaction_id ) ) {
-                $transaction_id  = $meta_transaction_id;
+            if (!empty($meta_transaction_id)) {
+                $transaction_id = $meta_transaction_id;
             }
         } else {
-            $invoice_date       = $invoice->get_invoice_date( false );
+            $invoice_date       = $invoice->get_invoice_date(false);
         }
         
-        $profile_id             = empty( $profile_id ) ? $invoice->ID : $profile_id;
-        $status                 = empty( $subscription_status ) ? 'pending' : $subscription_status;
+        $profile_id             = empty($profile_id) ? $invoice->ID : $profile_id;
+        $status                 = empty($subscription_status) ? 'pending' : $subscription_status;
         
-        $period                 = $item->get_recurring_period( true );
+        $period                 = $item->get_recurring_period(true);
         $interval               = $item->get_recurring_interval();
-        $bill_times             = (int)$item->get_recurring_limit();
+        $bill_times             = (int) $item->get_recurring_limit();
         $add_period             = $interval . ' ' . $period;
         $trial_period           = '';
 
-        if ( $invoice->is_free_trial() ) {
-            $trial_period       = $item->get_trial_period( true );
+        if ($invoice->is_free_trial()) {
+            $trial_period       = $item->get_trial_period(true);
             $free_interval      = $item->get_trial_interval();
             $trial_period       = $free_interval . ' ' . $trial_period;
 
-            if ( empty( $last_payment ) ) {
+            if (empty($last_payment)) {
                 $add_period     = $trial_period;
             }
         }
 
-        $expiration             = date_i18n( 'Y-m-d H:i:s', strtotime( '+' . $add_period  . ' 23:59:59', strtotime( $invoice_date ) ) );
-        if ( strtotime( $expiration ) <  strtotime( date_i18n( 'Y-m-d' ) ) ) {
-            if ( $status == 'active' || $status == 'trialling' || $status == 'pending' ) {
+        $expiration = date_i18n('Y-m-d H:i:s', strtotime('+' . $add_period . ' 23:59:59', strtotime($invoice_date)));
+        if (strtotime($expiration) < strtotime(date_i18n('Y-m-d'))) {
+            if ($status == 'active' || $status == 'trialling' || $status == 'pending') {
                 $status = 'expired';
             }
         }
@@ -159,7 +159,7 @@ 
             'frequency'         => $interval,
             'period'            => $period,
             'initial_amount'    => $invoice->get_total(),
-            'recurring_amount'  => $invoice->get_recurring_details( 'total' ),
+            'recurring_amount'  => $invoice->get_recurring_details('total'),
             'bill_times'        => $bill_times,
             'created'           => $invoice_date,
             'expiration'        => $expiration,
@@ -169,14 +169,14 @@ 
         );
 
         $subs_db      = new WPInv_Subscriptions_DB;
-        $subs         = $subs_db->get_subscriptions( array( 'parent_payment_id' => $invoice->ID, 'number' => 1 ) );
-        $subscription = reset( $subs );
+        $subs         = $subs_db->get_subscriptions(array('parent_payment_id' => $invoice->ID, 'number' => 1));
+        $subscription = reset($subs);
 
-        if ( empty( $subscription ) || $subscription->id <= 0 ) {
+        if (empty($subscription) || $subscription->id <= 0) {
             $subscription = new WPInv_Subscription();
-            $new_sub = $subscription->create( $args );
+            $new_sub = $subscription->create($args);
 
-            if ( !empty( $bill_times ) && $new_sub->get_times_billed() >= $bill_times && ( 'active' == $new_sub->status || 'trialling' == $new_sub->status ) ) {
+            if (!empty($bill_times) && $new_sub->get_times_billed() >= $bill_times && ('active' == $new_sub->status || 'trialling' == $new_sub->status)) {
                 $new_sub->complete(); // Mark completed if all times billed
             }
         }
@@ -186,20 +186,20 @@ 
 function wpinv_update_new_email_settings() {
     global $wpinv_options;
 
-    $current_options = get_option( 'wpinv_settings', array() );
+    $current_options = get_option('wpinv_settings', array());
     $options = array(
-        'email_new_invoice_body' => __( '<p>Hi Admin,</p><p>You have received payment invoice from {name}.</p>', 'invoicing' ),
-        'email_cancelled_invoice_body' => __( '<p>Hi Admin,</p><p>The invoice #{invoice_number} from {site_title} has been cancelled.</p>', 'invoicing' ),
-        'email_failed_invoice_body' => __( '<p>Hi Admin,</p><p>Payment for invoice #{invoice_number} from {site_title} has been failed.</p>', 'invoicing' ),
-        'email_onhold_invoice_body' => __( '<p>Hi {name},</p><p>Your invoice is on-hold until we confirm your payment has been received.</p>', 'invoicing' ),
-        'email_processing_invoice_body' => __( '<p>Hi {name},</p><p>Your invoice has been received at {site_title} and is now being processed.</p>', 'invoicing' ),
-        'email_refunded_invoice_body' => __( '<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded.</p>', 'invoicing' ),
-        'email_user_invoice_body' => __( '<p>Hi {name},</p><p>An invoice has been created for you on {site_title}. To view / pay for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing' ),
-        'email_user_note_body' => __( '<p>Hi {name},</p><p>Following note has been added to your {invoice_label}:</p><blockquote class="wpinv-note">{customer_note}</blockquote>', 'invoicing' ),
-        'email_overdue_body' => __( '<p>Hi {full_name},</p><p>This is just a friendly reminder that your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To view / pay now for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing' ),
+        'email_new_invoice_body' => __('<p>Hi Admin,</p><p>You have received payment invoice from {name}.</p>', 'invoicing'),
+        'email_cancelled_invoice_body' => __('<p>Hi Admin,</p><p>The invoice #{invoice_number} from {site_title} has been cancelled.</p>', 'invoicing'),
+        'email_failed_invoice_body' => __('<p>Hi Admin,</p><p>Payment for invoice #{invoice_number} from {site_title} has been failed.</p>', 'invoicing'),
+        'email_onhold_invoice_body' => __('<p>Hi {name},</p><p>Your invoice is on-hold until we confirm your payment has been received.</p>', 'invoicing'),
+        'email_processing_invoice_body' => __('<p>Hi {name},</p><p>Your invoice has been received at {site_title} and is now being processed.</p>', 'invoicing'),
+        'email_refunded_invoice_body' => __('<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded.</p>', 'invoicing'),
+        'email_user_invoice_body' => __('<p>Hi {name},</p><p>An invoice has been created for you on {site_title}. To view / pay for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing'),
+        'email_user_note_body' => __('<p>Hi {name},</p><p>Following note has been added to your {invoice_label}:</p><blockquote class="wpinv-note">{customer_note}</blockquote>', 'invoicing'),
+        'email_overdue_body' => __('<p>Hi {full_name},</p><p>This is just a friendly reminder that your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To view / pay now for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing'),
     );
 
-    foreach ($options as $option => $value){
+    foreach ($options as $option => $value) {
         if (!isset($current_options[$option])) {
             $current_options[$option] = $value;
         }
@@ -207,5 +207,5 @@ 
 
     $wpinv_options = $current_options;
 
-    update_option( 'wpinv_settings', $current_options );
+    update_option('wpinv_settings', $current_options);
 }
\ No newline at end of file

includes/class-wpinv-bp-core.php

Spacing +125 added lines, -125 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -9,42 +9,42 @@ 
     
     public function __construct() {
 
-        if ( !defined( 'WPINV_BP_SLUG' ) ) {
-            define( 'WPINV_BP_SLUG', 'invoices' );
+        if (!defined('WPINV_BP_SLUG')) {
+            define('WPINV_BP_SLUG', 'invoices');
         }
 
-        add_action( 'wp_ajax_invoicing_filter', array( $this, 'invoices_content' ) );
-        add_action( 'wp_ajax_nopriv_invoicing_filter', array( $this, 'invoices_content' ) );
-        add_filter( 'wpinv_settings_sections_general', array( $this, 'bp_section' ), 10, 1 );
-        add_filter( 'wpinv_settings_general', array( $this, 'bp_settings' ), 10, 1 );
-        add_filter( 'wp_nav_menu_objects', array( $this, 'wp_nav_menu_objects' ), 10, 2 );
+        add_action('wp_ajax_invoicing_filter', array($this, 'invoices_content'));
+        add_action('wp_ajax_nopriv_invoicing_filter', array($this, 'invoices_content'));
+        add_filter('wpinv_settings_sections_general', array($this, 'bp_section'), 10, 1);
+        add_filter('wpinv_settings_general', array($this, 'bp_settings'), 10, 1);
+        add_filter('wp_nav_menu_objects', array($this, 'wp_nav_menu_objects'), 10, 2);
         add_action('bp_setup_nav', array($this, 'setup_nav'), 15);
         
-        $position       = wpinv_get_option( 'wpinv_menu_position' );
+        $position       = wpinv_get_option('wpinv_menu_position');
         $position       = $position !== '' && $position !== false ? $position : 91;
-        $this->position = apply_filters( 'wpinv_bp_nav_position', $position );
-        $this->id     = WPINV_BP_SLUG;
+        $this->position = apply_filters('wpinv_bp_nav_position', $position);
+        $this->id = WPINV_BP_SLUG;
     }
 
     public function setup_nav() {
 
-        if ( wpinv_get_option( 'wpinv_bp_hide_menu' ) || !is_user_logged_in()) {
+        if (wpinv_get_option('wpinv_bp_hide_menu') || !is_user_logged_in()) {
             return;
         }
 
-        if(bp_displayed_user_id() != bp_loggedin_user_id() && !current_user_can('administrator')){
+        if (bp_displayed_user_id() != bp_loggedin_user_id() && !current_user_can('administrator')) {
             return;
         }
 
         $count = $this->get_invoice_count();
-        $class = ( 0 === $count ) ? 'no-count' : 'count';
+        $class = (0 === $count) ? 'no-count' : 'count';
 
         $main_nav_name = sprintf(
-            __( 'My Invoices %s', 'invoicing' ),
+            __('My Invoices %s', 'invoicing'),
             sprintf(
                 '<span class="%s">%s</span>',
-                esc_attr( $class ),
-                bp_core_number_format( $count )
+                esc_attr($class),
+                bp_core_number_format($count)
             )
         );
 
@@ -52,31 +52,31 @@ 
             'name'                => $main_nav_name,
             'slug'                => WPINV_BP_SLUG,
             'position'            => $this->position,
-            'screen_function'     => array( $this, 'invoices_screen' ),
+            'screen_function'     => array($this, 'invoices_screen'),
             'default_subnav_slug' => 'invoices',
             'item_css_id'         => $this->id
         );
 
-        bp_core_new_nav_item( $main_nav );
+        bp_core_new_nav_item($main_nav);
     }
     
     public function invoices_screen() {
-        if ( wpinv_get_option( 'wpinv_bp_hide_menu' ) ) {
+        if (wpinv_get_option('wpinv_bp_hide_menu')) {
             return;
         }
         
-        add_action( 'bp_template_content', array( $this, 'invoices_content' ) );
+        add_action('bp_template_content', array($this, 'invoices_content'));
 
-        $template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
+        $template = apply_filters('bp_core_template_plugin', 'members/single/plugins');
         
-        bp_core_load_template( apply_filters( 'wpinv_bp_core_template_plugin', $template ) );
+        bp_core_load_template(apply_filters('wpinv_bp_core_template_plugin', $template));
     }
     
     public function invoices_content() {
-        if ( $this->has_invoices( bp_ajax_querystring( 'invoices' ) ) ) {
+        if ($this->has_invoices(bp_ajax_querystring('invoices'))) {
             global $invoices_template;
             
-            do_action( 'wpinv_bp_invoices_before_content' );
+            do_action('wpinv_bp_invoices_before_content');
             ?>
             <div class="wpi-g wpi-bp-invoices invoices invoicing" style="position:relative">
                 <div id="pag-top" class="pagination">
@@ -90,61 +90,61 @@ 
                 <table class="table table-bordered table-hover table-responsive wpi-user-invoices" style="margin:0">
                     <thead>
                         <tr>
-                            <?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-                                <th class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>"><span class="nobr"><?php echo esc_html( $column_name['title'] ); ?></span></th>
+                            <?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+                                <th class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>"><span class="nobr"><?php echo esc_html($column_name['title']); ?></span></th>
                             <?php endforeach; ?>
                         </tr>
                     </thead>
                     <tbody>
-                        <?php foreach ( $invoices_template->invoices as $invoice ) {
+                        <?php foreach ($invoices_template->invoices as $invoice) {
                             ?>
                             <tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
-                                <?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-                                    <td class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>" data-title="<?php echo esc_attr( $column_name['title'] ); ?>">
-                                        <?php if ( has_action( 'wpinv_user_invoices_column_' . $column_id ) ) : ?>
-                                            <?php do_action( 'wpinv_user_invoices_column_' . $column_id, $invoice ); ?>
-
-                                        <?php elseif ( 'invoice-number' === $column_id ) : ?>
-                                            <a href="<?php echo esc_url( $invoice->get_view_url() ); ?>">
-                                                <?php echo _x( '#', 'hash before invoice number', 'invoicing' ) . $invoice->get_number(); ?>
+                                <?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+                                    <td class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>" data-title="<?php echo esc_attr($column_name['title']); ?>">
+                                        <?php if (has_action('wpinv_user_invoices_column_' . $column_id)) : ?>
+                                            <?php do_action('wpinv_user_invoices_column_' . $column_id, $invoice); ?>
+
+                                        <?php elseif ('invoice-number' === $column_id) : ?>
+                                            <a href="<?php echo esc_url($invoice->get_view_url()); ?>">
+                                                <?php echo _x('#', 'hash before invoice number', 'invoicing') . $invoice->get_number(); ?>
                                             </a>
 
-                                        <?php elseif ( 'created-date' === $column_id ) : $date = wpinv_get_date_created( $invoice->ID ); $dateYMD = wpinv_get_date_created( $invoice->ID, 'Y-m-d H:i:s' ); ?>
-                                            <time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
+                                        <?php elseif ('created-date' === $column_id) : $date = wpinv_get_date_created($invoice->ID); $dateYMD = wpinv_get_date_created($invoice->ID, 'Y-m-d H:i:s'); ?>
+                                            <time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
 
-                                        <?php elseif ( 'payment-date' === $column_id ) : $date = wpinv_get_invoice_date( $invoice->ID, '', false ); $dateYMD = wpinv_get_invoice_date( $invoice->ID, 'Y-m-d H:i:s', false ); ?>
-                                            <time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
+                                        <?php elseif ('payment-date' === $column_id) : $date = wpinv_get_invoice_date($invoice->ID, '', false); $dateYMD = wpinv_get_invoice_date($invoice->ID, 'Y-m-d H:i:s', false); ?>
+                                            <time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
 
-                                        <?php elseif ( 'invoice-status' === $column_id ) : ?>
-                                            <?php echo wpinv_invoice_status_label( $invoice_status, $invoice->get_status( true ) ) ; ?>
+                                        <?php elseif ('invoice-status' === $column_id) : ?>
+                                            <?php echo wpinv_invoice_status_label($invoice_status, $invoice->get_status(true)); ?>
 
-                                        <?php elseif ( 'invoice-total' === $column_id ) : ?>
-                                            <?php echo $invoice->get_total( true ); ?>
+                                        <?php elseif ('invoice-total' === $column_id) : ?>
+                                            <?php echo $invoice->get_total(true); ?>
 
-                                        <?php elseif ( 'invoice-actions' === $column_id ) : ?>
+                                        <?php elseif ('invoice-actions' === $column_id) : ?>
                                             <?php
                                                 $actions = array(
                                                     'pay'    => array(
                                                         'url'  => $invoice->get_checkout_payment_url(),
-                                                        'name' => __( 'Pay Now', 'invoicing' ),
+                                                        'name' => __('Pay Now', 'invoicing'),
                                                         'class' => 'btn-success'
                                                     ),
                                                     'print'   => array(
                                                         'url'  => $invoice->get_view_url(),
-                                                        'name' => __( 'Print', 'invoicing' ),
+                                                        'name' => __('Print', 'invoicing'),
                                                         'class' => 'btn-primary',
                                                         'attrs' => 'target="_blank"'
                                                     )
                                                 );
 
-                                                if ( ! $invoice->needs_payment() ) {
-                                                    unset( $actions['pay'] );
+                                                if (!$invoice->needs_payment()) {
+                                                    unset($actions['pay']);
                                                 }
 
-                                                if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
-                                                    foreach ( $actions as $key => $action ) {
+                                                if ($actions = apply_filters('wpinv_user_invoices_actions', $actions, $invoice)) {
+                                                    foreach ($actions as $key => $action) {
                                                         $class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
-                                                        echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
+                                                        echo '<a href="' . esc_url($action['url']) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class($key) . '" ' . (!empty($action['attrs']) ? $action['attrs'] : '') . '>' . $action['name'] . '</a>';
                                                     }
                                                 }
                                             ?>
@@ -172,64 +172,64 @@ 
             </div>
             <?php
         
-            do_action( 'wpinv_bp_invoices_after_content' );
+            do_action('wpinv_bp_invoices_after_content');
         } else {
             ?>
             <div id="message" class="info">
-                <p><?php _e( 'No invoice has been made yet.', 'invoicing' ); ?></p>
+                <p><?php _e('No invoice has been made yet.', 'invoicing'); ?></p>
             </div>
             <?php
         }
         
-        if ( defined( 'DOING_AJAX' ) ) {
+        if (defined('DOING_AJAX')) {
             exit;
         }
     }
     
-    public function has_invoices( $args = '' ) {
+    public function has_invoices($args = '') {
         global $invoices_template;
 
-        $per_page = absint( wpinv_get_option( 'wpinv_bp_per_page' ) );
+        $per_page = absint(wpinv_get_option('wpinv_bp_per_page'));
         // Parse arguments.
-        $r = bp_parse_args( $args, array(
+        $r = bp_parse_args($args, array(
             'status'            => 'all',
             'page_arg'          => 'bpage',
             'page'              => 1,
             'per_page'          => $per_page > 0 ? $per_page : 20,
             'max'               => false,
             'user_id'           => bp_displayed_user_id(),
-        ), 'has_invoices' );
+        ), 'has_invoices');
 
 
-        if ( ! empty( $r['max'] ) && ( (int)$r['per_page'] > (int)$r['max'] ) ) {
-            $r['per_page'] = (int)$r['max'];
+        if (!empty($r['max']) && ((int) $r['per_page'] > (int) $r['max'])) {
+            $r['per_page'] = (int) $r['max'];
         }
 
         // Get the invoices.
-        $invoices_template = new WPInv_BP_Invoices_Template( $r['status'], $r['page'], $r['per_page'], $r['max'], $r['user_id'], $r['page_arg'] );
+        $invoices_template = new WPInv_BP_Invoices_Template($r['status'], $r['page'], $r['per_page'], $r['max'], $r['user_id'], $r['page_arg']);
 
-        return apply_filters( 'wpinv_bp_has_invoices', $invoices_template->has_invoices(), $invoices_template, $r );
+        return apply_filters('wpinv_bp_has_invoices', $invoices_template->has_invoices(), $invoices_template, $r);
     }
     
     public function get_invoice_count() {
-        $query      = apply_filters( 'wpinv_user_invoices_count_query', array( 'status' => 'all','user' => bp_displayed_user_id(), 'limit' => '-1', 'return' => 'ids', 'paginate' => false ) );
-        $invoices   = wpinv_get_invoices( $query );
+        $query      = apply_filters('wpinv_user_invoices_count_query', array('status' => 'all', 'user' => bp_displayed_user_id(), 'limit' => '-1', 'return' => 'ids', 'paginate' => false));
+        $invoices   = wpinv_get_invoices($query);
         
-        return !empty( $invoices ) ? count( $invoices ) : 0;
+        return !empty($invoices) ? count($invoices) : 0;
     }
     
     public function pagination_count() {
         global $invoices_template;
 
-        $start_num = intval( ( $invoices_template->pag_page - 1 ) * $invoices_template->pag_num ) + 1;
-        $from_num  = bp_core_number_format( $start_num );
-        $to_num    = bp_core_number_format( ( $start_num + ( $invoices_template->pag_num - 1 ) > $invoices_template->total_invoice_count ) ? $invoices_template->total_invoice_count : $start_num + ( $invoices_template->pag_num - 1 ) );
-        $total     = bp_core_number_format( $invoices_template->total_invoice_count );
+        $start_num = intval(($invoices_template->pag_page - 1) * $invoices_template->pag_num) + 1;
+        $from_num  = bp_core_number_format($start_num);
+        $to_num    = bp_core_number_format(($start_num + ($invoices_template->pag_num - 1) > $invoices_template->total_invoice_count) ? $invoices_template->total_invoice_count : $start_num + ($invoices_template->pag_num - 1));
+        $total     = bp_core_number_format($invoices_template->total_invoice_count);
 
-        if ( 1 == $invoices_template->total_invoice_count ) {
-            $message = __( 'Viewing 1 invoice', 'invoicing' );
+        if (1 == $invoices_template->total_invoice_count) {
+            $message = __('Viewing 1 invoice', 'invoicing');
         } else {
-            $message = sprintf( _n( 'Viewing %1$s - %2$s of %3$s invoice', 'Viewing %1$s - %2$s of %3$s invoices', $invoices_template->total_invoice_count, 'invoicing' ), $from_num, $to_num, $total );
+            $message = sprintf(_n('Viewing %1$s - %2$s of %3$s invoice', 'Viewing %1$s - %2$s of %3$s invoices', $invoices_template->total_invoice_count, 'invoicing'), $from_num, $to_num, $total);
         }
 
         return $message;
@@ -238,32 +238,32 @@ 
     function pagination_links() {
         global $invoices_template;
 
-        return apply_filters( 'wpinv_bp_get_pagination_links', $invoices_template->pag_links );
+        return apply_filters('wpinv_bp_get_pagination_links', $invoices_template->pag_links);
     }
     
-    public function bp_section( $settings = array() ) {
-        $settings['wpinv_bp'] = __( 'BuddyPress Integration', 'invoicing' );
+    public function bp_section($settings = array()) {
+        $settings['wpinv_bp'] = __('BuddyPress Integration', 'invoicing');
         return $settings;
     }
     
-    public function bp_settings( $settings = array() ) {
+    public function bp_settings($settings = array()) {
         $settings['wpinv_bp'] = array(
             'wpinv_bp_labels' => array(
                 'id'   => 'wpinv_bp_settings',
-                'name' => '<h3>' . __( 'BuddyPress Integration', 'invoicing' ) . '</h3>',
+                'name' => '<h3>' . __('BuddyPress Integration', 'invoicing') . '</h3>',
                 'desc' => '',
                 'type' => 'header',
             ),
             'wpinv_bp_hide_menu' => array(
                 'id'   => 'wpinv_bp_hide_menu',
-                'name' => __( 'Hide Invoices link', 'invoicing' ),
-                'desc' => __( 'Hide Invoices link from BP Profile menu.', 'invoicing' ),
+                'name' => __('Hide Invoices link', 'invoicing'),
+                'desc' => __('Hide Invoices link from BP Profile menu.', 'invoicing'),
                 'type' => 'checkbox',
             ),
             'wpinv_menu_position' => array(
                 'id'   => 'wpinv_menu_position',
-                'name' => __( 'Menu position', 'invoicing' ),
-                'desc' => __( 'Menu position for the Invoices link in BP Profile menu.', 'invoicing' ),
+                'name' => __('Menu position', 'invoicing'),
+                'desc' => __('Menu position for the Invoices link in BP Profile menu.', 'invoicing'),
                 'type' => 'number',
                 'size' => 'small',
                 'min'  => '1',
@@ -273,8 +273,8 @@ 
             ),
             'wpinv_bp_per_page' => array(
                 'id'   => 'wpinv_bp_per_page',
-                'name' => __( 'Max invoices per page', 'invoicing' ),
-                'desc' => __( 'Enter a number to lists the invoices for each page.', 'invoicing' ),
+                'name' => __('Max invoices per page', 'invoicing'),
+                'desc' => __('Enter a number to lists the invoices for each page.', 'invoicing'),
                 'type' => 'number',
                 'size' => 'small',
                 'min'  => '1',
@@ -287,20 +287,20 @@ 
         return $settings;
     }
 
-    public function wp_nav_menu_objects($items, $args){
-        if(!is_user_logged_in()){
+    public function wp_nav_menu_objects($items, $args) {
+        if (!is_user_logged_in()) {
             return $items;
         }
 
-        if(!apply_filters('wpinv_bp_invoice_history_redirect', true, $items, $args)){
+        if (!apply_filters('wpinv_bp_invoice_history_redirect', true, $items, $args)) {
             return $items;
         }
 
         $user_id = get_current_user_id();
-        $link = bp_core_get_user_domain( $user_id ).WPINV_BP_SLUG;
+        $link = bp_core_get_user_domain($user_id) . WPINV_BP_SLUG;
         $history_link = wpinv_get_history_page_uri();
-        foreach ( $items as $item ) {
-            $item->url = str_replace( $history_link, $link, $item->url );
+        foreach ($items as $item) {
+            $item->url = str_replace($history_link, $link, $item->url);
         }
 
         return $items;
@@ -318,78 +318,78 @@ 
     public $pag_links = '';
     public $total_invoice_count = 0;
     
-    public function __construct( $status, $page, $per_page, $max, $user_id, $page_arg = 'bpage' ) {
-        $this->invoices = array( 'invoices' => array(), 'total' => 0 );
+    public function __construct($status, $page, $per_page, $max, $user_id, $page_arg = 'bpage') {
+        $this->invoices = array('invoices' => array(), 'total' => 0);
         
-        $this->pag_arg  = sanitize_key( $page_arg );
-        $this->pag_page = bp_sanitize_pagination_arg( $this->pag_arg, $page );
-        $this->pag_num  = bp_sanitize_pagination_arg( 'num', $per_page );
+        $this->pag_arg  = sanitize_key($page_arg);
+        $this->pag_page = bp_sanitize_pagination_arg($this->pag_arg, $page);
+        $this->pag_num  = bp_sanitize_pagination_arg('num', $per_page);
 
-        $query_args     = array( 'user' => $user_id, 'page' => $this->pag_page, 'limit' => $this->pag_num, 'return' => 'self', 'paginate' => true );
-        if ( !empty( $status ) && $status != 'all' ) {
+        $query_args     = array('user' => $user_id, 'page' => $this->pag_page, 'limit' => $this->pag_num, 'return' => 'self', 'paginate' => true);
+        if (!empty($status) && $status != 'all') {
            $query_args['status'] = $status;
         }
-        $invoices  = wpinv_get_invoices( apply_filters( 'wpinv_bp_user_invoices_query', $query_args ) );
+        $invoices = wpinv_get_invoices(apply_filters('wpinv_bp_user_invoices_query', $query_args));
         
-        if ( !empty( $invoices ) && !empty( $invoices->found_posts ) ) {
-            $this->invoices['invoices'] = array_map( 'wpinv_get_invoice', $invoices->posts );
+        if (!empty($invoices) && !empty($invoices->found_posts)) {
+            $this->invoices['invoices'] = array_map('wpinv_get_invoice', $invoices->posts);
             $this->invoices['total']    = $invoices->found_posts;
         }
 
-        if ( empty( $max ) || ( $max >= (int)$this->invoices['total'] ) ) {
-            $this->total_invoice_count = (int)$this->invoices['total'];
+        if (empty($max) || ($max >= (int) $this->invoices['total'])) {
+            $this->total_invoice_count = (int) $this->invoices['total'];
         } else {
-            $this->total_invoice_count = (int)$max;
+            $this->total_invoice_count = (int) $max;
         }
 
         $this->invoices = $this->invoices['invoices'];
 
-        $invoice_count = count( $this->invoices );
+        $invoice_count = count($this->invoices);
 
-        if ( empty( $max ) || ( $max >= (int)$invoice_count ) ) {
-            $this->invoice_count = (int)$invoice_count;
+        if (empty($max) || ($max >= (int) $invoice_count)) {
+            $this->invoice_count = (int) $invoice_count;
         } else {
-            $this->invoice_count = (int)$max;
+            $this->invoice_count = (int) $max;
         }
         
-        if ( ! empty( $this->total_invoice_count ) && ! empty( $this->pag_num ) ) {
-            $this->pag_links = paginate_links( array(
-                'base'      => add_query_arg( $this->pag_arg, '%#%' ),
+        if (!empty($this->total_invoice_count) && !empty($this->pag_num)) {
+            $this->pag_links = paginate_links(array(
+                'base'      => add_query_arg($this->pag_arg, '%#%'),
                 'format'    => '',
-                'total'     => ceil( (int)$this->total_invoice_count / (int)$this->pag_num ),
-                'current'   => (int)$this->pag_page,
-                'prev_text' => _x( '&larr;', 'Invoice pagination previous text', 'invoicing' ),
-                'next_text' => _x( '&rarr;', 'Invoice pagination next text',     'invoicing' ),
+                'total'     => ceil((int) $this->total_invoice_count / (int) $this->pag_num),
+                'current'   => (int) $this->pag_page,
+                'prev_text' => _x('&larr;', 'Invoice pagination previous text', 'invoicing'),
+                'next_text' => _x('&rarr;', 'Invoice pagination next text', 'invoicing'),
                 'mid_size'  => 1,
                 'add_args'  => array(),
-            ) );
+            ));
         }
     }
 
     public function has_invoices() {
-        return (bool) ! empty( $this->invoice_count );
+        return (bool) !empty($this->invoice_count);
     }
 
     public function next_invoice() {
         $this->current_invoice++;
-        $this->invoice = $this->invoices[ $this->current_invoice ];
+        $this->invoice = $this->invoices[$this->current_invoice];
 
         return $this->invoice;
     }
 
     public function rewind_invoices() {
         $this->current_invoice = -1;
-        if ( $this->invoice_count > 0 ) {
+        if ($this->invoice_count > 0) {
             $this->invoice = $this->invoices[0];
         }
     }
 
     public function invoices() {
-        if ( ( $this->current_invoice + 1 ) < $this->invoice_count ) {
+        if (($this->current_invoice + 1) < $this->invoice_count) {
             return true;
-        } elseif ( ( $this->current_invoice + 1 ) === $this->invoice_count ) {
+        } elseif (($this->current_invoice + 1) === $this->invoice_count) {
 
-            do_action( 'wpinv_bp_invoice_loop_end' );
+            do_action('wpinv_bp_invoice_loop_end');
             
             $this->rewind_invoices();
         }
@@ -403,19 +403,19 @@ 
         $this->in_the_loop = true;
         $this->invoice     = $this->next_invoice();
 
-        if ( 0 === $this->current_invoice ) {
-            do_action( 'wpinv_bp_invoice_loop_start' );
+        if (0 === $this->current_invoice) {
+            do_action('wpinv_bp_invoice_loop_start');
         }
     }
 }
 
 function wpinv_bp_setup_component() {
 
-    if(!class_exists( 'BuddyPress' )){
+    if (!class_exists('BuddyPress')) {
         return;
     }
 
     new WPInv_BP_Component();
 
 }
-add_action( 'bp_loaded', 'wpinv_bp_setup_component' );
\ No newline at end of file
+add_action('bp_loaded', 'wpinv_bp_setup_component');
\ No newline at end of file

includes/class-wpinv-notes.php

Spacing +42 added lines, -42 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -14,74 +14,74 @@ 
     }
     
     public function init() {
-        do_action( 'wpinv_class_notes_init', $this );
+        do_action('wpinv_class_notes_init', $this);
     }
     
     public function includes() {
-        do_action( 'wpinv_class_notes_includes', $this );
+        do_action('wpinv_class_notes_includes', $this);
     }
     
     public function actions() {
         // Secure inovice notes
-        add_action( 'pre_get_comments', array( $this, 'set_invoice_note_type' ), 11, 1 );
-        add_action( 'comment_feed_where', array( $this, 'wpinv_comment_feed_where' ), 10, 1 );
+        add_action('pre_get_comments', array($this, 'set_invoice_note_type'), 11, 1);
+        add_action('comment_feed_where', array($this, 'wpinv_comment_feed_where'), 10, 1);
         
         // Count comments
-        add_filter( 'wp_count_comments', array( $this, 'wp_count_comments' ), 11, 2 );
+        add_filter('wp_count_comments', array($this, 'wp_count_comments'), 11, 2);
         
         // Delete comments count cache whenever there is a new comment or a comment status changes
-        add_action( 'wp_insert_comment', array( $this, 'delete_comments_count_cache' ) );
-        add_action( 'wp_set_comment_status', array( $this, 'delete_comments_count_cache' ) );
+        add_action('wp_insert_comment', array($this, 'delete_comments_count_cache'));
+        add_action('wp_set_comment_status', array($this, 'delete_comments_count_cache'));
         
-        do_action( 'wpinv_class_notes_actions', $this );
+        do_action('wpinv_class_notes_actions', $this);
     }
         
-    public function set_invoice_note_type( $query ) {
-        $post_ID        = !empty( $query->query_vars['post_ID'] ) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
+    public function set_invoice_note_type($query) {
+        $post_ID = !empty($query->query_vars['post_ID']) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
         
-        if ( $post_ID && in_array(get_post_type( $post_ID ), array($this->invoice_post_type, 'wpi_quote' )) ) {
+        if ($post_ID && in_array(get_post_type($post_ID), array($this->invoice_post_type, 'wpi_quote'))) {
             $query->query_vars['type__in']      = $this->comment_type;
             $query->query_vars['type__not_in']  = '';
         } else {        
-            if ( isset( $query->query_vars['type__in'] ) && $type_in = $query->query_vars['type__in'] ) {
-                if ( is_array( $type_in ) && in_array( $this->comment_type, $type_in ) ) {
-                    $key = array_search( $this->comment_type, $type_in );
-                    unset( $query->query_vars['type__in'][$key] );
-                } else if ( !is_array( $type_in ) && $type_in == $this->comment_type ) {
+            if (isset($query->query_vars['type__in']) && $type_in = $query->query_vars['type__in']) {
+                if (is_array($type_in) && in_array($this->comment_type, $type_in)) {
+                    $key = array_search($this->comment_type, $type_in);
+                    unset($query->query_vars['type__in'][$key]);
+                } else if (!is_array($type_in) && $type_in == $this->comment_type) {
                     $query->query_vars['type__in'] = '';
                 }
             }
             
-            if ( isset( $query->query_vars['type__not_in'] ) && $type_not_in = $query->query_vars['type__not_in'] ) {
-                if ( is_array( $type_not_in ) && !in_array( $this->comment_type, $type_not_in ) ) {
+            if (isset($query->query_vars['type__not_in']) && $type_not_in = $query->query_vars['type__not_in']) {
+                if (is_array($type_not_in) && !in_array($this->comment_type, $type_not_in)) {
                     $query->query_vars['type__not_in'][] = $this->comment_type;
-                } else if ( !is_array( $type_not_in ) && $type_not_in != $this->comment_type ) {
-                    $query->query_vars['type__not_in'] = (array)$query->query_vars['type__not_in'];
+                } else if (!is_array($type_not_in) && $type_not_in != $this->comment_type) {
+                    $query->query_vars['type__not_in'] = (array) $query->query_vars['type__not_in'];
                     $query->query_vars['type__not_in'][] = $this->comment_type;
                 }
             } else {
-                $query->query_vars['type__not_in']  = $this->comment_type;
+                $query->query_vars['type__not_in'] = $this->comment_type;
             }
         }
         
         return $query;
     }
     
-    public function get_invoice_notes( $invoice_id = 0, $type = '' ) {
+    public function get_invoice_notes($invoice_id = 0, $type = '') {
         $args = array( 
             'post_id'   => $invoice_id,
             'orderby'   => 'comment_ID',
             'order'     => 'ASC',
         );
         
-        if ( $type == 'customer' ) {
+        if ($type == 'customer') {
             $args['meta_key']   = '_wpi_customer_note';
             $args['meta_value'] = 1;
         }
         
-        $args   = apply_filters( 'wpinv_invoice_notes_args', $args, $this, $invoice_id, $type );
+        $args = apply_filters('wpinv_invoice_notes_args', $args, $this, $invoice_id, $type);
         
-        return get_comments( $args );
+        return get_comments($args);
     }
     
     /**
@@ -92,7 +92,7 @@ 
      * @return void
      */
     public function delete_comments_count_cache() {
-        delete_transient( 'wpinv_count_comments' );
+        delete_transient('wpinv_count_comments');
     }
     
     /**
@@ -103,16 +103,16 @@ 
      * @param  int    $post_id Post ID.
      * @return object
      */
-    public function wp_count_comments( $stats, $post_id ) {
+    public function wp_count_comments($stats, $post_id) {
         global $wpdb;
 
-        if ( 0 === $post_id ) {
-            $stats = get_transient( 'wpinv_count_comments' );
+        if (0 === $post_id) {
+            $stats = get_transient('wpinv_count_comments');
 
-            if ( ! $stats ) {
+            if (!$stats) {
                 $stats = array();
 
-                $count = $wpdb->get_results( "SELECT comment_approved, COUNT(*) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN ('" . $this->comment_type . "') GROUP BY comment_approved", ARRAY_A );
+                $count = $wpdb->get_results("SELECT comment_approved, COUNT(*) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN ('" . $this->comment_type . "') GROUP BY comment_approved", ARRAY_A);
 
                 $total = 0;
                 $approved = array(
@@ -123,33 +123,33 @@ 
                     'post-trashed' => 'post-trashed',
                 );
 
-                foreach ( (array) $count as $row ) {
+                foreach ((array) $count as $row) {
                     // Do not count post-trashed toward totals.
-                    if ( 'post-trashed' !== $row['comment_approved'] && 'trash' !== $row['comment_approved'] ) {
+                    if ('post-trashed' !== $row['comment_approved'] && 'trash' !== $row['comment_approved']) {
                         $total += $row['num_comments'];
                     }
-                    if ( isset( $approved[ $row['comment_approved'] ] ) ) {
-                        $stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
+                    if (isset($approved[$row['comment_approved']])) {
+                        $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
                     }
                 }
 
                 $stats['total_comments'] = $total;
                 $stats['all'] = $total;
-                foreach ( $approved as $key ) {
-                    if ( empty( $stats[ $key ] ) ) {
-                        $stats[ $key ] = 0;
+                foreach ($approved as $key) {
+                    if (empty($stats[$key])) {
+                        $stats[$key] = 0;
                     }
                 }
 
                 $stats = (object) $stats;
-                set_transient( 'wpinv_count_comments', $stats );
+                set_transient('wpinv_count_comments', $stats);
             }
         }
 
         return $stats;
     }
 
-    function wpinv_comment_feed_where($where){
-        return $where . ( $where ? ' AND ' : '' ) . " comment_type != 'wpinv_note' ";
+    function wpinv_comment_feed_where($where) {
+        return $where . ($where ? ' AND ' : '') . " comment_type != 'wpinv_note' ";
     }
 }

includes/class-wpinv-session-handler.php

Spacing +56 added lines, -56 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Session handler class.
@@ -52,11 +52,11 @@ 
 	 */
 	public function __construct() {
 
-	    $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
-        add_action( 'init', array( $this, 'init' ), -1 );
-		add_action( 'wp_logout', array( $this, 'destroy_session' ) );
-		add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
-		add_action( 'shutdown', array( $this, 'save_data' ), 20 );
+	    $this->_cookie = apply_filters('wpinv_cookie', 'wpinv_session_' . COOKIEHASH);
+        add_action('init', array($this, 'init'), -1);
+		add_action('wp_logout', array($this, 'destroy_session'));
+		add_action('wp', array($this, 'set_customer_session_cookie'), 10);
+		add_action('shutdown', array($this, 'save_data'), 20);
 	}
 
 	/**
@@ -67,8 +67,8 @@ 
 	public function init() {
 		$this->init_session_cookie();
 
-		if ( ! is_user_logged_in() ) {
-			add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ) );
+		if (!is_user_logged_in()) {
+			add_filter('nonce_user_logged_out', array($this, 'nonce_user_logged_out'));
 		}
 	}
 
@@ -80,7 +80,7 @@ 
 	public function init_session_cookie() {
 		$cookie = $this->get_session_cookie();
 
-		if ( $cookie ) {
+		if ($cookie) {
 			$this->_customer_id        = $cookie[0];
 			$this->_session_expiration = $cookie[1];
 			$this->_session_expiring   = $cookie[2];
@@ -88,17 +88,17 @@ 
 			$this->_data               = $this->get_session_data();
 
 			// If the user logs in, update session.
-			if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
+			if (is_user_logged_in() && get_current_user_id() != $this->_customer_id) {
 				$this->_customer_id = get_current_user_id();
 				$this->_dirty       = true;
 				$this->save_data();
-				$this->set_customer_session_cookie( true );
+				$this->set_customer_session_cookie(true);
 			}
 
 			// Update session if its close to expiring.
-			if ( time() > $this->_session_expiring ) {
+			if (time() > $this->_session_expiring) {
 				$this->set_session_expiration();
-				$this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
+				$this->update_session_timestamp($this->_customer_id, $this->_session_expiration);
 			}
 		} else {
 			$this->set_session_expiration();
@@ -116,25 +116,25 @@ 
 	 *
 	 * @param bool $set Should the session cookie be set.
 	 */
-	public function set_customer_session_cookie( $set ) {
-		if ( $set ) {
+	public function set_customer_session_cookie($set) {
+		if ($set) {
 			$to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
-			$cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+			$cookie_hash       = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 			$cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
 			$this->_has_cookie = true;
 
-			if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
-				$this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
+			if (!isset($_COOKIE[$this->_cookie]) || $_COOKIE[$this->_cookie] !== $cookie_value) {
+				$this->setcookie($this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true);
 			}
 		}
 	}
 
-	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
-        if ( ! headers_sent() ) {
-            setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
-        } elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-            headers_sent( $file, $line );
-            trigger_error( "{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE ); // @codingStandardsIgnoreLine
+	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false) {
+        if (!headers_sent()) {
+            setcookie($name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters('wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure));
+        } elseif (defined('WP_DEBUG') && WP_DEBUG) {
+            headers_sent($file, $line);
+            trigger_error("{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE); // @codingStandardsIgnoreLine
         }
     }
 
@@ -145,8 +145,8 @@ 
 	 * @return bool
 	 */
 	protected function use_secure_cookie() {
-        $is_https = false !== strstr( get_option( 'home' ), 'https:' );
-		return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
+        $is_https = false !== strstr(get_option('home'), 'https:');
+		return apply_filters('wpinv_session_use_secure_cookie', $is_https && is_ssl());
 	}
 
 	/**
@@ -155,15 +155,15 @@ 
 	 * @return bool
 	 */
 	public function has_session() {
-		return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
+		return isset($_COOKIE[$this->_cookie]) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
 	}
 
 	/**
 	 * Set session expiration.
 	 */
 	public function set_session_expiration() {
-		$this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
-		$this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
+		$this->_session_expiring   = time() + intval(apply_filters('wpinv_session_expiring', 60 * 60 * 47)); // 47 Hours.
+		$this->_session_expiration = time() + intval(apply_filters('wpinv_session_expiration', 60 * 60 * 48)); // 48 Hours.
 	}
 
 	/**
@@ -176,11 +176,11 @@ 
 	public function generate_customer_id() {
 		$customer_id = '';
 
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			$customer_id = get_current_user_id();
 		}
 
-		if ( empty( $customer_id ) ) {
+		if (empty($customer_id)) {
             $customer_id = wp_create_nonce('wpinv-session-customer-id');
 		}
 
@@ -195,27 +195,27 @@ 
 	 * @return bool|array
 	 */
 	public function get_session_cookie() {
-		$cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
+		$cookie_value = isset($_COOKIE[$this->_cookie]) ? wp_unslash($_COOKIE[$this->_cookie]) : false; // @codingStandardsIgnoreLine.
 
-		if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
+		if (empty($cookie_value) || !is_string($cookie_value)) {
 			return false;
 		}
 
-		list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
+		list($customer_id, $session_expiration, $session_expiring, $cookie_hash) = explode('||', $cookie_value);
 
-		if ( empty( $customer_id ) ) {
+		if (empty($customer_id)) {
 			return false;
 		}
 
 		// Validate hash.
 		$to_hash = $customer_id . '|' . $session_expiration;
-		$hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+		$hash    = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 
-		if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
+		if (empty($cookie_hash) || !hash_equals($hash, $cookie_hash)) {
 			return false;
 		}
 
-		return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
+		return array($customer_id, $session_expiration, $session_expiring, $cookie_hash);
 	}
 
 	/**
@@ -224,15 +224,15 @@ 
 	 * @return array
 	 */
 	public function get_session_data() {
-		return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
+		return $this->has_session() ? (array) $this->get_session($this->_customer_id) : array();
 	}
 
-	public function generate_key($customer_id){
-        if(!$customer_id){
+	public function generate_key($customer_id) {
+        if (!$customer_id) {
             return;
         }
 
-        return 'wpi_trans_'.$customer_id;
+        return 'wpi_trans_' . $customer_id;
     }
 
 	/**
@@ -240,9 +240,9 @@ 
 	 */
 	public function save_data() {
 		// Dirty if something changed - prevents saving nothing new.
-		if ( $this->_dirty && $this->has_session() ) {
+		if ($this->_dirty && $this->has_session()) {
 
-            set_transient( $this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
+            set_transient($this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
 
 			$this->_dirty = false;
 		}
@@ -252,7 +252,7 @@ 
 	 * Destroy all session data.
 	 */
 	public function destroy_session() {
-		$this->delete_session( $this->_customer_id );
+		$this->delete_session($this->_customer_id);
 		$this->forget_session();
 	}
 
@@ -260,7 +260,7 @@ 
 	 * Forget all session data without destroying it.
 	 */
 	public function forget_session() {
-		$this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
+		$this->setcookie($this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true);
 
 		wpinv_empty_cart();
 
@@ -275,7 +275,7 @@ 
 	 * @param int $uid User ID.
 	 * @return string
 	 */
-	public function nonce_user_logged_out( $uid ) {
+	public function nonce_user_logged_out($uid) {
 		return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
 	}
 
@@ -286,14 +286,14 @@ 
 	 * @param mixed  $default Default session value.
 	 * @return string|array
 	 */
-	public function get_session( $customer_id, $default = false ) {
+	public function get_session($customer_id, $default = false) {
 
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
+		if (defined('WP_SETUP_CONFIG')) {
 			return array();
 		}
 
-        if ( !is_user_logged_in() ) {
-            if(!wp_verify_nonce( $customer_id, 'wpinv-session-customer-id' )){
+        if (!is_user_logged_in()) {
+            if (!wp_verify_nonce($customer_id, 'wpinv-session-customer-id')) {
                 return array();
             }
         }
@@ -301,11 +301,11 @@ 
         $key = $this->generate_key($customer_id);
         $value = get_transient($key);
 
-        if ( !$value ) {
+        if (!$value) {
             $value = $default;
         }
 
-		return maybe_unserialize( $value );
+		return maybe_unserialize($value);
 	}
 
 	/**
@@ -313,7 +313,7 @@ 
 	 *
 	 * @param int $customer_id Customer ID.
 	 */
-	public function delete_session( $customer_id ) {
+	public function delete_session($customer_id) {
 
         $key = $this->generate_key($customer_id);
 
@@ -326,9 +326,9 @@ 
 	 * @param string $customer_id Customer ID.
 	 * @param int    $timestamp Timestamp to expire the cookie.
 	 */
-	public function update_session_timestamp( $customer_id, $timestamp ) {
+	public function update_session_timestamp($customer_id, $timestamp) {
 
-        set_transient( $this->generate_key($customer_id), maybe_serialize( $this->_data ), $timestamp);
+        set_transient($this->generate_key($customer_id), maybe_serialize($this->_data), $timestamp);
 
 	}
 }

includes/wpinv-item-functions.php

Spacing +302 added lines, -302 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-function wpinv_get_item_by_id( $id ) {
-    return wpinv_get_item_by( 'id', $id );
+function wpinv_get_item_by_id($id) {
+    return wpinv_get_item_by('id', $id);
 }
 
-function wpinv_get_item_by( $field = '', $value = '', $type = '' ) {
-    if( empty( $field ) || empty( $value ) ) {
+function wpinv_get_item_by($field = '', $value = '', $type = '') {
+    if (empty($field) || empty($value)) {
         return false;
     }
     
     $posts = array();
 
-    switch( strtolower( $field ) ) {
+    switch (strtolower($field)) {
         case 'id':
-            $item = new WPInv_Item( $value );
+            $item = new WPInv_Item($value);
 
-            if ( !empty( $item ) && $item->post_type == 'wpi_item' ) {
+            if (!empty($item) && $item->post_type == 'wpi_item') {
                 return $item;
             }
             return false;
@@ -26,16 +26,16 @@ 
 
         case 'slug':
         case 'name':
-            $posts = get_posts( array(
+            $posts = get_posts(array(
                 'post_type'      => 'wpi_item',
                 'name'           => $value,
                 'posts_per_page' => 1,
                 'post_status'    => 'any'
-            ) );
+            ));
 
             break;
         case 'custom_id':
-            if ( empty( $value ) || empty( $type ) ) {
+            if (empty($value) || empty($type)) {
                 return false;
             }
             
@@ -55,10 +55,10 @@ 
                 'post_status'    => 'any',
                 'orderby'        => 'ID',
                 'order'          => 'ASC',
-                'meta_query'     => array( $meta_query )
+                'meta_query'     => array($meta_query)
             );
             
-            $posts = get_posts( $args );
+            $posts = get_posts($args);
 
             break;
 
@@ -66,10 +66,10 @@ 
             return false;
     }
     
-    if ( !empty( $posts[0] ) ) {
-        $item = new WPInv_Item( $posts[0]->ID );
+    if (!empty($posts[0])) {
+        $item = new WPInv_Item($posts[0]->ID);
 
-        if ( !empty( $item ) && $item->post_type == 'wpi_item' ) {
+        if (!empty($item) && $item->post_type == 'wpi_item') {
             return $item;
         }
     }
@@ -77,10 +77,10 @@ 
     return false;
 }
 
-function wpinv_get_item( $item = 0 ) {
-    if ( is_numeric( $item ) ) {
-        $item = get_post( $item );
-        if ( ! $item || 'wpi_item' !== $item->post_type )
+function wpinv_get_item($item = 0) {
+    if (is_numeric($item)) {
+        $item = get_post($item);
+        if (!$item || 'wpi_item' !== $item->post_type)
             return null;
         return $item;
     }
@@ -93,18 +93,18 @@ 
 
     $item = get_posts($args);
 
-    if ( $item ) {
+    if ($item) {
         return $item[0];
     }
 
     return null;
 }
 
-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',
@@ -113,7 +113,7 @@ 
         'meta_query'     => array(),
         'return'         => 'objects',
         'paginate'       => false,
-    ) );
+    ));
 
     $wp_query_args = array(
         'post_type'      => 'wpi_item',
@@ -123,26 +123,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',
         );
     }
@@ -150,17 +150,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,
@@ -172,143 +172,143 @@ 
 
 }
 
-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();
 }
 
-function wpinv_item_is_editable( $item = 0 ) {
-    if ( !empty( $item ) && is_a( $item, 'WP_Post' ) ) {
+function wpinv_item_is_editable($item = 0) {
+    if (!empty($item) && is_a($item, 'WP_Post')) {
         $item = $item->ID;
     }
         
-    if ( empty( $item ) ) {
+    if (empty($item)) {
         return true;
     }
 
-    $item = new WPInv_Item( $item );
+    $item = new WPInv_Item($item);
     
     return (bool) $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;
     }
 
@@ -317,264 +317,264 @@ 
         '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 ) {
-    $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'] ) );
+function wpinv_cart_item_price($item) {
+    $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 ) );
+    $price = wpinv_price(wpinv_format_amount($price));
 
-    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 ) {
-    $subtotal   = isset( $item['subtotal'] ) ? $item['subtotal'] : 0;
-    $subtotal   = wpinv_price( wpinv_format_amount( $subtotal ) );
+function wpinv_cart_item_subtotal($item) {
+    $subtotal   = isset($item['subtotal']) ? $item['subtotal'] : 0;
+    $subtotal   = wpinv_price(wpinv_format_amount($subtotal));
 
-    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 ) {
+function wpinv_cart_item_tax($item) {
     $tax        = '';
     $tax_rate   = '';
     
-    if ( isset( $item['tax'] ) && $item['tax'] > 0 && $item['subtotal'] > 0 ) {
-        $tax      = wpinv_price( wpinv_format_amount( $item['tax'] ) );
-        $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']));
+        $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'];
     }
 
@@ -584,23 +584,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 {
@@ -613,80 +613,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;
             }
             
@@ -696,88 +696,88 @@ 
         $_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;
     
     return $in_use;
 }
 
-function wpinv_create_item( $args = array(), $wp_error = false, $force_update = false ) {
+function wpinv_create_item($args = array(), $wp_error = false, $force_update = false) {
     // Set some defaults
     $defaults = array(
-        'type'                 => 'custom',                                                // Optional. Item type. Default 'custom'.
-        'title'                => '',                                                      // Required. Item title.
-        'custom_id'            => 0,                                                       // Optional. Any integer or non numeric id. Must be unique within item type.
-        'price'                => '0.00',                                                  // Optional. Item price. Default '0.00'.
-        'status'               => 'pending',                                               // Optional. pending, publish
-        'custom_name'          => '',                                                      // Optional. Plural sub title for item.
-        'custom_singular_name' => '',                                                      // Optional. Singular sub title for item.
-        'vat_rule'             => 'digital',                                               // Optional. digital => Digital item, physical => Physical item
-        'editable'             => true,                                                    // Optional. Item editable from Items list page? Default true.
-        'excerpt'              => '',                                                      // Optional. Item short description
+        'type'                 => 'custom', // Optional. Item type. Default 'custom'.
+        'title'                => '', // Required. Item title.
+        'custom_id'            => 0, // Optional. Any integer or non numeric id. Must be unique within item type.
+        'price'                => '0.00', // Optional. Item price. Default '0.00'.
+        'status'               => 'pending', // Optional. pending, publish
+        'custom_name'          => '', // Optional. Plural sub title for item.
+        'custom_singular_name' => '', // Optional. Singular sub title for item.
+        'vat_rule'             => 'digital', // Optional. digital => Digital item, physical => Physical item
+        'editable'             => true, // Optional. Item editable from Items list page? Default true.
+        'excerpt'              => '', // Optional. Item short description
         /* Recurring item fields */
-        'is_recurring'         => 0,                                                       // Optional. 1 => Allow recurring or 0 => Don't allow recurring
-        'recurring_period'     => 'M',                                                     // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
-        'recurring_interval'   => 0,                                                       // Optional. Integer value between 1 - 90.
-        'recurring_limit'      => 0,                                                       // Optional. Any integer number. 0 for recurring forever until cancelled.
-        'free_trial'           => 0,                                                       // Optional. 1 => Allow free trial or 0 => Don't free trial
-        'trial_period'         => 'M',                                                     // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
-        'trial_interval'       => 0,                                                       // Optional. Any integer number.
-        'minimum_price'        => '0.00',                                                  // Optional. Minimum allowed prices for items with dynamic pricing.
-        'dynamic_pricing'      => 0,                                                       // Optional. Whether or not the item supports dynamic prices.
+        'is_recurring'         => 0, // Optional. 1 => Allow recurring or 0 => Don't allow recurring
+        'recurring_period'     => 'M', // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
+        'recurring_interval'   => 0, // Optional. Integer value between 1 - 90.
+        'recurring_limit'      => 0, // Optional. Any integer number. 0 for recurring forever until cancelled.
+        'free_trial'           => 0, // Optional. 1 => Allow free trial or 0 => Don't free trial
+        'trial_period'         => 'M', // Optional. D => Daily, W => Weekly, M => Monthly, Y => Yearly
+        'trial_interval'       => 0, // Optional. Any integer number.
+        'minimum_price'        => '0.00', // Optional. Minimum allowed prices for items with dynamic pricing.
+        'dynamic_pricing'      => 0, // Optional. Whether or not the item supports dynamic prices.
     );
 
-    $data = wp_parse_args( $args, $defaults );
+    $data = wp_parse_args($args, $defaults);
 
-    if ( empty( $data['type'] ) ) {
+    if (empty($data['type'])) {
         $data['type'] = 'custom';
     }
 
-    if ( !empty( $data['custom_id'] ) ) {
-        $item = wpinv_get_item_by( 'custom_id', $data['custom_id'], $data['type'] );
+    if (!empty($data['custom_id'])) {
+        $item = wpinv_get_item_by('custom_id', $data['custom_id'], $data['type']);
     } else {
         $item = NULL;
     }
 
-    if ( !empty( $item ) ) {
-        if ( $force_update ) {
-            if ( empty( $args['ID'] ) ) {
+    if (!empty($item)) {
+        if ($force_update) {
+            if (empty($args['ID'])) {
                 $args['ID'] = $item->ID;
             }
-            return wpinv_update_item( $args, $wp_error );
+            return wpinv_update_item($args, $wp_error);
         }
 
         return $item;
@@ -788,21 +788,21 @@ 
     $meta['custom_id']              = $data['custom_id'];
     $meta['custom_singular_name']   = $data['custom_singular_name'];
     $meta['custom_name']            = $data['custom_name'];
-    $meta['price']                  = wpinv_round_amount( $data['price'] );
-    $meta['editable']               = (int)$data['editable'];
+    $meta['price']                  = wpinv_round_amount($data['price']);
+    $meta['editable']               = (int) $data['editable'];
     $meta['vat_rule']               = $data['vat_rule'];
     $meta['vat_class']              = '_standard';
     $meta['dynamic_pricing']        = (int) $data['dynamic_pricing'];
-    $meta['minimum_price']          = wpinv_round_amount( $data['minimum_price'] );
+    $meta['minimum_price']          = wpinv_round_amount($data['minimum_price']);
     
-    if ( !empty( $data['is_recurring'] ) ) {
+    if (!empty($data['is_recurring'])) {
         $meta['is_recurring']       = $data['is_recurring'];
         $meta['recurring_period']   = $data['recurring_period'];
-        $meta['recurring_interval'] = absint( $data['recurring_interval'] );
-        $meta['recurring_limit']    = absint( $data['recurring_limit'] );
+        $meta['recurring_interval'] = absint($data['recurring_interval']);
+        $meta['recurring_limit']    = absint($data['recurring_limit']);
         $meta['free_trial']         = $data['free_trial'];
         $meta['trial_period']       = $data['trial_period'];
-        $meta['trial_interval']     = absint( $data['trial_interval'] );
+        $meta['trial_interval']     = absint($data['trial_interval']);
     } else {
         $meta['is_recurring']       = 0;
         $meta['recurring_period']   = '';
@@ -813,7 +813,7 @@ 
         $meta['trial_interval']     = '';
     }
     
-    $post_data  = array( 
+    $post_data = array( 
         'post_title'    => $data['title'],
         'post_excerpt'  => $data['excerpt'],
         'post_status'   => $data['status'],
@@ -821,34 +821,34 @@ 
     );
 
     $item = new WPInv_Item();
-    $return = $item->create( $post_data, $wp_error );
+    $return = $item->create($post_data, $wp_error);
 
-    if ( $return && !empty( $item ) && !is_wp_error( $return ) ) {
+    if ($return && !empty($item) && !is_wp_error($return)) {
         return $item;
     }
 
-    if ( $wp_error && is_wp_error( $return ) ) {
+    if ($wp_error && is_wp_error($return)) {
         return $return;
     }
     return 0;
 }
 
-function wpinv_update_item( $args = array(), $wp_error = false ) {
-    $item = !empty( $args['ID'] ) ? new WPInv_Item( $args['ID'] ) : NULL;
+function wpinv_update_item($args = array(), $wp_error = false) {
+    $item = !empty($args['ID']) ? new WPInv_Item($args['ID']) : NULL;
 
-    if ( empty( $item ) || !( !empty( $item->post_type ) && $item->post_type == 'wpi_item' ) ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'wpinv_invalid_item', __( 'Invalid item.', 'invoicing' ) );
+    if (empty($item) || !(!empty($item->post_type) && $item->post_type == 'wpi_item')) {
+        if ($wp_error) {
+            return new WP_Error('wpinv_invalid_item', __('Invalid item.', 'invoicing'));
         }
         return 0;
     }
     
-    if ( !empty( $args['custom_id'] ) ) {
-        $item_exists = wpinv_get_item_by( 'custom_id', $args['custom_id'], ( !empty( $args['type'] ) ? $args['type'] : $item->type ) );
+    if (!empty($args['custom_id'])) {
+        $item_exists = wpinv_get_item_by('custom_id', $args['custom_id'], (!empty($args['type']) ? $args['type'] : $item->type));
         
-        if ( !empty( $item_exists ) && $item_exists->ID != $args['ID'] ) {
-            if ( $wp_error ) {
-                return new WP_Error( 'wpinv_invalid_custom_id', __( 'Item with custom id already exists.', 'invoicing' ) );
+        if (!empty($item_exists) && $item_exists->ID != $args['ID']) {
+            if ($wp_error) {
+                return new WP_Error('wpinv_invalid_custom_id', __('Item with custom id already exists.', 'invoicing'));
             }
             return 0;
         }
@@ -875,54 +875,54 @@ 
     );
 
     $post_data = array();
-    if ( isset( $args['title'] ) ) { 
+    if (isset($args['title'])) { 
         $post_data['post_title'] = $args['title'];
     }
-    if ( isset( $args['excerpt'] ) ) { 
+    if (isset($args['excerpt'])) { 
         $post_data['post_excerpt'] = $args['excerpt'];
     }
-    if ( isset( $args['status'] ) ) { 
+    if (isset($args['status'])) { 
         $post_data['post_status'] = $args['status'];
     }
     
-    foreach ( $meta_fields as $meta_field ) {
-        if ( isset( $args[ $meta_field ] ) ) { 
-            $value = $args[ $meta_field ];
+    foreach ($meta_fields as $meta_field) {
+        if (isset($args[$meta_field])) { 
+            $value = $args[$meta_field];
 
-            switch ( $meta_field ) {
+            switch ($meta_field) {
                 case 'price':
                 case 'minimum_price':
-                    $value = wpinv_round_amount( $value );
+                    $value = wpinv_round_amount($value);
                 break;
                 case 'recurring_interval':
                 case 'recurring_limit':
                 case 'trial_interval':
-                    $value = absint( $value );
+                    $value = absint($value);
                 break;
 				case 'editable':
                     $value = (int) $value;
                 break;
             }
 
-            $post_data['meta'][ $meta_field ] = $value;
+            $post_data['meta'][$meta_field] = $value;
         };
     }
 
-    if ( empty( $post_data ) ) {
-        if ( $wp_error ) {
-            return new WP_Error( 'wpinv_invalid_item_data', __( 'Invalid item data.', 'invoicing' ) );
+    if (empty($post_data)) {
+        if ($wp_error) {
+            return new WP_Error('wpinv_invalid_item_data', __('Invalid item data.', 'invoicing'));
         }
         return 0;
     }
     $post_data['ID'] = $args['ID'];
 
-    $return = $item->update( $post_data, $wp_error );
+    $return = $item->update($post_data, $wp_error);
 
-    if ( $return && !empty( $item ) && !is_wp_error( $return ) ) {
+    if ($return && !empty($item) && !is_wp_error($return)) {
         return $item;
     }
 
-    if ( $wp_error && is_wp_error( $return ) ) {
+    if ($wp_error && is_wp_error($return)) {
         return $return;
     }
     return 0;

includes/wpinv-payment-functions.php

Spacing +78 added lines, -78 removed lines

@@ -1,155 +1,155 @@ 
 <?php
-function wpinv_is_subscription_payment( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_is_subscription_payment($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
         
-    if ( $invoice->is_renewal() ) {
+    if ($invoice->is_renewal()) {
         return true;
     }
 
     return false;
 }
 
-function wpinv_payment_link_transaction_id( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_payment_link_transaction_id($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
 
-    return apply_filters( 'wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice );
+    return apply_filters('wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice);
 }
 
-function wpinv_subscription_initial_payment_desc( $amount, $period, $interval, $trial_period = '', $trial_interval = 0 ) {
-    $interval   = (int)$interval > 0 ? (int)$interval : 1;
+function wpinv_subscription_initial_payment_desc($amount, $period, $interval, $trial_period = '', $trial_interval = 0) {
+    $interval   = (int) $interval > 0 ? (int) $interval : 1;
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
-        $amount = __( 'Free', 'invoicing' );
+    if ($trial_interval > 0 && !empty($trial_period)) {
+        $amount = __('Free', 'invoicing');
         $interval = $trial_interval;
         $period = $trial_period;
     }
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :
-            $description = wp_sprintf( _n( '%s for the first day.', '%s for the first %d days.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first day.', '%s for the first %d days.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'W' :
         case 'week' :
-            $description = wp_sprintf( _n( '%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'M' :
         case 'month' :
-            $description = wp_sprintf( _n( '%s for the first month.', '%s for the first %d months.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first month.', '%s for the first %d months.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'Y' :
         case 'year' :
-            $description = wp_sprintf( _n( '%s for the first year.', '%s for the first %d years.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first year.', '%s for the first %d years.', $interval, 'invoicing'), $amount, $interval);
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval  );
+    return apply_filters('wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_recurring_payment_desc( $amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0 ) {
-    $interval   = (int)$interval > 0 ? (int)$interval : 1;
-    $bill_times = (int)$bill_times > 0 ? (int)$bill_times : 0;
+function wpinv_subscription_recurring_payment_desc($amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0) {
+    $interval   = (int) $interval > 0 ? (int) $interval : 1;
+    $bill_times = (int) $bill_times > 0 ? (int) $bill_times : 0;
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d days, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d days, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d days.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d days.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'W' :
         case 'week' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d weeks, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d weeks, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d weeks.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d weeks.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each week.', '%s for each %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each week.', '%s for each %d weeks.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'M' :
         case 'month' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d months, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d months, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d months.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d months.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each month.', '%s for each %d months.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each month.', '%s for each %d months.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'Y' :
         case 'year' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d years, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d years, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d years.', 'invoicing'), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d years.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each year.', '%s for each %d years.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each year.', '%s for each %d years.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    return apply_filters('wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_payment_desc( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_subscription_payment_desc($invoice) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $description = '';
-    if ( $invoice->is_parent() && $item = $invoice->get_recurring( true ) ) {
-        if ( $item->has_free_trial() ) {
+    if ($invoice->is_parent() && $item = $invoice->get_recurring(true)) {
+        if ($item->has_free_trial()) {
             $trial_period = $item->get_trial_period();
             $trial_interval = $item->get_trial_interval();
         } else {
@@ -157,45 +157,45 @@ 
             $trial_interval = 0;
         }
         
-        $description = wpinv_get_billing_cycle( $invoice->get_total(), $invoice->get_recurring_details( 'total' ), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency() );
+        $description = wpinv_get_billing_cycle($invoice->get_total(), $invoice->get_recurring_details('total'), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency());
     }
     
-    return apply_filters( 'wpinv_subscription_payment_desc', $description, $invoice );
+    return apply_filters('wpinv_subscription_payment_desc', $description, $invoice);
 }
 
-function wpinv_get_billing_cycle( $initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '' ) {
-    $initial_total      = wpinv_round_amount( $initial );
-    $recurring_total    = wpinv_round_amount( $recurring );
+function wpinv_get_billing_cycle($initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '') {
+    $initial_total      = wpinv_round_amount($initial);
+    $recurring_total    = wpinv_round_amount($recurring);
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
+    if ($trial_interval > 0 && !empty($trial_period)) {
         // Free trial
     } else {
-        if ( $bill_times == 1 ) {
+        if ($bill_times == 1) {
             $recurring_total = $initial_total;
-        } else if ( $bill_times > 1 && $initial_total != $recurring_total ) {
+        } else if ($bill_times > 1 && $initial_total != $recurring_total) {
             $bill_times--;
         }
     }
     
-    $initial_amount     = wpinv_price( wpinv_format_amount( $initial_total ), $currency );
-    $recurring_amount   = wpinv_price( wpinv_format_amount( $recurring_total ), $currency );
+    $initial_amount     = wpinv_price(wpinv_format_amount($initial_total), $currency);
+    $recurring_amount   = wpinv_price(wpinv_format_amount($recurring_total), $currency);
     
-    $recurring          = wpinv_subscription_recurring_payment_desc( $recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    $recurring          = wpinv_subscription_recurring_payment_desc($recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
         
-    if ( $initial_total != $recurring_total ) {
-        $initial        = wpinv_subscription_initial_payment_desc( $initial_amount, $period, $interval, $trial_period, $trial_interval );
+    if ($initial_total != $recurring_total) {
+        $initial        = wpinv_subscription_initial_payment_desc($initial_amount, $period, $interval, $trial_period, $trial_interval);
         
-        $description    = wp_sprintf( __( '%s Then %s', 'invoicing' ), $initial, $recurring );
+        $description    = wp_sprintf(__('%s Then %s', 'invoicing'), $initial, $recurring);
     } else {
         $description    = $recurring;
     }
     
-    return apply_filters( 'wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency );
+    return apply_filters('wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency);
 }
 
-function wpinv_recurring_send_payment_failed( $invoice ) {
-    if ( !empty( $invoice->ID ) ) {
-        wpinv_failed_invoice_notification( $invoice->ID );
+function wpinv_recurring_send_payment_failed($invoice) {
+    if (!empty($invoice->ID)) {
+        wpinv_failed_invoice_notification($invoice->ID);
     }
 }
-add_action( 'wpinv_recurring_payment_failed', 'wpinv_recurring_send_payment_failed', 10, 1 );
\ No newline at end of file
+add_action('wpinv_recurring_payment_failed', 'wpinv_recurring_send_payment_failed', 10, 1);
\ No newline at end of file