AyeCode / invoicing

includes/reports/class-getpaid-reports-export.php

Indentation +175 added lines, -175 removed lines

@@ -12,47 +12,47 @@ 
  */
 class GetPaid_Reports_Export {
 
-	/**
-	 * Displays the reports tab.
-	 *
-	 */
-	public function display() {
-
-		echo "<div class='row mt-4' style='max-width: 920px;' >";
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$this->display_post_type_export( $post_type );
-		}
-		$this->display_subscription_export();
-		echo "</div>";
-
-	}
-
-	/**
-	 * Retrieves the download url.
-	 *
-	 */
-	public function get_download_url( $post_type ) {
-
-		return wp_nonce_url(
-			add_query_arg(
-				array(
-					'getpaid-admin-action' => 'export_invoices',
-					'post_type'            => urlencode( $post_type ),
-				)
-			),
-			'getpaid-nonce',
-			'getpaid-nonce'
-		);
-
-	}
-
-	/**
-	 * Displays a single post type export card.
-	 *
-	 */
-	public function display_post_type_export( $post_type ) {
-
-		?>
+    /**
+     * Displays the reports tab.
+     *
+     */
+    public function display() {
+
+        echo "<div class='row mt-4' style='max-width: 920px;' >";
+        foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
+            $this->display_post_type_export( $post_type );
+        }
+        $this->display_subscription_export();
+        echo "</div>";
+
+    }
+
+    /**
+     * Retrieves the download url.
+     *
+     */
+    public function get_download_url( $post_type ) {
+
+        return wp_nonce_url(
+            add_query_arg(
+                array(
+                    'getpaid-admin-action' => 'export_invoices',
+                    'post_type'            => urlencode( $post_type ),
+                )
+            ),
+            'getpaid-nonce',
+            'getpaid-nonce'
+        );
+
+    }
+
+    /**
+     * Displays a single post type export card.
+     *
+     */
+    public function display_post_type_export( $post_type ) {
+
+        ?>
 
 		<div class="col-12 col-md-6">
 			<div class="card m-0 p-0" style="max-width:100%">
@@ -60,11 +60,11 @@ 
 				<div class="card-header">
 					<strong>
 						<?php
-							printf(
-								__( 'Export %s', 'invoicing' ),
-								sanitize_text_field( getpaid_get_post_type_label( $post_type ) )
-							);
-						?>
+                            printf(
+                                __( 'Export %s', 'invoicing' ),
+                                sanitize_text_field( getpaid_get_post_type_label( $post_type ) )
+                            );
+                        ?>
 					</strong>
 				</div>
 
@@ -73,12 +73,12 @@ 
 					<form method="post" action="<?php echo esc_url( $this->get_download_url( $post_type ) ); ?>">
 
 						<?php
-							$this->display_markup( $this->generate_from_date( $post_type ) );
-							$this->display_markup( $this->generate_to_date( $post_type ) );
-							$this->display_markup( $this->generate_post_status_select( $post_type ) );
-							$this->display_markup( $this->generate_file_type_select( $post_type ) );
-							submit_button( __( 'Download', 'invoicing' ) );
-						?>
+                            $this->display_markup( $this->generate_from_date( $post_type ) );
+                            $this->display_markup( $this->generate_to_date( $post_type ) );
+                            $this->display_markup( $this->generate_post_status_select( $post_type ) );
+                            $this->display_markup( $this->generate_file_type_select( $post_type ) );
+                            submit_button( __( 'Download', 'invoicing' ) );
+                        ?>
 
 					</form>
 
@@ -89,122 +89,122 @@ 
 
 		<?php
 
-	}
-
-	/**
-	 * Generates the from date input field.
-	 *
-	 */
-	public function generate_from_date( $post_type ) {
-
-		return aui()->input(
-			array(
-				'name'       => 'from_date',
-				'id'         => esc_attr( "$post_type-from_date" ),
-				'placeholder'=> 'yy-mm-dd',
-				'label'      => __( 'From Date', 'invoicing' ),
-				'label_type' => 'vertical',
-				'label_class' => 'd-block',
-				'type'       => 'datepicker',
-			)
-		);
-
-	}
-
-	/**
-	 * Generates the to date input field.
-	 *
-	 */
-	public function generate_to_date( $post_type ) {
-
-		return aui()->input(
-			array(
-				'name'       => 'to_date',
-				'id'         => esc_attr( "$post_type-to_date" ),
-				'placeholder'=> 'yy-mm-dd',
-				'label'      => __( 'To Date', 'invoicing' ),
-				'label_type' => 'vertical',
-				'label_class' => 'd-block',
-				'type'       => 'datepicker',
-			)
-		);
-
-	}
-
-	/**
-	 * Generates the to post status select field.
-	 *
-	 */
-	public function generate_post_status_select( $post_type ) {
-
-		if ( 'subscriptions' === $post_type ) {
-			$options = getpaid_get_subscription_statuses();
-		} else {
-			$options = wpinv_get_invoice_statuses( true, false, $post_type );
-		}
-
-		return aui()->select(
-			array(
-				'name'        => 'status',
-				'id'          => esc_attr( "$post_type-status" ),
-				'placeholder' => __( 'All Statuses', 'invoicing' ),
-				'label'       => __( 'Status', 'invoicing' ),
-				'label_type'  => 'vertical',
-				'label_class' => 'd-block',
-				'options'     => $options,
-			)
-		);
-
-	}
-
-	/**
-	 * Generates the to file type select field.
-	 *
-	 */
-	public function generate_file_type_select( $post_type ) {
-
-		return aui()->select(
-			array(
-				'name'        => 'file_type',
-				'id'          => esc_attr( "$post_type-file_type" ),
-				'placeholder' => __( 'Select File Type', 'invoicing' ),
-				'label'       => __( 'Export File', 'invoicing' ),
-				'label_type'  => 'vertical',
-				'label_class' => 'd-block',
-				'options'     => array(
-					'csv'  => __( 'CSV', 'invoicing' ),
-					'xml'  => __( 'XML', 'invoicing' ),
-					'json' => __( 'JSON', 'invoicing' ),
-				),
-			)
-		);
-
-	}
-
-	/**
-	 * Displays a field's markup.
-	 *
-	 */
-	public function display_markup( $markup ) {
-
-		echo str_replace(
-			array(
-				'form-control',
-				'custom-select'
-			),
-			'regular-text',
-			$markup
-		);
-
-	}
-
-	/**
-	 * Displays a subscription export card.
-	 *
-	 */
-	public function display_subscription_export() {
-
-		?>
+    }
+
+    /**
+     * Generates the from date input field.
+     *
+     */
+    public function generate_from_date( $post_type ) {
+
+        return aui()->input(
+            array(
+                'name'       => 'from_date',
+                'id'         => esc_attr( "$post_type-from_date" ),
+                'placeholder'=> 'yy-mm-dd',
+                'label'      => __( 'From Date', 'invoicing' ),
+                'label_type' => 'vertical',
+                'label_class' => 'd-block',
+                'type'       => 'datepicker',
+            )
+        );
+
+    }
+
+    /**
+     * Generates the to date input field.
+     *
+     */
+    public function generate_to_date( $post_type ) {
+
+        return aui()->input(
+            array(
+                'name'       => 'to_date',
+                'id'         => esc_attr( "$post_type-to_date" ),
+                'placeholder'=> 'yy-mm-dd',
+                'label'      => __( 'To Date', 'invoicing' ),
+                'label_type' => 'vertical',
+                'label_class' => 'd-block',
+                'type'       => 'datepicker',
+            )
+        );
+
+    }
+
+    /**
+     * Generates the to post status select field.
+     *
+     */
+    public function generate_post_status_select( $post_type ) {
+
+        if ( 'subscriptions' === $post_type ) {
+            $options = getpaid_get_subscription_statuses();
+        } else {
+            $options = wpinv_get_invoice_statuses( true, false, $post_type );
+        }
+
+        return aui()->select(
+            array(
+                'name'        => 'status',
+                'id'          => esc_attr( "$post_type-status" ),
+                'placeholder' => __( 'All Statuses', 'invoicing' ),
+                'label'       => __( 'Status', 'invoicing' ),
+                'label_type'  => 'vertical',
+                'label_class' => 'd-block',
+                'options'     => $options,
+            )
+        );
+
+    }
+
+    /**
+     * Generates the to file type select field.
+     *
+     */
+    public function generate_file_type_select( $post_type ) {
+
+        return aui()->select(
+            array(
+                'name'        => 'file_type',
+                'id'          => esc_attr( "$post_type-file_type" ),
+                'placeholder' => __( 'Select File Type', 'invoicing' ),
+                'label'       => __( 'Export File', 'invoicing' ),
+                'label_type'  => 'vertical',
+                'label_class' => 'd-block',
+                'options'     => array(
+                    'csv'  => __( 'CSV', 'invoicing' ),
+                    'xml'  => __( 'XML', 'invoicing' ),
+                    'json' => __( 'JSON', 'invoicing' ),
+                ),
+            )
+        );
+
+    }
+
+    /**
+     * Displays a field's markup.
+     *
+     */
+    public function display_markup( $markup ) {
+
+        echo str_replace(
+            array(
+                'form-control',
+                'custom-select'
+            ),
+            'regular-text',
+            $markup
+        );
+
+    }
+
+    /**
+     * Displays a subscription export card.
+     *
+     */
+    public function display_subscription_export() {
+
+        ?>
 
 		<div class="col-12 col-md-6">
 			<div class="card m-0 p-0" style="max-width:100%">
@@ -220,12 +220,12 @@ 
 					<form method="post" action="<?php echo esc_url( $this->get_download_url( 'subscriptions' ) ); ?>">
 
 						<?php
-							$this->display_markup( $this->generate_from_date( 'subscriptions' ) );
-							$this->display_markup( $this->generate_to_date( 'subscriptions' ) );
-							$this->display_markup( $this->generate_post_status_select( 'subscriptions' ) );
-							$this->display_markup( $this->generate_file_type_select( 'subscriptions' ) );
-							submit_button( __( 'Download', 'invoicing' ) );
-						?>
+                            $this->display_markup( $this->generate_from_date( 'subscriptions' ) );
+                            $this->display_markup( $this->generate_to_date( 'subscriptions' ) );
+                            $this->display_markup( $this->generate_post_status_select( 'subscriptions' ) );
+                            $this->display_markup( $this->generate_file_type_select( 'subscriptions' ) );
+                            submit_button( __( 'Download', 'invoicing' ) );
+                        ?>
 
 					</form>
 
@@ -236,6 +236,6 @@ 
 
 		<?php
 
-	}
+    }
 
 }

Spacing +41 added lines, -41 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Export Class.
@@ -19,8 +19,8 @@ 
 	public function display() {
 
 		echo "<div class='row mt-4' style='max-width: 920px;' >";
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$this->display_post_type_export( $post_type );
+		foreach (array_keys(getpaid_get_invoice_post_types()) as $post_type) {
+			$this->display_post_type_export($post_type);
 		}
 		$this->display_subscription_export();
 		echo "</div>";
@@ -31,13 +31,13 @@ 
 	 * Retrieves the download url.
 	 *
 	 */
-	public function get_download_url( $post_type ) {
+	public function get_download_url($post_type) {
 
 		return wp_nonce_url(
 			add_query_arg(
 				array(
 					'getpaid-admin-action' => 'export_invoices',
-					'post_type'            => urlencode( $post_type ),
+					'post_type'            => urlencode($post_type),
 				)
 			),
 			'getpaid-nonce',
@@ -50,7 +50,7 @@ 
 	 * Displays a single post type export card.
 	 *
 	 */
-	public function display_post_type_export( $post_type ) {
+	public function display_post_type_export($post_type) {
 
 		?>
 
@@ -61,8 +61,8 @@ 
 					<strong>
 						<?php
 							printf(
-								__( 'Export %s', 'invoicing' ),
-								sanitize_text_field( getpaid_get_post_type_label( $post_type ) )
+								__('Export %s', 'invoicing'),
+								sanitize_text_field(getpaid_get_post_type_label($post_type))
 							);
 						?>
 					</strong>
@@ -70,14 +70,14 @@ 
 
 				<div class="card-body">
 
-					<form method="post" action="<?php echo esc_url( $this->get_download_url( $post_type ) ); ?>">
+					<form method="post" action="<?php echo esc_url($this->get_download_url($post_type)); ?>">
 
 						<?php
-							$this->display_markup( $this->generate_from_date( $post_type ) );
-							$this->display_markup( $this->generate_to_date( $post_type ) );
-							$this->display_markup( $this->generate_post_status_select( $post_type ) );
-							$this->display_markup( $this->generate_file_type_select( $post_type ) );
-							submit_button( __( 'Download', 'invoicing' ) );
+							$this->display_markup($this->generate_from_date($post_type));
+							$this->display_markup($this->generate_to_date($post_type));
+							$this->display_markup($this->generate_post_status_select($post_type));
+							$this->display_markup($this->generate_file_type_select($post_type));
+							submit_button(__('Download', 'invoicing'));
 						?>
 
 					</form>
@@ -95,14 +95,14 @@ 
 	 * Generates the from date input field.
 	 *
 	 */
-	public function generate_from_date( $post_type ) {
+	public function generate_from_date($post_type) {
 
 		return aui()->input(
 			array(
 				'name'       => 'from_date',
-				'id'         => esc_attr( "$post_type-from_date" ),
+				'id'         => esc_attr("$post_type-from_date"),
 				'placeholder'=> 'yy-mm-dd',
-				'label'      => __( 'From Date', 'invoicing' ),
+				'label'      => __('From Date', 'invoicing'),
 				'label_type' => 'vertical',
 				'label_class' => 'd-block',
 				'type'       => 'datepicker',
@@ -115,14 +115,14 @@ 
 	 * Generates the to date input field.
 	 *
 	 */
-	public function generate_to_date( $post_type ) {
+	public function generate_to_date($post_type) {
 
 		return aui()->input(
 			array(
 				'name'       => 'to_date',
-				'id'         => esc_attr( "$post_type-to_date" ),
+				'id'         => esc_attr("$post_type-to_date"),
 				'placeholder'=> 'yy-mm-dd',
-				'label'      => __( 'To Date', 'invoicing' ),
+				'label'      => __('To Date', 'invoicing'),
 				'label_type' => 'vertical',
 				'label_class' => 'd-block',
 				'type'       => 'datepicker',
@@ -135,20 +135,20 @@ 
 	 * Generates the to post status select field.
 	 *
 	 */
-	public function generate_post_status_select( $post_type ) {
+	public function generate_post_status_select($post_type) {
 
-		if ( 'subscriptions' === $post_type ) {
+		if ('subscriptions' === $post_type) {
 			$options = getpaid_get_subscription_statuses();
 		} else {
-			$options = wpinv_get_invoice_statuses( true, false, $post_type );
+			$options = wpinv_get_invoice_statuses(true, false, $post_type);
 		}
 
 		return aui()->select(
 			array(
 				'name'        => 'status',
-				'id'          => esc_attr( "$post_type-status" ),
-				'placeholder' => __( 'All Statuses', 'invoicing' ),
-				'label'       => __( 'Status', 'invoicing' ),
+				'id'          => esc_attr("$post_type-status"),
+				'placeholder' => __('All Statuses', 'invoicing'),
+				'label'       => __('Status', 'invoicing'),
 				'label_type'  => 'vertical',
 				'label_class' => 'd-block',
 				'options'     => $options,
@@ -161,20 +161,20 @@ 
 	 * Generates the to file type select field.
 	 *
 	 */
-	public function generate_file_type_select( $post_type ) {
+	public function generate_file_type_select($post_type) {
 
 		return aui()->select(
 			array(
 				'name'        => 'file_type',
-				'id'          => esc_attr( "$post_type-file_type" ),
-				'placeholder' => __( 'Select File Type', 'invoicing' ),
-				'label'       => __( 'Export File', 'invoicing' ),
+				'id'          => esc_attr("$post_type-file_type"),
+				'placeholder' => __('Select File Type', 'invoicing'),
+				'label'       => __('Export File', 'invoicing'),
 				'label_type'  => 'vertical',
 				'label_class' => 'd-block',
 				'options'     => array(
-					'csv'  => __( 'CSV', 'invoicing' ),
-					'xml'  => __( 'XML', 'invoicing' ),
-					'json' => __( 'JSON', 'invoicing' ),
+					'csv'  => __('CSV', 'invoicing'),
+					'xml'  => __('XML', 'invoicing'),
+					'json' => __('JSON', 'invoicing'),
 				),
 			)
 		);
@@ -185,7 +185,7 @@ 
 	 * Displays a field's markup.
 	 *
 	 */
-	public function display_markup( $markup ) {
+	public function display_markup($markup) {
 
 		echo str_replace(
 			array(
@@ -211,20 +211,20 @@ 
 
 				<div class="card-header">
 					<strong>
-						<?php _e( 'Export Subscriptions', 'invoicing' ); ?>
+						<?php _e('Export Subscriptions', 'invoicing'); ?>
 					</strong>
 				</div>
 
 				<div class="card-body">
 
-					<form method="post" action="<?php echo esc_url( $this->get_download_url( 'subscriptions' ) ); ?>">
+					<form method="post" action="<?php echo esc_url($this->get_download_url('subscriptions')); ?>">
 
 						<?php
-							$this->display_markup( $this->generate_from_date( 'subscriptions' ) );
-							$this->display_markup( $this->generate_to_date( 'subscriptions' ) );
-							$this->display_markup( $this->generate_post_status_select( 'subscriptions' ) );
-							$this->display_markup( $this->generate_file_type_select( 'subscriptions' ) );
-							submit_button( __( 'Download', 'invoicing' ) );
+							$this->display_markup($this->generate_from_date('subscriptions'));
+							$this->display_markup($this->generate_to_date('subscriptions'));
+							$this->display_markup($this->generate_post_status_select('subscriptions'));
+							$this->display_markup($this->generate_file_type_select('subscriptions'));
+							submit_button(__('Download', 'invoicing'));
 						?>
 
 					</form>

includes/reports/class-getpaid-subscription-exporter.php

Indentation +172 added lines, -172 removed lines

@@ -12,177 +12,177 @@
  */
 class GetPaid_Subscription_Exporter extends GetPaid_Graph_Downloader {
 
-	/**
-	 * Retrieves subscription query args.
-	 * 
-	 * @param array $args Args to search for.
-	 * @return array
-	 */
-	public function get_subscription_query_args( $args ) {
-
-		$query_args = array(
-			'status'      => 'all',
-			'number'      => -1,
-			'count_total' => false,
-			'fields'      => 'all',
-		);
-
-		if ( ! empty( $args['status'] ) && in_array( $args['status'], array_keys( getpaid_get_subscription_statuses() ), true ) ) {
-			$query_args['status'] = wpinv_clean( wpinv_parse_list( $args['status'] ) );
-		}
-
-		$date_query = array();
-		if ( ! empty( $args['to_date'] ) ) {
-			$date_query['before'] = wpinv_clean( $args['to_date'] );
-		}
-
-		if ( ! empty( $args['from_date'] ) ) {
-			$date_query['after'] = wpinv_clean( $args['from_date'] );
-		}
-
-		if ( ! empty( $date_query ) ) {
-			$date_query['inclusive']          = true;
-			$query_args['date_created_query'] = array( $date_query );
-		}
-
-		return $query_args;
-	}
-
-	/**
-	 * Retrieves subscriptions.
-	 * 
-	 * @param array $query_args GetPaid_Subscriptions_Query args.
-	 * @return WPInv_Subscription[]
-	 */
-	public function get_subscriptions( $query_args ) {
-
-		// Get subscriptions.
-		$subscriptions = new GetPaid_Subscriptions_Query( $query_args );
-
-		// Prepare the results.
-		return $subscriptions->get_results();
-
-	}
-
-	/**
-	 * Handles the actual download.
-	 *
-	 */
-	public function export( $post_type, $args ) {
-
-		$subscriptions = $this->get_subscriptions( $this->get_subscription_query_args( $args ) );
-		$stream        = $this->prepare_output();
-		$headers       = $this->get_export_fields();
-		$file_type     = $this->prepare_file_type( 'subscriptions' );
-
-		if ( 'csv' == $file_type ) {
-			$this->download_csv( $subscriptions, $stream, $headers );
-		} else if( 'xml' == $file_type ) {
-			$this->download_xml( $subscriptions, $stream, $headers );
-		} else {
-			$this->download_json( $subscriptions, $stream, $headers );
-		}
-
-		fclose( $stream );
-		exit;
-	}
-
-	/**
-	 * Prepares a single subscription for download.
-	 *
-	 * @param WPInv_Subscription $subscription The subscription to prepare..
-	 * @param array $fields The fields to stream.
-	 * @since       1.0.19
-	 * @return array
-	 */
-	public function prepare_row( $subscription, $fields ) {
-
-		$prepared      = array();
-		$amount_fields = $this->get_amount_fields();
-		$invoice       = $subscription->get_parent_payment();
-
-		foreach ( $fields as $field ) {
-
-			$value  = '';
-			$method = "get_$field";
-
-			if ( 0 === stripos( $field, 'customer' ) || 'currency' === $field ) {
-
-				if ( method_exists( $invoice, $method ) ) {
-					$value  = $invoice->$method();
-				}
-
-			} else if ( method_exists( $subscription, $method ) ) {
-				$value  = $subscription->$method();
-			}
-
-			if ( in_array( $field, $amount_fields ) ) {
-				$value  = wpinv_round_amount( wpinv_sanitize_amount( $value ) );
-			}
-
-			$prepared[ $field ] = wpinv_clean( $value );
-
-		}
-
-		return $prepared;
-	}
-
-	/**
-	 * Retrieves export fields.
-	 *
-	 * @since       1.0.19
-	 * @return array
-	 */
-	public function get_export_fields() {
-
-		$fields = array(
-			'id',
-			'currency',
-			'initial_amount',
-			'recurring_amount',
-			'trial_period',
-			'frequency',
-			'period',
-			'bill_times',
-			'parent_payment_id',
-			'profile_id',
-			'product_id',
-			'status',
-			'date_created',
-			'date_expires',
-
-			'customer_id',
-			'customer_first_name',
-			'customer_last_name',
-			'customer_phone',
-			'customer_email',
-			'customer_country',
-			'customer_city',
-			'customer_state',
-			'customer_zip',
-			'customer_company',
-			'customer_vat_number',
-			'customer_address',
-
-    	);
-
-		return apply_filters( 'getpaid_subscription_exporter_get_fields', $fields );
-	}
-
-	/**
-	 * Retrieves amount fields.
-	 *
-	 * @since       1.0.19
-	 * @return array
-	 */
-	public function get_amount_fields() {
-
-		$fields = array(
-			'initial_amount',
-			'recurring_amount'
-    	);
-
-		return apply_filters( 'getpaid_subscription_exporter_get_amount_fields', $fields );
-	}
+    /**
+     * Retrieves subscription query args.
+     * 
+     * @param array $args Args to search for.
+     * @return array
+     */
+    public function get_subscription_query_args( $args ) {
+
+        $query_args = array(
+            'status'      => 'all',
+            'number'      => -1,
+            'count_total' => false,
+            'fields'      => 'all',
+        );
+
+        if ( ! empty( $args['status'] ) && in_array( $args['status'], array_keys( getpaid_get_subscription_statuses() ), true ) ) {
+            $query_args['status'] = wpinv_clean( wpinv_parse_list( $args['status'] ) );
+        }
+
+        $date_query = array();
+        if ( ! empty( $args['to_date'] ) ) {
+            $date_query['before'] = wpinv_clean( $args['to_date'] );
+        }
+
+        if ( ! empty( $args['from_date'] ) ) {
+            $date_query['after'] = wpinv_clean( $args['from_date'] );
+        }
+
+        if ( ! empty( $date_query ) ) {
+            $date_query['inclusive']          = true;
+            $query_args['date_created_query'] = array( $date_query );
+        }
+
+        return $query_args;
+    }
+
+    /**
+     * Retrieves subscriptions.
+     * 
+     * @param array $query_args GetPaid_Subscriptions_Query args.
+     * @return WPInv_Subscription[]
+     */
+    public function get_subscriptions( $query_args ) {
+
+        // Get subscriptions.
+        $subscriptions = new GetPaid_Subscriptions_Query( $query_args );
+
+        // Prepare the results.
+        return $subscriptions->get_results();
+
+    }
+
+    /**
+     * Handles the actual download.
+     *
+     */
+    public function export( $post_type, $args ) {
+
+        $subscriptions = $this->get_subscriptions( $this->get_subscription_query_args( $args ) );
+        $stream        = $this->prepare_output();
+        $headers       = $this->get_export_fields();
+        $file_type     = $this->prepare_file_type( 'subscriptions' );
+
+        if ( 'csv' == $file_type ) {
+            $this->download_csv( $subscriptions, $stream, $headers );
+        } else if( 'xml' == $file_type ) {
+            $this->download_xml( $subscriptions, $stream, $headers );
+        } else {
+            $this->download_json( $subscriptions, $stream, $headers );
+        }
+
+        fclose( $stream );
+        exit;
+    }
+
+    /**
+     * Prepares a single subscription for download.
+     *
+     * @param WPInv_Subscription $subscription The subscription to prepare..
+     * @param array $fields The fields to stream.
+     * @since       1.0.19
+     * @return array
+     */
+    public function prepare_row( $subscription, $fields ) {
+
+        $prepared      = array();
+        $amount_fields = $this->get_amount_fields();
+        $invoice       = $subscription->get_parent_payment();
+
+        foreach ( $fields as $field ) {
+
+            $value  = '';
+            $method = "get_$field";
+
+            if ( 0 === stripos( $field, 'customer' ) || 'currency' === $field ) {
+
+                if ( method_exists( $invoice, $method ) ) {
+                    $value  = $invoice->$method();
+                }
+
+            } else if ( method_exists( $subscription, $method ) ) {
+                $value  = $subscription->$method();
+            }
+
+            if ( in_array( $field, $amount_fields ) ) {
+                $value  = wpinv_round_amount( wpinv_sanitize_amount( $value ) );
+            }
+
+            $prepared[ $field ] = wpinv_clean( $value );
+
+        }
+
+        return $prepared;
+    }
+
+    /**
+     * Retrieves export fields.
+     *
+     * @since       1.0.19
+     * @return array
+     */
+    public function get_export_fields() {
+
+        $fields = array(
+            'id',
+            'currency',
+            'initial_amount',
+            'recurring_amount',
+            'trial_period',
+            'frequency',
+            'period',
+            'bill_times',
+            'parent_payment_id',
+            'profile_id',
+            'product_id',
+            'status',
+            'date_created',
+            'date_expires',
+
+            'customer_id',
+            'customer_first_name',
+            'customer_last_name',
+            'customer_phone',
+            'customer_email',
+            'customer_country',
+            'customer_city',
+            'customer_state',
+            'customer_zip',
+            'customer_company',
+            'customer_vat_number',
+            'customer_address',
+
+        );
+
+        return apply_filters( 'getpaid_subscription_exporter_get_fields', $fields );
+    }
+
+    /**
+     * Retrieves amount fields.
+     *
+     * @since       1.0.19
+     * @return array
+     */
+    public function get_amount_fields() {
+
+        $fields = array(
+            'initial_amount',
+            'recurring_amount'
+        );
+
+        return apply_filters( 'getpaid_subscription_exporter_get_amount_fields', $fields );
+    }
 
 }

Spacing +33 added lines, -33 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Subscription_Exporter Class.
@@ -18,7 +18,7 @@ 
 	 * @param array $args Args to search for.
 	 * @return array
 	 */
-	public function get_subscription_query_args( $args ) {
+	public function get_subscription_query_args($args) {
 
 		$query_args = array(
 			'status'      => 'all',
@@ -27,22 +27,22 @@ 
 			'fields'      => 'all',
 		);
 
-		if ( ! empty( $args['status'] ) && in_array( $args['status'], array_keys( getpaid_get_subscription_statuses() ), true ) ) {
-			$query_args['status'] = wpinv_clean( wpinv_parse_list( $args['status'] ) );
+		if (!empty($args['status']) && in_array($args['status'], array_keys(getpaid_get_subscription_statuses()), true)) {
+			$query_args['status'] = wpinv_clean(wpinv_parse_list($args['status']));
 		}
 
 		$date_query = array();
-		if ( ! empty( $args['to_date'] ) ) {
-			$date_query['before'] = wpinv_clean( $args['to_date'] );
+		if (!empty($args['to_date'])) {
+			$date_query['before'] = wpinv_clean($args['to_date']);
 		}
 
-		if ( ! empty( $args['from_date'] ) ) {
-			$date_query['after'] = wpinv_clean( $args['from_date'] );
+		if (!empty($args['from_date'])) {
+			$date_query['after'] = wpinv_clean($args['from_date']);
 		}
 
-		if ( ! empty( $date_query ) ) {
+		if (!empty($date_query)) {
 			$date_query['inclusive']          = true;
-			$query_args['date_created_query'] = array( $date_query );
+			$query_args['date_created_query'] = array($date_query);
 		}
 
 		return $query_args;
@@ -54,10 +54,10 @@ 
 	 * @param array $query_args GetPaid_Subscriptions_Query args.
 	 * @return WPInv_Subscription[]
 	 */
-	public function get_subscriptions( $query_args ) {
+	public function get_subscriptions($query_args) {
 
 		// Get subscriptions.
-		$subscriptions = new GetPaid_Subscriptions_Query( $query_args );
+		$subscriptions = new GetPaid_Subscriptions_Query($query_args);
 
 		// Prepare the results.
 		return $subscriptions->get_results();
@@ -68,22 +68,22 @@ 
 	 * Handles the actual download.
 	 *
 	 */
-	public function export( $post_type, $args ) {
+	public function export($post_type, $args) {
 
-		$subscriptions = $this->get_subscriptions( $this->get_subscription_query_args( $args ) );
+		$subscriptions = $this->get_subscriptions($this->get_subscription_query_args($args));
 		$stream        = $this->prepare_output();
 		$headers       = $this->get_export_fields();
-		$file_type     = $this->prepare_file_type( 'subscriptions' );
+		$file_type     = $this->prepare_file_type('subscriptions');
 
-		if ( 'csv' == $file_type ) {
-			$this->download_csv( $subscriptions, $stream, $headers );
-		} else if( 'xml' == $file_type ) {
-			$this->download_xml( $subscriptions, $stream, $headers );
+		if ('csv' == $file_type) {
+			$this->download_csv($subscriptions, $stream, $headers);
+		} else if ('xml' == $file_type) {
+			$this->download_xml($subscriptions, $stream, $headers);
 		} else {
-			$this->download_json( $subscriptions, $stream, $headers );
+			$this->download_json($subscriptions, $stream, $headers);
 		}
 
-		fclose( $stream );
+		fclose($stream);
 		exit;
 	}
 
@@ -95,32 +95,32 @@ 
 	 * @since       1.0.19
 	 * @return array
 	 */
-	public function prepare_row( $subscription, $fields ) {
+	public function prepare_row($subscription, $fields) {
 
 		$prepared      = array();
 		$amount_fields = $this->get_amount_fields();
 		$invoice       = $subscription->get_parent_payment();
 
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 
 			$value  = '';
 			$method = "get_$field";
 
-			if ( 0 === stripos( $field, 'customer' ) || 'currency' === $field ) {
+			if (0 === stripos($field, 'customer') || 'currency' === $field) {
 
-				if ( method_exists( $invoice, $method ) ) {
-					$value  = $invoice->$method();
+				if (method_exists($invoice, $method)) {
+					$value = $invoice->$method();
 				}
 
-			} else if ( method_exists( $subscription, $method ) ) {
-				$value  = $subscription->$method();
+			} else if (method_exists($subscription, $method)) {
+				$value = $subscription->$method();
 			}
 
-			if ( in_array( $field, $amount_fields ) ) {
-				$value  = wpinv_round_amount( wpinv_sanitize_amount( $value ) );
+			if (in_array($field, $amount_fields)) {
+				$value = wpinv_round_amount(wpinv_sanitize_amount($value));
 			}
 
-			$prepared[ $field ] = wpinv_clean( $value );
+			$prepared[$field] = wpinv_clean($value);
 
 		}
 
@@ -166,7 +166,7 @@ 
 
     	);
 
-		return apply_filters( 'getpaid_subscription_exporter_get_fields', $fields );
+		return apply_filters('getpaid_subscription_exporter_get_fields', $fields);
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 			'recurring_amount'
     	);
 
-		return apply_filters( 'getpaid_subscription_exporter_get_amount_fields', $fields );
+		return apply_filters('getpaid_subscription_exporter_get_amount_fields', $fields);
 	}
 
 }

includes/reports/class-getpaid-reports.php

Indentation +103 added lines, -103 removed lines

@@ -12,49 +12,49 @@ 
  */
 class GetPaid_Reports {
 
-	/**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'register_reports_page' ), 20 );
-		add_action( 'wpinv_reports_tab_reports', array( $this, 'display_reports_tab' ) );
-		add_action( 'wpinv_reports_tab_export', array( $this, 'display_exports_tab' ) );
-		add_action( 'getpaid_authenticated_admin_action_download_graph', array( $this, 'download_graph' ) );
-		add_action( 'getpaid_authenticated_admin_action_export_invoices', array( $this, 'export_invoices' ) );
-
-	}
-
-	/**
-	 * Registers the reports page.
-	 *
-	 */
-	public function register_reports_page() {
-
-		add_submenu_page(
+    /**
+     * Class constructor.
+     *
+     */
+    public function __construct() {
+        add_action( 'admin_menu', array( $this, 'register_reports_page' ), 20 );
+        add_action( 'wpinv_reports_tab_reports', array( $this, 'display_reports_tab' ) );
+        add_action( 'wpinv_reports_tab_export', array( $this, 'display_exports_tab' ) );
+        add_action( 'getpaid_authenticated_admin_action_download_graph', array( $this, 'download_graph' ) );
+        add_action( 'getpaid_authenticated_admin_action_export_invoices', array( $this, 'export_invoices' ) );
+
+    }
+
+    /**
+     * Registers the reports page.
+     *
+     */
+    public function register_reports_page() {
+
+        add_submenu_page(
             'wpinv',
             __( 'Reports', 'invoicing' ),
             __( 'Reports', 'invoicing' ),
             wpinv_get_capability(),
             'wpinv-reports',
             array( $this, 'display_reports_page' )
-		);
+        );
 
-	}
+    }
 
-	/**
-	 * Displays the reports page.
-	 *
-	 */
-	public function display_reports_page() {
+    /**
+     * Displays the reports page.
+     *
+     */
+    public function display_reports_page() {
 
-		// Prepare variables.
-		$tabs        = $this->get_tabs();
-		$current_tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'reports';
-		$current_tab = array_key_exists( $current_tab, $tabs ) ? $current_tab : 'reports';
+        // Prepare variables.
+        $tabs        = $this->get_tabs();
+        $current_tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'reports';
+        $current_tab = array_key_exists( $current_tab, $tabs ) ? $current_tab : 'reports';
 
-		// Display the current tab.
-		?>
+        // Display the current tab.
+        ?>
 
         <div class="wrap">
 
@@ -63,19 +63,19 @@ 
 			<nav class="nav-tab-wrapper">
 
 				<?php
-					foreach( $tabs as $key => $label ) {
+                    foreach( $tabs as $key => $label ) {
 
-						$key   = sanitize_text_field( $key );
-						$label = sanitize_text_field( $label );
-						$class = $key == $current_tab ? 'nav-tab nav-tab-active' : 'nav-tab';
-						$url   = esc_url(
-							add_query_arg( 'tab', $key, admin_url( 'admin.php?page=wpinv-reports' ) )
-						);
+                        $key   = sanitize_text_field( $key );
+                        $label = sanitize_text_field( $label );
+                        $class = $key == $current_tab ? 'nav-tab nav-tab-active' : 'nav-tab';
+                        $url   = esc_url(
+                            add_query_arg( 'tab', $key, admin_url( 'admin.php?page=wpinv-reports' ) )
+                        );
 
-						echo "\n\t\t\t<a href='$url' class='$class'>$label</a>";
+                        echo "\n\t\t\t<a href='$url' class='$class'>$label</a>";
 
-					}
-				?>
+                    }
+                ?>
 
 			</nav>
 
@@ -86,83 +86,83 @@ 
         </div>
 		<?php
 
-			// Wordfence loads an unsupported version of chart js on our page.
-			wp_deregister_style( 'chart-js' );
-			wp_deregister_script( 'chart-js' );
-			wp_enqueue_script( 'chart-js', WPINV_PLUGIN_URL . 'assets/js/chart.bundle.min.js', array( 'jquery' ), '2.9.4', true );
-			wp_enqueue_style( 'chart-js', WPINV_PLUGIN_URL . 'assets/css/chart.min.css', array(), '2.9.4' );
+            // Wordfence loads an unsupported version of chart js on our page.
+            wp_deregister_style( 'chart-js' );
+            wp_deregister_script( 'chart-js' );
+            wp_enqueue_script( 'chart-js', WPINV_PLUGIN_URL . 'assets/js/chart.bundle.min.js', array( 'jquery' ), '2.9.4', true );
+            wp_enqueue_style( 'chart-js', WPINV_PLUGIN_URL . 'assets/css/chart.min.css', array(), '2.9.4' );
 
-	}
+    }
 
-	/**
-	 * Retrieves reports page tabs.
-	 *
-	 * @return array
-	 */
-	public function get_tabs() {
+    /**
+     * Retrieves reports page tabs.
+     *
+     * @return array
+     */
+    public function get_tabs() {
 
-		$tabs = array(
-			'reports' => __( 'Reports', 'invoicing' ),
-			'export'  => __( 'Export', 'invoicing' ),
-		);
+        $tabs = array(
+            'reports' => __( 'Reports', 'invoicing' ),
+            'export'  => __( 'Export', 'invoicing' ),
+        );
 
-		return apply_filters( 'getpaid_report_tabs', $tabs );
-	}
+        return apply_filters( 'getpaid_report_tabs', $tabs );
+    }
 
-	/**
-	 * Displays the reports tab.
-	 *
-	 */
-	public function display_reports_tab() {
+    /**
+     * Displays the reports tab.
+     *
+     */
+    public function display_reports_tab() {
 
-		$reports = new GetPaid_Reports_Report();
-		$reports->display();
+        $reports = new GetPaid_Reports_Report();
+        $reports->display();
 
-	}
+    }
 
-	/**
-	 * Displays the exports tab.
-	 *
-	 */
-	public function display_exports_tab() {
+    /**
+     * Displays the exports tab.
+     *
+     */
+    public function display_exports_tab() {
 
-		$exports = new GetPaid_Reports_Export();
-		$exports->display();
+        $exports = new GetPaid_Reports_Export();
+        $exports->display();
 
-	}
+    }
 
-	/**
-	 * Donwnloads a graph.
-	 *
-	 * @param array $args
-	 */
-	public function download_graph( $args ) {
+    /**
+     * Donwnloads a graph.
+     *
+     * @param array $args
+     */
+    public function download_graph( $args ) {
 
-		if ( ! empty( $args['graph'] ) ) {
-			$downloader = new GetPaid_Graph_Downloader();
-			$downloader->download( $args['graph'] );
-		}
+        if ( ! empty( $args['graph'] ) ) {
+            $downloader = new GetPaid_Graph_Downloader();
+            $downloader->download( $args['graph'] );
+        }
 
-	}
+    }
 
-	/**
-	 * Exports invoices.
-	 *
-	 * @param array $args
-	 */
-	public function export_invoices( $args ) {
+    /**
+     * Exports invoices.
+     *
+     * @param array $args
+     */
+    public function export_invoices( $args ) {
 
-		if ( ! empty( $args['post_type'] ) ) {
+        if ( ! empty( $args['post_type'] ) ) {
 
-			if ( 'subscriptions' === $args['post_type'] ) {
-				$downloader = new GetPaid_Subscription_Exporter();
-			} else {
-				$downloader = new GetPaid_Invoice_Exporter();
-			}
+            if ( 'subscriptions' === $args['post_type'] ) {
+                $downloader = new GetPaid_Subscription_Exporter();
+            } else {
+                $downloader = new GetPaid_Invoice_Exporter();
+            }
 
-			$downloader->export( $args['post_type'], $args );
-		}
+            $downloader->export( $args['post_type'], $args );
+        }
 
-	}
+    }
 
 }

Spacing +32 added lines, -32 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports Class.
@@ -17,11 +17,11 @@ 
 	 *
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'register_reports_page' ), 20 );
-		add_action( 'wpinv_reports_tab_reports', array( $this, 'display_reports_tab' ) );
-		add_action( 'wpinv_reports_tab_export', array( $this, 'display_exports_tab' ) );
-		add_action( 'getpaid_authenticated_admin_action_download_graph', array( $this, 'download_graph' ) );
-		add_action( 'getpaid_authenticated_admin_action_export_invoices', array( $this, 'export_invoices' ) );
+		add_action('admin_menu', array($this, 'register_reports_page'), 20);
+		add_action('wpinv_reports_tab_reports', array($this, 'display_reports_tab'));
+		add_action('wpinv_reports_tab_export', array($this, 'display_exports_tab'));
+		add_action('getpaid_authenticated_admin_action_download_graph', array($this, 'download_graph'));
+		add_action('getpaid_authenticated_admin_action_export_invoices', array($this, 'export_invoices'));
 
 	}
 
@@ -33,11 +33,11 @@ 
 
 		add_submenu_page(
             'wpinv',
-            __( 'Reports', 'invoicing' ),
-            __( 'Reports', 'invoicing' ),
+            __('Reports', 'invoicing'),
+            __('Reports', 'invoicing'),
             wpinv_get_capability(),
             'wpinv-reports',
-            array( $this, 'display_reports_page' )
+            array($this, 'display_reports_page')
 		);
 
 	}
@@ -50,26 +50,26 @@ 
 
 		// Prepare variables.
 		$tabs        = $this->get_tabs();
-		$current_tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'reports';
-		$current_tab = array_key_exists( $current_tab, $tabs ) ? $current_tab : 'reports';
+		$current_tab = isset($_GET['tab']) ? sanitize_text_field($_GET['tab']) : 'reports';
+		$current_tab = array_key_exists($current_tab, $tabs) ? $current_tab : 'reports';
 
 		// Display the current tab.
 		?>
 
         <div class="wrap">
 
-			<h1><?php echo sanitize_text_field( $tabs[ $current_tab ] ); ?></h1>
+			<h1><?php echo sanitize_text_field($tabs[$current_tab]); ?></h1>
 
 			<nav class="nav-tab-wrapper">
 
 				<?php
-					foreach( $tabs as $key => $label ) {
+					foreach ($tabs as $key => $label) {
 
-						$key   = sanitize_text_field( $key );
-						$label = sanitize_text_field( $label );
+						$key   = sanitize_text_field($key);
+						$label = sanitize_text_field($label);
 						$class = $key == $current_tab ? 'nav-tab nav-tab-active' : 'nav-tab';
 						$url   = esc_url(
-							add_query_arg( 'tab', $key, admin_url( 'admin.php?page=wpinv-reports' ) )
+							add_query_arg('tab', $key, admin_url('admin.php?page=wpinv-reports'))
 						);
 
 						echo "\n\t\t\t<a href='$url' class='$class'>$label</a>";
@@ -79,18 +79,18 @@ 
 
 			</nav>
 
-			<div class="bsui <?php echo esc_attr( $current_tab ); ?>">
-				<?php do_action( "wpinv_reports_tab_{$current_tab}" ); ?>
+			<div class="bsui <?php echo esc_attr($current_tab); ?>">
+				<?php do_action("wpinv_reports_tab_{$current_tab}"); ?>
 			</div>
 
         </div>
 		<?php
 
 			// Wordfence loads an unsupported version of chart js on our page.
-			wp_deregister_style( 'chart-js' );
-			wp_deregister_script( 'chart-js' );
-			wp_enqueue_script( 'chart-js', WPINV_PLUGIN_URL . 'assets/js/chart.bundle.min.js', array( 'jquery' ), '2.9.4', true );
-			wp_enqueue_style( 'chart-js', WPINV_PLUGIN_URL . 'assets/css/chart.min.css', array(), '2.9.4' );
+			wp_deregister_style('chart-js');
+			wp_deregister_script('chart-js');
+			wp_enqueue_script('chart-js', WPINV_PLUGIN_URL . 'assets/js/chart.bundle.min.js', array('jquery'), '2.9.4', true);
+			wp_enqueue_style('chart-js', WPINV_PLUGIN_URL . 'assets/css/chart.min.css', array(), '2.9.4');
 
 	}
 
@@ -102,11 +102,11 @@ 
 	public function get_tabs() {
 
 		$tabs = array(
-			'reports' => __( 'Reports', 'invoicing' ),
-			'export'  => __( 'Export', 'invoicing' ),
+			'reports' => __('Reports', 'invoicing'),
+			'export'  => __('Export', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_report_tabs', $tabs );
+		return apply_filters('getpaid_report_tabs', $tabs);
 	}
 
 	/**
@@ -136,11 +136,11 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function download_graph( $args ) {
+	public function download_graph($args) {
 
-		if ( ! empty( $args['graph'] ) ) {
+		if (!empty($args['graph'])) {
 			$downloader = new GetPaid_Graph_Downloader();
-			$downloader->download( $args['graph'] );
+			$downloader->download($args['graph']);
 		}
 
 	}
@@ -150,17 +150,17 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function export_invoices( $args ) {
+	public function export_invoices($args) {
 
-		if ( ! empty( $args['post_type'] ) ) {
+		if (!empty($args['post_type'])) {
 
-			if ( 'subscriptions' === $args['post_type'] ) {
+			if ('subscriptions' === $args['post_type']) {
 				$downloader = new GetPaid_Subscription_Exporter();
 			} else {
 				$downloader = new GetPaid_Invoice_Exporter();
 			}
 
-			$downloader->export( $args['post_type'], $args );
+			$downloader->export($args['post_type'], $args);
 		}
 
 	}