Introduced a debug option and a localization string for holidays.

[timetracker.git] / WEB-INF / lib / ttPredefinedExpenseHelper.class.php

diff --git a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
index 556bc42..8ec8ccf 100644 (file)
--- a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
+++ b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
@@ -31,21 +31,21 @@
 class ttPredefinedExpenseHelper {
 
   // get - gets predefined expense details.
-  static function get($id)
-  {
+  static function get($id) {
     global $user;
-    $replaceDecimalMark = ('.' != $user->decimal_mark);
-
     $mdb2 = getConnection();
 
-    $sql = "select id, name, cost from tt_predefined_expenses
-      where id = $id and team_id = $user->team_id";
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name, cost from tt_predefined_expenses".
+      " where id = $id and group_id = $group_id and org_id = $org_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
       if ($val && $val['id']) {
-        if ($replaceDecimalMark)
-          $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
+        if ('.' != $user->getDecimalMark())
+          $val['cost'] = str_replace('.', $user->getDecimalMark(), $val['cost']);
         return $val;
       }
     }
@@ -55,10 +55,13 @@ class ttPredefinedExpenseHelper {
   // delete - deletes a predefined expense from tt_predefined_expenses table.
   static function delete($id) {
     global $user;
-
     $mdb2 = getConnection();
 
-    $sql = "delete from tt_predefined_expenses where id = $id and team_id = $user->team_id";
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "delete from tt_predefined_expenses".
+      " where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -67,20 +70,20 @@ class ttPredefinedExpenseHelper {
   }
 
   // insert function inserts a new predefined expense into database.
-  static function insert($fields)
-  {
+  static function insert($fields) {
     global $user;
-
     $mdb2 = getConnection();
 
-    $team_id = (int) $fields['team_id'];
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $name = $fields['name'];
     $cost = $fields['cost'];
-    if ('.' != $user->decimal_mark)
-      $cost = str_replace($user->decimal_mark, '.', $cost);
+    if ('.' != $user->getDecimalMark())
+      $cost = str_replace($user->getDecimalMark(), '.', $cost);
 
-    $sql = "insert into tt_predefined_expenses (team_id, name, cost)
-      values ($team_id, ".$mdb2->quote($name).", ".$mdb2->quote($cost).")";
+    $sql = "insert into tt_predefined_expenses (group_id, org_id, name, cost)".
+      " values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($cost).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -89,21 +92,21 @@ class ttPredefinedExpenseHelper {
   }
 
   // update function - updates a predefined expense in database.
-  static function update($fields)
-  {
+  static function update($fields) {
     global $user;
-
     $mdb2 = getConnection();
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $predefined_expense_id = (int) $fields['id'];
-    $team_id = (int) $fields['team_id'];
     $name = $fields['name'];
     $cost = $fields['cost'];
-    if ('.' != $user->decimal_mark)
-      $cost = str_replace($user->decimal_mark, '.', $cost);
+    if ('.' != $user->getDecimalMark())
+      $cost = str_replace($user->getDecimalMark(), '.', $cost);
 
     $sql = "update tt_predefined_expenses set name = ".$mdb2->quote($name).", cost = ".$mdb2->quote($cost).
-      " where id = $predefined_expense_id and team_id = $team_id";
+      " where id = $predefined_expense_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }