tasks page shows when the task has been payed for

[contractor-progress.git] / tasks.php

diff --git a/tasks.php b/tasks.php
index ed35222..dd4ad15 100644 (file)
--- a/tasks.php
+++ b/tasks.php
@@ -84,12 +84,12 @@ function tasks_display_main() {
        $task_id = format_int($_REQUEST['tasks_id']);;
        $client_id = logged_in();
        if(logged_in_as_contractor()) {
-               $row = db_get_row('tasks', 'title,url,description,state,price,client_id', 'where id=%i', $task_id);
+               $row = db_get_row('tasks', 'title,url,description,state,price,client_id,paid', 'where id=%i', $task_id);
        } else {
-               $row = db_get_row('tasks', 'title,url,description,state,price,client_id', 'where id=%i && client_id=%i', $task_id, $client_id);
+               $row = db_get_row('tasks', 'title,url,description,state,price,client_id,paid', 'where id=%i && client_id=%i', $task_id, $client_id);
        }
        if($row) {
-               list($title, $url, $description, $state, $price, $owner_id) = $row;
+               list($title, $url, $description, $state, $price, $owner_id, $paid) = $row;
                tem_set('task_id', $task_id);
                tem_set('title', $title);
                tem_set('url', $url);
@@ -129,8 +129,12 @@ function tasks_display_main() {
                                        }
                                        # FALL THROUGH
                                case TASK_FINISHED:
+                                       if($paid) {
+                                               tem_show('marked_paid');
+                                       } else {
+                                               tem_show('mark_paid_link');
+                                       }
                                        tem_show('price_row');
-                                       tem_show('mark_paid_link'); # FIXME
                                break;
                        }
                } else {