← All changes
|
includes/admin/reports/class-charitable-reports.php
+13
-13
1.8.13
→
1.8.13.1
View file →
| @@ -458,9 +458,9 @@ | ||
| 458 | 458 | } |
| 459 | 459 | $badge_css = strtolower( $donation_parent ) === 'recurring' ? 'recurring' : 'one-time'; |
| 460 | 460 | $badge_label = strtolower( $donation_parent ) === 'recurring' ? esc_html__( 'Recurring', 'charitable' ) : esc_html__( 'One-Time', 'charitable' ); |
| 461 | 461 | |
| 462 | - $display_amount = ! empty( $top_donor->total_donation_amount ) ? charitable_format_money( $top_donor->total_donation_amount, 2, true ) : charitable_format_money( esc_html( $top_donor->amount ), 2, true ); | |
| 462 | + $display_amount = ! empty( $top_donor->total_donation_amount ) ? charitable_format_money( $top_donor->total_donation_amount, false, true ) : charitable_format_money( esc_html( $top_donor->amount ), false, true ); | |
| 463 | 463 | $display_count = ! empty( $top_donor->total_donation_count ) ? intval( $top_donor->total_donation_count ) : 1; |
| 464 | 464 | |
| 465 | 465 | // based on display count, override the badge css/label. |
| 466 | 466 | if ( $display_count > 1 ) { |
| @@ -761,15 +761,15 @@ | ||
| 761 | 761 | case 'charitable-failed': |
| 762 | 762 | $admin_campaign_url = ! empty( $activity->campaign_id ) ? charitable_get_admin_campaign_edit_url( $activity->campaign_id ) : '#'; |
| 763 | 763 | $admin_donation_url = ! empty( $activity->item_id ) ? charitable_get_admin_donation_edit_url( $activity->item_id ) : false; |
| 764 | 764 | $campaign_title = ! empty( $activity->campaign_title ) ? ' to <a target="_blank" href="' . $admin_campaign_url . '"><span class="campaign-title">' . esc_html( $activity->campaign_title ) . '</span></a> ' : ''; |
| 765 | - $secondary_info = $admin_donation_url ? '<p class="charitable-reports-activity-secondary-info amount"><a href="' . $admin_donation_url . '" target="_blank">' . charitable_format_money( $activity->amount, 2, true ) . '</a>' . $campaign_title . '</p>' : '<p class="charitable-reports-activity-secondary-info amount">' . charitable_format_money( $activity->amount, 2, true ) . $campaign_title . '</p>'; | |
| 765 | + $secondary_info = $admin_donation_url ? '<p class="charitable-reports-activity-secondary-info amount"><a href="' . $admin_donation_url . '" target="_blank">' . charitable_format_money( $activity->amount, false, true ) . '</a>' . $campaign_title . '</p>' : '<p class="charitable-reports-activity-secondary-info amount">' . charitable_format_money( $activity->amount, false, true ) . $campaign_title . '</p>'; | |
| 766 | 766 | break; |
| 767 | 767 | default: |
| 768 | 768 | $admin_campaign_url = ! empty( $activity->campaign_id ) ? charitable_get_admin_campaign_edit_url( $activity->campaign_id ) : '#'; |
| 769 | 769 | $admin_donation_url = ! empty( $activity->item_id ) ? charitable_get_admin_donation_edit_url( $activity->item_id ) : false; |
| 770 | 770 | $campaign_title = ! empty( $activity->campaign_title ) ? ' to <a target="_blank" href="' . $admin_campaign_url . '"><span class="campaign-title">' . esc_html( $activity->campaign_title ) . '</span></a> ' : ''; |
| 771 | - $secondary_info = $admin_donation_url ? '<p class="charitable-reports-activity-secondary-info amount"><a href="' . $admin_donation_url . '" target="_blank">' . charitable_format_money( $activity->amount, 2, true ) . '</a>' . $campaign_title . '</p>' : '<p class="charitable-reports-activity-secondary-info amount">' . charitable_format_money( $activity->amount, 2, true ) . $campaign_title . '</p>'; | |
| 771 | + $secondary_info = $admin_donation_url ? '<p class="charitable-reports-activity-secondary-info amount"><a href="' . $admin_donation_url . '" target="_blank">' . charitable_format_money( $activity->amount, false, true ) . '</a>' . $campaign_title . '</p>' : '<p class="charitable-reports-activity-secondary-info amount">' . charitable_format_money( $activity->amount, false, true ) . $campaign_title . '</p>'; | |
| 772 | 772 | break; |
| 773 | 773 | } |
| 774 | 774 | |
| 775 | 775 | return $secondary_info; |
| @@ -1172,11 +1172,11 @@ | ||
| 1172 | 1172 | } elseif ( $is_sample_data ) { |
| 1173 | 1173 | $last_donation_html = $last_donation_campaign_name; |
| 1174 | 1174 | } |
| 1175 | 1175 | } elseif ( $last_donation_date && $last_donation_campaign_name && $last_donation_campaign_id ) { |
| 1176 | - $last_donation_html = charitable_format_money( esc_html( $data->amount ), 2, true ) . '<br/><a href="' . $action_link . '" target="_blank">' . $last_donation_campaign_name . '</a><br/>' . $last_donation_date; | |
| 1176 | + $last_donation_html = charitable_format_money( esc_html( $data->amount ), false, true ) . '<br/><a href="' . $action_link . '" target="_blank">' . $last_donation_campaign_name . '</a><br/>' . $last_donation_date; | |
| 1177 | 1177 | } elseif ( $is_sample_data ) { |
| 1178 | - $last_donation_html = charitable_format_money( esc_html( $data->amount ), 2, true ) . '<br/>' . $last_donation_campaign_name . '<br/>' . $last_donation_date; | |
| 1178 | + $last_donation_html = charitable_format_money( esc_html( $data->amount ), false, true ) . '<br/>' . $last_donation_campaign_name . '<br/>' . $last_donation_date; | |
| 1179 | 1179 | } |
| 1180 | 1180 | |
| 1181 | 1181 | if ( $report_type === 'donors-first-time' ) { |
| 1182 | 1182 | ?> |
| @@ -1183,9 +1183,9 @@ | ||
| 1183 | 1183 | |
| 1184 | 1184 | <tr id="type-<?php echo esc_attr( $report_type ); ?>-donor-<?php echo intval( $donor_id ); ?>" class="type-<?php echo esc_attr( $report_type ); ?>"> |
| 1185 | 1185 | <td class="charitable-avatar" style="width: 32px;"><img src="<?php echo esc_url( $donor_avatar ); ?>" class="avatar avatar-32 photo charitable-avatar-donor-<?php echo intval( $donor_id ); ?>" width="32" height="32" alt="<?php echo esc_html__( 'Profile picture of', 'charitable' ); ?> <?php echo esc_html( $donor_name ); ?>"></td> |
| 1186 | 1186 | <td class="donated column-date" data-colname="<?php echo esc_html__( 'Name / Email', 'charitable' ); ?>"><?php echo esc_html( $donor_name ); ?><br/><?php echo esc_html( $donor_email ); ?></td> |
| 1187 | - <td class="donated column-donation-amount" data-colname="<?php echo esc_html__( 'Donation Amount', 'charitable' ); ?>"><?php echo charitable_format_money( esc_html( $data->total_amount ), 2, true ); // phpcs:ignore ?></td> | |
| 1187 | + <td class="donated column-donation-amount" data-colname="<?php echo esc_html__( 'Donation Amount', 'charitable' ); ?>"><?php echo charitable_format_money( esc_html( $data->total_amount ), false, true ); // phpcs:ignore ?></td> | |
| 1188 | 1188 | <td class="donated column-campaign" data-colname="<?php echo esc_html__( 'Campaign', 'charitable' ); ?>"><?php echo $last_donation_html; // phpcs:ignore ?></td> |
| 1189 | 1189 | <td class="donated column-date" data-colname="<?php echo esc_html__( 'Date', 'charitable' ); ?>"><?php echo esc_html( $last_donation_date ); ?></td> |
| 1190 | 1190 | <?php |
| 1191 | 1191 | $display = '<td class="donated column-actions " data-colname="Actions">'; |
| @@ -1202,11 +1202,11 @@ | ||
| 1202 | 1202 | |
| 1203 | 1203 | <tr id="type-<?php echo esc_attr( $report_type ); ?>-donor-<?php echo intval( $donor_id ); ?>" class="type-<?php echo esc_attr( $report_type ); ?>"> |
| 1204 | 1204 | <td class="charitable-avatar" style="width: 32px;"><img src="<?php echo esc_url( $donor_avatar ); ?>" class="avatar avatar-32 photo charitable-avatar-donor-<?php echo intval( $donor_id ); ?>" width="32" height="32" alt="<?php echo esc_html__( 'Profile picture of', 'charitable' ); ?> <?php echo esc_html( $donor_name ); ?>"></td> |
| 1205 | 1205 | <td class="donated column-date" data-colname="<?php echo esc_html__( 'Name / Email', 'charitable' ); ?>"><?php echo esc_html( $donor_name ); ?><br/><?php echo esc_html( $donor_email ); ?></td> |
| 1206 | - <td class="donated column-total-donations" data-colname="<?php echo esc_html__( 'Total Donations', 'charitable' ); ?>"><?php echo charitable_format_money( esc_html( $data->total_amount ), 2, true ); // phpcs:ignore ?></td> | |
| 1206 | + <td class="donated column-total-donations" data-colname="<?php echo esc_html__( 'Total Donations', 'charitable' ); ?>"><?php echo charitable_format_money( esc_html( $data->total_amount ), false, true ); // phpcs:ignore ?></td> | |
| 1207 | 1207 | <td class="donated column-number-donations" data-colname="Number of Donations"><?php echo esc_html( $donor_number_donations ); ?></td> |
| 1208 | - <td class="donated column-average" data-colname="Average"><?php echo charitable_format_money( $donor_average, 2, true ); // phpcs:ignore ?></td> | |
| 1208 | + <td class="donated column-average" data-colname="Average"><?php echo charitable_format_money( $donor_average, false, true ); // phpcs:ignore ?></td> | |
| 1209 | 1209 | <td class="donated column-number-campaigns" data-colname="Number of Campaigns"><?php echo esc_html( $donor_number_campaigns ); ?></td> |
| 1210 | 1210 | <td class="donated column-last-donation" data-colname="Last Donation"><?php echo $last_donation_html; // phpcs:ignore ?></td> |
| 1211 | 1211 | <?php |
| 1212 | 1212 | $display = '<td class="donated column-actions" data-colname="Actions">'; |
| @@ -3228,14 +3228,14 @@ | ||
| 3228 | 3228 | <p><?php echo esc_html__( 'Donors', 'charitable' ); ?></p> |
| 3229 | 3229 | <p><?php echo esc_html( $to_date_range ); ?></p> |
| 3230 | 3230 | </div> |
| 3231 | 3231 | <div class="charitable-container charitable-report-ui charitable-card"> |
| 3232 | - <strong><span id="charitable-top-donor-count"><?php echo charitable_format_money( $total_amount_donations_from, 2, true ); // phpcs:ignore ?></span></strong> | |
| 3232 | + <strong><span id="charitable-top-donor-count"><?php echo charitable_format_money( $total_amount_donations_from, false, true ); // phpcs:ignore ?></span></strong> | |
| 3233 | 3233 | <p><?php echo esc_html__( 'Donations', 'charitable' ); ?></p> |
| 3234 | 3234 | <p><?php echo esc_html( $from_date_range ); ?></p> |
| 3235 | 3235 | </div> |
| 3236 | 3236 | <div class="charitable-container charitable-report-ui charitable-card"> |
| 3237 | - <strong><span id="charitable-top-donor-count"><?php echo charitable_format_money( $total_amount_donations_to, 2, true ); // phpcs:ignore ?></span></strong> | |
| 3237 | + <strong><span id="charitable-top-donor-count"><?php echo charitable_format_money( $total_amount_donations_to, false, true ); // phpcs:ignore ?></span></strong> | |
| 3238 | 3238 | <p><?php echo esc_html__( 'Donations', 'charitable' ); ?></p> |
| 3239 | 3239 | <p><?php echo esc_html( $to_date_range ); ?></p> |
| 3240 | 3240 | </div> |
| 3241 | 3241 | </div> |
| @@ -3488,12 +3488,12 @@ | ||
| 3488 | 3488 | <tr id="type-lybunt-donor-<?php echo intval( $donor_id ); ?>" class="row-type-lybunt"> |
| 3489 | 3489 | <td class="charitable-avatar" style="width: 32px;"><img src="<?php echo esc_url( $donor_avatar ); ?>" class="avatar avatar-<?php echo esc_html( $donor_id ); ?> photo" width="32" height="32" alt="<?php esc_html__( 'Profile picture of', 'charitable' ); ?> <?php echo esc_html( $donor_name ); ?>"></td> |
| 3490 | 3490 | <td class="donated column-date" data-colname="<?php echo esc_html__( 'Date.', 'charitable' ); ?>"><?php echo esc_html( $donor_name ); ?><br/><?php echo esc_html( $donor_email ); ?></td> |
| 3491 | 3491 | <td class="donated column-donations" data-colname="Donations"><?php echo charitable_format_money( $last_donation_amount ); // phpcs:ignore ?></td> |
| 3492 | - <td class="donated column-donors" data-colname="Number of Donors"><?php echo esc_html( $total_donation_count_compare_from ); ?> <?php echo esc_html__( 'Donations', 'charitable' ); ?><br/><small><?php echo charitable_format_money( $total_donation_amount_compare_from, 2, true ); // phpcs:ignore ?></small></td> | |
| 3493 | - <td class="donated column-donors" data-colname="Number of Donors"><?php echo esc_html( $total_donation_count_compare_to ); ?> <?php echo esc_html__( 'Donations', 'charitable' ); ?><br/><small><?php echo charitable_format_money( $total_donation_amount_compare_to, 2, true ); // phpcs:ignore ?></small></td> | |
| 3492 | + <td class="donated column-donors" data-colname="Number of Donors"><?php echo esc_html( $total_donation_count_compare_from ); ?> <?php echo esc_html__( 'Donations', 'charitable' ); ?><br/><small><?php echo charitable_format_money( $total_donation_amount_compare_from, false, true ); // phpcs:ignore ?></small></td> | |
| 3493 | + <td class="donated column-donors" data-colname="Number of Donors"><?php echo esc_html( $total_donation_count_compare_to ); ?> <?php echo esc_html__( 'Donations', 'charitable' ); ?><br/><small><?php echo charitable_format_money( $total_donation_amount_compare_to, false, true ); // phpcs:ignore ?></small></td> | |
| 3494 | 3494 | <td class="donated column-refunds" data-colname="Refunds"><?php echo $campaign_links; // phpcs:ignore ?></td> |
| 3495 | - <td class="donated column-net " data-colname="Net"><?php echo charitable_format_money( $total_life_amount, 2, true ); // phpcs:ignore ?></td> | |
| 3495 | + <td class="donated column-net " data-colname="Net"><?php echo charitable_format_money( $total_life_amount, false, true ); // phpcs:ignore ?></td> | |
| 3496 | 3496 | <?php |
| 3497 | 3497 | |
| 3498 | 3498 | if ( $show_actions ) : |
| 3499 | 3499 | if ( $link && charitable_is_pro() ) : |