Bigbamboo/bb_sign
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of bitbucket.org:venbainformationtechnology/bb_sign

Browse Source
This commit is contained in:
unknown 2024-06-12 14:11:21 +05:30
commit f7ab58cad4
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controllers/MasterController.php
View File

@ -327,7 +327,7 @@ class MasterController extends BaseController
if($this->session->has('is_staff_logged_in')){ if($this->session->has('is_staff_logged_in')){
$userData = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow(); $userData = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow();
}else if($this->session->has('is_client_logged_in')){ }else if($this->session->has('is_client_logged_in')){
$userData = $this->ClientModel->where('client_id',$this->session->get('is_client_logged_in'))->get()->getRow(); $userData = $this->ClientBranchModel->where('id',$this->session->get('is_client_logged_in'))->get()->getRow();
} }
$doc_id = $this->request->getVar('doc_id'); $doc_id = $this->request->getVar('doc_id');
@ -335,7 +335,6 @@ class MasterController extends BaseController
$data['clientData'] = $this->ClientBranchModel->select('client.* , client_branch.*') $data['clientData'] = $this->ClientBranchModel->select('client.* , client_branch.*')
->join('client', 'client_branch.client_id = client.client_id', 'left') ->join('client', 'client_branch.client_id = client.client_id', 'left')
->where('client.business_id',$this->session->get('logged_in_staff_business_id'))
->where('client_branch.id',$data['docData']->client_branch_id)->get()->getRow(); ->where('client_branch.id',$data['docData']->client_branch_id)->get()->getRow();