New string: paymentmethod

diff --git a/enrol/authorize/index.php b/enrol/authorize/index.php
index 80a31ddcca1134476c6ed0f976f7363232819854..6f7a1f059287c6ca9b4096cda9629e2f7ced0a46 100644 (file)
--- a/enrol/authorize/index.php
+++ b/enrol/authorize/index.php
@@ -18,9 +18,9 @@
 
 /// Load strings. All strings should be defined here. locallib.php uses these strings.
     $strs = get_strings(array('status','action','time','course','confirm','no','all','none','error'));
-    $authstrs = get_strings(array('orderid','nameoncard','void','capture','refund','delete',
+    $authstrs = get_strings(array('orderid','nameoncard','echeckfirslasttname','void','capture','refund','delete',
                 'authcaptured','authorizedpendingcapture','capturedpendingsettle','capturedsettled',
-                'settled','refunded','cancelled','expired','tested','new',
+                'settled','refunded','cancelled','expired','tested','new','paymentmethod','methodcc','methodecheck',
                 'transid','settlementdate','notsettled','amount','unenrolstudent'), 'enrol_authorize');
 
 /// Print header

diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php
index 3d211ce49fd47a66c3e533408f520c611bd35a73..31c5697eff062fa4856ee256a477e1c04597ed37 100644 (file)
--- a/enrol/authorize/locallib.php
+++ b/enrol/authorize/locallib.php
@@ -197,6 +197,8 @@ function authorize_print_order_details($orderno)
     $settled = authorize_settled($order);
     $status = authorize_get_status_action($order);
 
+    $table->data[] = array("<b>$authstrs->paymentmethod:</b>",
+                          ($order->paymentmethod == AN_METHOD_CC ? $authstrs->methodcc : $authstrs->methodecheck));
     $table->data[] = array("<b>$authstrs->orderid:</b>", $orderno);
     $table->data[] = array("<b>$authstrs->transid:</b>", $order->transid);
     $table->data[] = array("<b>$authstrs->amount:</b>", "$order->currency $order->amount");
@@ -204,7 +206,12 @@ function authorize_print_order_details($orderno)
         $color = authorize_get_status_color($status->status);
         $table->data[] = array("<b>$strs->course:</b>", $order->shortname);
         $table->data[] = array("<b>$strs->status:</b>", "<font style='color:$color'>" . $authstrs->{$status->status} . "</font>");
-        $table->data[] = array("<b>$authstrs->nameoncard:</b>", $order->ccname);
+        if ($order->paymentmethod == AN_METHOD_CC) {
+            $table->data[] = array("<b>$authstrs->nameoncard:</b>", $order->ccname);
+        }
+        else {
+               $table->data[] = array("<b>$authstrs->echeckfirslasttname:</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);

diff --git a/lang/en_utf8/enrol_authorize.php b/lang/en_utf8/enrol_authorize.php
index da24ddbe676886266e33d662e132b3167d98e7bd..fbc27e8590d965dc61f532fa9689c4b4d9c7fa65 100644 (file)
--- a/lang/en_utf8/enrol_authorize.php
+++ b/lang/en_utf8/enrol_authorize.php
@@ -113,6 +113,7 @@ $string['noreturns'] = 'No returns!';
 $string['notsettled'] = 'Not settled';
 $string['orderid'] = 'Order ID';
 $string['paymentmanagement'] = 'Payment Management';
+$string['paymentmethod'] = 'Payment Method';
 $string['paymentpending'] = 'Your payment is pending for this course with this order number $a->orderid.  See <a href=\'$a->url\'>Order Details</a>.';
 $string['pendingordersemail'] = 'Dear admin,