Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

…d from MOODLE_16_STABLE.
  • Loading branch information...
commit 673d6024580dfa461d77bfc5639bd958a9de56dc 1 parent aed6497
ethem authored
4 enrol/authorize/index.php
@@ -17,8 +17,8 @@
17 17 }
18 18
19 19 /// Load strings. All strings should be defined here. locallib.php uses these strings.
20   - $strs = get_strings(array('user','status','action','time','course','confirm','yes','no','all','none','error'));
21   - $authstrs = get_strings(array('orderid','void','capture','refund','delete',
  20 + $strs = get_strings(array('status','action','time','course','confirm','yes','no','all','none','error'));
  21 + $authstrs = get_strings(array('orderid','nameoncard','void','capture','refund','delete',
22 22 'authcaptured','authorizedpendingcapture','capturedpendingsettle','capturedsettled',
23 23 'settled','refunded','cancelled','expired','tested','new',
24 24 'transid','settlementdate','notsettled','amount','unenrolstudent'), 'enrol_authorize');
4 enrol/authorize/locallib.php
@@ -65,7 +65,7 @@ function authorize_print_orders()
65 65 $table->set_attribute('class', 'generaltable generalbox');
66 66
67 67 $table->define_columns(array('id', 'timecreated', 'userid', 'status', ''));
68   - $table->define_headers(array($authstrs->orderid, $strs->time, $strs->user, $strs->status, $strs->action));
  68 + $table->define_headers(array($authstrs->orderid, $strs->time, $authstrs->nameoncard, $strs->status, $strs->action));
69 69 $table->define_baseurl($baseurl."&status=$status");
70 70
71 71 $table->sortable(true, 'id', SORT_DESC);
@@ -200,7 +200,7 @@ function authorize_print_order_details($orderno)
200 200 if (empty($cmdcapture) and empty($cmdrefund) and empty($cmdvoid) and empty($cmddelete)) {
201 201 $table->data[] = array("<b>$strs->course:</b>", $order->shortname);
202 202 $table->data[] = array("<b>$strs->status:</b>", $authstrs->{$status->status});
203   - $table->data[] = array("<b>$strs->user:</b>", $order->ccname);
  203 + $table->data[] = array("<b>$authstrs->nameoncard:</b>", $order->ccname);
204 204 $table->data[] = array("<b>$strs->time:</b>", userdate($order->timecreated));
205 205 $table->data[] = array("<b>$authstrs->settlementdate:</b>", $settled ?
206 206 userdate($order->settletime) : $authstrs->notsettled);

0 comments on commit 673d602

Please sign in to comment.
Something went wrong with that request. Please try again.