diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index 7655370..34e6a2b 100644 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -81,7 +81,7 @@ class MasterController extends BaseController $staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow(); echo view('layout/header', ['Data'=>$staffdata]); - echo view('service_form',); + echo view('service_form'); echo view('layout/footer'); } } @@ -165,6 +165,7 @@ class MasterController extends BaseController $id = $this->request->getVar('service_id'); $data['serviceData'] = $this->ServiceModel->where('md5(service_id)',$id)->get()->getRow(); + $data['AllServiceData'] = $this->ServiceModel->where('branch_id',$this->session->get('logged_in_staff_branch_id'))->findAll(); $staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow(); echo view('layout/header', ['Data'=>$staffdata]); @@ -180,7 +181,7 @@ class MasterController extends BaseController $id = $this->request->getVar('template_id'); $data['templateData'] = $this->TemplateModel->where('md5(template_id)',$id)->get()->getRow(); $data['serviceData'] = $this->ServiceModel->where('service_id',$data['templateData']->service_id)->get()->getRow(); - + $data['AllServiceData'] = $this->ServiceModel->where('branch_id',$this->session->get('logged_in_staff_branch_id'))->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); diff --git a/app/Views/client_docs_preview.php b/app/Views/client_docs_preview.php index 0661005..1823cb3 100644 --- a/app/Views/client_docs_preview.php +++ b/app/Views/client_docs_preview.php @@ -31,8 +31,9 @@
Close - Reject + is_approved != 1){ ?> + Reject Approve
diff --git a/app/Views/template_form.php b/app/Views/template_form.php index c5b0c30..08b0858 100644 --- a/app/Views/template_form.php +++ b/app/Views/template_form.php @@ -2,7 +2,18 @@ - +
@@ -34,10 +45,14 @@
+
- - - + +
@@ -191,7 +206,7 @@ $("#savedata").on("click", function() $(document).ready(function() { - + $('.select2-dropdown').select2(); $('#summernote-basic').summernote({