X-Git-Url: https://jasonwoof.com/gitweb/?p=contractor-progress.git;a=blobdiff_plain;f=tasks.php;h=b13a2db8c9891356a23fe023763c0bcce65bb0fe;hp=f47e240fb11ee495146f60089a65e2bf075a24d8;hb=9f423711f09068df37d0ac666e68eaa2a110ec41;hpb=e9275bae1584a4d61ed5c09fb5f63fb5096ed03a

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');
+		}
 	}
 }