Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MERGE_UAT_CORS

Browse Source
This commit is contained in:
Ubuntu 2026-06-15 16:48:09 +05:30
commit cff97da124
11 changed files with 169 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.env.sample
View File

@ -153,6 +153,18 @@ LEAD_CLIENT_FROM_MAIL_ID =
# BDS Daily Report Emails Configuration
bds.dailyReportEmails =
# BDS Installment Reminder (pending UTR / overdue) — used by getLeadInstallmentDetails / sendInstallmentRemainderMail cron
# Master switch: when false, no installment reminder records are fetched
bds.installmentReminder.enabled = true
# Business days ahead of today to match upcoming payment_date (was hardcoded 5)
bds.installmentReminder.businessDays = 5
# When true, also fetch records with null UTR whose payment_date is already past (overdue)
bds.installmentReminder.fetchOverduePendingUtr = false
# When true, fetch every day; when false, only on days listed in bds.installmentReminder.days
bds.installmentReminder.daily = true
# Comma-separated weekdays (mon,tue,wed,thu,fri,sat,sun) — used only when daily = false
bds.installmentReminder.days = mon,tue,wed,thu,fri
#--------------------------------------------------------------------
# MEDI ASSIST WELLNESS SSO Configuration

2
app/Config/Acl.php
View File

@ -44,7 +44,7 @@ class Acl
'#^/sendDataToTPA#' => ['roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID, MANAGER_ROLE_ID]],
'#^/swagger#' => ['roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID, MANAGER_ROLE_ID]],
'#^/viewClaimFile#' => ['roles' => [ADMIN_ROLE_ID, HEAD_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID, MANAGER_ROLE_ID, STAFF_ROLE_ID]],
'#^/employee/tpaReportsDashboard#' => ['roles' => [ACCOUNT_MANAGER_ROLE_ID]],
'#^/employee/tpaReportsDashboard#' => ['roles' => [ACCOUNT_MANAGER_ROLE_ID, ADMIN_ROLE_ID, HEAD_ROLE_ID]],

64
app/Config/BdsConfig.php Normal file
View File

@ -0,0 +1,64 @@
<?php
namespace Config;
use CodeIgniter\Config\BaseConfig;
class BdsConfig extends BaseConfig
{
public bool $installmentReminderEnabled = false;
public int $installmentReminderBusinessDays = 5;
public bool $installmentReminderFetchOverduePendingUtr = false;
public bool $installmentReminderDaily = false;
/** @var string[] Lowercase three-letter day abbreviations, e.g. mon, tue */
public array $installmentReminderDays = [];
public function __construct()
{
parent::__construct();
$this->installmentReminderEnabled = $this->envToBool(
env('bds.installmentReminder.enabled', 'true')
);
$this->installmentReminderBusinessDays = max(
0,
(int) env('bds.installmentReminder.businessDays', 5)
);
$this->installmentReminderFetchOverduePendingUtr = $this->envToBool(
env('bds.installmentReminder.fetchOverduePendingUtr', 'false')
);
$this->installmentReminderDaily = $this->envToBool(
env('bds.installmentReminder.daily', 'true')
);
$days = env('bds.installmentReminder.days', 'mon,tue,wed,thu,fri');
$this->installmentReminderDays = array_values(array_filter(array_map(
static fn (string $day): string => strtolower(substr(trim($day), 0, 3)),
explode(',', (string) $days)
)));
}
public function shouldFetchInstallmentRemindersToday(): bool
{
if (!$this->installmentReminderEnabled) {
return false;
}
if ($this->installmentReminderDaily) {
return true;
}
$today = strtolower(date('D'));
return in_array($today, $this->installmentReminderDays, true);
}
private function envToBool(mixed $value): bool
{
return in_array(strtolower((string) $value), ['1', 'true', 'yes', 'on'], true);
}
}

4
app/Config/Exceptions.php
View File

@ -3,7 +3,7 @@
namespace Config;
use CodeIgniter\Config\BaseConfig;
use CodeIgniter\Debug\ExceptionHandler;
use App\Debug\CorsExceptionHandler;
use CodeIgniter\Debug\ExceptionHandlerInterface;
use Psr\Log\LogLevel;
use Throwable;
@ -99,6 +99,6 @@ class Exceptions extends BaseConfig
*/
public function handler(int $statusCode, Throwable $exception): ExceptionHandlerInterface
{
return new ExceptionHandler($this);
return new CorsExceptionHandler($this);
}
}

12
app/Controllers/ClientController.php
View File

@ -7822,20 +7822,18 @@ class ClientController extends AdminController
->join('employees', 'clients.id = employees.client_id', 'left')
->join('employee_polices', 'employees.id = employee_polices.employee_id', 'left')
->where('client_policy.is_active', 1)
->where('insurers.is_active', 1)
->where('tpa.is_active', 1)
->where('employees.is_active', 1)
->where('employees.relationship', "Self")
->where('employee_polices.is_active', 1)
->whereIn('employees.emp_status', ['active', 'expired'])
->whereIn('employee_polices.status', ['active', 'expired'])
->where('employees.is_active', 1)
->where('client_policy.id', $param)
->where('employee_polices.client_policy_id', $param)
->groupBy('employees.emp_code')
->get()
->getResultArray();
// print_r(db_connect()->getLastQuery()); die;
// print_r(db_connect()->getLastQuery()->getQuery()); die;
$dataForClientAndInsurer = $this->clientPolicyModel
->select("
@ -7938,8 +7936,8 @@ class ClientController extends AdminController
->join('employees', 'clients.id = employees.client_id')
->join('employee_polices', 'employees.id = employee_polices.employee_id AND client_policy.id = employee_polices.client_policy_id')
->where('client_policy.is_active', 1)
->where('insurers.is_active', 1)
->where('tpa.is_active', 1)
// ->where('insurers.is_active', 1)
// ->where('tpa.is_active', 1)
->where('employees.is_active', 1)
->whereIn('employees.emp_status', ['active', 'expired'])
->where('employees.relationship', "Self")
@ -7964,7 +7962,7 @@ class ClientController extends AdminController
$data = $query->get()->getRowArray();
// print_r(db_connect()->getLastQuery()); die;
// print_r(db_connect()->getLastQuery()->getQuery()); die;
$memberData = [];
$dataForClientAndInsurer = [];

18
app/Controllers/PolicyTransactionController.php
View File

@ -40,6 +40,7 @@ use App\Models\NhanceBranchModel;
use App\Models\BDSDumpModel;
use App\Models\VehicleModel;
use CodeIgniter\CLI\CLI;
use Config\BdsConfig;
use Exception;
class PolicyTransactionController extends BaseController
@ -5349,6 +5350,16 @@ class PolicyTransactionController extends BaseController
$this->myLogger->logme("error", "Cron Job For Send Installment Remainder Mail Started");
try {
/** @var BdsConfig $bdsConfig */
$bdsConfig = config(BdsConfig::class);
if (!$bdsConfig->shouldFetchInstallmentRemindersToday()) {
$this->myLogger->logme(
'error',
'Installment reminder fetch skipped (bds.installmentReminder.enabled / daily / days config)'
);
CLI::write('Installment reminder fetch skipped per .env configuration');
return ['status' => false, 'message' => 'Fetch skipped per configuration', 'response' => []];
}
$bdsInstallmentData = [];
@ -5418,14 +5429,17 @@ class PolicyTransactionController extends BaseController
Policy No : {$policy_no}";
$contactPersonEmail = trim((string) ($data['contact_person_email'] ?? ''));
$to_mail = array_merge(
array_column($heads, 'email'),
array_column($admins, 'email'),
array_column($buisness_team, 'email'),
[$sales_person_mail]
[$sales_person_mail],
$contactPersonEmail !== '' ? [$contactPersonEmail] : []
);
$to_mail = array_unique($to_mail);
$to_mail = array_values(array_unique(array_filter($to_mail)));
$this->myLogger->logme("error", "Selected To Address : " . json_encode($to_mail));

39
app/Debug/CorsExceptionHandler.php Normal file
View File

@ -0,0 +1,39 @@
<?php
namespace App\Debug;
use App\Filters\Cors;
use CodeIgniter\Debug\ExceptionHandler;
use CodeIgniter\Debug\ExceptionHandlerInterface;
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\HTTP\ResponseInterface;
use Config\Exceptions;
use Throwable;
/**
* Ensures CORS headers are present on uncaught exception responses.
*
* The global Cors filter's after() method is not invoked when an exception
* bypasses the normal filter pipeline.
*/
class CorsExceptionHandler implements ExceptionHandlerInterface
{
protected ExceptionHandler $handler;
public function __construct(Exceptions $config)
{
$this->handler = new ExceptionHandler($config);
}
public function handle(
Throwable $exception,
RequestInterface $request,
ResponseInterface $response,
int $statusCode,
int $exitCode
): void {
(new Cors())->after($request, $response);
$this->handler->handle($exception, $request, $response, $statusCode, $exitCode);
}
}

10
app/Filters/Cors.php
View File

@ -355,9 +355,13 @@ class Cors implements FilterInterface
return $response;
}
// For non-OPTIONS requests, don't return a response
// Let the request proceed to the controller
// CORS headers will be added in after() method
// Apply CORS headers on the shared response before other before-filters run.
// When a before-filter returns early (4xx/5xx), CodeIgniter skips after-filters,
// so relying only on after() leaves error responses without CORS headers.
if (! empty($origin) && $this->isOriginAllowed($origin)) {
$this->addCorsHeaders(Services::response(), $request, $origin, false);
}
return null;
}

24
app/Models/BdsPlacementModel.php
View File

@ -3,6 +3,7 @@
namespace App\Models;
use CodeIgniter\Model;
use Config\BdsConfig;
class BdsPlacementModel extends Model
{
@ -132,6 +133,13 @@ class BdsPlacementModel extends Model
public function getLeadInstallmentDetails()
{
/** @var BdsConfig $config */
$config = config(BdsConfig::class);
if (!$config->shouldFetchInstallmentRemindersToday()) {
return [];
}
$heads = $this->db->table('user_profiles')
->select('email')->where(['role' => 5, 'is_active' => 1])
->get()->getResultArray();
@ -147,14 +155,24 @@ class BdsPlacementModel extends Model
->get()->getResultArray();
$builder = $this->db->table("lead_installment_payment_details lipd")
->select("lipd.*, COALESCE(ct.client_name, leads.client_name) as client_name, COALESCE(ct.short_name, leads.client_short_name) as short_name, COALESCE(cb.branch_name, leads.branch_name) as branch_name, leads.salse_person_id, cp.policy_no")
->select("lipd.*, COALESCE(ct.client_name, leads.client_name) as client_name, COALESCE(ct.short_name, leads.client_short_name) as short_name, COALESCE(cb.branch_name, leads.branch_name) as branch_name, leads.salse_person_id, leads.contact_person_email, cp.policy_no")
->join("leads", "leads.id = lipd.lead_id")
->join("clients ct", "ct.id = leads.client_id", "left")
->join("client_branch cb", "cb.id = leads.client_branch_id", "left")
->join("client_policy cp", "cp.id = leads.source_policy_id", "left")
->where("lipd.is_active", 1)
->where("lipd.utr_no IS NULL")
->where("lipd.payment_date", $this->addBusinessDays(5));
->where("lipd.utr_no IS NULL");
$targetPaymentDate = $this->addBusinessDays($config->installmentReminderBusinessDays);
if ($config->installmentReminderFetchOverduePendingUtr) {
$builder->groupStart()
->where('lipd.payment_date', $targetPaymentDate)
->orWhere('lipd.payment_date <', date('Y-m-d'))
->groupEnd();
} else {
$builder->where('lipd.payment_date', $targetPaymentDate);
}
$data = $builder->get()->getResultArray();

8
app/Views/client_policy.php
View File

@ -1546,14 +1546,8 @@ input:checked + .slider_blue::before {
return isNaN(parsed.getTime()) ? null : parsed;
}
var policyMonthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
function formatPolicyDisplayDate(inputDate) {
var d = parsePolicyDate(inputDate);
if (!d) {
return (inputDate && String(inputDate).trim() !== '') ? String(inputDate) : '';
}
return d.getDate() + '/' + policyMonthNames[d.getMonth()] + '/' + d.getFullYear();
return formatPolicyFormDate(inputDate);
}
function formatPolicyFormDate(inputDate) {

2
app/Views/layout/header.php
View File

@ -2017,7 +2017,7 @@ body[data-sidebar-size="condensed"] .footer {
<li>
<a href="<?= base_url('/employee/retail-endorsement-list') ?>">Retail Endorsement</a>
</li>
<?php if(in_array(get_role_id(), [ACCOUNT_MANAGER_ROLE_ID])) { ?>
<?php if(in_array(get_role_id(), [ACCOUNT_MANAGER_ROLE_ID, ADMIN_ROLE_ID, HEAD_ROLE_ID])) { ?>
<li>
<a href="<?= base_url('/employee/tpaReportsDashboard') ?>">TPA Reports</a>
</li>