diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 7b5f1610..d2a077fd 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -480,7 +480,6 @@ $routes->group("rfq", ["filter" => "authMVC"], function ($routes) { $routes->get("driveListFiles", "GoogleDriveController::listFiles"); $routes->post('dmsSearch', 'PolicyTransactionController::dmsSearch', ['filter' => 'authMVC']); $routes->get('dmsSearch', 'PolicyTransactionController::dmsSearch', ['filter' => 'authMVC']); -$routes->get('payouts', 'PolicyTransactionController::payouts', ['filter' => 'authMVC']); $routes->get('downloadGdriveFile', 'GoogleDriveController::downloadGdriveFile', ['filter' => 'authMVC']); $routes->get('cli/sendZeptoMail', 'MasterController::testZeptoSMTP'); @@ -774,6 +773,10 @@ $routes->group('payout', function($routes) { $routes->post('fetchUtrDetails',"PayoutController::fetchUtrDetails"); $routes->post('saveUtrDetails',"PayoutController::saveUtrDetails"); $routes->post('removeUtrDetails',"PayoutController::removeUtrDetails"); + // invoice policy mapping + $routes->get('invoices', 'PayoutController::invoices'); + $routes->post('invoices/save', 'PayoutController::saveInvoice'); + $routes->get('invoices/history', 'PayoutController::auditHistory'); }); //PARTNER COMMISSION @@ -787,5 +790,6 @@ $routes->group('commission', function($routes) { $routes->get('rules/list/(:any)',"RuleImportController::ruleList/$1"); $routes->post('rules/save/',"RuleImportController::saveRule"); $routes->post('rules/remove/',"RuleImportController::removeRule"); + $routes->get('checkRuleUsage',"RuleImportController::checkRuleUsage"); }); diff --git a/app/Controllers/InsuranceCommissionController.php b/app/Controllers/InsuranceCommissionController.php index 3798237a..f2907bf6 100644 --- a/app/Controllers/InsuranceCommissionController.php +++ b/app/Controllers/InsuranceCommissionController.php @@ -13,7 +13,7 @@ class InsuranceCommissionController extends AdminController public function __construct() { - set_session_context('Client'); + set_session_context('InsuranceCommissionController'); $this->myLogger = \Config\Services::mylogger(); // Load rules file if present in writable config path // $rulesPath = WRITEPATH . 'config/insurance_rules.json'; @@ -122,7 +122,10 @@ class InsuranceCommissionController extends AdminController // Normalise department keys to lowercase for consistent lookups $this->rules = []; foreach ($parsed as $dept => $rules) { - $this->rules[strtolower($dept)] = $rules; + if($rules['is_deleted'] === false) + { + $this->rules[strtolower($dept)] = $rules; + } } // print_r($this->rules);die(); diff --git a/app/Controllers/NotificationController.php b/app/Controllers/NotificationController.php index ee50a0fd..98067fa9 100755 --- a/app/Controllers/NotificationController.php +++ b/app/Controllers/NotificationController.php @@ -258,7 +258,7 @@ class NotificationController extends AdminController $template_id = $this->request->getPost('template_id'); - $test_mail = $this->request->getPost('test_mail'); + // $test_mail = $this->request->getPost('test_mail'); $test_mail_list = $this->request->getPost('test_mail_list'); @@ -268,27 +268,67 @@ class NotificationController extends AdminController if(!empty($notification_data)){ - $params = [ - 'client_data' => $client_data, - 'notification_data' => $notification_data, - 'test_mail' => $test_mail, - 'test_mail_list' => $test_mail_list - ]; + // First Index as test mail all are testmaillist + // $params = [ + // 'client_data' => $client_data, + // 'notification_data' => $notification_data, + // 'test_mail' => $test_mail, + // 'test_mail_list' => $test_mail_list + // ]; + // $testMailData = sendMailNotification::sendMailNotificationForTesting($notification_data['template_name'], $params); + // if (!empty($testMailData)) { + // $mail_send_return1 = MailHelper::send_email($testMailData); + // $this->myLogger->logme("info", $mail_send_return1); + // $this->myLogger->logme("info", $mail_send_return1); + // return $this->respond(['status' => true,'code' => 200, 'respond' => json_decode($mail_send_return1)]); + // }else{ + // return $this->respond(['status' => false,'code' => 200, 'message' => 'Test Mail Data Does Not Exist']); + // } - $testMailData = sendMailNotification::sendMailNotificationForTesting($notification_data['template_name'], $params); - // print_r($testMailData); die; - if (!empty($testMailData)) { - $mail_send_return1 = MailHelper::send_email($testMailData); - $this->myLogger->logme("info", $mail_send_return1); - $this->myLogger->logme("info", $mail_send_return1); + $mailArray = explode(',', $test_mail_list); + $successMails = []; + $failedMails = []; - return $this->respond(['status' => true,'code' => 200, 'respond' => json_decode($mail_send_return1)]); + foreach ($mailArray as $singleMail) { + $singleMail = trim($singleMail); - }else{ + $params = [ + 'client_data' => $client_data, + 'notification_data' => $notification_data, + 'test_mail' => $singleMail, + 'test_mail_list' => "" // optional + ]; + + $testMailData = sendMailNotification::sendMailNotificationForTesting($notification_data['template_name'], $params); + + if (!empty($testMailData)) { + $mail_send_return1 = MailHelper::send_email($testMailData); + + if ($mail_send_return1) { + $successMails[] = $singleMail; + } else { + $failedMails[] = $singleMail; + } + + $this->myLogger->logme("info", "Mail attempt to {$singleMail}: " . $mail_send_return1); + } else { + $failedMails[] = $singleMail; + $this->myLogger->logme("info", "Test Mail Data Does Not Exist for {$singleMail}"); + } + } + + // Prepare final response + if (!empty($successMails)) { + $responseMessage = "Count " . count($successMails) . " mail(s) sent successfully: \n" . implode("\n", $successMails); + if (!empty($failedMails)) { + $responseMessage .= "\nCount " . count($failedMails) . " mail(s) failed: \n" . implode("\n", $failedMails); + } + return $this->respond(['status' => true,'code' => 200,'message' => $responseMessage]); + } else { + return $this->respond(['status' => false,'code' => 200,'message' => 'All mails failed to send: ' . implode(", ", $failedMails)]); + } - return $this->respond(['status' => false,'code' => 200, 'message' => 'Test Mail Data Does Not Exist']); - } }else{ return $this->respond(['status' => false,'code' => 200, 'message' => 'Notification Template not enabled']); diff --git a/app/Controllers/PayoutController.php b/app/Controllers/PayoutController.php index 02bbe1b2..5c86ff39 100644 --- a/app/Controllers/PayoutController.php +++ b/app/Controllers/PayoutController.php @@ -9,6 +9,7 @@ use App\Models\InvoiceItemModel; use App\Models\InvoiceModel; use App\Models\InvoiceUtrModel; use App\Models\PolicyTransactionModel; +use App\Models\AuditHistoryModel; class PayoutController extends BaseController { @@ -20,21 +21,23 @@ class PayoutController extends BaseController protected $policyTransactionModel; protected $payout_status; + protected $auditHistory; + public function __construct() { set_session_context('PayoutController'); $this->myLogger = \Config\Services::mylogger(); $this->payout_status = [ - 1 => "Draft", - 2 => "Pending", - 3 => "Complete", + 1 => "Pending", + 2 => "Complete", ]; $this->invoiceItemModel = new InvoiceItemModel(); $this->invoiceModel = new InvoiceModel(); $this->invoiceUtrModel = new InvoiceUtrModel(); $this->policyTransactionModel = new PolicyTransactionModel(); + $this->auditHistory = new AuditHistoryModel(); } public function payoutList() @@ -189,4 +192,263 @@ class PayoutController extends BaseController } + /*************************************************************************************************************/ + //... Payout-invoice Mapping Commission's amount and Adjustment's Amount - Data Display + public function invoices() + { + + $type = $this->request->getGet('type'); + + $title = $type === 'add' ? 'Add Invoices' + : ($type === 'edit' ? 'Edit Invoices' + : ($type === 'adjustment' ? 'Adjustment Invoices' + : 'Invoices')); + + $data['tab_name'] = $title; + $data['page_name'] = $title; + + $id = $this->request->getGet('id'); + + + $data['agents'] = $this->invoiceModel->agentList(); // common both add and edit + // $data['checked_policy_numbers'] = []; + // $data['invoice'] = []; + // $data['extra_payouts'] = []; + + //... Now Seperated add => 'policy_transaction_payouts1' + //... Now Seperated edit and adjustment => 'policy_transaction_payouts' old file + //... Reason : Due Datatable issues Export button Searching like that so seperated + if ($type === 'add') { + $invoiceNo = $this->generateInvoiceNumber(); + $data['payouts'] = $this->invoiceModel->payoutList(1); + $data['invoice_number'] = $invoiceNo; + return $this->loadLayout('invoice_policy_mapping_add', $data); + } + + if (($type === 'edit' || $type === 'adjustment') && !empty($id)) { + + $invoice = $this->invoiceModel->where('id', $id)->first(); + $data['freeze_edit'] = $this->auditHistory->where('table_name', 'partner_invoice')->where('pk', $id)->countAllResults(); + + $agentId = $invoice['agent_id'] ?? null; + + $data['payouts'] = $this->invoiceModel->payoutList(2 ,$agentId,$id); + $data['extra_payouts'] = $agentId ? $this->invoiceModel->payoutList(3, $agentId) : []; + + $invoice_items = $this->invoiceItemModel->where('invoice_id', $id)->findAll(); + + if (!$invoice) { return redirect()->to('payout/invoices')->with('error', 'Invoice not found'); } + + $data['invoice'] = $invoice; + $data['invoice_items'] = $invoice_items; + // Initialize array for policy numbers + $data['checked_policy_numbers'] = array_column(array_filter($invoice_items, fn($ii) => isset($ii['is_active']) && $ii['is_active'] == 1),'policy_no'); + + $data['invoice_number']= $invoice['invoice_no']; + $data['type'] = $type; + + return $this->loadLayout('invoice_policy_mapping', $data); + + } + + + } + + //... Payout-invoice Mapping - Save/update/soft Delete/Hard Delete Data + public function saveInvoice() + { + $json = $this->request->getJSON(true); + + if (!$json) { + return $this->response->setJSON(['error' => 'Invalid JSON','message' => 'Invalid JSON received.'])->setStatusCode(400); + } + + $id = $json['invoice_id'] ?? null; + try { + + //... ADD Part + if (empty($id)) { + + $invoiceData = [ + 'invoice_no' => $json['invoice_no'], + 'agent_id' => $json['agent_id'], + 'invoice_date' => $json['invoice_date'], + 'invoice_amount' => $json['invoice_amount'], + 'payout_status' => 1 + ]; + + $invoiceId = $this->invoiceModel->insert($invoiceData); + + foreach ($json['policies'] as $p) { + $this->invoiceItemModel->insert([ + 'invoice_id' => $invoiceId, + 'policy_id' => $p['policy_id'], + 'policy_no' => $p['policy_no'], + 'commission_amount' => $p['commission_amount'], + 'is_active' => 1 + ]); + } + + $message = "Invoice created successfully.\nInvoice No: " . $json['invoice_no']; + + } + + // ... EDIT part + if (!empty($id)) { + + $invoiceId = $id; + + $invoiceData = [ + 'invoice_no' => $json['invoice_no'], + 'agent_id' => $json['agent_id'], + 'invoice_date' => $json['invoice_date'], + 'invoice_amount' => $json['invoice_amount'], + ]; + + $this->invoiceModel->update($invoiceId, $invoiceData); + + //... Fetch existing invoice item rows + $existingItems = $this->invoiceItemModel + ->where('invoice_id', $invoiceId) + ->findAll(); + + //... Create map by policy_no + $existingMap = []; + foreach ($existingItems as $item) { + $existingMap[$item['policy_no']] = $item; + } + + $newPolicyNos = []; + + //... Loop new JSON policies + foreach ($json['policies'] as $p) { + + $newPolicyNos[] = $p['policy_no']; + + if (isset($existingMap[$p['policy_no']])) { + + //... Update existing item + $this->invoiceItemModel + ->where('id', $existingMap[$p['policy_no']]['id']) + ->set([ + 'commission_amount' => $p['commission_amount'], + 'is_active' => 1 + ]) + ->update(); + + } else { + + //... Insert new item + $this->invoiceItemModel->insert([ + 'invoice_id' => $invoiceId, + 'policy_id' => $p['policy_id'], + 'policy_no' => $p['policy_no'], + 'commission_amount' => $p['commission_amount'], + 'is_active' => 1, + ]); + } + } + + //... Delete items removed in JSON (hard delete) + foreach ($existingItems as $old) { + if (!in_array($old['policy_no'], $newPolicyNos)) { + $this->invoiceItemModel + ->where('id', $old['id']) + ->delete(); + } + } + //... Delete items removed in JSON (soft delete REF : SVM ) + // foreach ($existingItems as $old) { + // if (!in_array($old['policy_no'], $newPolicyNos)) { + // $this->invoiceItemModel + // ->where('id', $old['id']) + // ->set(['is_active' => 0]) + // ->update(); + // } + // } + + $message = "Invoice updated successfully."; + + } + + return $this->response->setJSON([ + 'status' => 'success', + 'message' => $message, + 'invoice_id' => $invoiceId + ]); + + } catch (\Exception $e) { + + return $this->response->setJSON([ + 'status' => 'error', + 'message' => 'Unexpected error occurred: ' . $e->getMessage() + ]); + } + } + + + + + //... Payout-invoice Mapping - Invoice number is auto-generated only for the Add mode. + // Note: It will change each time the page is reloaded.. (REF:MGW) + private function generateInvoiceNumber() + { + $year = date('Y'); + $month = date('m'); + + do { + // random 3-digit number + $random = str_pad(rand(1, 999), 3, '0', STR_PAD_LEFT); + $invoiceNo = "INV{$year}{$month}{$random}"; + + // check main invoice table + $existsMain = $this->invoiceModel + ->where('invoice_no', $invoiceNo) + ->first(); + + // check partner invoice table + $existsPartner = $this->invoiceModel + ->where('invoice_no', $invoiceNo) + ->first(); + + } while ($existsMain || $existsPartner); // regenerate if duplicate found + + return $invoiceNo; + } + + //... Payout-invoice Mapping Audit History Based on "Adjustment" value (REF: KV,SVM) + public function auditHistory() + { + + + $iid = $this->request->getGet('id'); + + $details['invoice'] = $this->auditHistory + ->select('auditing_history.*,partner_invoice.invoice_no, user_profiles.first_name as created_name') + ->join('user_profiles', 'user_profiles.id = auditing_history.created_by', 'left') + ->join('partner_invoice', 'partner_invoice.id = auditing_history.pk', 'left') + ->where('auditing_history.table_name', 'partner_invoice') // ok + ->where('auditing_history.pk', $iid) + ->orderBy('auditing_history.created_at', 'desc') + ->get() + ->getResultArray(); + + $details['invoice_child'] = $this->auditHistory + ->select('auditing_history.*,partner_invoice.invoice_no, user_profiles.first_name as created_name') + ->join('user_profiles', 'user_profiles.id = auditing_history.created_by', 'left') + ->join('partner_invoice_items', 'partner_invoice_items.id = auditing_history.pk', 'left') + ->join('partner_invoice', 'partner_invoice.id = partner_invoice_items.invoice_id', 'left') + ->where('auditing_history.table_name', 'partner_invoice_items') // FIXED + ->where('partner_invoice.id', $iid) + ->orderBy('auditing_history.created_at', 'desc') + ->get() + ->getResultArray(); + + return $this->response->setJSON([ + 'status' => 'success', + 'data' => $details + ]); + + } + } diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php index 8d24f27b..a2f88d5f 100644 --- a/app/Controllers/PolicyTransactionController.php +++ b/app/Controllers/PolicyTransactionController.php @@ -2811,20 +2811,6 @@ $this->loadLayout('dms_search', $data); } - public function payouts() - { - - $data['tab_name'] = 'Payouts'; - $data['page_name'] = 'Payouts'; - $data['payouts'] = []; - $data['agents'] = [ 1 => "Agent 1", 2 => "Agent 2", 3 => "Agent 3", 4 => "Agent 4", 5 => "Agent 5", 6 => "Agent 6", 7 => "Agent 7", 8 => "Agent 8"]; - $data['brokers'] = []; - - if ($this->request->is('post')) {} - if ($this->request->is('get')) {} - - $this->loadLayout('policy_transaction_payouts', $data); - } //--------------------------------------------------------------------------------------------------- public function getCoShareStatementDetails($pt_id) diff --git a/app/Controllers/RuleImportController.php b/app/Controllers/RuleImportController.php index 2c155f71..b9f468d6 100644 --- a/app/Controllers/RuleImportController.php +++ b/app/Controllers/RuleImportController.php @@ -4,6 +4,9 @@ namespace App\Controllers; use CodeIgniter\API\ResponseTrait; use App\Models\CommissionFilesModel; use App\Models\InsurerModel; +use App\Models\PartnerPolicyModel; + + class RuleImportController extends AdminController { @@ -14,6 +17,7 @@ class RuleImportController extends AdminController protected $departments; protected $departmentFields; protected $insurerModel; + protected $partnerPolicyModel; public function __construct() { @@ -21,7 +25,7 @@ class RuleImportController extends AdminController $this->myLogger = \Config\Services::mylogger(); $this->ruleImportService = \Config\Services::ruleImportService(); - + $this->partnerPolicyModel = new partnerPolicyModel(); $this->commissionFilesModel = new CommissionFilesModel(); $this->insurerModel = new InsurerModel(); $this->departments = [ @@ -208,6 +212,8 @@ class RuleImportController extends AdminController 'insurer_id' => (int)$insurerId, 'department' => $department, 'commission_month' => $commissionMonth, + 'created_by' => (int)$createdBy, + ]; $this->myLogger->logme('info', 'RuleImportController::upload - Calling ruleImportService->processUpload', ['payload' => $payload]); @@ -276,10 +282,22 @@ class RuleImportController extends AdminController // handle existing JSON file based on $override (bool) if (file_exists($jsonPath)) { if ($overwrite) { - // delete existing file before writing (deterministic overwrite) - if (!@unlink($jsonPath)) { - $this->myLogger->logme('warning', 'RuleImportController::upload - Failed to delete existing JSON before overwrite', ['json_path' => $jsonPath]); - // proceed to overwrite anyway by writing to the same path + // rename existing file before overwrite + if (file_exists($jsonPath)) { + + $backupPath = $jsonPath . '.' . date('YmdHis') . '.bak'; + + if (!@rename($jsonPath, $backupPath)) { + $this->myLogger->logme( + 'warning', + 'RuleImportController::upload - Failed to rename existing JSON before overwrite', + [ + 'json_path' => $jsonPath, + 'backup_path' => $backupPath + ] + ); + // continue anyway; writing to same path will overwrite + } } $finalJson = $jsonData; } else { @@ -797,5 +815,15 @@ class RuleImportController extends AdminController return $this->respond(['status' => false, 'code' => 400, 'message' => $error_message], 200); } } + + public function checkRuleUsage() + { + $rule_id = $this->request->getGet('rule_id'); + + $count = $this->partnerPolicyModel->where('commission_applied_rule', $rule_id) + ->countAllResults(); + return $this->respond(['status' => true, 'code' => 200, 'count' => $count, 'message' => ""], 200); + } + } diff --git a/app/Helpers/MailHelper.php b/app/Helpers/MailHelper.php index 89e90262..6c16ca8a 100755 --- a/app/Helpers/MailHelper.php +++ b/app/Helpers/MailHelper.php @@ -318,7 +318,7 @@ class MailHelper $attachments = isset($params['attachments']) ? $params['attachments'] : []; $common = isset($params['common']) ? $params['common'] : ''; $bcc = isset($params['bcc']) ? $params['bcc'] : ''; - $cc = isset($params['cc']) ? $params['cc'] : ''; + $cc = (isset($params['cc']) && !empty($params['cc'])) ? $params['cc'] : ''; $from_address = isset($params['from_mail']) && !empty($params['from_mail']) ? $params['from_mail'] : getenv('email.fromEmail'); // $from_address = "claims@nhanceindia.in"; diff --git a/app/Libraries/RuleImportService.php b/app/Libraries/RuleImportService.php index 3e471f57..ff0f5fe5 100644 --- a/app/Libraries/RuleImportService.php +++ b/app/Libraries/RuleImportService.php @@ -62,6 +62,7 @@ class RuleImportService protected array $expectedColumns; protected array $columnValidators; + protected array $incomingData; protected string $annotatedDir; protected string $department; protected string $uploadedCommissionFileID; @@ -148,7 +149,7 @@ class RuleImportService { // dd($params); $startTime = microtime(true); - + $this->incomingData = $params; try { $this->department = $params['department']; $this->uploadedCommissionFileID = $params['id']; @@ -898,13 +899,29 @@ class RuleImportService */ protected function convertRowToRule(array $rowData): array { + $temp_rule_id = $this->generateRuleId($rowData); + //rule_e07f52d4366a2_32_oct2025_3_com + + $conditions = $this->buildConditions($rowData); + $temp_rule_id .= '_'.$this->incomingData['id'].'_'. strtolower(date('MY')).'_'.(count($conditions)); + $calculation = $this->buildCalculation($rowData); + + + $temp_rule_id .= '_'.substr($calculation['type'], 0, 3); + $rule = [ - 'id' => $this->generateRuleId($rowData), + 'id' => $temp_rule_id, 'name' => $this->sanitize($rowData[self::COL_RULE_NAME] ?? ''), 'department' => $this->department, + 'is_deleted' => false, 'file_id' => $this->uploadedCommissionFileID, - 'conditions' => $this->buildConditions($rowData), - 'calculation' => $this->buildCalculation($rowData) + 'conditions' => $conditions, + 'calculation' => $calculation, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), + 'created_by' => $this->incomingData['created_by'], + 'updated_by' => $this->incomingData['created_by'], + ]; return $rule; diff --git a/app/Models/InvoiceItemModel.php b/app/Models/InvoiceItemModel.php index 328be1d9..2533dd0f 100644 --- a/app/Models/InvoiceItemModel.php +++ b/app/Models/InvoiceItemModel.php @@ -38,4 +38,29 @@ class InvoiceItemModel extends Model protected $validationMessages = []; protected $skipValidation = false; + + protected $beforeInsert = ["checkAndAddCreatedByValue"]; + protected $beforeUpdate = ["checkAndUpdateUpdatedByValue"]; + + protected function checkAndAddCreatedByValue(array $data) + { + // Check if 'updated_by' value is null or empty + if (empty($data['data']['created_by'])) { + // Set 'updated_by' value to the current session user ID + $data['data']['created_by'] = get_session_userid(); + } + + return $data; + } + + protected function checkAndUpdateUpdatedByValue(array $data) + { + // Check if 'updated_by' value is null or empty + if (empty($data['data']['updated_by'])) { + // Set 'updated_by' value to the current session user ID + $data['data']['updated_by'] = get_session_userid(); + } + + return $data; + } } diff --git a/app/Models/InvoiceModel.php b/app/Models/InvoiceModel.php index 49d91ced..ea5fc4d3 100644 --- a/app/Models/InvoiceModel.php +++ b/app/Models/InvoiceModel.php @@ -29,7 +29,7 @@ class InvoiceModel extends Model protected $useTimestamps = false; protected $createdField = 'created_at'; protected $updatedField = 'updated_at'; - + // Validation (optional) protected $validationRules = [ 'invoice_no' => 'required|max_length[100]', @@ -187,4 +187,57 @@ class InvoiceModel extends Model return $data; } + + + public function payoutList($flag, $agentId = null, $invoiceId = null) + { + $builder = $this->db->table('policy_transaction pt') + ->select(' + pt.id, + pt.policy_no AS policyNo, + pt.agent_id AS agentId, + pp.insured_name AS customer, + pp.premium_amount AS premium, + pp.commission_amount AS commission, + pp.issued_date AS date_db, + DATE_FORMAT(pp.issued_date, "%d/%m/%Y") AS date, + pii.id AS invoiceItemId + ') + ->join('partner_policy pp','pt.policy_no = pp.policy_number AND pt.agent_id = pp.agent_id','left') + ->where('pt.is_active',1) + ->where('pt.agent_id IS NOT NULL', null, false); + + if ($flag == 1) { // Add mode + // EXCLUDE all policies that exist in partner_invoice_items + $builder->join('partner_invoice_items pii','pii.policy_no = pt.policy_no','left'); + $builder->where("pt.policy_no NOT IN (SELECT policy_no FROM partner_invoice_items)", null, false); + } + + if ($flag == 2) { // Edit mode + // Policies belonging to a specific invoice + $builder->select('pii.commission_amount as paid_amount'); + $builder->join('partner_invoice_items pii','pii.policy_no = pt.policy_no','inner'); // must exist + $builder->join('partner_invoice pi','pi.id = pii.invoice_id','inner'); // must exist + $builder->where('pii.is_active',1); + if ($invoiceId) { + $builder->where('pi.id', $invoiceId); // only policies of this invoice + } + if ($agentId) { + $builder->where('pt.agent_id', $agentId); + } + } + + if ($flag == 3) { // Extra policies + // Policies not assigned to any invoice + $builder->select('pii.commission_amount as paid_amount'); + $builder->join('partner_invoice_items pii','pii.policy_no = pt.policy_no','left'); + $builder->where('pii.id IS NULL', null, false); + if ($agentId) { + $builder->where('pt.agent_id', $agentId); + } + } + + return $builder->get()->getResultArray(); + } + } diff --git a/app/Views/add_image_list.php b/app/Views/add_image_list.php index 46332236..c47c5880 100755 --- a/app/Views/add_image_list.php +++ b/app/Views/add_image_list.php @@ -36,9 +36,9 @@ table.dataTable thead th { - - - + + + @@ -222,7 +222,8 @@ var table; $(document).ready(function() { table = $('#tickets-table').DataTable({ - dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, button right + // dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, button right + dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", buttons: [ diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php index c0ff4584..c530a6bb 100755 --- a/app/Views/cd_master_list.php +++ b/app/Views/cd_master_list.php @@ -17,6 +17,8 @@ table.dataTable thead th { max-width: 98% !important; } +.column-header {margin-right: 10px;} + .custom-dropdown-menu { display: none; position: absolute; @@ -70,15 +72,15 @@ table.dataTable thead th {
Advertisement Image NameStatusAction
Advertisement Image Name
Status
Action
- - - - - - - - - + + + + + + + + + @@ -215,7 +217,7 @@ table.dataTable thead th { $('#scroll-horizontal-datatable').DataTable({ scrollX: true, - dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + + dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", buttons: [ diff --git a/app/Views/client_deposit_list.php b/app/Views/client_deposit_list.php index c8be27ae..a86ffa11 100755 --- a/app/Views/client_deposit_list.php +++ b/app/Views/client_deposit_list.php @@ -103,9 +103,9 @@ $(document).ready(function() {
_INPUT_ + style="position:absolute; right:11px; top:50%; transform:translateY(-53%); color:#666;"> + style="position:absolute; right:11px; top:50%; transform:translateY(-53%); color:#666; display:none;">
`, searchPlaceholder: "Search", emptyTable: '
No Data found
' diff --git a/app/Views/client_list.php b/app/Views/client_list.php index 1a2f21f4..473d75fe 100755 --- a/app/Views/client_list.php +++ b/app/Views/client_list.php @@ -344,9 +344,9 @@ $(document).ready(function()
_INPUT_ + style="position:absolute; right:11px; top:50%; transform:translateY(-53%); color:#666;"> + style="position:absolute; right:11px; top:50%; transform:translateY(-53%); color:#666; display:none;">
`, searchPlaceholder: "Search", emptyTable: '
No Data found
' diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php index cb197be9..a64e3fc3 100755 --- a/app/Views/client_policy.php +++ b/app/Views/client_policy.php @@ -560,6 +560,20 @@ input:checked + .slider_blue::before { searching: true, autoWidth: false, responsive: true, + language: { + search: ` +
+ _INPUT_ + + + +
+ `, + searchPlaceholder: "Search", + emptyTable: '
No Data found
' + }, }); @@ -2543,6 +2557,20 @@ $(document).ready(function () { searching: true, autoWidth: false, responsive: true, + // language: { + // search: ` + //
+ // _INPUT_ + // + + // + //
+ // `, + // searchPlaceholder: "Search", + // emptyTable: '
No Data found
' + // }, }); diff --git a/app/Views/dms_search.php b/app/Views/dms_search.php index 6bdd968a..1808ab8b 100644 --- a/app/Views/dms_search.php +++ b/app/Views/dms_search.php @@ -173,7 +173,7 @@ if (ticketsTable.length) { ticketsTable.DataTable({ scrollX: true, - dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + + dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", buttons: [{ @@ -197,6 +197,20 @@ }], paging: true, pageLength: 10, + language: { + search: ` +
+ _INPUT_ + + + +
+ `, + searchPlaceholder: "Search", + emptyTable: '
No Data found
' + }, order: [ [0, 'desc'] ] diff --git a/app/Views/hr_activity_history.php b/app/Views/hr_activity_history.php index 8f52d592..f069c886 100644 --- a/app/Views/hr_activity_history.php +++ b/app/Views/hr_activity_history.php @@ -102,8 +102,18 @@ $(document).ready(function () { "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", language: { - search: "_INPUT_", - searchPlaceholder: "Search..." + search: ` +
+ _INPUT_ + + + +
+ `, + searchPlaceholder: "Search", + emptyTable: '
No Data found
' }, paging: true, pageLength: 10, diff --git a/app/Views/insurer_statement_list.php b/app/Views/insurer_statement_list.php index 197d19ed..b0c05935 100644 --- a/app/Views/insurer_statement_list.php +++ b/app/Views/insurer_statement_list.php @@ -164,6 +164,15 @@ margin-left: 5px; border-radius: 6px; } + th.no-sort { + pointer-events: none; /* disable click */ + } + + th.no-sort:before, + th.no-sort:after { + display: none !important; /* hide DataTables sorting arrows */ + } +
@@ -205,11 +214,12 @@
-
+
+
S.No Client Name Insurer Name Insurer Branch Name Opening Date CD Account No Opening Amount Date/User Action 
S.No 
Client Name 
Insurer Name 
Insurer Branch Name 
Opening Date 
CD Account No 
Opening Amount 
Date/User 
Action 
- + @@ -1734,9 +1744,24 @@ "order": [], // Disable initial sorting if needed "pageLength": 10, // "dom": '<"top"lf>rt<"bottom"ip><"clear">', // This places length and filter controls at top - "language": { - "lengthMenu": "Show _MENU_ entries", - "search": "Search:" + // "language": { + // "lengthMenu": "Show _MENU_ entries", + // "search": "Search:" + // } + language: { + lengthMenu: "Show _MENU_ entries", + search: ` +
+ _INPUT_ + + + +
+ `, + searchPlaceholder: "Search", + emptyTable: '
No Data found
' } }); diff --git a/app/Views/invoice_policy_mapping.php b/app/Views/invoice_policy_mapping.php new file mode 100644 index 00000000..12d18e6b --- /dev/null +++ b/app/Views/invoice_policy_mapping.php @@ -0,0 +1,970 @@ + + +
+
+
+
+

+ + + + Invoice Details + + + +

+
+
+ +
+
+ + +
+
+ + +
+
+ + + +
+
+ + + +
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ + +
+

+ Policy Selection + +

+
+ + +
+ + + + + + + + + + + + + + + + +
+ + +
+ + + +
+ +
+ +
+ +
+
+
Insurer
+ + + + + + + + + + + + + + + + +
Policy No
Customer
Premium
Policy Issues Date
Commission Amount
Paid Amount
+ + +
+
+
+ Selected Policies + 0 +
+ +
+ Total Commission + ₹0.00 +
+ + +
+ Total Paid Amount + ₹0.00 +
+ + +
+ +
+ + +
+ +
+ + +
+
+ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/Views/invoice_policy_mapping_add.php b/app/Views/invoice_policy_mapping_add.php new file mode 100755 index 00000000..43238c83 --- /dev/null +++ b/app/Views/invoice_policy_mapping_add.php @@ -0,0 +1,543 @@ + + + +
+
+
+
+

+ + + + Invoice Details + + + +

+
+
+ +
+
+ + +
+
+ + +
+
+ + + +
+
+ + + +
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+

+ Policy Selection + +

+
+ +
+ + + + +
+ + + + + +
+ +
+ +
+
+
+ + + + + + + + + + + + + + +
Policy No
Customer
Premium
Policy Issues Date
Commission Amount
+
+ +
+
+
+ Selected Policies + 0 +
+ +
+ Total Commission + ₹0.00 +
+ +
+ +
+ + +
+
+
+
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/app/Views/notification.php b/app/Views/notification.php index b36d3845..553c8329 100755 --- a/app/Views/notification.php +++ b/app/Views/notification.php @@ -1368,7 +1368,7 @@ let test_mail_list = $('#common_mail').val(); - let test_mail = test_mail_list.split(',')[0] ?? ''; + let test_mail = test_mail_list.split(',')[0] ?? ''; //REF:SVM if (test_mail !== null || test_mail !== "") { @@ -1400,30 +1400,19 @@ type: "POST", data:{ template_id, - test_mail, - test_mail_list + test_mail_list, }, dataType: 'json', success: function(res) { - - console.log('Test mail send function response', res) + console.log('Test mail send function response', res); $('.loader').fadeOut(); $('.loader-mask').delay(350).fadeOut('slow'); - if (res.status == true) { - - let respond = res.respond; - console.log('Parsed respond', respond) - - if (respond.status == 'success') { - toastr.success(respond.message, 'SUCCESS') - } else { - toastr.warning(respond.message, 'WARNING') - } - + if (res.status === true) { + toastr.success(res.message, 'SUCCESS'); } else { - toastr.warning('Failed to sent mail', 'WARNING') + toastr.warning('Failed to send mail', 'WARNING'); } }, error: function(xhr, status, error) { diff --git a/app/Views/payout_list.php b/app/Views/payout_list.php index df7d3c79..ff2a36f2 100644 --- a/app/Views/payout_list.php +++ b/app/Views/payout_list.php @@ -182,11 +182,18 @@
-
-
--> +
+
+ +
+
@@ -219,8 +226,8 @@
UTR - " class="dropdown-item">Edit - " class="dropdown-item">Adjustment + Edit + Adjustment
diff --git a/app/Views/policy_transaction_endorsement_list.php b/app/Views/policy_transaction_endorsement_list.php index 59963f43..49c3a18b 100644 --- a/app/Views/policy_transaction_endorsement_list.php +++ b/app/Views/policy_transaction_endorsement_list.php @@ -489,7 +489,8 @@ table.dataTable thead th { if (ticketsTable.length) { ticketsTable.DataTable({ scrollX: true, - dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, buttons right + // dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, buttons right + dom: "<'row'<'col-12 d-flex justify-content-between'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector buttons: [ diff --git a/app/Views/policy_transaction_inception_list.php b/app/Views/policy_transaction_inception_list.php index 37640c11..6566b389 100644 --- a/app/Views/policy_transaction_inception_list.php +++ b/app/Views/policy_transaction_inception_list.php @@ -561,7 +561,8 @@ $(document).ready(function() { if (ticketsTable.length) { ticketsTable.DataTable({ scrollX: true, - dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, buttons right + // dom: "<'row'<'col-12'f><'col-sm-11 text-right'B>>" + // Filter left, buttons right + dom: "<'row'<'col-12 d-flex justify-content-between'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector buttons: [ diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php index 63c64862..56134fa3 100644 --- a/app/Views/thz_list.php +++ b/app/Views/thz_list.php @@ -43,7 +43,7 @@ table.dataTable tbody td {
-
+
@@ -315,7 +315,7 @@ table.dataTable tbody td { // Datatable document ready $(document).ready(function() { - var ticketsTable = $('#tickets-table'); + var ticketsTable = $('#thz-table'); if (ticketsTable.length) { ticketsTable.DataTable({ @@ -349,7 +349,7 @@ table.dataTable tbody td { orthogonal: 'sort' }, className: 'app-btn-primary ', - title: 'Tickets' + title: 'Tickets', sheetName: 'Tickets', } ] @@ -374,6 +374,12 @@ table.dataTable tbody td { } else { console.error("Table not found."); } + + $(document).on('click', '.datatable-clear-icon', function () { + const input = $(this).closest('.datatable-search-wrapper').find('input'); + input.val('').trigger('input'); + $('#thz-table').DataTable().search('').draw(); + }); }); diff --git a/app/Views/ticket_form_handler.php b/app/Views/ticket_form_handler.php index 2478280b..149a9150 100644 --- a/app/Views/ticket_form_handler.php +++ b/app/Views/ticket_form_handler.php @@ -69,7 +69,7 @@

- Search by Mobile Number + Search by Employee ID / Mobile Number ➤

diff --git a/app/Views/ticket_type_modal.php b/app/Views/ticket_type_modal.php index 4a4728b1..6120833d 100644 --- a/app/Views/ticket_type_modal.php +++ b/app/Views/ticket_type_modal.php @@ -1,3 +1,54 @@ + +
- - - - - - - - + + + + + + + + @@ -465,9 +466,11 @@ $(document).ready(function() { $(document).ready(function() { - $('#scroll-horizontal-datatable').DataTable({ + var ticketsTable = $('#scroll-horizontal-datatable'); + if (ticketsTable.length) { + ticketsTable.DataTable({ scrollX: true, - dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + + dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", buttons: [ @@ -524,7 +527,10 @@ $(document).ready(function() { paging: true, pageLength: 10, order: [[0, 'desc']] - }); + }); + } else { + console.error("Table atet found."); + } }); function getEditVehicleDetailsData(input) { diff --git a/app/Views/vehicle_type_master_list.php b/app/Views/vehicle_type_master_list.php index fd6d0801..9cdcdb7d 100755 --- a/app/Views/vehicle_type_master_list.php +++ b/app/Views/vehicle_type_master_list.php @@ -2,6 +2,7 @@ .dataTables_filter { position: absolute; } +.column-header {margin-right: 10px;} @@ -12,10 +13,10 @@
S.No Owner Type Owner Name RC Book No Vehicle No Vehicle type Description Action 
S.No 
Owner Type 
Owner Name 
RC Book No 
Vehicle No 
Vehicle type 
Description 
Action 
- - + + - + @@ -94,7 +95,8 @@ var ticketsTable = $('#user-table'); ticketsTable.DataTable({ scrollX: true, - dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right + // dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right + dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector buttons: [
S.No.Vehicle Type
S.No.
Vehicle Type
 Action
Action