From: ethem Date: Fri, 18 Aug 2006 17:10:30 +0000 (+0000) Subject: Colorize all orders. X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=516b13851690825bde5267ece56f6cb4d557ba41;p=moodle.git Colorize all orders. --- diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php index dfe54b781b..dba4396bec 100644 --- a/enrol/authorize/locallib.php +++ b/enrol/authorize/locallib.php @@ -125,6 +125,7 @@ function authorize_print_orders() if ($records = get_records_sql($select . $from . $where . $sort . $limit)) { foreach ($records as $record) { $actionstatus = authorize_get_status_action($record); + $color = authorize_get_status_color($actionstatus->status); $actions = ''; if (empty($actionstatus->actions)) { @@ -140,7 +141,7 @@ function authorize_print_orders() "$record->id", userdate($record->timecreated), $record->ccname, - $authstrs->{$actionstatus->status}, + "" . $authstrs->{$actionstatus->status} . "", $actions )); } @@ -200,8 +201,9 @@ function authorize_print_order_details($orderno) $table->data[] = array("$authstrs->transid:", $order->transid); $table->data[] = array("$authstrs->amount:", "$order->currency $order->amount"); if (empty($cmdcapture) and empty($cmdrefund) and empty($cmdvoid) and empty($cmddelete)) { + $color = authorize_get_status_color($status->status); $table->data[] = array("$strs->course:", $order->shortname); - $table->data[] = array("$strs->status:", $authstrs->{$status->status}); + $table->data[] = array("$strs->status:", "" . $authstrs->{$status->status} . ""); $table->data[] = array("$authstrs->nameoncard:", $order->ccname); $table->data[] = array("$strs->time:", userdate($order->timecreated)); $table->data[] = array("$authstrs->settlementdate:", $settled ? @@ -480,32 +482,17 @@ function authorize_print_order_details($orderno) } } $sign = ''; - $color = ''; - switch ($substatus->status) { - case 'cancelled': - $color = 'black'; - break; - - case 'refunded': - $sign = '-'; - $color = 'red'; - $sumrefund += floatval($rf->amount); - break; - - case 'settled': - default: - $sign = '-'; - $color = 'green'; - $sumrefund += floatval($rf->amount); - break; + $color = authorize_get_status_color($substatus->status); + if ($substatus->status == 'refunded' or $substatus->status == 'settled') { + $sign = '-'; + $sumrefund += floatval($rf->amount); } - $t2->data[] = array( userdate($rf->settletime), $rf->transid, - $authstrs->{$substatus->status}, + "" .$authstrs->{$substatus->status} . "", $subactions, - "" . format_float($sign . $rf->amount, 2) . "" + format_float($sign . $rf->amount, 2) ); } $t2->data[] = array('','',get_string('total'),$order->currency,format_float('-'.$sumrefund, 2)); @@ -611,4 +598,31 @@ function authorize_get_status_action($order) return $ret; } } + + +function authorize_get_status_color($status) +{ + $color = 'black'; + switch ($status) { + case 'new': + case 'tested': + case 'cancelled': + case 'authorizedpendingcapture': + $color = '#FF6600'; // orange + break; + + case 'capturedpendingsettle': + case 'capturedsettled': + case 'settled': + $color = '#339900'; // green + break; + + case 'expired': + case 'cancelled': + case 'refunded'; + $color = '#FF0033'; // red + break; + } + return $color; +} ?>