Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

New string: All Pending Orders

  • Loading branch information...
commit 2c46669ba1dd1eeb2ca46306758df90a5e2522df 1 parent 82928b7
ethem authored
View
2  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');
View
5 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 . "') ";
View
1  lang/en_utf8/enrol_authorize.php
@@ -40,6 +40,7 @@
$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';
Please sign in to comment.
Something went wrong with that request. Please try again.