Work in progress integrating changes from PR #48 - introduced a database field.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 06726f1a975f29098f6f78679628474658706d72..e1c31da80f7627a1a2c7e71f0859709746121c84 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.13.15.3748 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.14.0.3749 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/dbinstall.php b/dbinstall.php
index 2b0d896ca3fccf2f4e80a6113fca7af4e3bfb130..49c9747ea04c5edf0feb6a90a6e5c6ea7d9ae21b 100755 (executable)
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -600,7 +600,7 @@ if ($_POST) {
     setChange("ALTER TABLE tt_invoices DROP end_date");
   }
 
     setChange("ALTER TABLE tt_invoices DROP end_date");
   }
 

-  if ($_POST["convert1600to11300"]) {
+  if ($_POST["convert1600to11400"]) {

     setChange("DROP TABLE IF EXISTS tt_invoice_headers");
     setChange("ALTER TABLE tt_fav_reports ADD COLUMN `client_id` int(11) default NULL");
     setChange("ALTER TABLE tt_fav_reports ADD COLUMN `cf_1_option_id` int(11) default NULL");
     setChange("DROP TABLE IF EXISTS tt_invoice_headers");
     setChange("ALTER TABLE tt_fav_reports ADD COLUMN `client_id` int(11) default NULL");
     setChange("ALTER TABLE tt_fav_reports ADD COLUMN `cf_1_option_id` int(11) default NULL");


@@ -645,6 +645,7 @@ if ($_POST) {
     setChange("ALTER TABLE `tt_teams` ADD `bcc_email` varchar(100) default NULL AFTER `uncompleted_indicators`");
     setChange("ALTER TABLE `tt_cron` ADD `cc` varchar(100) default NULL AFTER `email`");
     setChange("ALTER TABLE `tt_cron` ADD `subject` varchar(100) default NULL AFTER `cc`");
     setChange("ALTER TABLE `tt_teams` ADD `bcc_email` varchar(100) default NULL AFTER `uncompleted_indicators`");
     setChange("ALTER TABLE `tt_cron` ADD `cc` varchar(100) default NULL AFTER `email`");
     setChange("ALTER TABLE `tt_cron` ADD `subject` varchar(100) default NULL AFTER `cc`");

+    setChange("ALTER TABLE `tt_log` ADD `paid` tinyint(4) NULL default '0' AFTER `billable`");

   }
   
   // The update_clients function updates projects field in tt_clients table.
   }
   
   // The update_clients function updates projects field in tt_clients table.


@@ -750,7 +751,7 @@ if ($_POST) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>

-    <td width="80%"><b>Create database structure (v1.13.0)</b>
+    <td width="80%"><b>Create database structure (v1.14.0)</b>

     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>


@@ -782,8 +783,8 @@ if ($_POST) {
     <td><input type="submit" name="convert1579to1600" value="Update"><br><input type="submit" name="update_clients" value="Update clients"><br><input type="submit" name="update_custom_fields" value="Update custom fields"><br><input type="submit" name="update_tracking_mode" value="Update tracking mode"></td>
   </tr>
   <tr valign="top">
     <td><input type="submit" name="convert1579to1600" value="Update"><br><input type="submit" name="update_clients" value="Update clients"><br><input type="submit" name="update_custom_fields" value="Update custom fields"><br><input type="submit" name="update_tracking_mode" value="Update tracking mode"></td>
   </tr>
   <tr valign="top">

-    <td>Update database structure (v1.6 to v1.13)</td>
-    <td><input type="submit" name="convert1600to11300" value="Update"><br></td>
+    <td>Update database structure (v1.6 to v1.14)</td>
+    <td><input type="submit" name="convert1600to11400" value="Update"><br></td>

   </tr>
 </table>
 
   </tr>
 </table>
 

diff --git a/mysql.sql b/mysql.sql
index de5060dad95df2b15ccee3877d4a74ffb41d3212..9a971bece6268c136c767e7a28f1439005bf9afa 100644 (file)
--- a/mysql.sql
+++ b/mysql.sql
@@ -144,6 +144,7 @@ CREATE TABLE `tt_log` (
   `invoice_id` int(11) default NULL,   # invoice id
   `comment` text,                      # user provided comment for time record
   `billable` tinyint(4) default '0',   # whether the record is billable or not
   `invoice_id` int(11) default NULL,   # invoice id
   `comment` text,                      # user provided comment for time record
   `billable` tinyint(4) default '0',   # whether the record is billable or not

+  `paid` tinyint(4) default '0',       # whether the record is paid

   `status` tinyint(4) default '1',     # time record status
   PRIMARY KEY (`id`)
 );
   `status` tinyint(4) default '1',     # time record status
   PRIMARY KEY (`id`)
 );