stop showing tiny agreement to contractor when he switches users

diff --git a/index.php b/index.php
index 88e5605..03e3077 100644 (file)
--- a/index.php
+++ b/index.php
@@ -115,14 +115,17 @@ function totals_summary($arr) {
 
 function _index_main() {
        $client_id = logged_in();
 
 function _index_main() {
        $client_id = logged_in();

+       $ever_was_contractor = ever_was_contractor();

 
 

-       # make sure they've filled out the tiny user agreement
-       $tiny_agreement = db_get_value('people', 'tiny_agreement', 'where id=%i', $client_id);
-       if($tiny_agreement < 30 || $tiny_agreement > 999) {
-               return './tiny_agreement';
+       # make sure the client (not the contractor) has filled out the tiny agreement
+       if(!$ever_was_contractor) {
+               $tiny_agreement = db_get_value('people', 'tiny_agreement', 'where id=%i', $client_id);
+               if($tiny_agreement < 30 || $tiny_agreement > 999) {
+                       return './tiny_agreement';
+               }

        }
 
        }
 

-       if(ever_was_contractor()) {
+       if($ever_was_contractor) {

                tem_show('su_link');
        }
 
                tem_show('su_link');
        }
 

diff --git a/tiny_agreement.html b/tiny_agreement.html
index f3dcd16..96d4143 100644 (file)
--- a/tiny_agreement.html
+++ b/tiny_agreement.html
@@ -10,11 +10,13 @@
 <!--~main_body start~-->
   <h3><a href="#" id="tiny_job_agreement" name="tiny_job_agreement"></a>Tiny Job Agreement</h3>
 
 <!--~main_body start~-->
   <h3><a href="#" id="tiny_job_agreement" name="tiny_job_agreement"></a>Tiny Job Agreement</h3>
 

-  <p>For tiny jobs ($30 or less) it is a waste of time to wait for pricing approval. So I have my clients make the following agreement:</p>
+  <p>Welcome to the task manager! I'd like to take this opportunity to have you make an agreement with me about very small jobs. Please read it carefully, and call me if you have any questions.</p>
+
+  <p>For tiny jobs ($30 or less) the normal pricing approval process is cumbersome. So I have my clients make the following agreement:</p>

 
   <form action="tiny_agreement" method="post">
 
   <form action="tiny_agreement" method="post">

-    <p class="agreement">For work that I request of Jason Woofenden (whether through this site, or other forms of communication like e-mail or phone), I <input type="text" size="10" name="name" value="~name.attr~" /> hereby agree to pay the fee he chooses, if that fee is less than or equal to <select name="level"><!--~level.options~-->
-    </select> <input type="submit" value="Agree" /></p>
+    <p class="agreement">For work that I request of Jason Woofenden (whether through this site, or other forms of communication like e-mail or phone), I <input type="text" size="10" name="name" value="~name.attr~" /> hereby agree to pay the fee he chooses, so long as it is <select name="level"><!--~level.options~-->
+    </select> or less. <input type="submit" value="Agree" /></p>

   </form>
 
   <p>Cutting out the overhead of quotes for tiny jobs should make it so I can keep my minimum fee at $10.</p>
   </form>
 
   <p>Cutting out the overhead of quotes for tiny jobs should make it so I can keep my minimum fee at $10.</p>