From: Nik Okuntseff Date: Fri, 6 Apr 2018 11:20:07 +0000 (+0000) Subject: More fixes to invoice view. X-Git-Tag: timetracker_1.19-1~869 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=cc1f9442f83ebfa3a67b917548ffd70cdba7bc9a;p=timetracker.git More fixes to invoice view. --- diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index b88511c6..ce8281a6 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.17.87.4232 | Copyright © Anuko | +  Anuko Time Tracker 1.17.87.4233 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/invoice_view.php b/invoice_view.php index bfc67223..22383c02 100644 --- a/invoice_view.php +++ b/invoice_view.php @@ -89,7 +89,7 @@ elseif (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) $form = new Form('invoiceForm'); // Hidden control for invoice id. -$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id)); +$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_invoice_id)); // invoiceForm only contains controls for "Mark paid" block below invoice table. if ($user->isPluginEnabled('ps')) { $mark_paid_action_options = array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid')); @@ -106,16 +106,16 @@ if ($request->isPost()) { // Determine user action. $mark_paid = $request->getParameter('mark_paid_action_options') == 1 ? true : false; - ttInvoiceHelper::markPaid($cl_id, $mark_paid); + ttInvoiceHelper::markPaid($cl_invoice_id, $mark_paid); // Re-display this form. - header('Location: invoice_view.php?id='.$cl_id); + header('Location: invoice_view.php?id='.$cl_invoice_id); exit(); } } $smarty->assign('forms', array($form->getName()=>$form->toArray())); -$smarty->assign('invoice_id', $cl_id); +$smarty->assign('invoice_id', $cl_invoice_id); $smarty->assign('invoice_name', $invoice['name']); $smarty->assign('invoice_date', $invoice_date->toString($user->date_format)); $smarty->assign('client_name', $client['name']);