$cl_mark_paid_action_option = $request->getParameter('mark_paid_action_options', ($request->isPost() ? null : @$_SESSION['mark_paid_action_option']));
$_SESSION['mark_paid_action_option'] = $cl_mark_paid_action_option;
}
+if ($user->isPluginEnabled('iv')) {
+ $cl_assign_invoice_select_option = $request->getParameter('assign_invoice_select_options', ($request->isPost() ? null : @$_SESSION['assign_invoice_select_option']));
+ $_SESSION['assign_invoice_select_option'] = $cl_assign_invoice_select_option;
+ $cl_recent_invoice_option = $request->getParameter('recent_invoice', ($request->isPost() ? null : @$_SESSION['recent_invoice_option']));
+ $_SESSION['recent_invoice_option'] = $cl_recent_invoice_option;
+}
// Use custom fields plugin if it is enabled.
if ($user->isPluginEnabled('cf')) {
// Report settings are stored in session bean before we get here from reports.php.
$bean = new ActionForm('reportBean', $form, $request);
+// If we are in post, load the bean from session, as the constructor does it only in get.
+if ($request->isPost()) $bean->loadBean();
+
$client_id = $bean->getAttribute('client');
// Do we need to show checkboxes?
// Client is selected and we are displaying the invoice column.
$recent_invoices = ttTeamHelper::getRecentInvoices($user->team_id, $client_id);
if ($recent_invoices) {
+ $assign_invoice_select_options = array('1'=>$i18n->getKey('dropdown.all'),'2'=>$i18n->getKey('dropdown.select'));
+ $form->addInput(array('type'=>'combobox',
+ 'name'=>'assign_invoice_select_options',
+ 'data'=>$assign_invoice_select_options,
+ 'value'=>$cl_assign_invoice_select_option));
$form->addInput(array('type'=>'combobox',
'name'=>'recent_invoice',
'data'=>$recent_invoices,
'datakeys'=>array('id','name'),
+ 'value'=>$cl_recent_invoice_option,
'empty'=>array(''=>$i18n->getKey('dropdown.select_invoice'))));
$form->addInput(array('type'=>'submit','name'=>'btn_assign','value'=>$i18n->getKey('button.submit')));
+ $smarty->assign('use_assign_to_invoice', true);
}
- $smarty->assign('use_assign_to_invoice', true);
}
if ($request->isPost()) {
- if ($request->getParameter('btn_mark_paid')) {
- // User clicked the "Mark paid" button to mark some or all items either paid or not paid.
-
- // Determine user action.
- $mark_paid = $request->getParameter('mark_paid_action_options') == 1 ? true : false;
-
- // Obtain 2 arrays or record ids, one for log, another for expense items.
- if (1 == $request->getParameter('mark_paid_select_options')) {
- // We are marking all report items. Get the arrays from session.
- $item_ids = ttReportHelper::getFromSession();
- $time_log_ids = $item_ids['report_item_ids'];
- $expense_item_ids = $item_ids['report_item_expense_ids'];
- } else if (2 == $request->getParameter('mark_paid_select_options')) {
- // We are marking only selected items. Get the arrays from $_POST.
- foreach($_POST as $key => $val) {
- if ('log_id_' == substr($key, 0, 7))
- $time_log_ids[] = substr($key, 7);
- if ('item_id_' == substr($key, 0, 8))
- $expense_item_ids[] = substr($key, 8);
- }
- }
- // Mark as requested.
- if ($time_log_ids || $expense_item_ids) {
- ttReportHelper::markPaid($time_log_ids, $expense_item_ids, $mark_paid);
- }
-
- // Re-display this form.
- header('Location: report.php');
- exit();
- }
- if ($request->getParameter('btn_assign')) {
- // User clicked the Submit button to assign some items to a recent invoice.
+ // Validate parameters and at the same time build arrays of record ids.
+ if (($request->getParameter('btn_mark_paid') && 2 == $request->getParameter('mark_paid_select_options'))
+ || ($request->getParameter('btn_assign') && 2 == $request->getParameter('assign_invoice_select_options'))) {
+ // We act on selected records. Are there any?
foreach($_POST as $key => $val) {
if ('log_id_' == substr($key, 0, 7))
$time_log_ids[] = substr($key, 7);
if ('item_id_' == substr($key, 0, 8))
$expense_item_ids[] = substr($key, 8);
- if ('recent_invoice' == $key)
- $invoice_id = $val;
}
- if ($time_log_ids || $expense_item_ids) {
- // Some records are checked for invoice editing. Adjust their invoice accordingly.
- ttReportHelper::assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids);
+ if (!$time_log_ids && !$expense_item_ids) $err->Add($i18n->getKey('error.record')); // There are no selected records.
+ // Validation of parameteres ended here.
+ } else {
+ // We are assigning all report items. Get the arrays from session.
+ // Note: getting from session assures we act only on previously displayed records.
+ // Rebuilding from $bean may get us a different set.
+ $item_ids = ttReportHelper::getFromSession();
+ $time_log_ids = $item_ids['report_item_ids'];
+ $expense_item_ids = $item_ids['report_item_expense_ids'];
+ // The above code is here beacues the arrays are used in both "Mark paid" and "Assign to invoice" handlers below.
+ }
+
+ if ($err->no()) {
+ if ($request->getParameter('btn_mark_paid')) {
+ // User clicked the "Mark paid" button to mark some or all items either paid or not paid.
+
+ // Determine user action.
+ $mark_paid = $request->getParameter('mark_paid_action_options') == 1 ? true : false;
+
+ // Mark as requested.
+ if ($time_log_ids || $expense_item_ids) {
+ ttReportHelper::markPaid($time_log_ids, $expense_item_ids, $mark_paid);
+ }
+
+ // Re-display this form.
+ header('Location: report.php');
+ exit();
+ }
+
+ if ($request->getParameter('btn_assign')) {
+ // User clicked the Submit button to assign all or some items to a recent invoice.
+
+ // Determine invoice id.
+ $invoice_id = $request->getParameter('recent_invoice');
+
+ // Assign as requested.
+ if ($time_log_ids || $expense_item_ids) {
+ ttReportHelper::assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids);
+ }
+ // Re-display this form.
+ header('Location: report.php');
+ exit();
}
- // Re-display this form.
- header('Location: report.php');
- exit();
}
} // isPost
projects / timetracker.git / blobdiff