← All changes | includes/admin/reports/class-form-reports-table.php +50 -47 2.3.0 → 4.18.0 View file →

		@@ -3,9 +3,9 @@
3	3	* Download Reports Table Class
4	4	*
5	5	* @package Give
6	6	* @subpackage Admin/Reports
7		- * @copyright Copyright (c) 2016, WordImpress
	7	+ * @copyright Copyright (c) 2016, GiveWP
8	8	* @license https://opensource.org/licenses/gpl-license GNU Public License
9	9	* @since 1.0
10	10	*/
11	11
		@@ -55,15 +55,17 @@
55	55	public function __construct() {
56	56	global $status, $page;
57	57
58	58	// Set parent defaults
59		- parent::__construct( array(
60		- 'singular' => give_get_forms_label_singular(), // Singular name of the listed records.
61		- 'plural' => give_get_forms_label_plural(), // Plural name of the listed records.
62		- 'ajax' => false // Does this table support ajax?
63		- ) );
	59	+ parent::__construct(
	60	+ [
	61	+ 'singular' => give_get_forms_label_singular(), // Singular name of the listed records.
	62	+ 'plural' => give_get_forms_label_plural(), // Plural name of the listed records.
	63	+ 'ajax' => false, // Does this table support ajax?
	64	+ ]
	65	+ );
64	66
65		- add_action( 'give_report_view_actions', array( $this, 'category_filter' ) );
	67	+ add_action( 'give_report_view_actions', [ $this, 'category_filter' ] );
66	68	$this->query();
67	69
68	70	}
69	71
		@@ -93,15 +95,15 @@
93	95	'<a href="%s">%s</a>',
94	96	admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&form_id=' . urlencode( $item['ID'] ) ),
95	97	$item['sales']
96	98	);
97		- case 'earnings' :
98		- return give_currency_filter( give_format_amount( $item[ $column_name ], array( 'sanitize' => false ) ) );
99		- case 'average_sales' :
	99	+ case 'earnings':
	100	+ return give_currency_filter( give_format_amount( $item[ $column_name ], [ 'sanitize' => false ] ) );
	101	+ case 'average_sales':
100	102	return round( $item[ $column_name ] );
101		- case 'average_earnings' :
102		- return give_currency_filter( give_format_amount( $item[ $column_name ], array( 'sanitize' => false ) ) );
103		- case 'details' :
	103	+ case 'average_earnings':
	104	+ return give_currency_filter( give_format_amount( $item[ $column_name ], [ 'sanitize' => false ] ) );
	105	+ case 'details':
104	106	return '<a href="' . admin_url( 'edit.php?post_type=give_forms&page=give-reports&tab=forms&form-id=' . $item['ID'] ) . '">' . esc_html__( 'View Detailed Report', 'give' ) . '</a>';
105	107	default:
106	108	return $item[ $column_name ];
107	109	}
		@@ -115,16 +117,16 @@
115	117	*
116	118	* @return array $columns Array of all the list table columns
117	119	*/
118	120	public function get_columns() {
119		- $columns = array(
	121	+ $columns = [
120	122	'title' => esc_html__( 'Form', 'give' ),
121	123	'sales' => esc_html__( 'Donations', 'give' ),
122		- 'earnings' => esc_html__( 'Income', 'give' ),
	124	+ 'earnings' => esc_html__( 'Revenue', 'give' ),
123	125	'average_sales' => esc_html__( 'Monthly Average Donations', 'give' ),
124		- 'average_earnings' => esc_html__( 'Monthly Average Income', 'give' ),
125		- 'details' => esc_html__( 'Detailed Report', 'give' )
126		- );
	126	+ 'average_earnings' => esc_html__( 'Monthly Average Revenue', 'give' ),
	127	+ 'details' => esc_html__( 'Detailed Report', 'give' ),
	128	+ ];
127	129
128	130	return $columns;
129	131	}
130	132
		@@ -136,13 +138,13 @@
136	138	*
137	139	* @return array Array of all the sortable columns
138	140	*/
139	141	public function get_sortable_columns() {
140		- return array(
141		- 'title' => array( 'title', true ),
142		- 'sales' => array( 'sales', false ),
143		- 'earnings' => array( 'earnings', false ),
144		- );
	142	+ return [
	143	+ 'title' => [ 'title', true ],
	144	+ 'sales' => [ 'sales', false ],
	145	+ 'earnings' => [ 'earnings', false ],
	146	+ ];
145	147	}
146	148
147	149	/**
148	150	* Retrieve the current page number
		@@ -247,9 +249,9 @@
247	249	$orderby = isset( $_GET['orderby'] ) ? $_GET['orderby'] : 'title';
248	250	$order = isset( $_GET['order'] ) ? $_GET['order'] : 'DESC';
249	251	$category = $this->get_category();
250	252
251		- $args = array(
	253	+ $args = [
252	254	'post_type' => 'give_forms',
253	255	'post_status' => 'publish',
254	256	'order' => $order,
255	257	'fields' => 'ids',
		@@ -254,31 +256,31 @@
254	256	'order' => $order,
255	257	'fields' => 'ids',
256	258	'posts_per_page' => $this->per_page,
257	259	'paged' => $this->get_paged(),
258		- 'suppress_filters' => true
259		- );
	260	+ 'suppress_filters' => true,
	261	+ ];
260	262
261	263	if ( ! empty( $category ) ) {
262		- $args['tax_query'] = array(
263		- array(
	264	+ $args['tax_query'] = [
	265	+ [
264	266	'taxonomy' => 'form_category',
265		- 'terms' => $category
266		- )
267		- );
	267	+ 'terms' => $category,
	268	+ ],
	269	+ ];
268	270	}
269	271
270	272	switch ( $orderby ) :
271		- case 'title' :
	273	+ case 'title':
272	274	$args['orderby'] = 'title';
273	275	break;
274	276
275		- case 'sales' :
	277	+ case 'sales':
276	278	$args['orderby'] = 'meta_value_num';
277	279	$args['meta_key'] = '_give_form_sales';
278	280	break;
279	281
280		- case 'earnings' :
	282	+ case 'earnings':
281	283	$args['orderby'] = 'meta_value_num';
282	284	$args['meta_key'] = '_give_form_earnings';
283	285	break;
284	286	endswitch;
		@@ -300,22 +302,22 @@
300	302	*
301	303	* @return array $reports_data All the data for donor reports
302	304	*/
303	305	public function reports_data() {
304		- $reports_data = array();
	306	+ $reports_data = [];
305	307
306	308	$give_forms = $this->donation_forms->posts;
307	309
308	310	if ( $give_forms ) {
309	311	foreach ( $give_forms as $form ) {
310		- $reports_data[] = array(
	312	+ $reports_data[] = [
311	313	'ID' => $form,
312	314	'title' => get_the_title( $form ),
313	315	'sales' => give_get_form_sales_stats( $form ),
314	316	'earnings' => give_get_form_earnings_stats( $form ),
315	317	'average_sales' => give_get_average_monthly_form_sales( $form ),
316		- 'average_earnings' => give_get_average_monthly_form_earnings( $form )
317		- );
	318	+ 'average_earnings' => give_get_average_monthly_form_earnings( $form ),
	319	+ ];
318	320	}
319	321	}
320	322
321	323	return $reports_data;
		@@ -334,19 +336,20 @@
334	336	*
335	337	* @return void
336	338	*/
337	339	public function prepare_items() {
338		- $columns = $this->get_columns();
339		- $hidden = array(); // No hidden columns
340		- $sortable = $this->get_sortable_columns();
341		- $this->_column_headers = array( $columns, $hidden, $sortable );
342		- $this->items = $this->reports_data();
343		- $total_items = $this->count;
	340	+ $columns = $this->get_columns();
	341	+ $hidden = []; // No hidden columns
	342	+ $sortable = $this->get_sortable_columns();
	343	+ $this->_column_headers = [ $columns, $hidden, $sortable ];
	344	+ $this->items = $this->reports_data();
	345	+ $total_items = $this->count;
344	346
345		- $this->set_pagination_args( array(
	347	+ $this->set_pagination_args(
	348	+ [
346	349	'total_items' => $total_items,
347	350	'per_page' => $this->per_page,
348		- 'total_pages' => ceil( $total_items / $this->per_page )
349		- )
	351	+ 'total_pages' => ceil( $total_items / $this->per_page ),
	352	+ ]
350	353	);
351	354	}
352	355	}