Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

This commit is contained in:
Srinivas-Saravanan 2025-05-02 15:41:42 +05:30
commit 4a0d9657d9
6 changed files with 16 additions and 9 deletions

View File

@ -323,8 +323,8 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) {
$routes->get("test_mail", "MasterController::testGmailAPI"); $routes->get("test_mail", "MasterController::testGmailAPI");
$routes->post("test_mail", "MasterController::testGmailAPI"); $routes->post("test_mail", "MasterController::testGmailAPI");
$routes->get("check_policy_no/(:any)", "ClientController::check_policy_no/$1"); $routes->get("check_policy_no/(:any)", "ClientController::check_policy_no/$1");
$routes->get("get_client_policy_data_using_policy_no/(:any)", "ClientController::get_client_policy_data_using_policy_no/$1"); $routes->get("get_client_policy_data_using_policy_no", "ClientController::get_client_policy_data_using_policy_no");
$routes->get("get_client_policy_data_using_policy_no_and_endo_no/(:any)", "ClientController::get_client_policy_data_using_policy_no_and_endo_no/$1"); $routes->get("get_client_policy_data_using_policy_no_and_endo_no", "ClientController::get_client_policy_data_using_policy_no_and_endo_no");
$routes->get("checkInvoiceStatus/(:any)", "PolicyTransactionController::checkInvoiceStatus/$1"); $routes->get("checkInvoiceStatus/(:any)", "PolicyTransactionController::checkInvoiceStatus/$1");
$routes->get("base_policy_for_policy_inception/(:any)", "PolicyTransactionController::getBasePolicy/$1"); $routes->get("base_policy_for_policy_inception/(:any)", "PolicyTransactionController::getBasePolicy/$1");
$routes->get("sentTestMail/(:any)", "NotificationController::sentTestMail/$1"); $routes->get("sentTestMail/(:any)", "NotificationController::sentTestMail/$1");

View File

@ -3999,8 +3999,9 @@ class ClientController extends AdminController
} }
} }
public function get_client_policy_data_using_policy_no($policy_no) public function get_client_policy_data_using_policy_no()
{ {
$policy_no = $this->request->getGet('policy_no');
$data = $this->clientPolicyModel $data = $this->clientPolicyModel
->select(" ->select("
client_policy.*, client_policy.*,
@ -4020,8 +4021,11 @@ class ClientController extends AdminController
} }
} }
public function get_client_policy_data_using_policy_no_and_endo_no($policy_no, $endorsement_no) public function get_client_policy_data_using_policy_no_and_endo_no()
{ {
$policy_no = $this->request->getGet('policy_no');
$endorsement_no = $this->request->getGet('endorsement_no');
$data = $this->clientPolicyModel $data = $this->clientPolicyModel
->select('client_policy.*, endorsement.endorsement_type') ->select('client_policy.*, endorsement.endorsement_type')
->join('endorsement', 'client_policy.id = endorsement.client_policy_id') ->join('endorsement', 'client_policy.id = endorsement.client_policy_id')

View File

@ -434,7 +434,7 @@ class EmployeeController extends AdminController
$filePath = ROOTPATH . 'public/sample_excel/sample_correction .xls'; $filePath = ROOTPATH . 'public/sample_excel/sample_correction .xls';
} else if ($actionType == 'si_enhancement') { } else if ($actionType == 'si_enhancement') {
$filePath = ROOTPATH . 'public/sample_excel/sample_si_enhancement.xls'; $filePath = ROOTPATH . 'public/sample_excel/sample_si_enhancement.xls';
} else if ($actionType == 'dependent_addtion') { } else if ($actionType == 'dependent_addition') {
$filePath = ROOTPATH . 'public/sample_excel/sample_dependent_addition.xls'; $filePath = ROOTPATH . 'public/sample_excel/sample_dependent_addition.xls';
} else if ($actionType == 'addition') { } else if ($actionType == 'addition') {
$filePath = ROOTPATH . 'public/sample_excel/sample_addition.xls'; $filePath = ROOTPATH . 'public/sample_excel/sample_addition.xls';

View File

@ -31,6 +31,7 @@
margin: 1.75rem auto; margin: 1.75rem auto;
} }
</style> </style>
<div class="tab-pane fade" id="notification-tab"> <div class="tab-pane fade" id="notification-tab">
<input type="hidden" id="client_id_for_client_branch" value="<?= isset($notification['id']) ? $notification['id'] : '' ?>" /> <input type="hidden" id="client_id_for_client_branch" value="<?= isset($notification['id']) ? $notification['id'] : '' ?>" />

View File

@ -848,8 +848,9 @@ $('#endorsement_no').on('change', function(){
if(policy_no && endorsement_no){ if(policy_no && endorsement_no){
$.ajax({ $.ajax({
url: '<?php echo base_url('util/get_client_policy_data_using_policy_no_and_endo_no/');?>'+ policy_no + '/' + endorsement_no, url: '<?php echo base_url('util/get_client_policy_data_using_policy_no_and_endo_no/');?>',
type: "GET", type: "GET",
data : {policy_no : policy_no, endorsement_no : endorsement_no},
dataType: 'json', dataType: 'json',
success: function (res) { success: function (res) {

View File

@ -3721,8 +3721,9 @@ $('#policy_no').change(function(){
if($pt_id == "" && policy_no != ""){ if($pt_id == "" && policy_no != ""){
$.ajax({ $.ajax({
url: '<?php echo base_url('util/get_client_policy_data_using_policy_no/');?>'+policy_no, url: '<?php echo base_url('util/get_client_policy_data_using_policy_no/');?>',
type: "GET", type: "GET",
data : { policy_no : policy_no },
dataType: 'json', dataType: 'json',
success: function (res) { success: function (res) {