| Vouchers declined | ' + - '' + d.vouches_declined + ' | ' + + 'Vouchers declined | ' + + '' + d.vouches_declined + ' | ' + - 'Votes for | ' + - '' + d.votes_for + ' | ' + + 'Votes for | ' + + '' + d.votes_for + ' | ' + '
| Vouchers for | ' + - '' + d.vouches_for + ' | ' + + 'Vouchers for | ' + + '' + d.vouches_for + ' | ' + - 'Votes against | ' + - '' + d.votes_against + ' | ' + + 'Votes against | ' + + '' + d.votes_against + ' | ' + '
| Vouchers against | ' + - ''+ d.vouches_against +' | ' + + 'Vouchers against | ' + + '' + d.vouches_against + ' | ' + '
The request was sended to the user
There was an error sending your request
Voted: ' + $result .= '
Voted:' . $vote[ CCGN_GF_VOTE_APPROVE_MEMBERSHIP_APPLICATION ] . '
'; + $result .= ''; + . '" class="button">'; echo _('Change vouch requests for applicant.'); echo '
'; } else { @@ -463,35 +463,90 @@ function ccgn_application_users_page_render_details ( $applicant_id, $state ) { echo _('Original request date: ' - . $voucher_choices['date_created'] - . '
'; - if (! is_null ( $voucher_choices[ 'date_updated' ] ) ) { - echo 'Updated request date: ' - . $voucher_choices['date_updated'] - . '
'; - } - echo ccgn_application_users_page_vouchers( $applicant_id ); + echo 'Original request date: ' + . date('Y-m-d', strtotime($voucher_choices['date_created'])) + . '
'; + if (! is_null ( $voucher_choices[ 'date_updated' ] ) ) { + echo 'Updated request date: ' + . date('Y-m-d', strtotime($voucher_choices['date_updated'])) + . '
'; + } + echo ccgn_application_users_page_vouchers( $applicant_id ); + echo '' . $voucher['reason'] . '
'; + echo 'Vouched: '.$voucher['vouched'].'
'; + if (($voucher['vouched'] == 'Yes') && (ccgn_current_user_is_final_approver($applicant_id) || ccgn_current_user_is_membership_council($applicant_id)) ) { + echo 'Ask for clarification'; + } + echo ''
- . $item[ 0 ] . '
'
- . $value
+ $html = '
';
+ $html .= 'Membership Statement'; + $html .= ccgn_vp_clean_string($statement); + $html .= ' | ';
+ if ($is_individual):
+ $html .= '';
+ $html .= 'Brief Biography'; + $html .= ccgn_vp_clean_string($bio); + $html .= ' | ';
+ endif;
+ $html .= '
Applicant Name
'
- . get_user_by( 'ID', $applicant_id)->display_name
+ return '
' + . '' .get_user_by( 'ID', $applicant_id)->display_name. '' + . 'Individual Applicant' . '
'; } else { - return 'Institution Name
'
- . ccgn_institutional_applicant_name ( $applicant_id )
+ return '
' + . '' . ccgn_institutional_applicant_name ( $applicant_id ) .'' + . 'Institutional Applicant' . '
'; } } + +/////////////////////////////////////////////////////////////////////////////// +// Log ask for Clarification +/////////////////////////////////////////////////////////////////////////////// + +define('CCGN_CLARIFICATION_LOG_REG_PROP', 'ccgn-ask-clarification-log'); + +function ccgn_ask_clarification_log_get() +{ + return get_option(CCGN_CLARIFICATION_LOG_REG_PROP, array()); +} +function ccgn_ask_clarification_log_get_id($applicant_id) { + $log = ccgn_ask_clarification_log_get(); + return $log[$applicant_id]; +} +function ccgn_ask_clarification_log_ensure($today) +{ + $option = ccgn_ask_clarification_log_get(); + $days = array_keys($option); + // Oldest to newest + sort($days); + // No entry for today? Insert it + if ($days[count($days) - 1] != $today) { + $option[$today] = array(); + } + // Too many entries? Remove the oldest + if (count($option) > CCGN_CLARIFICATION_LOG_REG_TRUNCATE) { + unset($option[$days[0]]); + } + return $option; +} + +function ccgn_ask_clarification_log_set($log_structure) +{ + update_option(CCGN_CLARIFICATION_LOG_REG_PROP, $log_structure); +} + +function ccgn_ask_clarification_log_append( + $applicant_id +) { + $today = date('Y-m-d'); + $log = ccgn_ask_clarification_log_get(); + $log[$applicant_id][] = array( + 'applicant_id' => $applicant_id, + 'date' => $today, + 'ask_user_id' => get_current_user_id(), + 'applicant_name' => get_user_by('ID', $applicant_id)->display_name, + 'ask_user_name' => get_user_by('ID', get_current_user_id())->display_name, + ); + ccgn_ask_clarification_log_set($log); +} \ No newline at end of file diff --git a/plugins/cc-global-network/includes/gravityforms-interaction.php b/plugins/cc-global-network/includes/gravityforms-interaction.php index 3c33603..946e94f 100644 --- a/plugins/cc-global-network/includes/gravityforms-interaction.php +++ b/plugins/cc-global-network/includes/gravityforms-interaction.php @@ -1799,16 +1799,40 @@ function ccgn_application_users_page_vouch_responses ( } return $result; } +function ccgn_application_users_page_vouch_responses_data( + $applicant_id, + $full_date = false +) { + $result = ''; + $vouches = ccgn_application_vouches($applicant_id); + $vouches_list = array(); + foreach ($vouches as $vouch) { + $voucher = get_user_by('ID', $vouch['created_by']); + $vouch_date = ccgn_entry_created_or_updated($vouch); + if (!$full_date) { + $vouch_date = explode(' ', $vouch_date)[0]; + } + $the_vouch = array(); + $the_vouch['id'] = $vouch['created_by']; + $the_vouch['name'] = $voucher->display_name; + $the_vouch['date'] = $vouch_date; + $the_vouch['vouched'] = $vouch[CCGN_GF_VOUCH_DO_YOU_VOUCH]; + $the_vouch['reason'] = $vouch[CCGN_GF_VOUCH_REASON]; + + $vouches_list[] = $the_vouch; + } + return $vouches_list; +} // Format the count of vouches function ccgn_application_users_page_vouch_counts ( $applicant_id ) { $counts = ccgn_application_vouches_counts( $applicant_id ); - return 'Cannot: ' + return '
Cannot: ' . $counts['cannot'] - . '
Yes: ' + . '
Yes: ' . $counts['yes'] - . '
No: ' + . '
No: ' . $counts['no'] . '
'; } @@ -1819,7 +1843,7 @@ function ccgn_application_users_page_vouchers ( $applicant_id ) { $result = ''; $vouchers = ccgn_application_vouchers_users ( $applicant_id ); foreach ( $vouchers as $voucher ) { - $result .= '' . $voucher->display_name . '
'; + $result .= '' . $voucher->display_name . '
'; } return $result; } From ec49fadb0452957aaf5dff16a2f4d8a918def086 Mon Sep 17 00:00:00 2001 From: hugosolarThere was an error restoring the vouching state
There was an error restoring the vouching state
There was an error sending your request
There was an error sending your request
' . $voucher['reason'] . '
'; echo 'Vouched: '.$voucher['vouched'].'
'; if (($voucher['vouched'] == 'Yes') && (ccgn_current_user_is_final_approver($applicant_id) || ccgn_current_user_is_membership_council($applicant_id)) ) { - echo 'Ask for clarification'; + echo 'Ask for clarification'; } echo ''; } @@ -610,3 +611,19 @@ function ccgn_application_user_link( $actions, $user_object ) { } return $actions; } + +// Ajax function +// Executed in the UI when a MC member ask to a voucher for clarification +function ccgn_ajax_ask_voucher() +{ + $user_id = $_POST['user_id']; + $applicant_id = $_POST['applicant_id']; + if (check_ajax_referer('ask_voucher', 'sec') && (!empty($user_id))) { + ccgn_ask_email_vouching_request($applicant_id,$user_id); + ccgn_ask_clarification_log_append($applicant_id); + echo 'ok'; + } + exit(0); +} +add_action('wp_ajax_nopriv_ask_voucher', 'ccgn_ajax_ask_voucher'); +add_action('wp_ajax_ask_voucher', 'ccgn_ajax_ask_voucher'); \ No newline at end of file diff --git a/plugins/cc-global-network/includes/registration-form-emails.php b/plugins/cc-global-network/includes/registration-form-emails.php index 214e650..46faa4d 100644 --- a/plugins/cc-global-network/includes/registration-form-emails.php +++ b/plugins/cc-global-network/includes/registration-form-emails.php @@ -215,6 +215,20 @@ function ccgn_registration_email_to_voucher ( $applicant_id, ); } +function ccgn_ask_email_to_voucher ( $applicant_id, + $voucher_id, + $email_option ) { + $applicant = get_user_by( 'ID', $applicant_id ); + $voucher = get_user_by( 'ID', $voucher_id ); + ccgn_registration_email( + $applicant->user_nicename, + $applicant->ID, + $voucher->user_nicename, + $voucher->user_email, + $email_option + ); +} + function ccgn_registration_email_application_received ( $applicant_id ) { ccgn_registration_email_to_applicant( $applicant_id, @@ -283,6 +297,15 @@ function ccgn_registration_email_notify_legal_insititution_approved ( 'ccgn-email-notify-legal' ); } +function ccgn_ask_email_vouching_request ( $applicant_id, + $voucher_id ) { + ccgn_ask_email_to_voucher( + $applicant_id, + $voucher_id, + 'ccgn-email-ask-voucher' + ); +} + //////////////////////////////////////////////////////////////////////////////// // Use the name and address from our settings for emails From 04669d5a871edd69677aef08382535016dced918 Mon Sep 17 00:00:00 2001 From: hugosolarThe request was sended to the user
There was an error sending your request
There was an error sending your request
'; print_r($voucher_choices); echo ''; echo '
Original request date: ' . date('Y-m-d', strtotime($voucher_choices['date_created'])) . '
'; @@ -490,6 +491,44 @@ function ccgn_application_users_page_render_details ( $applicant_id, $state ) { ); echo ''; print_r($get_the_entries); echo ''; + $entry_id = $get_the_entries[0]['id']; + + echo wp_nonce_field('clarification_voucher', 'clarification_voucher_nonce', true, false); + echo ''; + echo ''; + echo '
'; print_r($get_the_entries); echo ''; + $entry_id = $get_the_entries[0]['id']; + $update_date = GFAPI::update_entry_field($entry_id, 'date_updated', date('Y-m-d H:m:s')); + $change_voucher_result = GFAPI::update_entry_field($entry_id, $position, $new_voucher); + if ($change_voucher_result) { + //send email to the new voucher + ccgn_registration_email_vouching_request( + $applicant_id, + $voucher_id + ); + echo 'ok'; + } else { + echo 'error'; + } + } else { + echo 'error'; + } + exit(0); +} +add_action('wp_ajax_nopriv_change_voucher', 'ccgn_ajax_change_voucher'); +add_action('wp_ajax_change_voucher', 'ccgn_ajax_change_voucher'); + +// Save new reason to vouch in order to clarify the reason of the vouched user +function ccgn_ajax_modify_reason_voucher() +{ + $user_id = get_current_user_id(); + $applicant_id = esc_attr($_POST['applicant_id']); + $new_reason = esc_attr($_POST['new_reason']); + $entry_id = esc_attr($_POST['entry_id']); + if (check_ajax_referer('clarification_voucher', 'sec') && (!empty($user_id)) && (!empty($entry_id)) && (!empty($new_reason)) ) { + //ccgn_ask_email_vouching_request($applicant_id, $user_id); + $update_date = GFAPI::update_entry_field($entry_id, 'date_updated', date('Y-m-d H:m:s')); + $reasonchange_result = GFAPI::update_entry_field($entry_id, CCGN_GF_VOUCH_REASON,$new_reason); + if ($reasonchange_result) { + echo 'ok'; + update_user_meta($user_id, 'ccgn_need_to_clarify_vouch_reason', 0); + } else { + echo 'error'; + } + } else { + echo 'error'; + } + exit(0); +} +add_action('wp_ajax_nopriv_reason_voucher', 'ccgn_ajax_modify_reason_voucher'); +add_action('wp_ajax_reason_voucher', 'ccgn_ajax_modify_reason_voucher'); \ No newline at end of file diff --git a/plugins/cc-global-network/includes/gravityforms-interaction.php b/plugins/cc-global-network/includes/gravityforms-interaction.php index 946e94f..3a18ca9 100644 --- a/plugins/cc-global-network/includes/gravityforms-interaction.php +++ b/plugins/cc-global-network/includes/gravityforms-interaction.php @@ -1842,8 +1842,24 @@ function ccgn_application_users_page_vouch_counts ( $applicant_id ) { function ccgn_application_users_page_vouchers ( $applicant_id ) { $result = ''; $vouchers = ccgn_application_vouchers_users ( $applicant_id ); + $vouch_data = ccgn_application_users_page_vouch_responses_data( + $applicant_id, + true + ); + $position = 1; foreach ( $vouchers as $voucher ) { - $result .= '
' . $voucher->display_name . '
'; + $data = array(); + $other_voucher = 0; // get the other voucher ID in case if vouched is "yes". this means that we have to disable the name in the select box + foreach ($vouch_data as $vouch_item) { + if ($voucher->ID == $vouch_item['id']) { + $data = $vouch_item; + } else if ( ($voucher->ID != $vouch_item['id']) && ($vouch_item['vouched'] == 'Yes') ) { + $other_voucher = $vouch_item['id']; + } + } + $action_button = (ccgn_current_user_is_final_approver() && ($data['vouched'] != 'Yes') && ($data['vouched'] != 'No') ) ? ' ' : ''; + $result .= '' . $voucher->display_name . $action_button .'
'; + $position++; } return $result; } From b3ec02800317aef64c63ac7d1451e25c22132609 Mon Sep 17 00:00:00 2001 From: hugosolar'; print_r($voucher_choices); echo ''; + echo '
Original request date: ' . date('Y-m-d', strtotime($voucher_choices['date_created'])) . '
'; @@ -490,7 +490,7 @@ function ccgn_application_users_page_render_details ( $applicant_id, $state ) { $state ); echo '| '; @@ -134,11 +139,20 @@ function ccgn_vouching_form_profile_format( $entry, $map, $applicant_id ) { $html .= ' |