Permalink
Browse files

Show 'name on card' string instead of moodle.php's user string. Merge…

…d from MOODLE_16_STABLE.
  • Loading branch information...
1 parent aed6497 commit 673d6024580dfa461d77bfc5639bd958a9de56dc ethem committed Jun 9, 2006
Showing with 4 additions and 4 deletions.
  1. +2 −2 enrol/authorize/index.php
  2. +2 −2 enrol/authorize/locallib.php
View
4 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');
View
4 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("<b>$strs->course:</b>", $order->shortname);
$table->data[] = array("<b>$strs->status:</b>", $authstrs->{$status->status});
- $table->data[] = array("<b>$strs->user:</b>", $order->ccname);
+ $table->data[] = array("<b>$authstrs->nameoncard:</b>", $order->ccname);
$table->data[] = array("<b>$strs->time:</b>", userdate($order->timecreated));
$table->data[] = array("<b>$authstrs->settlementdate:</b>", $settled ?
userdate($order->settletime) : $authstrs->notsettled);

0 comments on commit 673d602

Please sign in to comment.