X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=WEB-INF%2Flib%2FttInvoiceHelper.class.php;h=13e784d076031b4fc39b47c5cdee16f03972535a;hb=38b85fc251ea53e5d5842e25c8fc9b066a474a54;hp=d35aa3486d882033a7adfe7fb0406b51f50832c5;hpb=45c855269d952873285f7a835e82fc2b3eff3971;p=timetracker.git diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php index d35aa348..13e784d0 100644 --- a/WEB-INF/lib/ttInvoiceHelper.class.php +++ b/WEB-INF/lib/ttInvoiceHelper.class.php @@ -32,38 +32,6 @@ import('DateAndTime'); // Class ttInvoiceHelper is used for help with invoices. class ttInvoiceHelper { - // insert - inserts an invoice in database. - static function insert($fields) - { - $mdb2 = getConnection(); - - $group_id = (int) $fields['group_id']; - $name = $fields['name']; - if (!$name) return false; - - $client_id = (int) $fields['client_id']; - $date = $fields['date']; - if (array_key_exists('status', $fields)) { // Key exists and may be NULL during migration of data. - $status_f = ', status'; - $status_v = ', '.$mdb2->quote($fields['status']); - } - - // Insert a new invoice record. - $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; - - $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']; - - return $last_id; - } - // getInvoice - obtains invoice data from the database. static function getInvoice($invoice_id) { global $user; @@ -71,7 +39,8 @@ 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->group_id $client_part and status = 1"; + $sql = "select * from tt_invoices where id = $invoice_id and group_id = ". + $user->getGroup()."$client_part and status = 1"; $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { if ($val = $res->fetchRow()) @@ -86,7 +55,8 @@ class ttInvoiceHelper { $mdb2 = getConnection(); global $user; - $sql = "select id from tt_invoices where group_id = $user->group_id and name = ".$mdb2->quote($invoice_name)." and status = 1"; + $sql = "select id from tt_invoices where group_id = ". + $user->getGroup()." and name = ".$mdb2->quote($invoice_name)." and status = 1"; $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { $val = $res->fetchRow(); @@ -152,7 +122,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, @@ -233,7 +203,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->group_id"; + $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')); } @@ -255,7 +225,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 @@ -328,20 +298,16 @@ class ttInvoiceHelper { if (isset($fields['project_id'])) $project_id = (int) $fields['project_id']; // Create a new invoice record. - $sql = "insert into tt_invoices (group_id, name, date, client_id) - values($user->group_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)"; + $sql = "insert into tt_invoices (group_id, org_id, name, date, client_id) values(". + $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; // 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) @@ -423,6 +389,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 .= '
'; @@ -448,9 +417,9 @@ class ttInvoiceHelper { $body .= '