FIX_SUBMIT_ISSUES
This commit is contained in:
parent
8f80865b67
commit
e60cfa1795
@ -73,11 +73,11 @@ class AppContentManagementController extends AdminController
|
|||||||
]
|
]
|
||||||
],
|
],
|
||||||
'client_id' => [
|
'client_id' => [
|
||||||
'rules' => 'required|integer|is_natural_no_zero',
|
'rules' => 'required|integer|is_natural',
|
||||||
'errors' => [
|
'errors' => [
|
||||||
'required' => 'Client is required',
|
'required' => 'Client is required',
|
||||||
'integer' => 'Invalid client selected',
|
'integer' => 'Invalid client selected',
|
||||||
'is_natural_no_zero' => 'Invalid client selected'
|
'is_natural' => 'Invalid client selected',
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
'advertise_image' => [
|
'advertise_image' => [
|
||||||
@ -85,15 +85,13 @@ class AppContentManagementController extends AdminController
|
|||||||
. 'is_image[advertise_image]'
|
. 'is_image[advertise_image]'
|
||||||
. '|mime_in[advertise_image,image/jpg,image/jpeg,image/png]'
|
. '|mime_in[advertise_image,image/jpg,image/jpeg,image/png]'
|
||||||
. '|max_size[advertise_image,200]'
|
. '|max_size[advertise_image,200]'
|
||||||
. '|min_dims[advertise_image,1640,664]'
|
|
||||||
. '|max_dims[advertise_image,1640,664]',
|
. '|max_dims[advertise_image,1640,664]',
|
||||||
'errors' => [
|
'errors' => [
|
||||||
'uploaded' => 'Image is required',
|
'uploaded' => 'Image is required',
|
||||||
'is_image' => 'File must be an image',
|
'is_image' => 'File must be an image',
|
||||||
'mime_in' => 'Only JPG, JPEG, PNG allowed',
|
'mime_in' => 'Only JPG, JPEG, PNG allowed',
|
||||||
'max_size' => 'Image size must not exceed 200 KB',
|
'max_size' => 'Image size must not exceed 200 KB',
|
||||||
'min_dims' => 'Image dimensions must be exactly 1640x664 pixels',
|
'max_dims' => 'Image dimensions must not exceed 1640x664 pixels',
|
||||||
'max_dims' => 'Image dimensions must be exactly 1640x664 pixels',
|
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
@ -110,9 +108,11 @@ class AppContentManagementController extends AdminController
|
|||||||
$file = $this->request->getFile('advertise_image');
|
$file = $this->request->getFile('advertise_image');
|
||||||
$client_id = (int)($sanitized_post_data['client_id'] ?? 0);
|
$client_id = (int)($sanitized_post_data['client_id'] ?? 0);
|
||||||
|
|
||||||
$clientExists = $this->clientModel->where('id', $client_id)->where('is_active', 1)->first();
|
if ($client_id !== 0) {
|
||||||
if (!$clientExists) {
|
$clientExists = $this->clientModel->where('id', $client_id)->where('is_active', 1)->first();
|
||||||
return $this->respond(['status' => false, 'message' => 'Invalid client selected.'], 400);
|
if (!$clientExists) {
|
||||||
|
return $this->respond(['status' => false, 'message' => 'Invalid client selected.'], 400);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$file || !$file->isValid()) {
|
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);
|
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());
|
$fileName = sanitize_upload_filename($file->getClientName());
|
||||||
$existing = $this->addImgModel->where('name', $fileName)->where('client_id', $client_id)->where('is_active', 1)->first();
|
$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); }
|
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.is_active,
|
||||||
batch_files.amount,
|
batch_files.amount,
|
||||||
batch_files.status,
|
batch_files.status,
|
||||||
|
batch_files.icici_status_flag,
|
||||||
batch_files.client_branch_id,
|
batch_files.client_branch_id,
|
||||||
insurers.short_name as insurer_short_name,
|
insurers.short_name as insurer_short_name,
|
||||||
tpa.short_name as tpa_short_name,
|
tpa.short_name as tpa_short_name,
|
||||||
|
|||||||
@ -61,6 +61,11 @@ for ($i = 0; $i < $batch_col_count; $i++) {
|
|||||||
cursor: pointer;
|
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).
|
/* 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.
|
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). */
|
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 $file['event_type'] ?></td>
|
||||||
|
|
||||||
<td><?php echo $insurer_or_tpa[$file['insurer_or_tpa']] ?>
|
<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'] ?>
|
||||||
<?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>
|
||||||
<a href=""
|
</td>
|
||||||
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>
|
||||||
|
<?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>
|
||||||
|
|
||||||
<td><?php echo $import_or_export[$file['actions']] ?? ucfirst($file['actions']) ?></td>
|
|
||||||
<td><?php echo $file['count'] == null ? '-' : $file['count'] ?></td>
|
<td><?php echo $file['count'] == null ? '-' : $file['count'] ?></td>
|
||||||
|
|
||||||
<td><?php echo format_indian_number($file['amount'])?></td>
|
<td><?php echo format_indian_number($file['amount'])?></td>
|
||||||
|
|||||||
@ -251,7 +251,7 @@ input:checked + .slider_blue::before {
|
|||||||
<div class="form-group col-md-4">
|
<div class="form-group col-md-4">
|
||||||
<label for="policy_no">Policy No<span class="text-danger">*</span></label>
|
<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
|
<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.">
|
data-parsley-pattern-message="Invalid characters in Policy No.">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user