}
// getClients - returns an array of active and inactive clients in a group.
- static function getClients()
- {
+ static function getClients() {
global $user;
+ $mdb2 = getConnection();
+
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
$result = array();
- $mdb2 = getConnection();
- $sql = "select id, name from tt_clients where group_id = ".$user->getGroup()." and (status = 0 or status = 1) order by upper(name)";
+ $sql = "select id, name from tt_clients where group_id = $group_id and org_id = $org_id and (status = 0 or status = 1) order by upper(name)";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
// The getClientByName looks up a client by name.
static function getClientByName($client_name) {
-
- $mdb2 = getConnection();
global $user;
+ $mdb2 = getConnection();
- $sql = "select id from tt_clients where group_id = ".$user->getGroup().
- " and name = ".$mdb2->quote($client_name)." and (status = 1 or status = 0)";
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+ $sql = "select id from tt_clients where group_id = $group_id and org_id = $org_id".
+ " and name = ".$mdb2->quote($client_name)." and (status = 1 or status = 0)";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$val = $res->fetchRow();
// The getDeletedClient looks up a deleted client by id.
static function getDeletedClient($client_id) {
-
- $mdb2 = getConnection();
global $user;
+ $mdb2 = getConnection();
+
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
- $sql = "select name, address from tt_clients where group_id = ".$user->getGroup().
+ $sql = "select name, address from tt_clients where group_id = $group_id and org_id = $org_id".
" and id = $client_id and status is NULL";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
// The delete function marks client as deleded.
static function delete($id, $delete_client_entries) {
-
- $mdb2 = getConnection();
global $user;
+ $mdb2 = getConnection();
+
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
// Handle custom field log records.
if ($delete_client_entries) {
- $sql = "update tt_custom_field_log set status = NULL where log_id in (select id from tt_log where client_id = $id and status = 1)";
+ $sql = "update tt_custom_field_log set status = null".
+ " where log_id in (select id from tt_log where client_id = $id and status = 1) and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
- if (is_a($affected, 'PEAR_Error'))
- return false;
+ if (is_a($affected, 'PEAR_Error'))
+ return false;
}
// Handle time records.
$modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
if ($delete_client_entries) {
- $sql = 'update tt_log set status = NULL'.$modified_part." where client_id = $id";
+ $sql = 'update tt_log set status = null'.$modified_part.
+ " where client_id = $id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
// Handle expense items.
if ($delete_client_entries) {
- $sql = 'update tt_expense_items set status = NULL'.$modified_part." where client_id = $id";
+ $sql = 'update tt_expense_items set status = null'.$modified_part.
+ " where client_id = $id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
// Handle invoices.
if ($delete_client_entries) {
- $sql = "update tt_invoices set status = NULL where client_id = $id and group_id = ".$user->getGroup();
+ $sql = "update tt_invoices set status = null".
+ " where client_id = $id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
}
// Delete project binds to this client.
- $sql = "delete from tt_client_project_binds where client_id = $id";
+ $sql = "delete from tt_client_project_binds".
+ " where client_id = $id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
// Handle users for client.
- $sql = 'update tt_users set status = NULL'.$modified_part." where client_id = $id and group_id = ".$user->getGroup();
+ $sql = 'update tt_users set status = null'.$modified_part.
+ " where client_id = $id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
// Mark client deleted.
- $sql = "update tt_clients set status = NULL where id = $id and group_id = ".$user->getGroup();
+ $sql = "update tt_clients set status = null".
+ " where id = $id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
return (!is_a($affected, 'PEAR_Error'));
}
global $user;
$mdb2 = getConnection();
- $group_id = (int) $fields['group_id'];
- $org_id = (int) $fields['org_id'];
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
$name = $fields['name'];
$address = $fields['address'];
$tax = $fields['tax'];
// The update function updates a client record in tt_clients table.
static function update($fields)
{
- $mdb2 = getConnection();
global $user;
+ $mdb2 = getConnection();
+
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
$id = $fields['id'];
$name = $fields['name'];
if ($tax == '') $tax = 0;
// Insert client to project binds into tt_client_project_binds table.
- $sql = "delete from tt_client_project_binds where client_id = $id";
+ $sql = "delete from tt_client_project_binds".
+ " where client_id = $id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
die($affected->getMessage());
if (count($projects) > 0)
foreach ($projects as $p_id) {
- $sql = "insert into tt_client_project_binds (client_id, project_id) values($id, $p_id)";
+ $sql = "insert into tt_client_project_binds (client_id, project_id, group_id, org_id) values($id, $p_id, $group_id, $org_id)";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
$comma_separated = implode(",", $projects); // This is a comma-separated list of associated project ids.
$sql = "update tt_clients set name = ".$mdb2->quote($name).", address = ".$mdb2->quote($address).
", tax = $tax, projects = ".$mdb2->quote($comma_separated).", status = $status".
- " where group_id = ".$user->getGroup()." and id = ".$id;
+ " where id = $id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
return (!is_a($affected, 'PEAR_Error'));
}
// $cl_projects[] = $project_item['id'];
}
+$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
+
$form = new Form('clientForm');
$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 350px;','value'=>$cl_name));
$form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','style'=>'width: 350px; height: 80px;','value'=>$cl_address));
$form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
-if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
+if ($show_projects)
$form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'layout'=>'H','datakeys'=>array('id','name'),'value'=>$cl_projects));
$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
if ($err->no()) {
if (!ttClientHelper::getClientByName($cl_name)) {
- if (ttClientHelper::insert(array(
- 'group_id' => $user->getGroup(),
- 'org_id' => $user->org_id,
- 'name' => $cl_name,
+ if (ttClientHelper::insert(array('name' => $cl_name,
'address' => $cl_address,
'tax' => $cl_tax,
'projects' => $cl_projects,
$smarty->assign('forms', array($form->getName()=>$form->toArray()));
$smarty->assign('onload', 'onLoad="document.clientForm.name.focus()"');
+$smarty->assign('show_projects',$show_projects);
$smarty->assign('title', $i18n->get('title.add_client'));
$smarty->assign('content_page_name', 'client_add.tpl');
$smarty->display('index.tpl');
// $cl_projects[] = $project_item['id'];
}
+$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
+
$form = new Form('clientForm');
$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
$form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','class'=>'mobile-textarea','value'=>$cl_address));
$form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
-if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
+if ($show_projects)
$form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'layout'=>'H','datakeys'=>array('id','name'),'value'=>$cl_projects));
$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
if ($err->no()) {
if (!ttClientHelper::getClientByName($cl_name)) {
- if (ttClientHelper::insert(array(
- 'group_id' => $user->getGroup(),
- 'org_id' => $user->org_id,
- 'name' => $cl_name,
+ if (ttClientHelper::insert(array('name' => $cl_name,
'address' => $cl_address,
'tax' => $cl_tax,
'projects' => $cl_projects,
$smarty->assign('forms', array($form->getName()=>$form->toArray()));
$smarty->assign('onload', 'onLoad="document.clientForm.name.focus()"');
+$smarty->assign('show_projects',$show_projects);
$smarty->assign('title', $i18n->get('title.add_client'));
$smarty->assign('content_page_name', 'mobile/client_add.tpl');
$smarty->display('mobile/index.tpl');
projects / timetracker.git / commitdiff