X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttInvoiceHelper.class.php;h=3d67f6a787b973610556a4ba9342af15f2feea27;hb=0c28ebb2ecb192d9d1976d86de7d1f24f109171d;hp=3a8dbe27b8a0283f8649f4034cee46173d53c98c;hpb=3c5f822f90846e9a65866c9e33b7e1ff81b46b1f;p=timetracker.git
diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 3a8dbe27..3d67f6a7 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -73,7 +73,7 @@ class ttInvoiceHelper {
if ($user->isClient()) $client_part = " and client_id = $user->client_id";
$sql = "select * from tt_invoices where id = $invoice_id and group_id = ".
- $user->getActiveGroup()."$client_part and status = 1";
+ $user->getGroup()."$client_part and status = 1";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
if ($val = $res->fetchRow())
@@ -89,7 +89,7 @@ class ttInvoiceHelper {
global $user;
$sql = "select id from tt_invoices where group_id = ".
- $user->getActiveGroup()." and name = ".$mdb2->quote($invoice_name)." and status = 1";
+ $user->getGroup()." and name = ".$mdb2->quote($invoice_name)." and status = 1";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$val = $res->fetchRow();
@@ -155,7 +155,7 @@ class ttInvoiceHelper {
// It is anticipated to support "totals only" option later on.
// Our query is different depending on tracking mode.
- if (MODE_TIME == $user->tracking_mode) {
+ if (MODE_TIME == $user->getTrackingMode()) {
// In "time only" tracking mode there is a single user rate.
$sql = "select l.date as date, 1 as type, u.name as user_name, p.name as project_name,
t.name as task_name, l.comment as note,
@@ -236,7 +236,7 @@ class ttInvoiceHelper {
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error')) return false;
- $sql = "update tt_invoices set status = NULL where id = $invoice_id and group_id = ".$user->getActiveGroup();
+ $sql = "update tt_invoices set status = NULL where id = $invoice_id and group_id = ".$user->getGroup();
$affected = $mdb2->exec($sql);
return (!is_a($affected, 'PEAR_Error'));
}
@@ -258,7 +258,7 @@ class ttInvoiceHelper {
if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
// Our query is different depending on tracking mode.
- if (MODE_TIME == $user->tracking_mode) {
+ if (MODE_TIME == $user->getTrackingMode()) {
// In "time only" tracking mode there is a single user rate.
$sql = "select count(*) as num from tt_log l, tt_users u
where l.status = 1 and l.client_id = $client_id and l.invoice_id is NULL
@@ -332,7 +332,7 @@ class ttInvoiceHelper {
// Create a new invoice record.
$sql = "insert into tt_invoices (group_id, org_id, name, date, client_id) values(".
- $user->getActiveGroup().", $user->org_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)";
+ $user->getGroup().", $user->org_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error')) return false;
@@ -344,7 +344,7 @@ class ttInvoiceHelper {
$last_id = $val['last_insert_id'];
// Our update sql is different depending on tracking mode.
- if (MODE_TIME == $user->tracking_mode) {
+ if (MODE_TIME == $user->getTrackingMode()) {
// In "time only" tracking mode there is a single user rate.
$sql = "update tt_log l
left join tt_users u on (u.id = l.user_id)
@@ -426,6 +426,9 @@ class ttInvoiceHelper {
$style_tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;';
$style_tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;';
+ // Determine tracking mode once for multiple reuse below.
+ $trackingMode = $user->getTrackingMode();
+
// Start creating email body.
$body = '';
$body .= '';
@@ -451,9 +454,9 @@ class ttInvoiceHelper {
$body .= '';
$body .= '| '.$i18n->get('label.date').' | ';
$body .= ''.$i18n->get('form.invoice.person').' | ';
- if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+ if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)
$body .= ''.$i18n->get('label.project').' | ';
- if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+ if (MODE_PROJECTS_AND_TASKS == $trackingMode)
$body .= ''.$i18n->get('label.task').' | ';
$body .= ''.$i18n->get('label.note').' | ';
$body .= ''.$i18n->get('label.duration').' | ';
@@ -463,9 +466,9 @@ class ttInvoiceHelper {
$body .= '
';
$body .= '| '.$item['date'].' | ';
$body .= ''.htmlspecialchars($item['user_name']).' | ';
- if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+ if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)
$body .= ''.htmlspecialchars($item['project_name']).' | ';
- if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+ if (MODE_PROJECTS_AND_TASKS == $trackingMode)
$body .= ''.htmlspecialchars($item['task_name']).' | ';
$body .= ''.htmlspecialchars($item['note']).' | ';
$body .= ''.$item['duration'].' | ';
@@ -474,9 +477,9 @@ class ttInvoiceHelper {
}
// Output summary.
$colspan = 4;
- if (MODE_PROJECTS == $user->tracking_mode)
+ if (MODE_PROJECTS == $trackingMode)
$colspan++;
- elseif (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+ elseif (MODE_PROJECTS_AND_TASKS == $trackingMode)
$colspan += 2;
$body .= '
| |
';
if ($tax) {