From 427c395338ccfea55b942471d909e4192b8eba81 Mon Sep 17 00:00:00 2001 From: Hugo Solar Date: Thu, 12 Dec 2019 10:18:14 -0300 Subject: [PATCH 1/2] fix #376 - Condition added to check if user is in vouching state --- .../cron/email-vouch-request-reminders.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/cc-global-network/cron/email-vouch-request-reminders.php b/plugins/cc-global-network/cron/email-vouch-request-reminders.php index 87b9662..9f3b857 100644 --- a/plugins/cc-global-network/cron/email-vouch-request-reminders.php +++ b/plugins/cc-global-network/cron/email-vouch-request-reminders.php @@ -111,18 +111,18 @@ function ccgn_email_vouch_request_reminders () { $day = ($now->diff($request_date))->days; $vouchers = ccgn_application_vouchers_users_ids ( $applicant_id ); foreach ( $vouchers as $voucher_id ) { - if ( ccgn_vouching_request_open ( $applicant_id, $voucher_id ) ) { - ccgn_email_vouch_request_reminder_maybe_close ( + if ( ccgn_vouching_request_open ( $applicant_id, $voucher_id ) && ccgn_registration_user_is_vouchable ( $applicant_id ) ) { + ccgn_email_vouch_request_reminder_maybe_close ( $voucher_id, $applicant_id, $day ); // This will notify the voucher if the request was closed - ccgn_email_vouch_request_reminder_send ( + ccgn_email_vouch_request_reminder_send ( $voucher_id, $applicant_id, $day - ); + ); } } } From 2e3be4206c0b5dffecdb0f79077f7af3fbd2e096 Mon Sep 17 00:00:00 2001 From: Hugo Solar Date: Thu, 12 Dec 2019 12:19:24 -0300 Subject: [PATCH 2/2] less aggresive notification emails --- .../cron/email-vouch-request-reminders.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/cc-global-network/cron/email-vouch-request-reminders.php b/plugins/cc-global-network/cron/email-vouch-request-reminders.php index 9f3b857..1e647e3 100644 --- a/plugins/cc-global-network/cron/email-vouch-request-reminders.php +++ b/plugins/cc-global-network/cron/email-vouch-request-reminders.php @@ -15,10 +15,10 @@ // Defines //////////////////////////////////////////////////////////////////////////////// -define('CCGN_VOUCH_REQUEST_REMINDER_DAY_FIRST_REMINDER', 1); -define('CCGN_VOUCH_REQUEST_REMINDER_DAY_SECOND_REMINDER', 3); -define('CCGN_VOUCH_REQUEST_REMINDER_DAY_FINAL_REMINDER', 5); -define('CCGN_VOUCH_REQUEST_REMINDER_DAY_CLOSE', 6); +define('CCGN_VOUCH_REQUEST_REMINDER_DAY_FIRST_REMINDER', 3); +define('CCGN_VOUCH_REQUEST_REMINDER_DAY_SECOND_REMINDER', 6); +define('CCGN_VOUCH_REQUEST_REMINDER_DAY_FINAL_REMINDER', 8); +define('CCGN_VOUCH_REQUEST_REMINDER_DAY_CLOSE', 14); //////////////////////////////////////////////////////////////////////////////// // Checking and sending @@ -111,7 +111,7 @@ function ccgn_email_vouch_request_reminders () { $day = ($now->diff($request_date))->days; $vouchers = ccgn_application_vouchers_users_ids ( $applicant_id ); foreach ( $vouchers as $voucher_id ) { - if ( ccgn_vouching_request_open ( $applicant_id, $voucher_id ) && ccgn_registration_user_is_vouchable ( $applicant_id ) ) { + if ( ccgn_vouching_request_open ( $applicant_id, $voucher_id ) ) { ccgn_email_vouch_request_reminder_maybe_close ( $voucher_id, $applicant_id,