X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttInvoiceHelper.class.php;h=9fa7e58c38017f67338c10a30a9443718eb0e943;hb=08bbf671649fd5419fe4d38fab621e053472e8ce;hp=b5a3c59ec831ee87cb83253281fd45fd37c61440;hpb=7ddf5c391598126ec473db7b25884ee0bd94f153;p=timetracker.git diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php index b5a3c59e..9fa7e58c 100644 --- a/WEB-INF/lib/ttInvoiceHelper.class.php +++ b/WEB-INF/lib/ttInvoiceHelper.class.php @@ -85,7 +85,6 @@ class ttInvoiceHelper { global $user; $sql = "select id from tt_invoices where team_id = $user->team_id and name = ".$mdb2->quote($invoice_name)." and status = 1"; - $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { $val = $res->fetchRow(); @@ -96,10 +95,55 @@ class ttInvoiceHelper { return false; } + // The isPaid determines if an invoice is paid by looking at the paid status of its items. + // If any non-paid item is found, the entire invoice is considered not paid. + // Therefore, the paid status of the invoice is a calculated value. + // This is because we maintain the paid status on individual item level. + static function isPaid($invoice_id) { + + $mdb2 = getConnection(); + global $user; + + $sql = "select count(*) as count from tt_log where invoice_id = $invoice_id and status = 1 and paid < 1"; + $res = $mdb2->query($sql); + if (!is_a($res, 'PEAR_Error')) { + $val = $res->fetchRow(); + if ($val['count'] > 0) + return false; // A non-paid time item exists. + } + $sql = "select count(*) as count from tt_expense_items where invoice_id = $invoice_id and status = 1 and paid < 1"; + $res = $mdb2->query($sql); + if (!is_a($res, 'PEAR_Error')) { + $val = $res->fetchRow(); + if ($val['count'] > 0) + return false; // A non-paid expense item exists. + else + return true; // All time and expense items in invoice are paid. + } + return false; + } + + // markPaid marks invoice items as paid. + static function markPaid($invoice_id, $mark_paid = true) { + + global $user; + $mdb2 = getConnection(); + + $paid_status = $mark_paid ? 1 : 0; + $sql = "update tt_log set paid = $paid_status where invoice_id = $invoice_id and status = 1"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + $sql = "update tt_expense_items set paid = $paid_status where invoice_id = $invoice_id and status = 1"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + return true; + } + // The getInvoiceItems retrieves tt_log items associated with the invoice. static function getInvoiceItems($invoice_id) { global $user; - global $i18n; $mdb2 = getConnection(); // At this time only detailed invoice is supported. @@ -111,7 +155,8 @@ class ttInvoiceHelper { $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, time_format(l.duration, '%k:%i') as duration, - cast(l.billable * u.rate * time_to_sec(l.duration)/3600 as decimal(10, 2)) as cost from tt_log l + cast(l.billable * u.rate * time_to_sec(l.duration)/3600 as decimal(10, 2)) as cost, + l.paid as paid from tt_log l inner join tt_users u on (l.user_id = u.id) left join tt_projects p on (p.id = l.project_id) left join tt_tasks t on (t.id = l.task_id) @@ -120,7 +165,8 @@ class ttInvoiceHelper { $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, time_format(l.duration, '%k:%i') as duration, - cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2)) as cost from tt_log l + cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2)) as cost, + l.paid as paid from tt_log l inner join tt_users u on (l.user_id = u.id) left join tt_projects p on (p.id = l.project_id) left join tt_tasks t on (t.id = l.task_id) @@ -132,7 +178,8 @@ class ttInvoiceHelper { if ($user->isPluginEnabled('ex')) { $sql_for_expense_items = "select ei.date as date, 2 as type, u.name as user_name, p.name as project_name, null as task_name, ei.name as note, - null as duration, ei.cost as cost from tt_expense_items ei + null as duration, ei.cost as cost, + ei.paid as paid from tt_expense_items ei inner join tt_users u on (ei.user_id = u.id) left join tt_projects p on (p.id = ei.project_id) where ei.invoice_id = $invoice_id and ei.status = 1"; @@ -211,8 +258,8 @@ class ttInvoiceHelper { $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 and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end)." - and l.billable * u.rate * time_to_sec(l.duration)/3600 > 0 - and l.user_id = u.id"; + and l.user_id = u.id + and l.billable = 1"; // l.billable * u.rate * time_to_sec(l.duration)/3600 > 0 // See explanation below. } else { // sql part for project id. if ($project_id) $project_part = " and l.project_id = $project_id"; @@ -221,8 +268,14 @@ class ttInvoiceHelper { $sql = "select count(*) as num from tt_log l, tt_user_project_binds upb where l.status = 1 and l.client_id = $client_id $project_part and l.invoice_id is NULL and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end)." - and l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0 - and upb.user_id = l.user_id and upb.project_id = l.project_id"; + and upb.user_id = l.user_id and upb.project_id = l.project_id + and l.billable = 1"; // l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0 + // Users with a lot of clients and projects (Jaro) may forget to set user rates properly. + // Specifically, user rate may be set to 0 on a project, by mistake. This leads to error.no_invoiceable_items + // and increased support cost. Commenting out allows us to include 0 cost items in invoices so that + // the problem becomes obvious. + + // TODO: If the above turns out useful, rework the query to simplify it by removing left join. } $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { @@ -293,7 +346,7 @@ class ttInvoiceHelper { set l.invoice_id = $last_id where l.status = 1 and l.client_id = $client_id and l.invoice_id is NULL and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end)." - and l.billable * u.rate * time_to_sec(l.duration)/3600 > 0"; + and l.billable = 1"; // l.billable * u.rate * time_to_sec(l.duration)/3600 > 0"; // See explanation below. } else { // sql part for project id. if ($project_id) $project_part = " and l.project_id = $project_id"; @@ -304,7 +357,13 @@ class ttInvoiceHelper { set l.invoice_id = $last_id where l.status = 1 and l.client_id = $client_id $project_part and l.invoice_id is NULL and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end)." - and l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0"; + and l.billable = 1"; // l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0"; + // Users with a lot of clients and projects (Jaro) may forget to set user rates properly. + // Specifically, user rate may be set to 0 on a project, by mistake. This leads to error.no_invoiceable_items + // and increased support cost. Commenting out allows us to include 0 cost items in invoices so that + // the problem becomes obvious. + + // TODO: If the above turns out useful, rework the query to simplify it by removing left join. } $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) @@ -423,7 +482,9 @@ class ttInvoiceHelper { $body .= ''; // Output footer. - $body .= '
'.$i18n->getKey('form.mail.footer').'
'; + if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false)) + $body .= ''.$i18n->getKey('form.mail.footer').'
'; + // Finish creating email body. $body .= '