X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttInvoiceHelper.class.php;h=d35aa3486d882033a7adfe7fb0406b51f50832c5;hb=167e70e68597a70269edea5c5af9b186c489d57f;hp=9fa7e58c38017f67338c10a30a9443718eb0e943;hpb=b7df85b084e9aaecef29ff6712015194f96e0c22;p=timetracker.git diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php index 9fa7e58c..d35aa348 100644 --- a/WEB-INF/lib/ttInvoiceHelper.class.php +++ b/WEB-INF/lib/ttInvoiceHelper.class.php @@ -37,7 +37,7 @@ class ttInvoiceHelper { { $mdb2 = getConnection(); - $team_id = (int) $fields['team_id']; + $group_id = (int) $fields['group_id']; $name = $fields['name']; if (!$name) return false; @@ -49,8 +49,8 @@ class ttInvoiceHelper { } // Insert a new invoice record. - $sql = "insert into tt_invoices (team_id, name, date, client_id $status_f) - values($team_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id $status_v)"; + $sql = "insert into tt_invoices (group_id, name, date, client_id $status_f)". + " values($group_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id $status_v)"; $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) return false; @@ -69,7 +69,9 @@ class ttInvoiceHelper { global $user; $mdb2 = getConnection(); - $sql = "select * from tt_invoices where id = $invoice_id and team_id = $user->team_id and status = 1"; + if ($user->isClient()) $client_part = " and client_id = $user->client_id"; + + $sql = "select * from tt_invoices where id = $invoice_id and group_id = $user->group_id $client_part and status = 1"; $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { if ($val = $res->fetchRow()) @@ -84,7 +86,7 @@ class ttInvoiceHelper { $mdb2 = getConnection(); global $user; - $sql = "select id from tt_invoices where team_id = $user->team_id and name = ".$mdb2->quote($invoice_name)." and status = 1"; + $sql = "select id from tt_invoices where group_id = $user->group_id and name = ".$mdb2->quote($invoice_name)." and status = 1"; $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { $val = $res->fetchRow(); @@ -231,7 +233,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 team_id = $user->team_id"; + $sql = "update tt_invoices set status = NULL where id = $invoice_id and group_id = $user->group_id"; $affected = $mdb2->exec($sql); return (!is_a($affected, 'PEAR_Error')); } @@ -326,8 +328,8 @@ class ttInvoiceHelper { if (isset($fields['project_id'])) $project_id = (int) $fields['project_id']; // Create a new invoice record. - $sql = "insert into tt_invoices (team_id, name, date, client_id) - values($user->team_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)"; + $sql = "insert into tt_invoices (group_id, name, date, client_id) + values($user->group_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)"; $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) return false; @@ -427,16 +429,16 @@ class ttInvoiceHelper { $body .= ''; // Output title. - $body .= '

'.$i18n->getKey('title.invoice').' '.htmlspecialchars($invoice['name']).'

'; + $body .= '

'.$i18n->get('title.invoice').' '.htmlspecialchars($invoice['name']).'

'; // Output comment. if($comment) $body .= '

'.htmlspecialchars($comment).'

'; // Output invoice info. $body .= ''; - $body .= ''; - $body .= ''; - $body .= ''; + $body .= ''; + $body .= ''; + $body .= ''; $body .= '
'.$i18n->getKey('label.date').': '.$invoice['date'].'
'.$i18n->getKey('label.client').': '.htmlspecialchars($client['name']).'
'.$i18n->getKey('label.client_address').': '.htmlspecialchars($client['address']).'
'.$i18n->get('label.date').': '.$invoice['date'].'
'.$i18n->get('label.client').': '.htmlspecialchars($client['name']).'
'.$i18n->get('label.client_address').': '.htmlspecialchars($client['address']).'
'; $body .= '

'; @@ -444,15 +446,15 @@ class ttInvoiceHelper { // Output invoice items. $body .= ''; $body .= ''; - $body .= ''; - $body .= ''; + $body .= ''; + $body .= ''; if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) - $body .= ''; + $body .= ''; if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) - $body .= ''; - $body .= ''; - $body .= ''; - $body .= ''; + $body .= ''; + $body .= ''; + $body .= ''; + $body .= ''; $body .= ''; foreach ($invoice_items as $item) { $body .= ''; @@ -475,15 +477,15 @@ class ttInvoiceHelper { $colspan += 2; $body .= ''; if ($tax) { - $body .= ''; - $body .= ''; + $body .= ''; + $body .= ''; } - $body .= ''; + $body .= ''; $body .= '
'.$i18n->getKey('label.date').''.$i18n->getKey('form.invoice.person').''.$i18n->get('label.date').''.$i18n->get('form.invoice.person').''.$i18n->getKey('label.project').''.$i18n->get('label.project').''.$i18n->getKey('label.task').''.$i18n->getKey('label.note').''.$i18n->getKey('label.duration').''.$i18n->getKey('label.cost').''.$i18n->get('label.task').''.$i18n->get('label.note').''.$i18n->get('label.duration').''.$i18n->get('label.cost').'
 
'.$i18n->getKey('label.subtotal').':'.$subtotal.'
'.$i18n->getKey('label.tax').':'.$tax.'
'.$i18n->get('label.subtotal').':'.$subtotal.'
'.$i18n->get('label.tax').':'.$tax.'
'.$i18n->getKey('label.total').':'.$total.'
'.$i18n->get('label.total').':'.$total.'
'; // Output footer. if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false)) - $body .= '

'.$i18n->getKey('form.mail.footer').'

'; + $body .= '

'.$i18n->get('form.mail.footer').'

'; // Finish creating email body. $body .= '';