MERGE_TEST_CLAIMS_LIVE_ISSSUE

This commit is contained in:
Ubuntu 2026-04-27 18:47:00 +05:30
commit d6d914783a
4 changed files with 33 additions and 12 deletions

View File

@ -4590,9 +4590,9 @@ class EmployeeRestController extends AdminController
} }
return $this->respondCreated($responce); return $this->respondCreated($responce);
} catch (\Exception $e) { } catch (\Exception $e) {
// return $this->failServerError($e->getMessage()); // return $this->failServerError($e->getMessage());
log_message('error', 'Error in hrFileUpload: ' . $e->getMessage() . ' in file ' . $e->getFile() . ' on line ' . $e->getLine() . ' Trace: ' . $e->getTraceAsString());
return $this->respondCreated(['status' => false, 'message' => $e->getMessage(), 'data' => []]); return $this->respondCreated(['status' => false, 'message' => $e->getMessage(), 'data' => []]);
} }
} }

View File

@ -2321,8 +2321,8 @@ class TicketController extends BaseController
->findAll(); ->findAll();
foreach ($dataToSend['messages'] as &$message) { foreach ($dataToSend['messages'] as &$message) {
$mail_content_converted = $this->convertHtmlToText($message['mail_content']); // $mail_content_converted = $this->convertHtmlToText($message['mail_content']);
$message['mail_content'] = $mail_content_converted; // $message['mail_content'] = $mail_content_converted;
$claimFiles = new ClaimFilesModel(); $claimFiles = new ClaimFilesModel();
$message["files_data"] = $claimFiles->where('is_active', 1) $message["files_data"] = $claimFiles->where('is_active', 1)

View File

@ -143,7 +143,7 @@ class AclFilter implements FilterInterface
$response = service('response'); $response = service('response');
$response->setStatusCode(403); $response->setStatusCode(403);
$response->setBody(view('errors/404', [ $response->setBody(view('errors/403', [
'message' => '403 Access denied - You do not have permission to access this resource' 'message' => '403 Access denied - You do not have permission to access this resource'
])); ]));

View File

@ -164,6 +164,21 @@
<script> <script>
const MAX_UPLOAD_PAYLOAD_BYTES = 25 * 1024 * 1024; // 25 MB
function getSelectedUploadPayloadSize() {
let totalBytes = 0;
$('#drive_file_upload_form input[type=file]').each(function () {
if (!this.files || !this.files.length) {
return;
}
for (let i = 0; i < this.files.length; i++) {
totalBytes += this.files[i].size || 0;
}
});
return totalBytes;
}
$(document).ready(function(){ $(document).ready(function(){
let ticket_id = $('#ticket_master_id').val(); let ticket_id = $('#ticket_master_id').val();
$('#ticket_id_url').val(ticket_id); $('#ticket_id_url').val(ticket_id);
@ -203,6 +218,12 @@
return; return;
} }
const selectedPayloadBytes = getSelectedUploadPayloadSize();
if (selectedPayloadBytes > MAX_UPLOAD_PAYLOAD_BYTES) {
toastr.warning('Total selected file size must not exceed 25 MB.', 'Validation');
return;
}
form_action = '<?php echo base_url() . 'ticket/upload_url' ?>'; form_action = '<?php echo base_url() . 'ticket/upload_url' ?>';
$('.loader').fadeIn(); $('.loader').fadeIn();