diff --git a/enrol/authorize/config.html b/enrol/authorize/config.html
index 847d0e65d0c..d9ffa3e57ae 100755
--- a/enrol/authorize/config.html
+++ b/enrol/authorize/config.html
@@ -16,6 +16,7 @@ if (!isset($frm->an_review)) $frm->an_review = '';
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)) {
@@ -167,6 +168,15 @@ if (!isset($frm->acceptccs)) {
|
+
+ | an_sorttype: |
+ get_string('adminemailexpiredsortsum', 'enrol_authorize'),
+ 'cnt' => get_string('adminemailexpiredsortcount', 'enrol_authorize'));
+ choose_from_menu($sorts, "an_sorttype", $frm->an_sorttype, "","", "") ?> |
+ |
+
+
| enrol_mailstudents: |
enrol_mailstudents)) ?> |
diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php
index b1f62b1f6c7..c837f90446d 100755
--- a/enrol/authorize/enrol.php
+++ b/enrol/authorize/enrol.php
@@ -527,6 +527,7 @@ class enrolment_plugin_authorize
$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 @@ class enrolment_plugin_authorize
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 @@ class enrolment_plugin_authorize
$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);