X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tasks.php;h=dd4ad15460119282d004c97f363c5eaa289705cb;hb=ba364b253f2a61970eee1432b4e4393ad9a3241a;hp=e4a8b50b6c526d344371378cdd0fa051674362aa;hpb=753eb74e35f2bc1c06b6a1e1c8214cee1fca61cd;p=contractor-progress.git

diff --git a/tasks.php b/tasks.php
index e4a8b50..dd4ad15 100644
--- 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 {
@@ -355,8 +359,8 @@ function tasks_edit_main() {
 			return './';
 		}
 		db_update('tasks', 'state', TASK_WORKING, 'where id=%i', $id);
-		message('OK, client locked out of modifying that one.');
-		return './';
+		message('Task marked as "in progress".');
+		return './tasks?tasks_id=' . $id;
 	}
 
 	if(isset($_REQUEST['tasks_needs_testing_id'])) {