Close #7 #8 #9

.gitignore

@@ -6,3 +6,4 @@ vendor
 composer.lock
 package-lock.json
 build
+cf7-smtp.zip

.wp-env.json

@@ -1,15 +1,15 @@
 {
-  "phpVersion": "7.4",
-  "core": "WordPress/WordPress",
-  "plugins": [
-	"https://downloads.wordpress.org/plugin/contact-form-7.zip",
-	"https://downloads.wordpress.org/plugin/flamingo.zip",
-	"."
-  ],
-  "config": {
-	"WP_DEBUG": true,
-	"WP_DEBUG_DISPLAY": true,
-	"SCRIPT_DEBUG": true,
-	"FS_METHOD": "direct"
-  }
+	"core": null,
+	"plugins": [
+		"https://downloads.wordpress.org/plugin/contact-form-7.zip",
+		"https://downloads.wordpress.org/plugin/flamingo.zip",
+		"."
+	],
+	"config": {
+		"WP_DEBUG": true,
+		"WP_DEBUG_DISPLAY": true,
+		"SCRIPT_DEBUG": true,
+		"FS_METHOD": "direct"
+	},
+	"phpVersion": "7.4"
 }

build/smtp-settings.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-api-fetch', 'wp-i18n'), 'version' => 'f88578200fe2d3845bcc');
+<?php return array('dependencies' => array('wp-api-fetch', 'wp-i18n'), 'version' => 'ecb6d39b56aad47a945f');

core/Cron.php

@@ -145,14 +145,13 @@ public function cf7_smtp_format_report( $report, $last_report = false ) {
 	 * in the plugin settings
 	 */
 	public function cf7_smtp_send_report() {
-		/* get the stored report */
-		$options = cf7_smtp_get_settings();
-		$report  = get_option( 'cf7-smtp-report', false );
-
-		if ( empty( $report ) ) {
+		/* if report is disabled then return */
+		if ( ! get_option( 'cf7-smtp-report', false ) ) {
 			return;
 		}
 
+		$options = cf7_smtp_get_settings();
+
 		/* init the mail */
 		$smtp_mailer = new Mailer();
 		$mail        = array();
@@ -162,7 +161,7 @@ public function cf7_smtp_send_report() {
 		$last_report = time() - intval( $schedules[ $options['report_every'] ]['interval'] );
 
 		/* build the report */
-		$report_formatted = $this->cf7_smtp_format_report( $report, $last_report );
+		$report_formatted = $this->cf7_smtp_format_report( get_option( 'cf7-smtp-report' ), $last_report );
 
 		$mail['subject'] = esc_html(
 			sprintf(

package.json

@@ -16,14 +16,16 @@
         "public/*",
         "index.php",
         "cf7-smtp.php",
+        "languages/cf7-smtp.pot",
         "README.txt",
         "LICENSE.txt",
         "uninstall.php"
     ],
     "scripts": {
         "start": "wp-scripts start",
         "build": "wp-scripts build",
-        "plugin-zip": "wp-scripts plugin-zip",
+        "preplugin-zip": "composer install --no-dev && composer dump-autoload --optimize && wp-scripts build",
+		"plugin-zip": "wp-scripts plugin-zip",
         "lint:js": "wp-scripts lint-js  ./src/",
         "packages-update": "wp-scripts packages-update",
         "wp-env:start": "wp-env start",

src/scripts/stats.js

@@ -1,7 +1,7 @@
 /* global smtpReportData */
 import Chart from 'chart.js/auto';
 
-export function mailCharts() {
+export function mailChartsSMTP() {
 	if (
 		typeof smtpReportData !== 'undefined' &&
 		0 !== Object.keys(smtpReportData).length
@@ -104,17 +104,19 @@ export function mailCharts() {
 		};
 
 		cf7aCharts.lineChart = new Chart(
-			document.querySelector('.smtp-style-chart #line-chart'),
+			document.querySelector('.smtp-style-chart > #line-chart'),
 			lineConfig
 		);
 
 		cf7aCharts.pieChart = new Chart(
-			document.querySelector('.smtp-style-chart #pie-chart'),
+			document.querySelector(
+				'.smtp-style-chart > #pie-container > #pie-chart'
+			),
 			PieConfig
 		);
 
 		return cf7aCharts;
 	}
 }
 
-window.onload = mailCharts();
+window.onload = mailChartsSMTP();