X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttExpenseHelper.class.php;h=e42a0ab5ec825c3dfe7f6bf1bc6701cd6e2beee1;hb=f58ab716cb0cc4b8be8e48723b345bfab29697a6;hp=86ccbcd8317e408d90c56c86216f7632968d5e3d;hpb=c9ab2e84d7c459e4d5e8e946be78c2e49533796e;p=timetracker.git

diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index 86ccbcd8..e42a0ab5 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -31,31 +31,35 @@ class ttExpenseHelper {
   // insert - inserts an entry into tt_expense_items table.
   static function insert($fields)
   {
+    global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getActiveUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $date = $fields['date'];
-    $user_id = (int) $fields['user_id'];
     $client_id = $fields['client_id'];
     $project_id = $fields['project_id'];
     $name = $fields['name'];
     $cost = str_replace(',', '.', $fields['cost']);
     $invoice_id = $fields['invoice_id'];
     $status = $fields['status'];
-       
-    $sql = "insert into tt_expense_items (date, user_id, client_id, project_id, name, cost, invoice_id, status) ".
-      "values (".$mdb2->quote($date).", $user_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).
-      ", ".$mdb2->quote($name).", ".$mdb2->quote($cost).", ".$mdb2->quote($invoice_id).", ".$mdb2->quote($status).")";
+    $paid = (int) $fields['paid'];
+    $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
+
+    $sql = "insert into tt_expense_items".
+      " (date, user_id, group_id, org_id, client_id, project_id, name, cost, invoice_id, paid, created, created_ip, created_by, status)".
+      " values (".$mdb2->quote($date).", $user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).
+      ", ".$mdb2->quote($name).", ".$mdb2->quote($cost).", ".$mdb2->quote($invoice_id).", $paid $created, ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
-    
-    $id = $mdb2->lastInsertID('tt_expense_items', 'id');
-    return $id;
+    return (!is_a($affected, 'PEAR_Error'));
   }
-  
+
   // update - updates a record in tt_expense_items table.
   static function update($fields)
   {
+    global $user;
     $mdb2 = getConnection();
 
     $id = (int) $fields['id'];
@@ -66,35 +70,34 @@ class ttExpenseHelper {
     $name = $fields['name'];
     $cost = str_replace(',', '.', $fields['cost']);
     $invoice_id = $fields['invoice_id'];
-    
+
+    $paid_part = '';
+    if ($user->can('manage_invoices') && $user->isPluginEnabled('ps')) {
+      $paid_part = $fields['paid'] ? ', paid = 1' : ', paid = 0';
+    }
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->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).", invoice_id = ".$mdb2->quote($invoice_id).
+      ", cost = ".$mdb2->quote($cost)."$paid_part $modified_part, invoice_id = ".$mdb2->quote($invoice_id).
       " WHERE id = $id";
-    
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
-   
-    return true;
+    return (!is_a($affected, 'PEAR_Error'));
   }
-  
+
   // markDeleted - marks an item as deleted in tt_expense_items table.
   static function markDeleted($id, $user_id) {
     $mdb2 = getConnection();
 
     $sql = "update tt_expense_items set status = NULL where id = $id and user_id = $user_id";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
-      
-    return true;
+    return (!is_a($affected, 'PEAR_Error'));
   }
-  
+
   // getTotalForDay - gets total expenses for a user for a specific date.
   static function getTotalForDay($user_id, $date) {
-  	global $user;
-  	
+    global $user;
+
     $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";
@@ -106,23 +109,23 @@ class ttExpenseHelper {
     }
     return false;
   }
-  
+
   // getItem - retrieves an entry from tt_expense_items table.
   static function getItem($id, $user_id) {
-  	global $user;
-  	
+    global $user;
+
     $mdb2 = getConnection();
-    
+
     $client_field = null;
-    if (ttPluginEnabled('cl'))
+    if ($user->isPluginEnabled('cl'))
       $client_field = ", c.name as client_name";
-      
+
     $left_joins = "";
     $left_joins = " left join tt_projects p on (ei.project_id = p.id)";
-    if (ttPluginEnabled('cl'))
+    if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (ei.client_id = c.id)";
-      
-    $sql = "select ei.id, ei.date, ei.client_id, ei.project_id, ei.name, ei.cost, ei.invoice_id $client_field, p.name as project_name
+
+    $sql = "select ei.id, ei.date, ei.client_id, ei.project_id, ei.name, ei.cost, ei.invoice_id, ei.paid $client_field, p.name as project_name
       from tt_expense_items ei
       $left_joins
       where ei.id = $id and ei.user_id = $user_id and ei.status = 1";
@@ -132,45 +135,27 @@ class ttExpenseHelper {
         return false;
       }
       if ($val = $res->fetchRow()) {
-      	$val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
+        $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
         return $val;
       }
     }
     return false;
   }
-  
-  /*
-  // getAllItems - returns all expense items for a certain user.
-  static function getAllItems($user_id) {
-    $result = array();
-
-    $mdb2 = getConnection();
-
-    $sql = "select * from tt_expense_items where user_id = $user_id order by id";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-    } else return false;
-
-    return $result;
-  }*/
 
   // getItems - returns expense items for a user for a given date.
   static function getItems($user_id, $date) {
-  	global $user;
-  	  	
+    global $user;
+
     $result = array();
     $mdb2 = getConnection();
 
     $client_field = null;
-    if (ttPluginEnabled('cl'))
+    if ($user->isPluginEnabled('cl'))
       $client_field = ", c.name as client";
-    
+
     $left_joins = "";
     $left_joins = " left join tt_projects p on (ei.project_id = p.id)";
-    if (ttPluginEnabled('cl'))
+    if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (ei.client_id = c.id)";
 
     $sql = "select ei.id as id $client_field, p.name as project, ei.name as item, ei.cost as cost,
@@ -178,7 +163,7 @@ class ttExpenseHelper {
       $left_joins
       where ei.date = ".$mdb2->quote($date)." and ei.user_id = $user_id and ei.status = 1
       order by ei.id";
-      
+
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {