← All changes | classes/models/FrmEmailStats.php +16 -71 6.26 → 6.7 View file →

		@@ -2,9 +2,8 @@
2	2	/**
3	3	* Stats email class
4	4	*
5	5	* @since 6.7
6		- *
7	6	* @package Formidable
8	7	*/
9	8
10	9	if ( ! defined( 'ABSPATH' ) ) {
		@@ -80,9 +79,9 @@
80	79	$this->prev_from_date = gmdate( 'Y-m-d', strtotime( $this->prev_to_date . '-' . $date_minus . ' days' ) );
81	80	}
82	81
83	82	/**
84		- * @return false|string
	83	+ * @return mixed
85	84	*/
86	85	protected function get_inner_content() {
87	86	$args = $this->get_content_args();
88	87
		@@ -94,15 +93,8 @@
94	93	protected function get_content_args() {
95	94	$args = parent::get_content_args();
96	95
97	96	$entries_count = FrmEmailSummaryHelper::get_entries_count( $this->from_date, $this->to_date );
98		- $entries_stat = array(
99		- 'entries' => array(
100		- 'label' => __( 'Entries created', 'formidable' ),
101		- 'count' => $entries_count,
102		- 'compare' => 0,
103		- ),
104		- );
105	97
106	98	$args['inbox_msg'] = $this->has_inbox_msg ? FrmEmailSummaryHelper::get_latest_inbox_message() : false;
107	99	$args['from_date'] = $this->from_date;
108	100	$args['to_date'] = $this->to_date;
		@@ -108,9 +100,15 @@
108	100	$args['to_date'] = $this->to_date;
109	101	$args['top_forms'] = FrmEmailSummaryHelper::get_top_forms( $this->from_date, $this->to_date );
110	102	$args['top_forms_label'] = $this->get_top_forms_label();
111	103	$args['dashboard_url'] = site_url() . '/wp-admin/admin.php?page=formidable';
112		- $args['stats'] = isset( $args['stats'] ) ? array_merge( $entries_stat, $args['stats'] ) : $entries_stat;
	104	+ $args['stats'] = array(
	105	+ 'entries' => array(
	106	+ 'label' => __( 'Entries created', 'formidable' ),
	107	+ 'count' => $entries_count,
	108	+ 'compare' => 0,
	109	+ ),
	110	+ );
113	111
114	112	if ( $this->has_out_of_date_plugins ) {
115	113	$args['out_of_date_plugins'] = FrmEmailSummaryHelper::get_out_of_date_plugins();
116	114	$args['plugins_url'] = site_url() . '/wp-admin/plugins.php';
		@@ -125,10 +123,8 @@
125	123	/**
126	124	* Adds entries comparison data.
127	125	*
128	126	* @param array $stats Statistics section data.
129		- *
130		- * @return void
131	127	*/
132	128	protected function add_entries_comparison_data( &$stats ) {
133	129	if ( ! $this->has_comparison ) {
134	130	return;
		@@ -133,9 +129,9 @@
133	129	if ( ! $this->has_comparison ) {
134	130	return;
135	131	}
136	132
137		- $prev_entries_count = FrmEmailSummaryHelper::get_entries_count( $this->prev_from_date, $this->prev_to_date );
	133	+ $prev_entries_count = FrmEmailSummaryHelper::get_entries_count( $this->prev_from_date, $this->prev_to_date );
138	134	$stats['entries']['compare'] = $this->get_compare_diff( $stats['entries']['count'], $prev_entries_count );
139	135	}
140	136
141	137	/**
		@@ -141,13 +137,11 @@
141	137	/**
142	138	* Adds payments count and total data.
143	139	*
144	140	* @param array $stats Statistics section data.
145		- *
146		- * @return void
147	141	*/
148	142	protected function add_payments_data( &$stats ) {
149		- $payment_data = FrmEmailSummaryHelper::get_payments_data( $this->from_date, $this->to_date );
	143	+ $payment_data = FrmEmailSummaryHelper::get_payments_data( $this->from_date, $this->to_date );
150	144	$stats['payments_count'] = array(
151	145	'label' => __( 'Payments collected', 'formidable' ),
152	146	'count' => $payment_data['count'],
153	147	'compare' => 0,
		@@ -164,9 +158,9 @@
164	158	);
165	159	}
166	160
167	161	if ( $this->has_comparison ) {
168		- $prev_payment_data = FrmEmailSummaryHelper::get_payments_data( $this->prev_from_date, $this->prev_to_date );
	162	+ $prev_payment_data = FrmEmailSummaryHelper::get_payments_data( $this->prev_from_date, $this->prev_to_date );
169	163
170	164	if ( ! $payment_data['count'] && ! $prev_payment_data['count'] ) {
171	165	// Maybe this site doesn't collect payment, hide these sections.
172	166	unset( $stats['payments_count'] );
		@@ -195,17 +189,16 @@
195	189	'display' => $this->get_formatted_price( 0, $currency ),
196	190	'compare' => -1,
197	191	);
198	192	}
199		- }//end if
	193	+ }
200	194	}
201	195
202	196	/**
203	197	* Gets formatted price.
204	198	*
205		- * @param float $amount Amount.
206		- * @param array|string $currency Currency string value or array.
207		- *
	199	+ * @param float $amount Amount.
	200	+ * @param string|array $currency Currency string value or array.
208	201	* @return string
209	202	*/
210	203	protected function get_formatted_price( $amount, $currency ) {
211	204	if ( ! is_array( $currency ) ) {
		@@ -219,20 +212,17 @@
219	212	* Gets comparison diff between 2 values.
220	213	*
221	214	* @param float $current Current value.
222	215	* @param float $prev Previous value.
223		- *
224	216	* @return float
225	217	*/
226	218	public function get_compare_diff( $current, $prev ) {
227	219	if ( ! $current && ! $prev ) {
228		- // No comparison if both are zero.
229		- return 0;
	220	+ return 0; // No comparison if both are zero.
230	221	}
231	222
232	223	if ( ! $prev ) {
233		- // Increase 100%;
234		- return 1;
	224	+ return 1; // Increase 100%;
235	225	}
236	226
237	227	return ( $current - $prev ) / $prev;
238	228	}
		@@ -242,50 +232,5 @@
242	232	*
243	233	* @return string
244	234	*/
245	235	abstract protected function get_top_forms_label();
246		-
247		- /**
248		- * @since 6.11.1
249		- *
250		- * @return int
251		- */
252		- public function get_date_range() {
253		- return $this->date_range;
254		- }
255		-
256		- /**
257		- * @since 6.11.1
258		- *
259		- * @return string
260		- */
261		- public function get_from_date() {
262		- return $this->from_date;
263		- }
264		-
265		- /**
266		- * @since 6.11.1
267		- *
268		- * @return string
269		- */
270		- public function get_to_date() {
271		- return $this->to_date;
272		- }
273		-
274		- /**
275		- * @since 6.11.1
276		- *
277		- * @return string
278		- */
279		- public function get_prev_from_date() {
280		- return $this->prev_from_date;
281		- }
282		-
283		- /**
284		- * @since 6.11.1
285		- *
286		- * @return string
287		- */
288		- public function get_prev_to_date() {
289		- return $this->prev_to_date;
290		- }
291	236	}