From 9f423711f09068df37d0ac666e68eaa2a110ec41 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Fri, 12 Dec 2008 13:19:26 -0500
Subject: [PATCH] when admin enters a new task, he can set it to
 NEEDS_GO_AHEAD (even if it is a tiny price) or can set it
 to NEEDS_CLARIFICATION

---
 tasks.html |    7 ++++---
 tasks.php  |   22 ++++++++++++++++++++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/tasks.html b/tasks.html
index 80d3dba..65fc163 100644
--- a/tasks.html
+++ b/tasks.html
@@ -66,9 +66,10 @@
       <tr><td class="caption">Price: </td><td class="field"><input type="text" size="10" name="price" value="~price.attr~" /></td></tr>
 <!--~end~-->
 <!--~contractor_submits start~-->
-      <tr><td class="submit_row" colspan="2"><input type="submit" name="save_price" value="Save With Price" /></td></tr>
-      <tr><td class="submit_row" colspan="2"><input type="submit" name="save_draft" value="Save As Draft" /></td></tr>
-      <tr><td class="submit_row" colspan="2"><input type="submit" name="needs_clarification" value="Needs Clarification" /></td></tr>
+      <tr><td colspan="2"><input type="submit" name="save_price" value="Save With Price" /> (directly to queue if &lt;= tiny)</td></tr>
+      <tr><td colspan="2"><input type="submit" name="save_price_no_tiny" value="Await Price Approval" /> (even if it's &lt;= tiny agreement)</td></tr>
+      <tr><td colspan="2"><input type="submit" name="save_draft" value="Save As Draft" /></td></tr>
+      <tr><td colspan="2"><input type="submit" name="needs_clarification" value="Needs Clarification" /></td></tr>
 <!--~end~-->
 <!--~normal_submits start~-->
       <tr><td class="submit_row" colspan="2"><input type="submit" name="request_price" value="Save and Request Price" /></td></tr>
diff --git a/tasks.php b/tasks.php
index f47e240..b13a2db 100644
--- a/tasks.php
+++ b/tasks.php
@@ -268,6 +268,8 @@ function tasks_edit_main() {
 			$state = TASK_DRAFT;
 		} elseif(isset($_REQUEST['save_bug'])) {
 			$state = TASK_BUG;
+		} elseif(isset($_REQUEST['save_price_no_tiny']) && logged_in_as_contractor()) {
+			$state = TASK_NEEDS_GO_AHEAD;
 		} elseif(isset($_REQUEST['save_price']) && logged_in_as_contractor()) {
 			$tiny_agreement = db_get_value('people', 'tiny_agreement', 'where id=%i', $client_id);
 			if($price <= $tiny_agreement) {
@@ -300,8 +302,11 @@ function tasks_edit_main() {
 				$client_id = logged_in();
 				if(logged_in_as_contractor() && $_REQUEST['client_id']) {
 					$client_id = format_int($_REQUEST['client_id']);
+				} else {
+					# if client entered the task, no price is set
+					$price = 0;
 				}
-				db_insert('tasks', 'client_id,title,url,description,state,paid', $client_id, $title, $url, $description, $state, $paid);
+				db_insert('tasks', 'client_id,title,url,description,state,paid,price', $client_id, $title, $url, $description, $state, $paid, $price);
 				message('Task saved.');
 			}
 			if($GLOBALS['tasks_form_recipient'] != "fixme@example.com") {
@@ -373,7 +378,20 @@ function tasks_edit_main() {
 		} else {
 			tem_show('normal_instructions');
 		}
-		tem_show('normal_submits');
+		if(logged_in_as_contractor()) {
+			tem_show('contractor_submits');
+			switch($state) {
+				case TASK_DRAFT:
+				case TASK_NEEDS_CLARIFICATION:
+				case TASK_NEEDS_QUOTE:
+				case TASK_NEEDS_GO_AHEAD:
+				case TASK_QUEUED:
+				case TASK_BUG:
+				tem_show('price_field');
+			}
+		} else {
+			tem_show('normal_submits');
+		}
 	}
 }
 
-- 
1.7.10.4