From 2626051ff656b6958e7666608a0d37d3e50e3a48 Mon Sep 17 00:00:00 2001
From: Gowtham M <gowtham.m@venbainfotech.com>
Date: Fri, 14 Nov 2025 12:25:40 +0530
Subject: [PATCH] GWM : FE request changes

---
 app/Controllers/StaffController.php | 29 +++++++++++++------
 app/Models/AgentModel.php           |  1 +
 app/Models/EnquiryModel.php         |  2 +-
 app/Models/InvoiceItemModel.php     | 41 +++++++++++++++++++++++++++
 app/Models/InvoiceModel.php         | 43 +++++++++++++++++++++++++++++
 app/Models/InvoiceUtrModel.php      | 39 ++++++++++++++++++++++++++
 6 files changed, 146 insertions(+), 9 deletions(-)
 create mode 100644 app/Models/InvoiceItemModel.php
 create mode 100644 app/Models/InvoiceModel.php
 create mode 100644 app/Models/InvoiceUtrModel.php

diff --git a/app/Controllers/StaffController.php b/app/Controllers/StaffController.php
index ede1cf0..1c92223 100644
--- a/app/Controllers/StaffController.php
+++ b/app/Controllers/StaffController.php
@@ -56,24 +56,37 @@ class StaffController extends ResourceController
             $handler_id = $this->request->getGet('handler_id');
             $manager_id = $this->request->getGet('manager_id');
 
+            $data = [];
+
             if(!empty($manager_id))
             {
-                $data = $this->StaffModel->select('partner_staff.id, partner_staff.name , R.role')
+                $staffData = $this->StaffModel->select('partner_staff.id, partner_staff.name , R.role')
                                         ->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')
                                         ->where('partner_staff.manager_id' , $manager_id )
                                         ->where('partner_staff.role_id' , 3 )
                                         ->where('partner_staff.is_active' , 1 )
                                         ->findAll();
+                $managerData = $this->StaffModel->select('partner_staff.id, partner_staff.name , R.role')
+                                        ->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')
+                                        ->where('partner_staff.id', $manager_id )
+                                        ->where('partner_staff.is_active' , 1 )
+                                        ->first();
+                 $data = array_values(array_unique(array_merge($staffData, [$managerData]), SORT_REGULAR));
 
             }else if(!empty($handler_id)){
 
-            $data = $this->StaffModel->select('partner_staff.id, partner_staff.name , R.role')
-                                    ->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')
-                                    ->where("JSON_CONTAINS(partner_staff.handler_id, '\"$handler_id\"')")
-                                    // ->where('partner_staff.handler_id' , $handler_id )
-                                    ->where('partner_staff.role_id' , 3 )
-                                    ->where('partner_staff.is_active' , 1 )
-                                    ->findAll();
+                $staffData = $this->StaffModel->select('partner_staff.id, partner_staff.name , R.role')
+                                        ->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')
+                                        ->where("JSON_CONTAINS(partner_staff.handler_id, '\"$handler_id\"')")
+                                        ->where('partner_staff.role_id' , 3 )
+                                        ->where('partner_staff.is_active' , 1 )
+                                        ->findAll();
+                $handlerData = $this->StaffModel->select('partner_staff.id, partner_staff.name , R.role')
+                                        ->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')
+                                        ->where('partner_staff.id', $handler_id )
+                                        ->where('partner_staff.is_active' , 1 )
+                                        ->first();
+                 $data = array_values(array_unique(array_merge($staffData, [$handlerData]), SORT_REGULAR));
             }
 
             return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data], 200);
diff --git a/app/Models/AgentModel.php b/app/Models/AgentModel.php
index 3332063..80e60a8 100644
--- a/app/Models/AgentModel.php
+++ b/app/Models/AgentModel.php
@@ -18,6 +18,7 @@ class AgentModel extends Model
         'email_otp',
         'firebase_device_token',
         'manager_id',
+        'commission_retain',
         'is_active',
         'created_by',
         'created_on',
diff --git a/app/Models/EnquiryModel.php b/app/Models/EnquiryModel.php
index 149ff88..ae10dc3 100644
--- a/app/Models/EnquiryModel.php
+++ b/app/Models/EnquiryModel.php
@@ -42,7 +42,7 @@ class EnquiryModel extends Model
     {
                 $data = $this->select('partner_enquiry.*, partner_enquiry.name as insured_name,
                                 VT.vehicle_type as vehicle_type,
-                                A.name as agent_name,
+                                A.name as agent_name, A.agent_code,
                                 I.name as insurer_name,I.short_name as insurer_short_name,
                                 S.name as assigned_to_name,
                                 Q.id as quotation_id,
diff --git a/app/Models/InvoiceItemModel.php b/app/Models/InvoiceItemModel.php
new file mode 100644
index 0000000..328be1d
--- /dev/null
+++ b/app/Models/InvoiceItemModel.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class InvoiceItemModel extends Model
+{
+    protected $table            = 'partner_invoice_items';
+    protected $primaryKey       = 'id';
+    protected $useAutoIncrement = true;
+
+    protected $returnType       = 'array';
+    protected $useSoftDeletes   = false;
+
+    protected $allowedFields    = [
+        'invoice_id',
+        'policy_id',
+        'policy_no',
+        'commission_amount',
+        'is_active',
+        'created_at',
+        'created_by',
+        'updated_at',
+        'updated_by'
+    ];
+
+    protected $useTimestamps = false;
+    protected $createdField  = 'created_at';
+    protected $updatedField  = 'updated_at';
+
+    protected $validationRules = [
+        'invoice_id'        => 'required|integer',
+        'policy_id'         => 'required|integer',
+        'policy_no'         => 'required|max_length[100]',
+        'commission_amount' => 'decimal'
+    ];
+
+    protected $validationMessages = [];
+    protected $skipValidation     = false;
+}
diff --git a/app/Models/InvoiceModel.php b/app/Models/InvoiceModel.php
new file mode 100644
index 0000000..fce8f79
--- /dev/null
+++ b/app/Models/InvoiceModel.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class InvoiceModel extends Model
+{
+    protected $table            = 'partner_invoice';
+    protected $primaryKey       = 'id';
+    protected $useAutoIncrement = true;
+
+    protected $returnType       = 'array';
+    protected $useSoftDeletes   = false;
+
+    protected $allowedFields    = [
+        'invoice_no',
+        'invoice_amount',
+        'agent_id',
+        'invoice_date',
+        'is_active',
+        'created_at',
+        'created_by',
+        'updated_at',
+        'updated_by'
+    ];
+
+    // Timestamps
+    protected $useTimestamps = false;
+    protected $createdField  = 'created_at';
+    protected $updatedField  = 'updated_at';
+
+    // Validation (optional)
+    protected $validationRules = [
+        'invoice_no'      => 'required|max_length[100]',
+        'invoice_amount'  => 'decimal',
+        'agent_id'        => 'required|integer',
+        'invoice_date'    => 'required|valid_date',
+    ];
+
+    protected $validationMessages = [];
+    protected $skipValidation     = false;
+}
diff --git a/app/Models/InvoiceUtrModel.php b/app/Models/InvoiceUtrModel.php
new file mode 100644
index 0000000..9f0c44c
--- /dev/null
+++ b/app/Models/InvoiceUtrModel.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class InvoiceUtrModel extends Model
+{
+    protected $table            = 'partner_invoice_utr';
+    protected $primaryKey       = 'id';
+    protected $useAutoIncrement = true;
+
+    protected $returnType       = 'array';
+    protected $useSoftDeletes   = false;
+
+    protected $allowedFields    = [
+        'invoice_id',
+        'utr_no',
+        'amount',
+        'is_active',
+        'created_at',
+        'created_by',
+        'updated_at',
+        'updated_by'
+    ];
+
+    protected $useTimestamps = false;
+    protected $createdField  = 'created_at';
+    protected $updatedField  = 'updated_at';
+
+    protected $validationRules = [
+        'invoice_id' => 'required|integer',
+        'utr_no'     => 'required|max_length[100]',
+        'amount'     => 'decimal'
+    ];
+
+    protected $validationMessages = [];
+    protected $skipValidation     = false;
+}