diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 206e38f..a32a705 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -35,14 +35,17 @@ use CodeIgniter\Router\RouteCollection; $routes->post('doc_rejection','ClientController::doc_rejection'); - + $routes->match(['get','post'],'/service_group_list','MasterController::service_group_list'); + $routes->match(['get','post'],'/service_group_create','MasterController::service_group_create'); + $routes->match(['get','post'],'/service_group_edit','MasterController::service_group_edit'); $routes->match(['get','post'],'/service_list','MasterController::service_list'); $routes->match(['get','post'],'/service_create','MasterController::service_create'); $routes->match(['get','post'],'/service_edit','MasterController::service_edit'); - $routes->match(['get','post'],'/service_view','MasterController::service_view'); + $routes->match(['get','post'],'/template_list','MasterController::template_list'); $routes->match(['get','post'],'/template_create','MasterController::template_create'); + $routes->match(['get','post'],'/get_service_data','MasterController::get_service_data'); $routes->match(['get','post'],'/template_edit','MasterController::template_edit'); $routes->match(['get','post'],'/template_preview','MasterController::template_preview'); @@ -51,9 +54,7 @@ use CodeIgniter\Router\RouteCollection; $routes->match(['get','post'],'/create_docs','MasterController::create_docs'); $routes->match(['get','post'],'/client_docs_preview','MasterController::client_docs_preview'); $routes->match(['get','post'],'/change_doc_status','MasterController::change_doc_status'); - $routes->match(['get','post'],'/test','MasterController::test'); - $routes->post('doc_generate_otp','MasterController::doc_generate_otp'); $routes->post('doc_verify_otp','MasterController::doc_verify_otp'); diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index 34e6a2b..da14b14 100644 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -10,6 +10,7 @@ use App\Models\ClientDocsModel; use App\Models\ClientModel; use App\Models\BusinessModel; use App\Models\BranchModel; +use App\Models\ServiceGroupModel; class MasterController extends BaseController @@ -22,6 +23,7 @@ class MasterController extends BaseController protected $ClientModel; protected $BusinessModel; protected $BranchModel; + protected $ServiceGroupModel; public function __construct() { @@ -33,30 +35,80 @@ class MasterController extends BaseController $this->ClientModel = new ClientModel(); $this->BusinessModel = new BusinessModel(); $this->BranchModel = new BranchModel(); + $this->ServiceGroupModel = new ServiceGroupModel(); } - public function test() + + + public function service_group_list() { - $businessData = $this->BranchModel->select('branches.* , business.business_name ') - ->join('business', 'branches.business_id = business.business_id', 'left') - ->where('branches.branch_id',$this->session->get('logged_in_staff_branch_id')) - ->get()->getRow(); - dd($businessData); + if(!$this->session->has('is_staff_logged_in')){ return redirect()->to(base_url().'staff'); } + + $data['serviceGroupList'] = $this->ServiceGroupModel->select('service_group.* , COUNT(services.service_id) as service_count') + ->join('services', 'service_group.service_group_id = services.service_group_id', 'left') + ->where('service_group.business_id',$this->session->get('logged_in_staff_business_id')) + ->groupBy('service_group.service_group_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('service_group_list',$data); + echo view('layout/footer'); } + public function service_group_create() + { + if(!$this->session->has('is_staff_logged_in')){ return redirect()->to(base_url().'staff'); } + + if($this->request->getmethod() == 'POST') + { + $serviceGroupData = $this->request->getVar(); + if( isset($serviceGroupData['service_group_id']) ){ + + $this->ServiceGroupModel->where('service_group_id', $this->request->getVar('service_group_id') )->set($serviceGroupData)->update(); + + }else{ + $serviceGroupData = $this->request->getVar(); + $serviceGroupData['business_id'] = $this->session->get('logged_in_staff_business_id'); + $serviceGroupData['branch_id'] = $this->session->get('logged_in_staff_branch_id'); + + $this->ServiceGroupModel->insert($serviceGroupData); + + } + + return redirect()->to(base_url()."service_group_list"); + + } + } + + public function service_group_edit() + { + if(!$this->session->has('is_staff_logged_in')){ return redirect()->to(base_url().'staff'); } + + $service_group_id = $this->request->getVar('service_group_id'); + $data = $this->ServiceGroupModel->where('service_group_id',$service_group_id)->get()->getRow(); + return $this->response->setJSON(['success' => true , 'data' =>$data]); + + } + + + + public function service_list() { if(!$this->session->has('is_staff_logged_in')){ return redirect()->to(base_url().'staff'); } - // $data['serviceList'] = $this->ServiceModel->findAll(); - $data['serviceList'] = $this->ServiceModel->select('services.* , COUNT(template.template_id) as template_count') + + $data['serviceList'] = $this->ServiceModel->select('services.* , service_group.group_name ,COUNT(template.template_id) as template_count') ->join('template', 'services.service_id = template.service_id', 'left') + ->join('service_group', 'services.service_group_id = service_group.service_group_id', 'left') ->where('services.branch_id',$this->session->get('logged_in_staff_branch_id')) ->groupBy('services.service_id') + ->orderBy('services.service_group_id') ->findAll(); - + $data['serviceGroupData'] = $this->ServiceGroupModel->where('is_active',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('service_list',$data); @@ -70,11 +122,20 @@ class MasterController extends BaseController if($this->request->getmethod() == 'POST') { + + $serviceData = $this->request->getVar(); + if( isset($serviceData['service_id']) ){ + + $this->ServiceModel->where('service_id', $this->request->getVar('service_id') )->set($serviceData)->update(); + + }else{ $serviceData = $this->request->getVar(); $serviceData['branch_id'] = $this->session->get('logged_in_staff_branch_id'); $this->ServiceModel->insert($serviceData); - return redirect()->to(base_url()."service_list"); + } + + return redirect()->to(base_url()."service_list"); }else{ @@ -90,56 +151,36 @@ class MasterController extends BaseController { if(!$this->session->has('is_staff_logged_in')){ return redirect()->to(base_url().'staff'); } - if($this->request->getmethod() == 'POST') - { - $serviceData = $this->request->getVar(); - - $id = $this->request->getVar('id'); - $this->ServiceModel->where('service_id', $id )->set($serviceData)->update(); - return redirect()->to(base_url()."service_list"); - - }else{ - - $id = $this->request->getVar('id'); - $data['serviceData'] = $this->ServiceModel->where('service_id',$id)->get()->getRow(); + $service_id = $this->request->getVar('service_id'); + $data = $this->ServiceModel->where('service_id',$service_id)->get()->getRow(); - $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',$data); - echo view('layout/footer'); - } + return $this->response->setJSON(['success' => true , 'data' =>$data]); + } - public function service_view() + + + + public function template_list() { if(!$this->session->has('is_staff_logged_in')){ return redirect()->to(base_url().'staff'); } - if($this->request->getmethod() == 'POST') - { - $serviceData = $this->request->getVar(); - - $id = $this->request->getVar('id'); - $this->ServiceModel->where('service_id', $id )->set($serviceData)->update(); - return redirect()->to(base_url()."service_list"); - - }else{ + + + $data['templateData'] = $this->TemplateModel->select('template.* , services.service_name , service_group.group_name') + ->join('services', 'services.service_id = template.service_id', 'left') + ->join('service_group', 'template.service_group_id = service_group.service_group_id', 'left') + ->findAll(); + - $id = $this->request->getVar('service_id'); - $data['serviceData'] = $this->ServiceModel->where('md5(service_id)',$id)->get()->getRow(); - $data['templateData'] = $this->TemplateModel->where('md5(service_id)',$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_list',$data); echo view('layout/footer'); - } + } - - - - - public function template_create() { if(!$this->session->has('is_staff_logged_in')){ return redirect()->to(base_url().'staff'); } @@ -164,8 +205,8 @@ class MasterController extends BaseController }else{ $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(); + $data['AllServiceGroupData'] = $this->ServiceGroupModel->findAll(); + //$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]); @@ -174,14 +215,30 @@ class MasterController extends BaseController } } + public function get_service_data() + { + if(!$this->session->has('is_staff_logged_in')){ return redirect()->to(base_url().'staff'); } + + $service_group_id = $this->request->getVar('service_group_id'); + $result = $this->ServiceModel->where('service_group_id',$service_group_id)->findAll(); + + return $this->response->setJSON(['count'=>count($result) , 'data'=>$result ]); + + } + public function template_edit() { if(!$this->session->has('is_staff_logged_in')){ return redirect()->to(base_url().'staff'); } $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(); + + $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(); + $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/Controllers/StaffController.php b/app/Controllers/StaffController.php index cab4c62..ab52fd9 100644 --- a/app/Controllers/StaffController.php +++ b/app/Controllers/StaffController.php @@ -57,6 +57,7 @@ class StaffController extends BaseController $this->session->set('logged_in_staff_role',$staffdata['role']); $this->session->set('logged_in_staff_name',$staffdata['name']); $this->session->set('logged_in_staff_branch_id',$staffdata['branch_id']); + $this->session->set('logged_in_staff_business_id',$staffdata['business_id']); return redirect()->to(base_url().'client_list'); } diff --git a/app/Models/ClientModel.php b/app/Models/ClientModel.php index dc7d296..b585405 100644 --- a/app/Models/ClientModel.php +++ b/app/Models/ClientModel.php @@ -7,7 +7,7 @@ class ClientModel extends Model protected $table = 'client'; protected $primaryKey = 'client_id'; - protected $allowedFields = [ 'branch_id', 'name','pan_no', 'mobile_no' , 'email' , 'otp', 'address' , 'city' , 'state' , 'country' , 'pin_code' , 'is_active' ,'created_by','updated_by']; + protected $allowedFields = [ 'business_id','branch_id', 'name','pan_no', 'mobile_no' , 'email' , 'is_active' ,'created_by','updated_by']; protected $beforeInsert = ['beforeInsert']; protected $beforeUpdate = ['beforeUpdate']; diff --git a/app/Models/ServiceGroupModel.php b/app/Models/ServiceGroupModel.php new file mode 100644 index 0000000..86a42f9 --- /dev/null +++ b/app/Models/ServiceGroupModel.php @@ -0,0 +1,15 @@ +db->table('staff'); - $builder -> select("staff_id,name,email,password,is_active,role,branch_id"); + $builder -> select("staff_id,name,email,password,is_active,role,branch_id,business_id"); $builder -> where('email',$email); $result = $builder->get(); if(count($result->getResultArray()) ==1) diff --git a/app/Models/TemplateModel.php b/app/Models/TemplateModel.php index 141792f..8d8cb24 100644 --- a/app/Models/TemplateModel.php +++ b/app/Models/TemplateModel.php @@ -7,7 +7,7 @@ class TemplateModel extends Model protected $table = 'template'; protected $primaryKey = 'template_id'; - protected $allowedFields = ['service_id','template_name','header_type','body_text','body_html', 'is_active' ,'created_by','updated_by']; + protected $allowedFields = ['service_group_id','service_id','template_name','header_type','body_text','body_html', 'is_active' ,'created_by','updated_by']; diff --git a/app/Views/client_form.php b/app/Views/client_form.php index 7753c14..1ab8313 100644 --- a/app/Views/client_form.php +++ b/app/Views/client_form.php @@ -37,7 +37,7 @@ class="parsley-examples"> - + diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 29b1ba7..8c0265e 100644 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -119,6 +119,17 @@ background-color: #85a7c9; /* background-color: #d44d4dd1; */ } + + .select2-container .select2-selection--single{ + height: 36px; + border:1px solid #ced4da; + } + .select2-container--default .select2-selection--single .select2-selection__rendered{ + line-height: 36px; + } + .select2-container--default .select2-selection--single .select2-selection__arrow{ + top:4px; + } @@ -273,6 +284,12 @@ + +
  • + "> + Share Docs +
    • +
  • "> - Services + + +
  • + +
    + " class="dropdown-item">Service Group + " class="dropdown-item">Services + " class="dropdown-item">Template +
    +
    • + +
  • + +
    + " class="dropdown-item">Business +
    • diff --git a/app/Views/service_group_list.php b/app/Views/service_group_list.php new file mode 100644 index 0000000..e00357c --- /dev/null +++ b/app/Views/service_group_list.php @@ -0,0 +1,257 @@ + + + + +
    + +
    + +
    +
    +
    +

    Service Group List

    +
    + + Create New + +
    +
    +
    +
    + + + + +
    +
    +
    +
    + + + + + + + + + + + + $value) { ?> + + + + + + + + + + + + + + + + + +
    Group NameNo Of ServiceAction
    +
    + +
    + Edit + + + Deactivate + + Activate + + + + +
    +
    + +
    +
    +
    +
    +
    + + + + +
    + +
    + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/Views/service_list.php b/app/Views/service_list.php index 5c47c79..99b6ba4 100644 --- a/app/Views/service_list.php +++ b/app/Views/service_list.php @@ -29,9 +29,11 @@ + + @@ -39,12 +41,29 @@ $value) { ?> - - + + + @@ -71,7 +90,7 @@ -
    Group Name Service Name Description No Of TemplatesAction
    +
    + +
    + Edit + + + Deactivate + + Activate + + + +
    +
    + +