From: ethem <ethem>
Date: Tue, 3 Oct 2006 09:05:38 +0000 (+0000)
Subject: No need extra $order->status check. These functions expired() and settled() do it... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b99cb7fd2396af84e060165e9dc58069eb386b6f;p=moodle.git

No need extra $order->status check. These functions expired() and settled() do it for us. Merged from 16stable.
---

diff --git a/enrol/authorize/authorizenetlib.php b/enrol/authorize/authorizenetlib.php
index 50b46e0513..a1b4c5f2e3 100644
--- a/enrol/authorize/authorizenetlib.php
+++ b/enrol/authorize/authorizenetlib.php
@@ -89,7 +89,7 @@ function authorize_expired(&$order)
  * @param string &$message Information about error message if this function returns false.
  * @param object &$extra Extra data that used for refunding and credit card information.
  * @param int $action Which action will be performed. See AN_ACTION_*
- * @param string $cctype Credit card type, used internally to configure automatically types.
+ * @param string $cctype Used internally to configure credit types automatically.
  * @return bool true Transaction was successful, false otherwise. Use $message for reason.
  * @author Ethem Evlice <ethem a.t evlice d.o.t com>
  * @uses $CFG
@@ -231,20 +231,8 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE, $
 
         case AN_ACTION_VOID:
         {
-            if ($order->status == AN_STATUS_AUTH) {
-                if (authorize_expired($order)) {
-                    $message = "Authorized transaction must be voided within 30 days. EXPIRED!";
-                    return false;
-                }
-            }
-            elseif ($order->status == AN_STATUS_AUTHCAPTURE or $order->status == AN_STATUS_CREDIT) {
-                if (authorize_settled($order)) {
-                    $message = "Settled transaction cannot be voided. Check Cut-Off time!";
-                    return false;
-                }
-            }
-            else {
-                $message = "Order status must be authorized/pending capture or captured-refunded/pending settlement!";
+            if (authorize_expired($order) || authorize_settled($order)) {
+                $message = "The transaction cannot be voided due to the fact that it is expired or settled.";
                 return false;
             }
             $poststring .= '&x_type=VOID&x_trans_id=' . urlencode($order->transid);