New string: All Pending Orders

diff --git a/enrol/authorize/index.php b/enrol/authorize/index.php
index 7d8491992ab6ba2a7c705027f43d3d1c3dc8f44f..aa1876e5ca20aa7d117ea3a931bc0c0c3748f23a 100644 (file)
--- a/enrol/authorize/index.php
+++ b/enrol/authorize/index.php
@@ -23,7 +23,7 @@
 /// Load strings. All strings should be defined here. locallib.php uses these strings.
     $strs = get_strings(array('search','status','action','time','course','confirm','no','all','none','error'));
     $authstrs = get_strings(array('orderid','nameoncard','echeckfirslasttname','void','capture','refund','delete',
-                'authcaptured','authorizedpendingcapture','capturedpendingsettle','settled',
+                'allpendingorders','authcaptured','authorizedpendingcapture','capturedpendingsettle','settled',
                 'refunded','cancelled','expired','underreview','approvedreview','reviewfailed','tested','new',
                 'paymentmethod','methodcc','methodecheck',
                 'transid','settlementdate','notsettled','amount','unenrolstudent'), 'enrol_authorize');

diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php
index b188cf00ebc54656b56330000cad6ccd68d274f4..090a3e874e22514f4ba966f16ca07d81c6cd8c9b 100644 (file)
--- a/enrol/authorize/locallib.php
+++ b/enrol/authorize/locallib.php
@@ -33,6 +33,7 @@ function authorize_print_orders($courseid, $userid)
 
     $baseurl = $CFG->wwwroot."/enrol/authorize/index.php?user=$userid";
     $statusmenu = array(AN_STATUS_NONE => $strs->all,
+                        AN_STATUS_AUTH | AN_STATUS_UNDERREVIEW | AN_STATUS_APPROVEDREVIEW => $authstrs->allpendingorders,
                         AN_STATUS_AUTH => $authstrs->authorizedpendingcapture,
                         AN_STATUS_AUTHCAPTURE => $authstrs->authcaptured,
                         AN_STATUS_CREDIT => $authstrs->refunded,
@@ -100,6 +101,10 @@ function authorize_print_orders($courseid, $userid)
     if ($status > AN_STATUS_NONE) {
         switch ($status)
         {
+            case AN_STATUS_AUTH | AN_STATUS_UNDERREVIEW | AN_STATUS_APPROVEDREVIEW:
+                $where .= 'AND (e.status IN('.AN_STATUS_AUTH.','.AN_STATUS_UNDERREVIEW.','.AN_STATUS_APPROVEDREVIEW.')) ';
+                break;
+
             case AN_STATUS_CREDIT:
                 $from .= "INNER JOIN {$CFG->prefix}enrol_authorize_refunds r ON e.id = r.orderid ";
                 $where .= "AND (e.status = '" . AN_STATUS_AUTHCAPTURE . "') ";

diff --git a/lang/en_utf8/enrol_authorize.php b/lang/en_utf8/enrol_authorize.php
index a85afa959f6a9e7d1ce574a0afbab948e14e26b0..8fc586ec1850f3b50a790051102709497a8f60a1 100644 (file)
--- a/lang/en_utf8/enrol_authorize.php
+++ b/lang/en_utf8/enrol_authorize.php
@@ -40,6 +40,7 @@ $string['adminnewordersubject'] = '$a->course; New Pending Order: $a->orderid';
 $string['adminpendingorders'] = 'You have disabled scheduled-capture feature.<br />Total $a->count transactions with the status of \'Authorized/Pending Capture\' are to be cancelled unless you check them.<br />To accept/deny payments, go to <a href=\'$a->url\'>Payment Management</a> page.';
 $string['adminreview'] = 'Review order before processing the credit card.';
 $string['adminteachermanagepay'] = 'Teachers can manage the payments of the course.';
+$string['allpendingorders'] = 'All Pending Orders';
 $string['amount'] = 'Amount';
 $string['anlogin'] = 'Authorize.net: Login name';
 $string['anpassword'] = 'Authorize.net: Password';