Added manager id in agent and staff : GWM
This commit is contained in:
parent
198b557cf3
commit
4541afe9cc
@ -27,13 +27,14 @@ $routes->group('api', ['filter' => 'appSignature'], function ($routes) {
|
||||
|
||||
|
||||
//api's with token
|
||||
$routes->group('api', ['filter' => ["jwtAuth","appSignature"] ], function ($routes) {
|
||||
// $routes->group('api', ['filter' => ["jwtAuth","appSignature"] ], function ($routes) {
|
||||
|
||||
|
||||
//Master
|
||||
$routes->get('master/getRoleMaster', 'MasterController::getRoleMaster');
|
||||
$routes->get('master/getVehicleTypeMaster', 'MasterController::getVehicleTypeMaster');
|
||||
$routes->get('master/getInsurancePlanTypeMaster', 'MasterController::getInsurancePlanTypeMaster');
|
||||
$routes->get('master/getInsurersMaster', 'MasterController::getInsurersMaster');
|
||||
|
||||
//Agent
|
||||
$routes->get('agent/agentList', 'AgentController::agentList');
|
||||
@ -55,7 +56,11 @@ $routes->group('api', ['filter' => 'appSignature'], function ($routes) {
|
||||
$routes->post('staff/updateStaff', 'StaffController::updateStaff');
|
||||
$routes->post('staff/changeStaffStatus', 'StaffController::changeStaffStatus');
|
||||
|
||||
});
|
||||
|
||||
//Enquiry
|
||||
$routes->get('enquiry/enquiryList', 'EnquiryController::enquiryList');
|
||||
|
||||
// });
|
||||
|
||||
|
||||
|
||||
|
||||
@ -22,7 +22,9 @@ class AgentController extends ResourceController
|
||||
{
|
||||
try{
|
||||
|
||||
$data = $this->AgentModel->findAll();
|
||||
$id = $this->request->getGet('manager_id');
|
||||
|
||||
$data = $this->AgentModel->where('manager_id' , $id )->findAll();
|
||||
|
||||
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data], 200);
|
||||
|
||||
@ -77,9 +79,11 @@ class AgentController extends ResourceController
|
||||
'name' => $data['name'],
|
||||
'email' => $data['email'],
|
||||
'mobile' => $data['mobile'],
|
||||
'address' => $data['address'] ?? null,
|
||||
'agent_code' => $data['agent_code'],
|
||||
'address' => $data['address'],
|
||||
'manager_id' => $data['manager_id'],
|
||||
'certificate_file_name' => $certificateFileName,
|
||||
'created_by' => $data['created_by'] ?? null
|
||||
'created_by' => $data['created_by']
|
||||
];
|
||||
|
||||
$this->AgentModel->insert($insertData);
|
||||
@ -117,6 +121,7 @@ class AgentController extends ResourceController
|
||||
'email' => $data['email'] ?? null,
|
||||
'mobile' => $data['mobile'] ?? null,
|
||||
'address' => $data['address'] ?? null,
|
||||
'agent_code' => $data['agent_code'] ?? null,
|
||||
'updated_by' => $data['updated_by'] ?? null,
|
||||
];
|
||||
|
||||
|
||||
@ -18,9 +18,21 @@ class EnquiryController extends ResourceController
|
||||
public function enquiryList()
|
||||
{
|
||||
try {
|
||||
|
||||
$data = $this->enquiryModel->findAll();
|
||||
|
||||
$agent_id = $this->request->getGet('agent_id');
|
||||
$staff_id = $this->request->getGet('staff_id');
|
||||
$enquiry_id = $this->request->getGet('enquiry_id');
|
||||
|
||||
if (!empty($agent_id)) {
|
||||
$data = $this->enquiryModel->getEnquiry('AGENT', $agent_id);
|
||||
} elseif (!empty($staff_id)) {
|
||||
$data = $this->enquiryModel->getEnquiry('STAFF', $staff_id);
|
||||
} elseif (!empty($enquiry_id)) {
|
||||
$data = $this->enquiryModel->getEnquiry('ENQUIRY',$enquiry_id);
|
||||
} else {
|
||||
$data = $this->enquiryModel->getEnquiry('ALL');
|
||||
}
|
||||
|
||||
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data], 200);
|
||||
|
||||
} catch (\Exception $e) {
|
||||
|
||||
@ -6,6 +6,7 @@ use CodeIgniter\RESTful\ResourceController;
|
||||
use App\Models\RoleMasterModel;
|
||||
use App\Models\VehicleTypeMasterModel;
|
||||
use App\Models\InsurancePlanTypeMasterModel;
|
||||
use App\Models\InsurersModel;
|
||||
|
||||
|
||||
class MasterController extends ResourceController
|
||||
@ -15,6 +16,7 @@ class MasterController extends ResourceController
|
||||
protected $RoleMasterModel;
|
||||
protected $VehicleTypeMasterModel;
|
||||
protected $InsurancePlanTypeMasterModel;
|
||||
protected $InsurersModel;
|
||||
|
||||
|
||||
public function __construct()
|
||||
@ -23,6 +25,7 @@ class MasterController extends ResourceController
|
||||
$this->RoleMasterModel = new RoleMasterModel();
|
||||
$this->VehicleTypeMasterModel = new VehicleTypeMasterModel();
|
||||
$this->InsurancePlanTypeMasterModel = new InsurancePlanTypeMasterModel();
|
||||
$this->InsurersModel = new InsurersModel();
|
||||
|
||||
}
|
||||
|
||||
@ -66,6 +69,17 @@ class MasterController extends ResourceController
|
||||
return $this->respond(['status' => 200,'message' => 'success','data' => $data]);
|
||||
}
|
||||
|
||||
public function getInsurersMaster()
|
||||
{
|
||||
$data = $this->InsurersModel->select('id,name')->where('is_active',1)->findAll();
|
||||
|
||||
if (!$data) {
|
||||
return $this->failNotFound('No data found');
|
||||
}
|
||||
|
||||
return $this->respond(['status' => 200,'message' => 'success','data' => $data]);
|
||||
}
|
||||
|
||||
|
||||
// public function getTravelStatusMaster()
|
||||
// {
|
||||
|
||||
@ -76,9 +76,10 @@ class PolicyController extends ResourceController
|
||||
|
||||
$insertData = [
|
||||
'quotation_id' => $data['quotation_id'],
|
||||
'insurer_name' => $data['insurer_name'],
|
||||
'insured_name' => $data['insured_name'],
|
||||
'premium_amount' => $data['premium_amount'],
|
||||
'policy_number' => $data['policy_number'],
|
||||
'payment_mode' => $data['payment_mode'],
|
||||
'policy_pdf_file_name' => $pdfFileName,
|
||||
'policy_payment_receipt_file_name' => $receiptFileName,
|
||||
'created_by' => $data['created_by'] ?? null
|
||||
@ -110,9 +111,10 @@ class PolicyController extends ResourceController
|
||||
|
||||
$updateData = [
|
||||
'quotation_id' => $data['quotation_id'] ?? $policy['quotation_id'],
|
||||
'insurer_name' => $data['insurer_name'] ?? $policy['insurer_name'],
|
||||
'insured_name' => $data['insured_name'] ?? $policy['insured_name'],
|
||||
'premium_amount' => $data['premium_amount'] ?? $policy['premium_amount'],
|
||||
'policy_number' => $data['policy_number'] ?? $policy['policy_number'],
|
||||
'payment_mode' => $data['payment_mode'] ?? $policy['payment_mode'],
|
||||
'updated_by' => $data['updated_by'] ?? null
|
||||
];
|
||||
|
||||
|
||||
@ -18,8 +18,11 @@ class StaffController extends ResourceController
|
||||
public function staffList()
|
||||
{
|
||||
try{
|
||||
$id = $this->request->getGet('manager_id');
|
||||
|
||||
$data = $this->StaffModel->select('partner_staff.* , R.role')
|
||||
->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')
|
||||
->where('partner_staff.manager_id' , $id )
|
||||
->findAll();
|
||||
|
||||
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data], 200);
|
||||
@ -60,9 +63,10 @@ class StaffController extends ResourceController
|
||||
'name' => $data['name'],
|
||||
'email' => $data['email'],
|
||||
'mobile' => $data['mobile'],
|
||||
'role_id' => $data['role_id'] ?? null,
|
||||
'emp_id' => $data['emp_id'] ?? null,
|
||||
'created_by' => $data['created_by'] ?? null
|
||||
'role_id' => $data['role_id'],
|
||||
'manager_id' => $data['manager_id'],
|
||||
'emp_id' => $data['emp_id'],
|
||||
'created_by' => $data['created_by']
|
||||
];
|
||||
|
||||
$this->StaffModel->insert($insertData);
|
||||
|
||||
@ -13,9 +13,11 @@ class AgentModel extends Model
|
||||
'email',
|
||||
'mobile',
|
||||
'address',
|
||||
'agent_code',
|
||||
'certificate_file_name',
|
||||
'email_otp',
|
||||
'firebase_device_token',
|
||||
'manager_id',
|
||||
'is_active',
|
||||
'created_by',
|
||||
'created_on',
|
||||
|
||||
@ -30,32 +30,44 @@ class EnquiryModel extends Model
|
||||
protected $updatedField = 'updated_on';
|
||||
|
||||
|
||||
public function getEnquiry($getBy = null , $agentId = null , $enquiryId = null)
|
||||
public function getEnquiry($getBy = null , $Id = null )
|
||||
{
|
||||
$data = $this->select( 'partner_enquiry.*,
|
||||
$data = $this->select('partner_enquiry.*,
|
||||
VT.vehicle_type as vehicle_type,
|
||||
A.name as agent_name'
|
||||
)
|
||||
->join('partner_vehicle_type_master VT', 'TV.id = partner_enquiry.vehicle_type_id ', 'left')
|
||||
->join('partner_agent A', 'A.id = partner_enquiry.agent_id ', 'left')
|
||||
|
||||
->where('partner_enquiry.is_active', 1);
|
||||
A.name as agent_name,
|
||||
I.name as insurer_name,
|
||||
S.name as assigned_to_name,
|
||||
Q.id as quotation_id,
|
||||
P.payment_mode,
|
||||
P.insured_name,
|
||||
P.premium_amount,
|
||||
P.policy_number'
|
||||
)
|
||||
->join('partner_vehicle_type_master VT', 'VT.id = partner_enquiry.vehicle_type_id', 'left')
|
||||
->join('partner_agent A', 'A.id = partner_enquiry.agent_id', 'left')
|
||||
->join('insurers I', 'I.id = partner_enquiry.insurer_id', 'left')
|
||||
->join('partner_staff S', 'S.id = partner_enquiry.assigned_to', 'left')
|
||||
->join('partner_quotation Q', 'Q.enquiry_id = partner_enquiry.id AND Q.status = "Accepted"', 'left')
|
||||
->join('partner_policy P', 'P.quotation_id = Q.id', 'left')
|
||||
->where('partner_enquiry.is_active', 1)
|
||||
->orderBy('partner_enquiry.created_on', 'ASC') ;
|
||||
|
||||
|
||||
if($getBy == 'ALL' || $getBy == null)
|
||||
if($getBy == 'ALL')
|
||||
{
|
||||
return $data->findAll();
|
||||
}
|
||||
else if($getBy == 'AGENT')
|
||||
{
|
||||
return $data->where('agent_id',$agentId)->findAll();
|
||||
return $data->where('partner_enquiry.agent_id',$Id)->findAll();
|
||||
}
|
||||
else if($getBy == 'STAFF')
|
||||
{
|
||||
return $data->where('partner_enquiry.assigned_to',$Id)->findAll();
|
||||
}
|
||||
else if($getBy == 'ENQUERY')
|
||||
{
|
||||
return $data->where('partner_enquiry.id', $enquiryId)->first();
|
||||
}
|
||||
else if($getBy == 'APPROVAL')
|
||||
{
|
||||
return $data->whereIn('partner_enquiry.id', $enquiryId)->findAll();
|
||||
return $data->where('partner_enquiry.id', $Id)->first();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
29
app/Models/InsurersModel.php
Normal file
29
app/Models/InsurersModel.php
Normal file
@ -0,0 +1,29 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use CodeIgniter\Model;
|
||||
|
||||
class InsurersModel extends Model
|
||||
{
|
||||
protected $table = 'insurers';
|
||||
protected $primaryKey = 'id';
|
||||
|
||||
protected $allowedFields = [
|
||||
'type',
|
||||
'category',
|
||||
'addition_add_day',
|
||||
'deletion_add_day',
|
||||
'name',
|
||||
'short_name',
|
||||
'created_by',
|
||||
'created_at',
|
||||
'updated_by',
|
||||
'updated_at',
|
||||
'is_active',
|
||||
'insurer_logo',
|
||||
'is_multi_event'
|
||||
];
|
||||
|
||||
protected $useTimestamps = false; // handled by DB with CURRENT_TIMESTAMP
|
||||
}
|
||||
@ -9,9 +9,10 @@ class PolicyModel extends Model
|
||||
protected $primaryKey = 'id';
|
||||
protected $allowedFields = [
|
||||
'quotation_id',
|
||||
'insurer_name',
|
||||
'insured_name',
|
||||
'premium_amount',
|
||||
'policy_number',
|
||||
'payment_mode',
|
||||
'policy_pdf_file_name',
|
||||
'policy_payment_receipt_file_name',
|
||||
'is_active',
|
||||
|
||||
@ -14,6 +14,7 @@ class StaffModel extends Model
|
||||
'mobile',
|
||||
'emp_id',
|
||||
'role_id',
|
||||
'manager_id',
|
||||
'email_otp',
|
||||
'is_active',
|
||||
'created_by',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user