Skip to content

Commit 2fc2c5c

Browse files
committed
update details reminders - add metadata when reminder is sended
1 parent 6b2e74d commit 2fc2c5c

File tree

2 files changed

+36
-3
lines changed

2 files changed

+36
-3
lines changed

plugins/cc-global-network/admin/user-pre-approve-list-page.php

+8
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ function ccgn_list_applications_for_pre_approval () {
2323
$applicant_state = ccgn_registration_user_get_stage_and_date(
2424
$user_id
2525
);
26+
$status = get_user_meta($user_id, 'ccgn_applicant_update_details_state');
27+
$reminders = 'none';
28+
if (!empty($status)) {
29+
$reminders = $status['state'].' (<small>'.$status['date'].'</small>)';
30+
}
2631
// The last form the user filled out, so the time to use
2732
$vouchers_entry = ccgn_application_vouchers( $user_id );
2833
echo '<tr';
@@ -41,6 +46,8 @@ function ccgn_list_applications_for_pre_approval () {
4146
. $applicant_state[ 'stage' ]
4247
. '</td><td>'
4348
. $applicant_state[ 'date' ]
49+
. '</td><td>'
50+
. $reminders
4451
.'</td></tr>';
4552
}
4653
}
@@ -56,6 +63,7 @@ function ccgn_application_spam_check_page () {
5663
<th>Application date</th>
5764
<th>Application state</th>
5865
<th>Application state date</th>
66+
<th>Reminder</th>
5967
</tr>
6068
</thead>
6169
<tbody>

plugins/cc-global-network/cron/email-update-details-reminders.php

+28-3
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,40 @@ function ccgn_email_update_details_reminders()
4848
CCGN_APPLICATION_STATE_UPDATE_DETAILS
4949
);
5050
foreach ($applicants as $applicant_id) {
51+
$status = get_user_meta($applicant_id, 'ccgn_applicant_update_details_state');
5152
$days_in_state = ccgn_days_since_state_set($applicant_id, $now);
5253
if ($days_in_state > CCGN_CLOSE_UPDATE_DETAILS_AFTER_DAYS) {
53-
ccgn_close_update_details_applicant($applicant_id);
54+
if ( ($status['state'] == 'second-reminer') && ($status['done']) ) {
55+
ccgn_close_update_details_applicant($applicant_id);
56+
} else {
57+
//update user status date
58+
update_user_meta(
59+
$user_id,
60+
CCGN_APPLICATION_STATE_DATE,
61+
date('Y-m-d H:i:s', strtotime('now'))
62+
);
63+
}
5464
} elseif ( ($days_in_state > CCGN_FIRST_REMINDER_UPDATE_DETAILS_AFTER_DAYS) && ($days_in_state <= CCGN_SECOND_REMINDER_UPDATE_DETAILS_AFTER_DAYS) ) {
5565
// Send first reminder
56-
ccgn_registration_email_update_details_first_reminder($applicant_id);
66+
if (empty($status['state'])) {
67+
ccgn_registration_email_update_details_first_reminder($applicant_id);
68+
$update_details_meta = array(
69+
'state' => 'first-reminder',
70+
'date' => date('Y-m-d H:i:s', strtotime('now')),
71+
'done' => true
72+
);
73+
update_user_meta( $applicant_id, 'ccgn_applicant_update_details_state', $update_details_meta );
74+
}
5775
} elseif ( ($days_in_state > CCGN_SECOND_REMINDER_UPDATE_DETAILS_AFTER_DAYS) && ($days_in_state <= CCGN_CLOSE_UPDATE_DETAILS_AFTER_DAYS) ) {
5876
// Send second reminder
59-
ccgn_registration_email_update_details_second_reminder($applicant_id);
77+
if (($status['state'] == 'first-reminer') && ($status['done'])) {
78+
ccgn_registration_email_update_details_second_reminder($applicant_id);
79+
$update_details_meta = array(
80+
'state' => 'second-reminder',
81+
'date' => date('Y-m-d H:i:s', strtotime('now')),
82+
'done' => true
83+
);
84+
}
6085
}
6186
}
6287
}

0 commit comments

Comments
 (0)