diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index 52ab0a0..7770a63 100644 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -221,7 +221,7 @@ class MasterController extends BaseController $id = $this->request->getVar('service_id'); $data['AllServiceGroupData'] = $this->ServiceGroupModel->findAll(); - $data['AllBusinessData'] = $this->BusinessModel->findAll(); + $data['AllBusinessData'] = $this->BusinessModel->where('isactive',1)->findAll(); $staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow(); echo view('layout/header', ['Data'=>$staffdata]); @@ -245,6 +245,9 @@ class MasterController extends BaseController $data['serviceGroupData'] = $this->ServiceGroupModel->where('service_group_id',$data['templateData']->service_group_id)->get()->getRow(); $data['AllServiceGroupData'] = $this->ServiceGroupModel->where('branch_id',$this->session->get('logged_in_staff_branch_id'))->findAll(); + $data['BusinessData'] = $this->BusinessModel->where('business_id',$data['templateData']->template_header_business)->where('isactive',1)->get()->getRow(); + $data['AllBusinessData'] = $this->BusinessModel->where('isactive',1)->findAll(); + $staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow(); echo view('layout/header', ['Data'=>$staffdata]); echo view('template_form',$data); @@ -353,7 +356,8 @@ class MasterController extends BaseController ->join('client', 'client_branch.client_id = client.client_id', 'left') ->where('client_branch.id',$data['docData']->client_branch_id)->get()->getRow(); - + $data['header_html'] = $data['docData']->header_html; + $data['footer_html'] = $data['docData']->footer_html; $data['body_html'] = $data['docData']->body_html; foreach ($data['clientData'] as $key => $value) { $placeHolder = '%'.$key.'%'; diff --git a/app/Models/ClientDocsModel.php b/app/Models/ClientDocsModel.php index 6c9991a..f1942ce 100644 --- a/app/Models/ClientDocsModel.php +++ b/app/Models/ClientDocsModel.php @@ -37,9 +37,10 @@ class ClientDocsModel extends Model public function docPreview($doc_id){ - $this->select('client_docs.is_approved ,client_docs.id as doc_id,client_docs.client_branch_id ,client_docs.updated_at,client_docs.ip_address,template.template_name,client_docs.body_html , services.service_name'); + $this->select('client_docs.is_approved ,client_docs.id as doc_id,client_docs.client_branch_id ,client_docs.updated_at,client_docs.ip_address,template.template_name,client_docs.body_html , services.service_name , business.header_html, business.footer_html'); $this->join('template', 'template.template_id = client_docs.template_id'); $this->join('services', 'services.service_id = template.service_id'); + $this->join('business', 'business.business_id = template.template_header_business'); $this->where('client_docs.id', $doc_id); return $this->get()->getRow(); diff --git a/app/Views/client_docs_preview.php b/app/Views/client_docs_preview.php index f9d9e1f..85873a4 100644 --- a/app/Views/client_docs_preview.php +++ b/app/Views/client_docs_preview.php @@ -51,19 +51,20 @@