From: Nik Okuntseff Date: Fri, 26 Jan 2018 14:47:47 +0000 (+0000) Subject: Added paid column on invoice views. X-Git-Tag: timetracker_1.19-1~1328 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=df8a6c4cd909701bef9e6b58a71271846c527148;p=timetracker.git Added paid column on invoice views. --- diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php index 2784a7b9..c30776c0 100644 --- a/WEB-INF/lib/ttInvoiceHelper.class.php +++ b/WEB-INF/lib/ttInvoiceHelper.class.php @@ -80,12 +80,9 @@ class ttInvoiceHelper { // The getInvoiceByName looks up an invoice by name. static function getInvoiceByName($invoice_name) { - $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"; - $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { $val = $res->fetchRow(); @@ -96,6 +93,34 @@ 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; + } + // The getInvoiceItems retrieves tt_log items associated with the invoice. static function getInvoiceItems($invoice_id) { global $user; @@ -110,7 +135,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) @@ -119,7 +145,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) @@ -131,7 +158,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"; diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php index 553ab0d9..9a57d9c6 100644 --- a/WEB-INF/lib/ttTeamHelper.class.php +++ b/WEB-INF/lib/ttTeamHelper.class.php @@ -28,6 +28,7 @@ import('ttUserHelper'); import('DateAndTime'); +import('ttInvoiceHelper'); // Class ttTeamHelper - contains helper functions that operate with teams. class ttTeamHelper { @@ -328,6 +329,7 @@ class ttTeamHelper { static function getActiveInvoices($localizeDates = true) { global $user; + $addPaidStatus = $user->isPluginEnabled('ps'); $result = array(); $mdb2 = getConnection(); @@ -347,6 +349,8 @@ class ttTeamHelper { $dt->parseVal($val['date']); $val['date'] = $dt->toString($user->date_format); } + if ($addPaidStatus) + $val['paid'] = ttInvoiceHelper::isPaid($val['id']); $result[] = $val; } } diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 3d0d6202..54394134 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- + {if $user->isPluginEnabled('ps')} + + {/if} {foreach $invoice_items as $invoice_item} @@ -43,6 +46,9 @@ + {if $user->isPluginEnabled('ps')} + + {/if} {/foreach} diff --git a/WEB-INF/templates/invoices.tpl b/WEB-INF/templates/invoices.tpl index 1dfd43ad..0fad98d2 100644 --- a/WEB-INF/templates/invoices.tpl +++ b/WEB-INF/templates/invoices.tpl @@ -11,6 +11,9 @@ + {if $user->isPluginEnabled('ps')} + + {/if} {if !$user->isClient()} @@ -21,6 +24,9 @@ + {if $user->isPluginEnabled('ps')} + + {/if} {if !$user->isClient()}
 Anuko Time Tracker 1.17.5.3791 | Copyright © Anuko | +  Anuko Time Tracker 1.17.5.3792 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/invoice_view.tpl b/WEB-INF/templates/invoice_view.tpl index 1ff5c834..ec8bb96e 100644 --- a/WEB-INF/templates/invoice_view.tpl +++ b/WEB-INF/templates/invoice_view.tpl @@ -29,6 +29,9 @@ {$i18n.label.note} {$i18n.label.duration} {$i18n.label.cost}{$i18n.label.paid}
{$invoice_item.note|escape} {$invoice_item.duration} {$invoice_item.cost}{if $invoice_item.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}
 
{$i18n.label.invoice} {$i18n.label.client} {$i18n.label.date}{$i18n.label.paid}{$i18n.label.view}{$i18n.label.delete}{$invoice.name|escape} {$invoice.client_name|escape} {$invoice.date}{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{$i18n.label.view}{$i18n.label.delete}