Some config sections 'Order Review' moved to

an_teachermanagepay -> Site-Wide Settings
an_emailexpired: -> Email-Sending Settings
an_cutoff: -> Authorize.net Settings

merged from 16stable.

diff --git a/enrol/authorize/config.html b/enrol/authorize/config.html
index 4159e4f0f042df72c322b3fb2fa54540737dba7e..4c63ce48aa6c0612951a9a9683d10d62e603e3e5 100755 (executable)
--- a/enrol/authorize/config.html
+++ b/enrol/authorize/config.html
@@ -47,6 +47,13 @@ if (!isset($frm->acceptccs)) {
     <td><?php print_string("currency") ?>
     </td>
 </tr>
+
+<tr valign="top">
+    <td align="right">an_teachermanagepay:</td>
+    <td><?php print_checkbox('an_teachermanagepay', '1', !empty($frm->an_teachermanagepay)) ?></td>
+    <td><?php print_string("adminteachermanagepay", "enrol_authorize") ?></td>
+</tr>
+
 <?php if (substr($CFG->wwwroot, 0, 5) !== 'https') { /* https && loginhttps */ ?>
 <tr valign="top">
     <td align="right">loginhttps:</td>
@@ -57,6 +64,7 @@ if (!isset($frm->acceptccs)) {
     ?></td>
 </tr>
 <?php } /* end: https && loginhttps */ ?>
+
 <tr valign="top"><td colspan="3"><h4><?php print_string("adminauthorizesettings", "enrol_authorize") ?></h4></td></tr>
 
 <tr valign="top">
@@ -88,6 +96,12 @@ if (!isset($frm->acceptccs)) {
     <td><?php print_string("anreferer", "enrol_authorize") ?></td>
 </tr>
 
+<tr valign="top">
+    <td align="right">an_cutoff:</td>
+    <td><?php print_time_selector("an_cutoff_hour","an_cutoff_min",make_timestamp(2000,1,1,$frm->an_cutoff_hour,$frm->an_cutoff_min),5); ?></td>
+    <td><?php print_string("cutofftime", "enrol_authorize") ?></td>
+</tr>
+
 <tr valign="top">
     <td align="right">an_avs:</td>
     <td><?php print_checkbox('an_avs', '1', !empty($frm->an_avs)) ?></td>
@@ -113,18 +127,6 @@ if (!isset($frm->acceptccs)) {
 
 <tr valign="top"><td colspan="3"><h4><?php print_string("adminauthorizeccapture", "enrol_authorize") ?></h4></td></tr>
 
-<tr valign="top">
-    <td align="right">an_cutoff:</td>
-    <td><?php print_time_selector("an_cutoff_hour","an_cutoff_min",make_timestamp(2000,1,1,$frm->an_cutoff_hour,$frm->an_cutoff_min),5); ?></td>
-    <td><?php print_string("cutofftime", "enrol_authorize") ?></td>
-</tr>
-
-<tr valign="top">
-    <td align="right">an_teachermanagepay:</td>
-    <td><?php print_checkbox('an_teachermanagepay', '1', !empty($frm->an_teachermanagepay)) ?></td>
-    <td><?php print_string("adminteachermanagepay", "enrol_authorize") ?></td>
-</tr>
-
 <tr valign="top">
     <td align="right">an_review:</td>
     <td><?php print_checkbox('an_review', '1', !empty($frm->an_review)) ?>
@@ -139,14 +141,14 @@ if (!isset($frm->acceptccs)) {
     <td><?php print_string("reviewday", "enrol_authorize", $frm->an_capture_day) ?></td>
 </tr>
 
+<tr valign="top"><td colspan="3"><h4><?php print_string("adminauthorizeemail", "enrol_authorize") ?></h4></td></tr>
+
 <tr valign="top">
     <td align="right">an_emailexpired:</td>
     <td><input type="text" name="an_emailexpired" size="1" maxlength="1" value="<?php p($frm->an_emailexpired) ?>" /></td>
     <td><?php print_string("adminemailexpired", "enrol_authorize", $frm->an_emailexpired) ?></td>
 </tr>
 
-<tr valign="top"><td colspan="3"><h4><?php print_string("adminauthorizeemail", "enrol_authorize") ?></h4></td></tr>
-
 <tr valign="top">
     <td align="right">enrol_mailstudents:</td>
     <td><?php print_checkbox('enrol_mailstudents', '1', !empty($frm->enrol_mailstudents)) ?></td>