Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

This commit is contained in:
VENKATESHWARAN 2025-11-05 11:33:55 +05:30
commit 29c642a048
4 changed files with 35 additions and 15 deletions

View File

@ -344,10 +344,15 @@ class LeadsController extends BaseController
$where = []; $where = [];
foreach ($search_data as $search_objects => $key) { foreach ($search_data as $search_objects => $key) {
if ($key != null && $key != '' && $key != 0 && $search_objects != 'is_dashboard') { if ($key != null && $key != '' && $key != 0 && $search_objects != 'is_dashboard') {
$where[$search_objects] = $key; if($search_objects == 'status')
{
$where[('leads.'.$search_objects)] = $key;
}else{
$where[$search_objects] = $key;
}
} }
} }
// !dd($where);
$data['lead_data_list'] = $this->leadsModel->getLeadDataForLising($where); $data['lead_data_list'] = $this->leadsModel->getLeadDataForLising($where);
$html = view('leads_list', $data); $html = view('leads_list', $data);

View File

@ -354,14 +354,14 @@ class MasterController extends AdminController
exit(); exit();
} }
public function getInsurerBranchList() public function getInsurerBranchList()
{ {
$id = $this->request->getPost('insurer_id'); $id = $this->request->getPost('insurer_id');
$insurer_branch_list = $this->insurerBranchModel->where(['insurer_id' => $id, 'is_active' => 1])->findAll()??[]; $insurer_branch_list = $this->insurerBranchModel->where(['insurer_id' => $id, 'is_active' => 1])->findAll()??[];
return $this->response->setJSON([ 'data' => $insurer_branch_list ])->setStatusCode(200); return $this->response->setJSON([ 'data' => $insurer_branch_list ])->setStatusCode(200);
} }
public function editInsurerGeneralInfo() public function editInsurerGeneralInfo()
{ {

View File

@ -45,7 +45,22 @@ p{
} }
} }
@media screen and (max-width: 600px){
.header-div{
width: 100% !important;
}
.footer-div{
width : 100% !important ;
}
}
.client_logo,
.nhance_logo
{
vertical-align: middle !important;
}
</style> </style>
@ -53,10 +68,10 @@ p{
<body> <body>
<!-- header --> <!-- header -->
<div align="center"> <div align="center" class="header-div">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="mail-template-header"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="mail-template-header">
<tr style="height:90px; background-color: #ffffff !important;"> <tr style="height:90px; background-color: #ffffff !important;">
<td align="left" valign="middle" style="padding:5px;" width="50%"> <td align="left" class="client_logo" style="padding:5px;" width="50%">
<div style=" <div style="
width:160px; width:160px;
height:80px; height:80px;
@ -67,7 +82,7 @@ p{
</div> </div>
</td> </td>
<td align="right" valign="middle" style="padding:5px;" width="50%"> <td align="right" class="nhance_logo" style="padding:5px;" width="50%">
<img src="<?= base_url('/public/assets/images/Nhance-Logo-Final.png'); ?>" <img src="<?= base_url('/public/assets/images/Nhance-Logo-Final.png'); ?>"
alt="Default Logo" alt="Default Logo"
style="height:auto; max-width: 120px;"> style="height:auto; max-width: 120px;">
@ -86,7 +101,7 @@ p{
<!-- footer --> <!-- footer -->
<div align="center"> <div align="center" class="footer-div">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="mail-template-footer"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="mail-template-footer">
<tr style="background-color: #ffffff !important;"> <tr style="background-color: #ffffff !important;">
<td align="center" valign="middle" style="padding-top:5px;"> <td align="center" valign="middle" style="padding-top:5px;">

View File

@ -176,12 +176,12 @@
buttons: [{ buttons: [{
extend: 'csv', extend: 'csv',
text: '<i class="mdi mdi-file-delimited " ></i><span class=" btn-custom"> CSV </span>', text: '<i class="mdi mdi-file-delimited " ></i><span class=" btn-custom"> CSV </span>',
title: 'Policy-Tranction-BDS-List', title: 'Outstanding Report',
}, },
{ {
extend: 'excel', extend: 'excel',
text: '<i class="mdi mdi-file-excel " ></i><span class=" btn-custom"> EXCEL </span>', text: '<i class="mdi mdi-file-excel " ></i><span class=" btn-custom"> EXCEL </span>',
title: 'Policy-Tranction-BDS-List', title: 'Outstanding Report',
customize: function(xlsx) { customize: function(xlsx) {
var sheet = xlsx.xl.worksheets['sheet1.xml']; var sheet = xlsx.xl.worksheets['sheet1.xml'];
var total = 0; var total = 0;