import('ttExpenseHelper');
// Access check.
-if (!ttAccessCheck(right_data_entry)) {
+if (!ttAccessCheck(right_data_entry) || !$user->isPluginEnabled('ex')) {
header('Location: access_denied.php');
exit();
}
$form = new Form('expenseItemForm');
// Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->tracking_mode && in_array('cl', explode(',', $user->plugins))) {
+if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
$active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
$form->addInput(array('type'=>'combobox',
'onchange'=>'fillProjectDropdown(this.value);',
'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
// Dropdown for clients if the clients plugin is enabled.
- if (in_array('cl', explode(',', $user->plugins))) {
+ if ($user->isPluginEnabled('cl')) {
$active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
// We need an array of assigned project ids to do some trimming.
foreach($project_list as $project)
'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
}
}
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'item_name','style'=>'width: 250px;','value'=>$cl_item_name));
+// If predefined expenses are configured, add controls to select an expense and quantity.
+$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->team_id);
+if ($predefined_expenses) {
+ $form->addInput(array('type'=>'combobox',
+ 'onchange'=>'recalculateCost();',
+ 'name'=>'predefined_expense',
+ 'style'=>'width: 250px;',
+ 'value'=>$cl_predefined_expense,
+ 'data'=>$predefined_expenses,
+ 'datakeys'=>array('id', 'name'),
+ 'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+ $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity));
+}
+$form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_item_name));
$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
$form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
// Hidden control for record id.
if ($request->isPost()) {
// Validate user input.
- if (in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)) && !$cl_client)
- $errors->add($i18n->getKey('error.client'));
+ if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+ $err->add($i18n->getKey('error.client'));
if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
- if (!$cl_project) $errors->add($i18n->getKey('error.project'));
- }
- if (!ttValidString($cl_item_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.item'));
- if (!ttValidFloat($cl_cost)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
- if (!ttValidDate($cl_date)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
-
- // Determine lock date.
- $lock_interval = $user->lock_interval;
- $lockdate = 0;
- if ($lock_interval > 0) {
- $lockdate = new DateAndTime();
- $lockdate->decDay($lock_interval);
+ if (!$cl_project) $err->add($i18n->getKey('error.project'));
}
+ if (!ttValidString($cl_item_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.item'));
+ if (!ttValidFloat($cl_cost)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
+ if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
// This is a new date for the expense item.
$new_date = new DateAndTime($user->date_format, $cl_date);
if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
$browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
if ($new_date->after($browser_today))
- $errors->add($i18n->getKey('error.future_date'));
+ $err->add($i18n->getKey('error.future_date'));
}
// Save record.
if ($request->getParameter('btn_save')) {
// We need to:
- // 1) Prohibit updating locked entries (that are in locked interval).
- // 2) Prohibit saving unlocked entries into locked interval.
+ // 1) Prohibit updating locked entries (that are in locked range).
+ // 2) Prohibit saving unlocked entries into locked range.
// Now, step by step.
- // 1) Prohibit updating locked entries.
- if($lockdate && $item_date->before($lockdate))
- $errors->add($i18n->getKey('error.period_locked'));
- // 2) Prohibit saving completed unlocked entries into locked interval.
- if($errors->no() && $lockdate && $new_date->before($lockdate))
- $errors->add($i18n->getKey('error.period_locked'));
+ // 1) Prohibit saving locked entries in any form.
+ if ($user->isDateLocked($item_date))
+ $err->add($i18n->getKey('error.range_locked'));
+
+ // 2) Prohibit saving unlocked entries into locked range.
+ if ($err->no() && $user->isDateLocked($new_date))
+ $err->add($i18n->getKey('error.range_locked'));
// Now, an update.
- if ($errors->no()) {
+ if ($err->no()) {
if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getActiveUser(),
'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost))) {
header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
// Save as new record.
if ($request->getParameter('btn_copy')) {
// We need to prohibit saving into locked interval.
- if($lockdate && $new_date->before($lockdate))
- $errors->add($i18n->getKey('error.period_locked'));
+ if ($user->isDateLocked($new_date))
+ $err->add($i18n->getKey('error.range_locked'));
// Now, a new insert.
- if ($errors->no()) {
+ if ($err->no()) {
if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getActiveUser(),
'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
exit();
} else
- $errors->add($i18n->getKey('error.db'));
+ $err->add($i18n->getKey('error.db'));
}
}
header("Location: expense_delete.php?id=$cl_id");
exit();
}
-} // POST
+} // isPost
+$smarty->assign('predefined_expenses', $predefined_expenses);
$smarty->assign('client_list', $client_list);
$smarty->assign('project_list', $project_list);
$smarty->assign('task_list', $task_list);
projects / timetracker.git / blobdiff