MERGE_TEST_MINOR_ITEMS
This commit is contained in:
Ubuntu
commit
9b0dca1ee7
@ -73,11 +73,11 @@ class AppContentManagementController extends AdminController
|
||||
]
|
||||
],
|
||||
'client_id' => [
|
||||
'rules' => 'required|integer|is_natural_no_zero',
|
||||
'rules' => 'required|integer|is_natural',
|
||||
'errors' => [
|
||||
'required' => 'Client is required',
|
||||
'integer' => 'Invalid client selected',
|
||||
'is_natural_no_zero' => 'Invalid client selected'
|
||||
'required' => 'Client is required',
|
||||
'integer' => 'Invalid client selected',
|
||||
'is_natural' => 'Invalid client selected',
|
||||
]
|
||||
],
|
||||
'advertise_image' => [
|
||||
@ -85,15 +85,13 @@ class AppContentManagementController extends AdminController
|
||||
. 'is_image[advertise_image]'
|
||||
. '|mime_in[advertise_image,image/jpg,image/jpeg,image/png]'
|
||||
. '|max_size[advertise_image,200]'
|
||||
. '|min_dims[advertise_image,1640,664]'
|
||||
. '|max_dims[advertise_image,1640,664]',
|
||||
'errors' => [
|
||||
'uploaded' => 'Image is required',
|
||||
'is_image' => 'File must be an image',
|
||||
'mime_in' => 'Only JPG, JPEG, PNG allowed',
|
||||
'max_size' => 'Image size must not exceed 200 KB',
|
||||
'min_dims' => 'Image dimensions must be exactly 1640x664 pixels',
|
||||
'max_dims' => 'Image dimensions must be exactly 1640x664 pixels',
|
||||
'max_dims' => 'Image dimensions must not exceed 1640x664 pixels',
|
||||
]
|
||||
],
|
||||
];
|
||||
@ -110,9 +108,11 @@ class AppContentManagementController extends AdminController
|
||||
$file = $this->request->getFile('advertise_image');
|
||||
$client_id = (int)($sanitized_post_data['client_id'] ?? 0);
|
||||
|
||||
$clientExists = $this->clientModel->where('id', $client_id)->where('is_active', 1)->first();
|
||||
if (!$clientExists) {
|
||||
return $this->respond(['status' => false, 'message' => 'Invalid client selected.'], 400);
|
||||
if ($client_id !== 0) {
|
||||
$clientExists = $this->clientModel->where('id', $client_id)->where('is_active', 1)->first();
|
||||
if (!$clientExists) {
|
||||
return $this->respond(['status' => false, 'message' => 'Invalid client selected.'], 400);
|
||||
}
|
||||
}
|
||||
|
||||
if (!$file || !$file->isValid()) {
|
||||
@ -123,6 +123,11 @@ class AppContentManagementController extends AdminController
|
||||
return $this->respond(['status' => false, 'message' => 'Only JPG, JPEG, PNG files are allowed.'], 400);
|
||||
}
|
||||
|
||||
$dimInfo = @getimagesize($file->getTempName());
|
||||
if ($dimInfo === false || (int) $dimInfo[0] !== 1640 || (int) $dimInfo[1] !== 664) {
|
||||
return $this->respond(['status' => false, 'message' => 'Image dimensions must be exactly 1640x664 pixels.'], 400);
|
||||
}
|
||||
|
||||
$fileName = sanitize_upload_filename($file->getClientName());
|
||||
$existing = $this->addImgModel->where('name', $fileName)->where('client_id', $client_id)->where('is_active', 1)->first();
|
||||
if($existing){ return $this->respond(['status' => false, 'message' => 'This file has already been uploaded in active state.'], 400); }
|
||||
|
||||
@ -497,6 +497,7 @@ class EmployeeController extends AdminController
|
||||
batch_files.is_active,
|
||||
batch_files.amount,
|
||||
batch_files.status,
|
||||
batch_files.icici_status_flag,
|
||||
batch_files.client_branch_id,
|
||||
insurers.short_name as insurer_short_name,
|
||||
tpa.short_name as tpa_short_name,
|
||||
|
||||
@ -61,6 +61,11 @@ for ($i = 0; $i < $batch_col_count; $i++) {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
/* Allow line breaks in tooltip titles using \n */
|
||||
.tooltip-inner {
|
||||
white-space: pre-line;
|
||||
}
|
||||
|
||||
/* Column widths from max data length (see PHP above).
|
||||
Avoid table-layout:fixed + identical max-width on TH — it fights DataTables col sizing and skews TH vs TD.
|
||||
Do not max-width THEAD cells (sort icons use position:absolute; narrow max clips them). */
|
||||
@ -289,15 +294,32 @@ for ($i = 0; $i < $batch_col_count; $i++) {
|
||||
<td><?php echo $file['event_type'] ?></td>
|
||||
|
||||
<td><?php echo $insurer_or_tpa[$file['insurer_or_tpa']] ?>
|
||||
|
||||
<?php $insurer_or_tpa_display = $insurer_or_tpa[$file['insurer_or_tpa']] == 'TPA' ? $file['tpa_short_name'] : $file['insurer_short_name'] ?>
|
||||
<a href=""
|
||||
class="fe-alert-circle" style="color: #000;" aria-hidden="true"
|
||||
data-toggle="tooltip" data-placement="top" title="<?php echo $insurer_or_tpa_display ?>"></a>
|
||||
|
||||
<?php $insurer_or_tpa_display = $insurer_or_tpa[$file['insurer_or_tpa']] == 'TPA' ? $file['tpa_short_name'] : $file['insurer_short_name'] ?>
|
||||
<a href="#" class="fe-alert-circle" style="color: #000;" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="<?php echo $insurer_or_tpa_display ?>"></a>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<?php echo $import_or_export[$file['actions']] ?? ucfirst($file['actions']); ?>
|
||||
|
||||
<?php if ($file['actions'] == 'push'): ?>
|
||||
<?php $tpa_push_status = $file['icici_status_flag']; ?>
|
||||
|
||||
<?php
|
||||
$tooltipText = $insurer_or_tpa_display . ' TPA Push Status: ' . ($tpa_push_status ?? 'N/A');
|
||||
$tooltipText .= "\n\n\nNote: TPA ID can be fetched only after the TPA push status is completed.";
|
||||
?>
|
||||
|
||||
<a href="#"
|
||||
class="fe-alert-circle"
|
||||
style="color: #000;"
|
||||
aria-hidden="true"
|
||||
data-toggle="tooltip"
|
||||
data-placement="top"
|
||||
title="<?php echo htmlspecialchars($tooltipText, ENT_QUOTES, 'UTF-8'); ?>">
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
|
||||
<td><?php echo $import_or_export[$file['actions']] ?? ucfirst($file['actions']) ?></td>
|
||||
<td><?php echo $file['count'] == null ? '-' : $file['count'] ?></td>
|
||||
|
||||
<td><?php echo format_indian_number($file['amount'])?></td>
|
||||
|
||||
@ -151,10 +151,7 @@
|
||||
}
|
||||
|
||||
</style>
|
||||
<?php
|
||||
$isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team()) ? 'active show' : '';
|
||||
?>
|
||||
<div class="tab-pane fade <?= $isActive ?>" id="claims-dash-tab">
|
||||
<div class="tab-pane fade <?= $dash_claims_pane_active ?? '' ?>" id="claims-dash-tab">
|
||||
<div class="row">
|
||||
<div class="col inside-tab-content-div">
|
||||
<div class="claimTypeTile">
|
||||
|
||||
@ -251,7 +251,7 @@ input:checked + .slider_blue::before {
|
||||
<div class="form-group col-md-4">
|
||||
<label for="policy_no">Policy No<span class="text-danger">*</span></label>
|
||||
<input value="" type="text" class="form-control" oninput="checkPolicyNo(this)" placeholder="Enter Policy Number" name="policy_no" id="policy_no" required
|
||||
data-parsley-pattern="^[a-zA-Z0-9\\s_\\-/\\\\]+$"
|
||||
data-parsley-pattern="^[a-zA-Z0-9\\s_/\\\\-]+$"
|
||||
data-parsley-pattern-message="Invalid characters in Policy No.">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -193,7 +193,7 @@
|
||||
|
||||
</style>
|
||||
|
||||
<div class="tab-pane active show" id="pending-actions-dash-tab" >
|
||||
<div class="tab-pane fade <?= $dash_pending_pane_active ?? '' ?>" id="pending-actions-dash-tab" >
|
||||
|
||||
<div class="inside-tab-content-div">
|
||||
|
||||
|
||||
@ -41,11 +41,19 @@
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.error-illustration-frame {
|
||||
display: inline-block;
|
||||
max-width: 100%;
|
||||
line-height: 0;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.error-image {
|
||||
width: min(100%, 560px);
|
||||
height: auto;
|
||||
display: block;
|
||||
margin: 0 auto 10px auto;
|
||||
width: auto !important;
|
||||
height: auto !important;
|
||||
max-width: 100% !important;
|
||||
object-fit: contain;
|
||||
}
|
||||
|
||||
.error-title {
|
||||
@ -98,7 +106,7 @@
|
||||
background-image: radial-gradient(circle at 0 0, rgba(87, 233, 255, 0.12) 0, rgba(87, 233, 255, 0.12) 120px, transparent 120px), radial-gradient(circle at 100% 100%, rgba(87, 233, 255, 0.12) 0, rgba(87, 233, 255, 0.12) 140px, transparent 140px);
|
||||
}
|
||||
|
||||
.error-image {
|
||||
.error-illustration-frame {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
@ -113,7 +121,13 @@
|
||||
|
||||
<body>
|
||||
<main class="error-wrapper">
|
||||
<img class="error-image" src="<?= base_url()."public"; ?>/assets/images/errors/404_illustration.jpg" alt="404 page not found illustration">
|
||||
<div class="error-illustration-frame">
|
||||
<img class="error-image"
|
||||
src="<?= base_url()."public"; ?>/assets/images/errors/404_illustration.png"
|
||||
decoding="async"
|
||||
fetchpriority="high"
|
||||
alt="404 page not found">
|
||||
</div>
|
||||
<h1 class="error-title">PAGE NOT FOUND</h1>
|
||||
<p class="error-subtitle">
|
||||
<?= isset($message) && !empty($message) ? $message : "Sorry, the page you're looking for doesn't exist or has been moved." ?>
|
||||
|
||||
@ -1,84 +1,23 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title><?= lang('Errors.pageNotFound') ?></title>
|
||||
<?php
|
||||
|
||||
<style>
|
||||
div.logo {
|
||||
height: 200px;
|
||||
width: 155px;
|
||||
display: inline-block;
|
||||
opacity: 0.08;
|
||||
position: absolute;
|
||||
top: 2rem;
|
||||
left: 50%;
|
||||
margin-left: -73px;
|
||||
}
|
||||
body {
|
||||
height: 100%;
|
||||
background: #fafafa;
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
color: #777;
|
||||
font-weight: 300;
|
||||
}
|
||||
h1 {
|
||||
font-weight: lighter;
|
||||
letter-spacing: normal;
|
||||
font-size: 3rem;
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
color: #222;
|
||||
}
|
||||
.wrap {
|
||||
max-width: 1024px;
|
||||
margin: 5rem auto;
|
||||
padding: 2rem;
|
||||
background: #fff;
|
||||
text-align: center;
|
||||
border: 1px solid #efefef;
|
||||
border-radius: 0.5rem;
|
||||
position: relative;
|
||||
}
|
||||
pre {
|
||||
white-space: normal;
|
||||
margin-top: 1.5rem;
|
||||
}
|
||||
code {
|
||||
background: #fafafa;
|
||||
border: 1px solid #efefef;
|
||||
padding: 0.5rem 1rem;
|
||||
border-radius: 5px;
|
||||
display: block;
|
||||
}
|
||||
p {
|
||||
margin-top: 1.5rem;
|
||||
}
|
||||
.footer {
|
||||
margin-top: 2rem;
|
||||
border-top: 1px solid #efefef;
|
||||
padding: 1em 2em 0 2em;
|
||||
font-size: 85%;
|
||||
color: #999;
|
||||
}
|
||||
a:active,
|
||||
a:link,
|
||||
a:visited {
|
||||
color: #dd4814;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="wrap">
|
||||
<h1>404</h1>
|
||||
declare(strict_types=1);
|
||||
|
||||
<p>
|
||||
<?php if (ENVIRONMENT !== 'production') : ?>
|
||||
<?= nl2br(esc($message)) ?>
|
||||
<?php else : ?>
|
||||
<?= lang('Errors.sorryCannotFind') ?>
|
||||
<?php endif; ?>
|
||||
</p>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
/**
|
||||
* CodeIgniter resolves PageNotFoundException to this file (see ExceptionHandler::determineView).
|
||||
* Delegate to the NHance branded page at Views/errors/404.php.
|
||||
*/
|
||||
|
||||
$page_name = $page_name ?? 'NHance';
|
||||
|
||||
if (ENVIRONMENT === 'production') {
|
||||
$displayMessage = lang('Errors.sorryCannotFind');
|
||||
if ($displayMessage === '') {
|
||||
$displayMessage = "Sorry, the page you're looking for doesn't exist or has been moved.";
|
||||
}
|
||||
} else {
|
||||
$displayMessage = nl2br(esc($message ?? ''));
|
||||
}
|
||||
|
||||
$message = $displayMessage;
|
||||
|
||||
include dirname(__DIR__) . DIRECTORY_SEPARATOR . '404.php';
|
||||
|
||||
@ -156,10 +156,7 @@
|
||||
|
||||
|
||||
</style>
|
||||
<?php
|
||||
$isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID, user_team()) ? 'show active' : '';
|
||||
?>
|
||||
<div class="tab-pane fade <?= $isActive ?>" id="leads-dash-tab">
|
||||
<div class="tab-pane fade <?= $dash_leads_pane_active ?? '' ?>" id="leads-dash-tab">
|
||||
<div class="row">
|
||||
<div class="col inside-tab-content-div">
|
||||
<div class="leadTypeTile">
|
||||
|
||||
BIN
public/assets/images/errors/404_illustration.png
Normal file
BIN
public/assets/images/errors/404_illustration.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 100 KiB |
BIN
public/assets/images/errors/404_illustration_old.jpg
Normal file
BIN
public/assets/images/errors/404_illustration_old.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
Loading…
Reference in New Issue
Block a user