import('DateAndTime');
// Access check.
-if (!ttAccessCheck(right_data_entry)) {
+if (!ttAccessAllowed('track_own_time')) {
header('Location: access_denied.php');
exit();
}
$cl_billable = 1;
if ($user->isPluginEnabled('iv'))
$cl_billable = $request->getParameter('billable');
+ if ($user->isPluginEnabled('ps'))
+ $cl_paid = $request->getParameter('paid');
} else {
$cl_client = $time_rec['client_id'];
$cl_project = $time_rec['project_id'];
}
$cl_billable = $time_rec['billable'];
+ $cl_paid = $time_rec['paid'];
// Add an info message to the form if we are editing an uncompleted record.
if (strlen($cl_start) > 0 && $cl_start == $cl_finish && $cl_duration == '0:00') {
if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
$form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
$form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
- if (!$user->canManageTeam() && defined('READONLY_START_FINISH') && isTrue(READONLY_START_FINISH)) {
+ if ($user->punch_mode && !in_array('override_punch_mode', $user->rights)) {
// Make the start and finish fields read-only.
$form->getElement('start')->setEnabled(false);
$form->getElement('finish')->setEnabled(false);
$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
if ($user->isPluginEnabled('iv'))
$form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+if ($user->canManageTeam() && $user->isPluginEnabled('ps'))
+ $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.save')));
$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.copy')));
$err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
}
} else {
- if (!ttTimeHelper::isValidDuration($cl_duration))
+ if (false === ttTimeHelper::postedDurationToMinutes($cl_duration))
$err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
}
if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
$new_date = new DateAndTime($user->date_format, $cl_date);
// Prohibit creating entries in future.
- if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
+ if (!$user->future_entries) {
$browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
if ($new_date->after($browser_today))
$err->add($i18n->getKey('error.future_date'));
'finish'=>$cl_finish,
'duration'=>$cl_duration,
'note'=>$cl_note,
- 'billable'=>$cl_billable));
+ 'billable'=>$cl_billable,
+ 'paid'=>$cl_paid));
// If we have custom fields - update values.
if ($res && $custom_fields) {
'finish'=>$cl_finish,
'duration'=>$cl_duration,
'note'=>$cl_note,
- 'billable'=>$cl_billable));
+ 'billable'=>$cl_billable,
+ 'paid'=>$cl_paid));
// Insert a custom field if we have it.
$res = true;