Display capture/void/delete instead of 'Yes'; Merged from 16stable.

diff --git a/enrol/authorize/index.php b/enrol/authorize/index.php
index 72b82889451e8abe6e4d7944fdef2bb547c81a65..b9fd79da529bf99172596eec81c727cab33c518a 100644 (file)
--- a/enrol/authorize/index.php
+++ b/enrol/authorize/index.php
@@ -17,7 +17,7 @@
     }
 
 /// Load strings. All strings should be defined here. locallib.php uses these strings.
-    $strs = get_strings(array('status','action','time','course','confirm','yes','no','all','none','error'));
+    $strs = get_strings(array('status','action','time','course','confirm','no','all','none','error'));
     $authstrs = get_strings(array('orderid','nameoncard','void','capture','refund','delete',
                 'authcaptured','authorizedpendingcapture','capturedpendingsettle','capturedsettled',
                 'settled','refunded','cancelled','expired','tested','new',

diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php
index 8db5c9247a405027e84530e7f28bcd1e577d2457..fda4dcec3568bd6bce723ed3a779fc97e3fa9273 100644 (file)
--- a/enrol/authorize/locallib.php
+++ b/enrol/authorize/locallib.php
@@ -219,8 +219,9 @@ function authorize_print_order_details($orderno)
         if (empty($confirm)) {
             $strcaptureyes = get_string('captureyes', 'enrol_authorize');
             $table->data[] = array("<b>$strs->confirm:</b>",
-            "$strcaptureyes<br /><a href='index.php?order=$orderno&amp;sesskey=$USER->sesskey&amp;".ORDER_CAPTURE."=y&amp;confirm=1'>$strs->yes</a>
-            &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
+            "$strcaptureyes <br />
+            <input type='hidden' name='confirm' value='1'><input type='submit' name='". ORDER_CAPTURE ."' value='$authstrs->capture' />
+            &nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
         }
         else {
             $message = '';
@@ -337,7 +338,7 @@ function authorize_print_order_details($orderno)
                 $table->data[] = array("<b>$strs->confirm:</b>",
                     "$strvoidyes<br /><input type='hidden' name='".ORDER_VOID."' value='y'>
                      <input type='hidden' name='confirm' value='1'>
-                     <input type='submit' value='$strs->yes'>
+                     <input type='submit' value='$authstrs->void'>
                      &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
             }
             else {
@@ -386,7 +387,7 @@ function authorize_print_order_details($orderno)
                         "$strsubvoidyes<br /><input type='hidden' name='".ORDER_VOID."' value='y'>
                          <input type='hidden' name='confirm' value='1'>
                          <input type='hidden' name='suborder' value='$suborderno'>
-                         <input type='submit' value='$strs->yes'>
+                         <input type='submit' value='$authstrs->void'>
                          &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
                 }
                 else {
@@ -425,7 +426,7 @@ function authorize_print_order_details($orderno)
             $table->data[] = array("<b>$strs->confirm:</b>",
                 "<input type='hidden' name='".ORDER_DELETE."' value='y'>
                  <input type='hidden' name='confirm' value='1'>
-                 <input type='submit' value='$strs->yes'>
+                 <input type='submit' value='$authstrs->delete'>
                  &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
         }
         else {