Permalink
Browse files

When the number of pending orders expiring are sent to the teachers v…

…ia email, which one is important? The number of the orders or the total of the amounts.

Merged from 16 stable.
  • Loading branch information...
1 parent 43457b5 commit b9e829691e506b895a7da8d7eebeb87fa9687556 ethem committed Jun 15, 2006
Showing with 15 additions and 2 deletions.
  1. +10 −0 enrol/authorize/config.html
  2. +5 −2 enrol/authorize/enrol.php
@@ -16,6 +16,7 @@
if (!isset($frm->an_capture_day)) $frm->an_capture_day = '5';
if (!isset($frm->an_emailexpired)) $frm->an_emailexpired = '2';
if (!isset($frm->an_emailexpiredteacher)) $frm->an_emailexpiredteacher = '';
+if (!isset($frm->an_sorttype)) $frm->an_sorttype = 'ttl';
if (!isset($frm->an_teachermanagepay)) $frm->an_teachermanagepay = '';
if (isset($CFG->an_cutoff)) {
@@ -168,6 +169,15 @@
</tr>
<tr valign="top">
+ <td align="right">an_sorttype:</td>
+ <td><?php
+ $sorts = array('ttl' => get_string('adminemailexpiredsortsum', 'enrol_authorize'),
+ 'cnt' => get_string('adminemailexpiredsortcount', 'enrol_authorize'));
+ choose_from_menu($sorts, "an_sorttype", $frm->an_sorttype, "","", "") ?></td>
+ <td><?php print_string("adminemailexpiredsort", "enrol_authorize") ?></td>
+</tr>
+
+<tr valign="top">
<td align="right">enrol_mailstudents:</td>
<td><?php print_checkbox('enrol_mailstudents', '1', !empty($frm->enrol_mailstudents)) ?></td>
<td><?php print_string("mailstudents") ?></td>
@@ -527,6 +527,7 @@ function process_config($config)
$captureday = optional_param('an_capture_day', 5, PARAM_INT);
$emailexpired = optional_param('an_emailexpired', 2, PARAM_INT);
$emailexpiredteacher = optional_param('an_emailexpiredteacher', 0, PARAM_BOOL);
+ $sorttype = optional_param('an_sorttype', 'ttl', PARAM_ALPHA);
$captureday = ($captureday > 29) ? 29 : (($captureday < 0) ? 0 : $captureday);
$emailexpired = ($emailexpired > 5) ? 5 : (($emailexpired < 0) ? 0 : $emailexpired);
@@ -542,6 +543,7 @@ function process_config($config)
set_config('an_capture_day', $captureday);
set_config('an_emailexpired', $emailexpired);
set_config('an_emailexpiredteacher', $emailexpiredteacher);
+ set_config('an_sorttype', $sorttype);
// required fields
$loginval = optional_param('an_login', '');
@@ -666,9 +668,10 @@ function cron()
$adminuser = get_admin();
email_to_user($adminuser, $adminuser, $subject, $message);
if (!empty($CFG->an_teachermanagepay) and !empty($CFG->an_emailexpiredteacher)) {
- $sql = "SELECT E.courseid, COUNT(E.courseid) AS cnt " .
+ $sorttype = empty($CFG->an_sorttype) ? 'ttl' : $CFG->an_sorttype;
+ $sql = "SELECT E.courseid, COUNT(E.courseid) AS cnt, SUM(E.amount) as ttl " .
"FROM {$CFG->prefix}enrol_authorize E " .
- "WHERE $select GROUP BY E.courseid ORDER BY cnt DESC";
+ "WHERE $select GROUP BY E.courseid ORDER BY $sorttype DESC";
$message = ''; $subject = '';
$lastcourse = 0; $lastcount = 0;
$courseidandcounts = get_records_sql($sql);

0 comments on commit b9e8296

Please sign in to comment.