diff --git a/app/Config/Acl.php b/app/Config/Acl.php index b66743fb..df90b2f2 100644 --- a/app/Config/Acl.php +++ b/app/Config/Acl.php @@ -122,7 +122,7 @@ class Acl // ===================== POLICY TRANSACTION / BDS ===================== '#^/policy_tranction#' => [ - 'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID], + 'roles' => [ HEAD_ROLE_ID,ADMIN_ROLE_ID, MANAGER_ROLE_ID, ACCOUNT_MANAGER_ROLE_ID,STAFF_ROLE_ID], 'teams' => [FINANCE_TEAM_ID,POS_TEAM_ID] ], '#^/dmsSearch#' => [ diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 33aa40e1..2d363f2d 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -609,7 +609,7 @@ $routes->group("employeeRest/api/v1", ["filter" => ['ratelimit', 'authJWT']], fu $routes->post('create', 'Api\NonEbClaimApiController::createClaim'); $routes->post('list', 'Api\NonEbClaimApiController::listClaims'); $routes->get('history/(:num)', 'Api\NonEbClaimApiController::claimHistory/$1'); - $routes->post('(:num)/upload-required-doc', 'Api\NonEbClaimApiController::uploadRequiredDoc/$1'); + $routes->post('upload-required-doc', 'Api\NonEbClaimApiController::uploadRequiredDoc'); $routes->get('statuses', 'Api\NonEbClaimApiController::listClaimStatuses'); $routes->post('policies', 'Api\NonEbClaimApiController::listPolicies'); }); diff --git a/app/Controllers/Api/NonEbClaimApiController.php b/app/Controllers/Api/NonEbClaimApiController.php index 3cfa914d..0e2355b5 100644 --- a/app/Controllers/Api/NonEbClaimApiController.php +++ b/app/Controllers/Api/NonEbClaimApiController.php @@ -653,7 +653,61 @@ class NonEbClaimApiController extends BaseController ], 200); } - public function uploadRequiredDoc(int $claim_id) + public function uploadRequiredDoc() + { + $authUser = $this->getAuthUser(); + if (!$authUser) { + return $this->respond(['status' => false, 'code' => 401, 'message' => 'Unauthorized'], 401); + } + + $ticket_id = $this->request->getPost('ticket_id') ?? null; + $get_file_data = $this->request->getFiles('claim_docs') ?? null; + $get_docs_name = $this->request->getPost('claim_doc_names') ?? []; + $required_docs = $this->request->getPost('required_docs') ?? null; + + if (is_string($get_docs_name)) { + $decoded = json_decode($get_docs_name, true); + $get_docs_name = json_last_error() === JSON_ERROR_NONE ? $decoded : []; + } elseif (!is_array($get_docs_name)) { + $get_docs_name = []; + } + + $file_data = []; + if (!empty($get_file_data)) { + $file_path = WRITEPATH . 'uploads/claim_files/'; + $file_data = multi_file_Upload($get_file_data, $file_path, $get_docs_name, UPLOAD_EXT_CLAIM_DOCS); + } + + if (!empty($file_data) && !empty($ticket_id)) { + foreach ($file_data as $value) { + $this->claimFilesModel->insert([ + 'ticket_id' => $ticket_id, + 'ticket_type' => 2, + 'doc_name' => $value['doc_name'], + 'file_name' => $value['file_name'], + 'url' => $value['file_path'], + 'file_type' => 2, + 'mime_type' => getMimeTypeByFileName($value['file_name']), + 'docs_for_ir' => 1, + 'is_active' => 1, + 'created_by' => self::API_SYSTEM_USER_ID, + ]); + } + + db_connect()->query( + 'UPDATE non_eb_ticket_master SET required_docs = ? WHERE id = ?', + [$required_docs, $ticket_id] + ); + + $this->myLogger->logme('error', "[NON_EB_API][uploadRequiredDoc] Docs uploaded. ticket_id: $ticket_id, count: " . count($file_data) . ", user: {$authUser['id']}"); + + return $this->respond(['status' => true, 'code' => 200, 'message' => 'Files uploaded successfully'], 200); + } + + return $this->respond(['status' => false, 'code' => 400, 'message' => 'Failed to upload the file'], 400); + } + + public function uploadRequiredDoc_v1(int $claim_id) { $authUser = $this->getAuthUser(); if (!$authUser) { diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php index 9a8ec5f1..12f9ed38 100644 --- a/app/Controllers/LeadsController.php +++ b/app/Controllers/LeadsController.php @@ -4083,9 +4083,16 @@ class LeadsController extends BaseController private function prepareClientPolicyData($data, $client_id, $branch_id) { - $proposel_data = json_decode($data['proposel_data'], true); - // print_r($proposel_data); die; - list($insurer_branch_id, $insurer_id) = explode('-', $proposel_data['insurer'], 2); + $proposel_data = json_decode($data['proposel_data'] ?? '', true) ?? []; + + if ($data['lead_form_type'] == 1) { + // EB: insurer stored as "{insurer_branch_id}-{insurer_id}" inside proposel_data + list($insurer_branch_id, $insurer_id) = explode('-', $proposel_data['insurer'] ?? '-', 2); + } else { + // Non-EB: insurer IDs are direct columns on the lead row + $insurer_id = $data['insurer_id'] ?? null; + $insurer_branch_id = $data['insurer_branch_id'] ?? null; + } $client_policy_data = [ 'client_id' => $client_id, @@ -4315,7 +4322,7 @@ class LeadsController extends BaseController public function getPlacementJson(array $data): ?string { - $proposel_data = json_decode($data['proposel_data'], true); + $proposel_data = json_decode($data['proposel_data'] ?? '', true) ?? []; $QCRData = $this->RFQModel ->where('is_active', 1) diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php index 44d25abe..91d71085 100644 --- a/app/Controllers/TicketController.php +++ b/app/Controllers/TicketController.php @@ -1307,7 +1307,7 @@ class TicketController extends BaseController 'approved_date' => ['label' => 'Approved Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Approved Date must be dd/mm/yyyy.']], 'approved_letter' => ['label' => 'Approved Letter','rules' => 'permit_empty','errors' => []], 'approved_description' => ['label' => 'Approved Description','rules' => 'permit_empty','errors' => []], - 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|alpha_numeric_punct','errors' => ['alpha_numeric_punct' => 'UTR Details contains invalid characters.']], + 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details only allows alphanumeric, spaces, and ~ ! # $ % & * - _ + = | : . , ']], 'settled_date' => ['label' => 'Settled Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Settled Date must be dd/mm/yyyy.']], 'settle_letter' => ['label' => 'Settle Letter','rules' => 'permit_empty','errors' => []], 'pay_initiate_date' => ['label' => 'Payment Initiate Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Payment Initiate Date must be dd/mm/yyyy.']], @@ -1418,7 +1418,7 @@ class TicketController extends BaseController 'approved_date' => ['label' => 'Approved Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Approved Date must be dd/mm/yyyy.']], 'approved_letter' => ['label' => 'Approved Letter','rules' => 'permit_empty','errors' => []], 'approved_description' => ['label' => 'Approved Description','rules' => 'permit_empty','errors' => []], - 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|alpha_numeric_punct','errors' => ['alpha_numeric_punct' => 'UTR Details contains invalid characters.']], + 'utr_details' => [ 'label' => 'UTR Details', 'rules' => 'permit_empty|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details only allows alphanumeric, spaces, and ~ ! # $ % & * - _ + = | : . , ']], 'settled_date' => ['label' => 'Settled Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Settled Date must be dd/mm/yyyy.']], 'settle_letter' => ['label' => 'Settle Letter','rules' => 'permit_empty','errors' => []], 'pay_initiate_date' => ['label' => 'Payment Initiate Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Payment Initiate Date must be dd/mm/yyyy.']], @@ -1672,7 +1672,8 @@ class TicketController extends BaseController 'approved_date' => ['label' => 'Approved Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Approved Date must be dd/mm/yyyy.']], 'approved_letter' => ['label' => 'Approved Letter','rules' => 'permit_empty','errors' => []], 'approved_description' => ['label' => 'Approved Description','rules' => 'permit_empty','errors' => []], - 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|alpha_numeric_punct','errors' => ['alpha_numeric_punct' => 'UTR Details contains invalid characters.']], + 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details only allows alphanumeric, spaces, and ~ ! # $ % & * - _ + = | : . , ']], + 'errors' => [ 'regex_match' => 'UTR Details only allows alphanumeric, spaces, and ~ ! # $ % & * - _ + = | : . , '], 'settled_date' => ['label' => 'Settled Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Settled Date must be dd/mm/yyyy.']], 'settle_letter' => ['label' => 'Settle Letter','rules' => 'permit_empty','errors' => []], 'pay_initiate_date' => ['label' => 'Payment Initiate Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Payment Initiate Date must be dd/mm/yyyy.']], @@ -1783,7 +1784,7 @@ class TicketController extends BaseController 'approved_date' => ['label' => 'Approved Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Approved Date must be dd/mm/yyyy.']], 'approved_letter' => ['label' => 'Approved Letter','rules' => 'permit_empty','errors' => []], 'approved_description' => ['label' => 'Approved Description','rules' => 'permit_empty','errors' => []], - 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|alpha_numeric_punct','errors' => ['alpha_numeric_punct' => 'UTR Details contains invalid characters.']], + 'utr_details' => ['label' => 'UTR Details','rules' => 'permit_empty|regex_match[/^[a-zA-Z0-9 ~!#$%&*\-_+=|:.,]+$/]','errors' => ['regex_match' => 'UTR Details only allows alphanumeric, spaces, and ~ ! # $ % & * - _ + = | : . , ']], 'settled_date' => ['label' => 'Settled Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Settled Date must be dd/mm/yyyy.']], 'settle_letter' => ['label' => 'Settle Letter','rules' => 'permit_empty','errors' => []], 'pay_initiate_date' => ['label' => 'Payment Initiate Date','rules' => 'permit_empty|regex_match[/^\d{2}\/\d{2}\/\d{4}$/]','errors' => ['regex_match' => 'Payment Initiate Date must be dd/mm/yyyy.']], diff --git a/app/Models/LeadsModel.php b/app/Models/LeadsModel.php index 5ed42522..d194375a 100644 --- a/app/Models/LeadsModel.php +++ b/app/Models/LeadsModel.php @@ -186,13 +186,19 @@ class LeadsModel extends Model public function getLeadForInsertClientList($type = null, $client_id = null) { $query = $this->db->table('leads') - ->select('leads.*, user_profiles.first_name as user_name') + ->select('leads.*, user_profiles.first_name as user_name, policy_type.allocg') ->join('user_profiles', 'leads.created_by = user_profiles.id') + ->join('policy_type', 'leads.policy_type_id = policy_type.id', 'left') ->where('leads.is_active', 1) ->where('leads.status', 'won') - ->where("leads.proposel_data IS NOT NULL AND leads.proposel_data <> ''") - ->where("(leads.is_client_created = '' OR leads.is_client_created IS NULL)") - ->where("(leads.is_policy_created = '' OR leads.is_policy_created IS NULL)"); + ->groupStart() + ->where("(leads.is_client_created = '' OR leads.is_client_created IS NULL)") + ->orWhere("(leads.is_policy_created = '' OR leads.is_policy_created IS NULL)") + ->groupEnd() + ->groupStart() + ->where("policy_type.allocg != 'EB'") + ->orWhere("(policy_type.allocg = 'EB' AND leads.proposel_data IS NOT NULL AND leads.proposel_data <> '')") + ->groupEnd(); if ($type) { $query->where('leads.lead_type', $type); diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php index e8720c97..b45d5d11 100755 --- a/app/Views/client_policy.php +++ b/app/Views/client_policy.php @@ -357,7 +357,7 @@ input:checked + .slider_blue::before {
- +
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 8c23fd9b..97eef3be 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -2107,9 +2107,14 @@ body[data-sidebar-size="condensed"] .footer { - - - +
  • diff --git a/app/Views/leads_list.php b/app/Views/leads_list.php index 2485c68e..07390580 100644 --- a/app/Views/leads_list.php +++ b/app/Views/leads_list.php @@ -236,7 +236,7 @@ table.dataTable tbody td { RFQ - + QCR @@ -262,7 +262,7 @@ table.dataTable tbody td { RFQ - + QCR diff --git a/dev_logs/2026-04-01.md b/dev_logs/2026-04-01.md index 0870e7f5..1d7e53a6 100644 --- a/dev_logs/2026-04-01.md +++ b/dev_logs/2026-04-01.md @@ -45,3 +45,29 @@ Also removed early-return on empty history so all 4 keys are always present in t ### API Docs - `dev_logs/non_eb_claim_api.md` + +--- + +### 5. Change: `uploadRequiredDoc` — rewritten to mirror `uploadIRDocs` + +**Old URL:** `POST /api/v1/non-eb-claim/{claim_id}/upload-required-doc` +**New URL:** `POST /api/v1/non-eb-claim/upload-required-doc` + +Old function copied as `uploadRequiredDoc_v1` (preserved for reference). + +**What changed:** +- Removed `claim_id` from URL; `ticket_id` now comes from POST body +- Switched from single-file (`file` field) to multi-file (`claim_docs[]` field) using `multi_file_Upload` +- Added `claim_doc_names[]` — index-matched names for uploaded files +- `required_docs` JSON string now sent by client and stored directly to `non_eb_ticket_master.required_docs` (no server-side checklist merging) +- Each inserted `claim_files` row now has `docs_for_ir = 1` +- Removed TPA push (`pushClaimFiles` not called) +- Success response simplified to `{status, code, message}` + +### Files Changed +- `app/Controllers/Api/NonEbClaimApiController.php` +- `app/Config/Routes.php` + +### API Docs +- `nonebapidocs.md` +- `dev_logs/non_eb_claim_api.md` diff --git a/dev_logs/non_eb_claim_api.md b/dev_logs/non_eb_claim_api.md index 242b4df1..3f844885 100644 --- a/dev_logs/non_eb_claim_api.md +++ b/dev_logs/non_eb_claim_api.md @@ -195,45 +195,34 @@ --- -## 4. Upload Required Document -`POST /{claim_id}/upload-required-doc` +## 4. Upload Required IR Documents +`POST /upload-required-doc` **Content-Type:** `multipart/form-data` ### Request Fields | Field | Type | Required | Notes | |---|---|---|---| -| `document_name` | string | Yes | Must exactly match a name in `required_docs.docs` | -| `file` | file | Yes | Allowed: pdf, jpg, jpeg, png, doc, docx, xls, xlsx | +| `ticket_id` | integer | Yes | The non-EB claim (ticket) ID | +| `claim_docs[]` | file(s) | Yes | One or more files to upload | +| `claim_doc_names[]` | string[] | Yes | Name for each file — index-matched to `claim_docs[]` | +| `required_docs` | string (JSON) | Yes | Full updated checklist JSON to store (e.g. `{"is_action_freeze":false,"docs":[...]}`) | ### Response — 200 ```json { "status": true, "code": 200, - "message": "Document uploaded successfully", - "claim_id": 42, - "document_name": "Claim Form", - "download_url": "https://yourdomain.com/downloadClaimFile/101", - "required_docs": { - "is_action_freeze": false, - "docs": [ - { "document_name": "Claim Form", "document_received": true }, - { "document_name": "Survey Report", "document_received": false } - ] - } + "message": "Files uploaded successfully" } ``` ### Error Responses | Code | Reason | |---|---| -| 400 | Missing `document_name` or invalid file | -| 404 | Claim not found, or `document_name` not in checklist | -| 415 | Unsupported file type | -| 422 | No required docs checklist configured | -| 423 | Checklist is locked (`is_action_freeze = true`) | -| 500 | File upload or DB transaction failed | +| 400 | No files uploaded or `ticket_id` missing | +| 401 | Missing / expired token | +| 500 | File upload or DB failed | --- diff --git a/nonebapidocs.md b/nonebapidocs.md index c161de0b..1c7e99bc 100644 --- a/nonebapidocs.md +++ b/nonebapidocs.md @@ -63,7 +63,7 @@ All responses follow this consistent shape: | 1 | `POST` | `/api/v1/non-eb-claim/create` | Raise a new Non-EB claim | | 2 | `POST` | `/api/v1/non-eb-claim/list` | List / search claims | | 3 | `GET` | `/api/v1/non-eb-claim/history/{claim_id}` | Status timeline of a claim | -| 4 | `POST` | `/api/v1/non-eb-claim/{claim_id}/upload-required-doc` | Upload a required document | +| 4 | `POST` | `/api/v1/non-eb-claim/upload-required-doc` | Upload required IR documents for a claim | | 5 | `GET` | `/api/v1/non-eb-claim/statuses` | List Non-EB claim statuses | | 6 | `POST` | `/api/v1/non-eb-claim/policies` | List Non-EB policies by client (MD5) + branch | @@ -319,23 +319,13 @@ Authorization: Bearer --- -## 4. Upload Required Document +## 4. Upload Required IR Documents -**POST** `/api/v1/non-eb-claim/{claim_id}/upload-required-doc` +**POST** `/api/v1/non-eb-claim/upload-required-doc` ### How it works -Each claim has a **required documents checklist** configured by the staff (e.g. "Invoice Copy", "Survey Report"). This endpoint lets the user upload a file against one of those checklist items. - -When a document is uploaded successfully, its `document_received` flag in the checklist is set to `true` and the updated checklist is returned so you can refresh the UI. - -The `document_name` you send must **exactly match** (case-sensitive) one of the `document_name` values in the checklist. Use the checklist data to drive your UI — display the exact names as options so the user cannot type the wrong value. - -### URL Parameter - -| Param | Type | Required | Description | -|---|---|---|---| -| `claim_id` | integer | Yes | The claim to upload against | +Uploads one or more IR documents for a claim. Each file is stored in `claim_files` with `docs_for_ir = 1`. The full updated `required_docs` JSON (checklist) sent by the client is written directly to `non_eb_ticket_master.required_docs` — the caller is responsible for reflecting any `document_received` flag changes in the JSON before sending. ### Request @@ -343,37 +333,24 @@ The `document_name` you send must **exactly match** (case-sensitive) one of the | Field | Required | Type | Notes | |---|---|---|---| -| `document_name` | Yes | string | Must exactly match a `document_name` in the claim's checklist | -| `file` | Yes | file | Allowed types: pdf, jpg, jpeg, png, doc, docx, xls, xlsx | - -### How to get the checklist - -The required documents list for a claim is returned when you fetch claim details (or can be shown after claim creation). The structure is: - -```json -{ - "is_action_freeze": false, - "docs": [ - { "document_name": "Invoice Copy", "document_received": false }, - { "document_name": "Survey Report", "document_received": true }, - { "document_name": "Police FIR Copy","document_received": false } - ] -} -``` - -- `is_action_freeze: true` means the checklist is locked — the upload endpoint will reject new uploads with `423`. -- `document_received: true` means the staff has already received this document. You may still re-upload if needed (previous upload is replaced). -- Show only the document names as upload targets — do not allow freetext entry. +| `ticket_id` | Yes | integer | The non-EB claim (ticket) ID | +| `claim_docs[]` | Yes | file(s) | One or more files; use the same field name for multiple | +| `claim_doc_names[]` | Yes | string[] | Document name for each uploaded file — index-matched to `claim_docs[]` | +| `required_docs` | Yes | string (JSON) | Full checklist JSON to persist (e.g. `{"is_action_freeze":false,"docs":[...]}`) | ### Example Request ``` -POST /api/v1/non-eb-claim/123/upload-required-doc +POST /api/v1/non-eb-claim/upload-required-doc Content-Type: multipart/form-data Authorization: Bearer -document_name = Invoice Copy -file = +ticket_id = 3 +claim_docs[] = +claim_docs[] = +claim_doc_names[] = ecard +claim_doc_names[] = Sample Doc 1 +required_docs = {"is_action_freeze":false,"docs":[{"document_name":"Sample Doc 1","document_received":true},{"document_name":"Sample Doc 2","document_received":false}]} ``` ### Success Response `200` @@ -382,36 +359,16 @@ file = { "status": true, "code": 200, - "message": "Document uploaded successfully", - "claim_id": 123, - "document_name": "Invoice Copy", - "download_url": "https://yourdomain.com/downloadClaimFile/456", - "required_docs": { - "is_action_freeze": false, - "docs": [ - { "document_name": "Invoice Copy", "document_received": true }, - { "document_name": "Survey Report", "document_received": true }, - { "document_name": "Police FIR Copy", "document_received": false } - ] - } + "message": "Files uploaded successfully" } ``` -> Use the returned `required_docs` to update the checklist UI immediately without a separate fetch. - ### Error Responses | Code | Scenario | Message | |---|---|---| -| `400` | `document_name` not sent | `"document_name is required"` | -| `400` | No file sent or invalid file | `"A valid file is required"` | +| `400` | No valid files uploaded or `ticket_id` missing | `"Failed to upload the file"` | | `401` | Missing / expired token | `"Unauthorized"` | -| `404` | Claim not found | `"Claim not found"` | -| `404` | `document_name` not in checklist | `"Document 'Invoice Copy' not found in required documents list"` | -| `415` | Unsupported file type | `"Unsupported file type: bmp"` | -| `422` | Claim has no checklist configured | `"No required documents checklist configured for this claim"` | -| `423` | Checklist is locked | `"Document checklist is locked for this claim"` | -| `500` | Upload or DB failure | `"File upload failed"` / `"Failed to save document. Please try again."` | ---