Refactoring expense related things for subgroups.

diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index b11e71fd035a4d805b818cfea27ef209ce20cb54..bfc3ab72771cc831c47f0e162638f675b1c6d412 100644 (file)
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -29,8 +29,7 @@
 // The ttExpenseHelper is a class to help with expense items.
 class ttExpenseHelper {
   // insert - inserts an entry into tt_expense_items table.
 // The ttExpenseHelper is a class to help with expense items.
 class ttExpenseHelper {
   // insert - inserts an entry into tt_expense_items table.

-  static function insert($fields)
-  {
+  static function insert($fields) {

     global $user;
     $mdb2 = getConnection();
 
     global $user;
     $mdb2 = getConnection();
 


@@ -57,11 +56,13 @@ class ttExpenseHelper {
   }
 
   // update - updates a record in tt_expense_items table.
   }
 
   // update - updates a record in tt_expense_items table.

-  static function update($fields)
-  {
+  static function update($fields) {

     global $user;
     $mdb2 = getConnection();
 
     global $user;
     $mdb2 = getConnection();
 

+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+

     $id = (int) $fields['id'];
     $date = $fields['date'];
     $user_id = (int) $fields['user_id'];
     $id = (int) $fields['id'];
     $date = $fields['date'];
     $user_id = (int) $fields['user_id'];


@@ -77,34 +78,45 @@ class ttExpenseHelper {
     }
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
 
     }
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
 

-    $sql = "UPDATE tt_expense_items set date = ".$mdb2->quote($date).", user_id = $user_id, client_id = ".$mdb2->quote($client_id).
+    $sql = "update tt_expense_items set date = ".$mdb2->quote($date).", user_id = $user_id, client_id = ".$mdb2->quote($client_id).

       ", project_id = ".$mdb2->quote($project_id).", name = ".$mdb2->quote($name).
       ", cost = ".$mdb2->quote($cost)."$paid_part $modified_part, invoice_id = ".$mdb2->quote($invoice_id).
       ", project_id = ".$mdb2->quote($project_id).", name = ".$mdb2->quote($name).
       ", cost = ".$mdb2->quote($cost)."$paid_part $modified_part, invoice_id = ".$mdb2->quote($invoice_id).

-      " WHERE id = $id";
+      " where id = $id and group_id = $group_id and org_id = $org_id";

     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 
   // markDeleted - marks an item as deleted in tt_expense_items table.
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 
   // markDeleted - marks an item as deleted in tt_expense_items table.

-  static function markDeleted($id, $user_id) {
+  static function markDeleted($id) {
+    global $user;

     $mdb2 = getConnection();
 
     $mdb2 = getConnection();
 

-    $sql = "update tt_expense_items set status = NULL where id = $id and user_id = $user_id";
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "update tt_expense_items set status = null".
+      " where id = $id and user_id = $user_id and group_id = $group_id and org_id = $org_id";

     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 
   // getTotalForDay - gets total expenses for a user for a specific date.
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 
   // getTotalForDay - gets total expenses for a user for a specific date.

-  static function getTotalForDay($user_id, $date) {
+  static function getTotalForDay($date) {

     global $user;
     global $user;

-

     $mdb2 = getConnection();
 
     $mdb2 = getConnection();
 

-    $sql = "select sum(cost) as sm from tt_expense_items where user_id = $user_id and date = ".$mdb2->quote($date)." and status = 1";
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select sum(cost) as sm from tt_expense_items".
+      " where user_id = $user_id and group_id = $group_id and org_id = $org_id".
+      " and date = ".$mdb2->quote($date)." and status = 1";

     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();

-      $val['sm'] = str_replace('.', $user->decimal_mark, $val['sm']);
+      $val['sm'] = str_replace('.', $user->getDecimalMark(), $val['sm']);

       return $val['sm'];
     }
     return false;
       return $val['sm'];
     }
     return false;

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a4ddf7cc1988d0c6542e088438f5171f8a7b4f28..05f357bc6c0ab865b55c3cd47d8746d68d806283 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.18.29.4581 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4582 | 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/expense_delete.php b/expense_delete.php
index fcb039f07ae1daa931bd52f73831bb04cc7db672..32b9ab6792df831a0690c363061f4f5e960f315b 100644 (file)
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -59,7 +59,7 @@ if ($request->isPost()) {
 
     if ($err->no()) {
       // Mark the record as deleted.
 
     if ($err->no()) {
       // Mark the record as deleted.

-      if (ttExpenseHelper::markDeleted($cl_id, $user->getUser())) {
+      if (ttExpenseHelper::markDeleted($cl_id)) {

         header('Location: expenses.php');
         exit();
       } else
         header('Location: expenses.php');
         exit();
       } else

diff --git a/expenses.php b/expenses.php
index 1ff638fbebc6b9d7e9a6d5eee3684c9fdff6c086..eea55d1c0784f0ad94019d56b239ecdf04e701b8 100644 (file)
--- a/expenses.php
+++ b/expenses.php
@@ -211,7 +211,7 @@ if ($request->isPost()) {
   }
 }
 
   }
 }
 

-$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($user->getUser(), $cl_date));
+$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($cl_date));

 $smarty->assign('expense_items', ttExpenseHelper::getItems($user->getUser(), $cl_date));
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('expense_items', ttExpenseHelper::getItems($user->getUser(), $cl_date));
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);

diff --git a/mobile/expense_delete.php b/mobile/expense_delete.php
index c0fa032eba9534f364eb6b66641f3f1802f85009..93d6d59f11ce20940b19736f49ec8c387e7a89c4 100644 (file)
--- a/mobile/expense_delete.php
+++ b/mobile/expense_delete.php
@@ -59,7 +59,7 @@ if ($request->isPost()) {
 
     if ($err->no()) {
       // Mark the record as deleted.
 
     if ($err->no()) {
       // Mark the record as deleted.

-      if (ttExpenseHelper::markDeleted($cl_id, $user->getUser())) {
+      if (ttExpenseHelper::markDeleted($cl_id)) {

         header('Location: expenses.php');
         exit();
       } else
         header('Location: expenses.php');
         exit();
       } else

diff --git a/mobile/expenses.php b/mobile/expenses.php
index a39bf4a99827f725606ba94e447271d60433cb29..656b20e054c42f843effc6a1dc75835efdd951d9 100644 (file)
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -217,7 +217,7 @@ if ($request->isPost()) {
 
 $smarty->assign('next_date', $next_date);
 $smarty->assign('prev_date', $prev_date);
 
 $smarty->assign('next_date', $next_date);
 $smarty->assign('prev_date', $prev_date);

-$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($user->getUser(), $cl_date));
+$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($cl_date));

 $smarty->assign('expense_items', ttExpenseHelper::getItems($user->getUser(), $cl_date));
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('expense_items', ttExpenseHelper::getItems($user->getUser(), $cl_date));
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);