diff --git a/enrol/authorize/index.php b/enrol/authorize/index.php index 58d5a2e230b..72b82889451 100644 --- a/enrol/authorize/index.php +++ b/enrol/authorize/index.php @@ -17,8 +17,8 @@ } /// Load strings. All strings should be defined here. locallib.php uses these strings. - $strs = get_strings(array('user','status','action','time','course','confirm','yes','no','all','none','error')); - $authstrs = get_strings(array('orderid','void','capture','refund','delete', + $strs = get_strings(array('status','action','time','course','confirm','yes','no','all','none','error')); + $authstrs = get_strings(array('orderid','nameoncard','void','capture','refund','delete', 'authcaptured','authorizedpendingcapture','capturedpendingsettle','capturedsettled', 'settled','refunded','cancelled','expired','tested','new', 'transid','settlementdate','notsettled','amount','unenrolstudent'), 'enrol_authorize'); diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php index 729f5323f6a..6b34ec9c2fe 100644 --- a/enrol/authorize/locallib.php +++ b/enrol/authorize/locallib.php @@ -65,7 +65,7 @@ function authorize_print_orders() $table->set_attribute('class', 'generaltable generalbox'); $table->define_columns(array('id', 'timecreated', 'userid', 'status', '')); - $table->define_headers(array($authstrs->orderid, $strs->time, $strs->user, $strs->status, $strs->action)); + $table->define_headers(array($authstrs->orderid, $strs->time, $authstrs->nameoncard, $strs->status, $strs->action)); $table->define_baseurl($baseurl."&status=$status"); $table->sortable(true, 'id', SORT_DESC); @@ -200,7 +200,7 @@ function authorize_print_order_details($orderno) if (empty($cmdcapture) and empty($cmdrefund) and empty($cmdvoid) and empty($cmddelete)) { $table->data[] = array("$strs->course:", $order->shortname); $table->data[] = array("$strs->status:", $authstrs->{$status->status}); - $table->data[] = array("$strs->user:", $order->ccname); + $table->data[] = array("$authstrs->nameoncard:", $order->ccname); $table->data[] = array("$strs->time:", userdate($order->timecreated)); $table->data[] = array("$authstrs->settlementdate:", $settled ? userdate($order->settletime) : $authstrs->notsettled);