X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/7797eda9fb04c217a813db88e00bb9ee541eabbb..db51a4b1e95f48d82bf2a214f8d0736f2485e3a2:/WEB-INF/lib/ttInvoiceHelper.class.php
diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 13e5dea0..0867ee1e 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -56,12 +56,7 @@ class ttInvoiceHelper {
if (is_a($affected, 'PEAR_Error')) return false;
- $last_id = 0;
- $sql = "select last_insert_id() as last_insert_id";
- $res = $mdb2->query($sql);
- $val = $res->fetchRow();
- $last_id = $val['last_insert_id'];
-
+ $last_id = $mdb2->lastInsertID('tt_invoices', 'id');
return $last_id;
}
@@ -155,7 +150,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,
@@ -258,7 +253,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
@@ -337,14 +332,10 @@ class ttInvoiceHelper {
if (is_a($affected, 'PEAR_Error')) return false;
// Mark associated invoice items with invoice id.
- $last_id = 0;
- $sql = "select last_insert_id() as last_insert_id";
- $res = $mdb2->query($sql);
- $val = $res->fetchRow();
- $last_id = $val['last_insert_id'];
+ $last_id = $mdb2->lastInsertID('tt_invoices', '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 +417,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 +445,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 +457,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 +468,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) {