diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index b4380b4b..7917751a 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -254,9 +254,7 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) {
$routes->post("getId", "RestAuthenticationController::getUserIdFromToken");
});
-$routes->get("/getEmployeeProfile", "EmployeeRestController::getEmployeeProfile/$1");
-$routes->post("/editEmployeeProfile", "EmployeeRestController::editEmployeeProfile");
-$routes->post("/calculatePremium", "EmployeeRestController::calculatePremium");
+
@@ -288,11 +286,14 @@ $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) {
$routes->get("getEmployeeOldPolicy", "EmployeeRestController::getEmployeeOldPolicy");
$routes->get("getEmployeeActiveOrInactivePolicy", "EmployeeRestController::getEmployeeActiveOrInactivePolicy");
+ $routes->get("getFEContent", "EmployeeRestController::getFEContent");
+ $routes->get("getAdvertisementImage", "EmployeeRestController::getAdvertisementImage");
});
$routes->post("sendEmail", "EmployeeRestController::send_email");
+
diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php
index 3c7b8860..1b3fa587 100644
--- a/app/Controllers/EmpDataServiceController.php
+++ b/app/Controllers/EmpDataServiceController.php
@@ -146,19 +146,20 @@ class EmpDataServiceController extends BaseController
$totals = round($totals, 2);
- $this->removeOldExportInfoFromBatchFile($export_data);
-
-
if (!empty($cash_balance)) {
if ((int) $cash_balance['balance'] < (int) $totals) {
-
+
$this->myLogger->logme('error', 'Inception export failed due to insufficient deposit amount.');
+ $this->myLogger->logme('error', 'Inception export failed due to insufficient deposit amount. CASH BALANCE : {balance} and TOTAL AMOUNT : {total}', ['balance' => $cash_balance['balance'], 'total' => $totals]);
return 0;
}
}
+ $this->removeOldExportInfoFromBatchFile($export_data);
+
+
// Log the count of exported data
$count = count($objects);
$export_data['count'] = $count;
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 644c97ff..61c66278 100644
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -974,6 +974,14 @@ class EmployeeController extends AdminController
'{INSURER_BRANCH}' =>$value['insurer_branch_city'],
'{RELATION}' =>$value['relationship'],
'{TPA_LOGO}' => base_url() . 'public/uploads/logo/' . $value['tpa_logo'],
+ '{MEDI_USER}' => base_url() . 'public/e_card_imgs/medi_uesr.jpg',
+ '{MEDI_INSURER}' => base_url() . 'public/e_card_imgs/Magma.png',
+ '{MEDI_BARCODE}' => base_url() . 'public/e_card_imgs/borcode.jpeg',
+ '{QR_ANDROID}' => base_url() . 'public/e_card_imgs/android.png',
+ '{QR_IOS}' => base_url() . 'public/e_card_imgs/ios.png',
+ '{QR_ANDROID_2}' => base_url() . 'public/e_card_imgs/play_store.png',
+ '{QR_IOS_2}' => base_url() . 'public/e_card_imgs/appstore.png',
+
];
// Replace placeholders with values in HTML content
@@ -1198,6 +1206,14 @@ class EmployeeController extends AdminController
'{BACK_CARD}' => base_url() . 'public/uploads/template_bg/' . $tpa_id['back_card'],
'{TPA_LOGO}' => base_url() . 'public/uploads/logo/' . $tpa_id['tpa_logo'],
'{INSURER_LOGO}' => base_url() . 'public/assets/images/sample_logo_3.png',
+ '{MEDI_USER}' => base_url() . 'public/e_card_imgs/medi_uesr.jpg',
+ '{MEDI_INSURER}' => base_url() . 'public/e_card_imgs/Magma.png',
+ '{MEDI_BARCODE}' => base_url() . 'public/e_card_imgs/borcode.jpeg',
+ '{QR_ANDROID}' => base_url() . 'public/e_card_imgs/android.png',
+ '{QR_IOS}' => base_url() . 'public/e_card_imgs/ios.png',
+ '{QR_ANDROID_2}' => base_url() . 'public/e_card_imgs/play_store.png',
+ '{QR_IOS_2}' => base_url() . 'public/e_card_imgs/appstore.png',
+
];
// Get the values to replace the placeholders
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index b6fbcf86..a14aac42 100644
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -25,6 +25,9 @@ use App\Models\PolicyPremium2Model;
use App\Models\PolicyTypeModel;
use App\Models\NotificationModel;
use App\Models\UserModel;
+use App\Models\FEContentModel;
+use App\Models\AddImgModel;
+
use App\Controllers\Jobs ;
use App\Controllers\JobWorker ;
@@ -57,6 +60,8 @@ class EmployeeRestController extends AdminController
protected $policyTypeModel;
protected $notificationModel;
protected $userModel;
+ protected $feContentModel;
+ protected $addImgModel;
public function __construct()
{
@@ -76,6 +81,8 @@ class EmployeeRestController extends AdminController
$this->policyTypeModel = new PolicyTypeModel();
$this->notificationModel = new NotificationModel();
$this->userModel = new UserModel();
+ $this->feContentModel = new FEContentModel();
+ $this->addImgModel = new AddImgModel();
}
@@ -355,7 +362,7 @@ class EmployeeRestController extends AdminController
$Gender = $this->employeeModel->where('emp_code',$empCode)->where('relationship','Self')->get()->getRow()->gender;
if($Gender == 'M'){ return 'F'; }else{ return 'M'; }
}
-}
+ }
private function convertDateFormatYMD($dateString)
{
@@ -1363,16 +1370,17 @@ public function getAddOnPolicy()
->where('client_branch_id',$this->request->getGet('client_branch_id'))
->where('is_addon_value',1)->findAll();
-
+
$clientPolicy = $this->clientPolicyModel->where('client_id',$this->request->getGet('client_id'))
->where('client_branch_id',$this->request->getGet('client_branch_id'))
->where('policy_status', 1)
->findAll();
-
+
if(count($clientPolicy))
{
$band = $this->employeeModel->where('is_active', 1 )->where('emp_code',$this->request->getGet('emp_code'))->where('client_id',$this->request->getGet('client_id'))->where('client_branch_id',$this->request->getGet('client_branch_id'))->where('family_floater_key','self')->get()->getRow()->band;
+
$PolicyData = [];
foreach ($clientPolicy as $key => $array) {
$responce = [];
@@ -1388,9 +1396,16 @@ public function getAddOnPolicy()
$uniqueData[] = $item;
}
}else{
- if (!in_array($item['si'], $siValues)) {
- $uniqueData[] = $item;
- $siValues[] = $item['si'];
+ if (!in_array($item['si'], $siValues) ) {
+
+ if ($item['policy_grid_id'] == 11 && ($item['max_si'] != 0 || $item['max_si'] != null)) {
+ $uniqueData[] = $item;
+ $siValues[] = $item['si'];
+ }else if($item['policy_grid_id'] != 11){
+ $uniqueData[] = $item;
+ $siValues[] = $item['si'];
+ }
+
}
}
@@ -2136,41 +2151,20 @@ function policyTermsFiter($terms , $type)
$gmc = [
"sum_insured" => "Sum Insured",
- "member_count" => "Elders Count:",
- "other_member_min_age" => "Min Age:",
- "other_member_max_age" => "Min Age:",
"waiverofpreexistingdiseases" => "Waiver of Pre-existing Diseases",
+ "maternitycoverage" => "Maternity Coverage",
+ "babyday1cover" => "Baby Day 1 Cover",
"9monthwaitingperiodwaived" => "9-month waiting Period –waived",
"coverfromthedateofjoining" => "Cover from the date of Joining",
"waiverof1,2,3&4thyearexclusions" => "Waiver of 1, 2, 3 & 4th year Exclusions",
"waiverof30dayswaitingperiod" => "Waiver of 30 days waiting period",
"prehospitalizationcover" => "Pre Hospitalization Cover",
- "congenitaldiseasesinternal" => "Congenital Diseases - Internal",
"copayzonewisecopay" => "Co-Pay/Zone wise Co Pay",
- "bioabsorbablestenttoriclensmultifocallens" => "Bio absorbable stent / Toric lens/ Multi Focal lens",
"roomrentlimit" => "Room Rent Limit",
- "proportionatedeductionclause" => "Proportionate Deduction Clause",
- "nursingallowance" => "Nursing Allowance",
"ailmentcapping" => "Ailment capping",
- "ambulancecharges" => "Ambulance Charges",
- "airambulance" => "Air Ambulance",
- "familytransportationbenefit" => "Family Transportation Benefit",
- "reasonableandcustomarycharges" => "Reasonable and Customary Charges",
- "daycaretreatment" => "Day Care Treatment",
- "ayudhtreatmentcover" => "AYUSH treatment cover",
- "armdcovered" => "ARMD Covered",
- "suminsuredenhancement" => "Sum Insured enhancement",
- "automaticsuminsuredreinstatement" => "Automatic Sum Insured reinstatement",
- "additionalsicknessbenefit" => "Additional Sickness Benefit",
- "lasiksurgery" => "Lasik Surgery",
- "midterminclusion" => "Mid Term inclusion",
- "capd" => "CAPD",
- "organdonorexpenses" => "Organ donor expenses",
- "moderntreatmentsasperirdai" => "Modern treatments as per IRDAI",
- "days_of_discharge" => "Claim Intimation Clause",
- "days_from_dod" => "Claim Submission",
- "cataract" => "Cataract"
];
+
+
$finalarray = [];
if($type == 'gpa'){
@@ -2203,4 +2197,46 @@ private function convertDateFormatDisplay($dateString)
}
}
+public function getFEContent()
+{
+ try {
+
+ $feContentData = $this->feContentModel->findAll();
+ if (count($feContentData) > 0) {
+
+ return $this->respond(['status' => 'success','code' => 200,'data' => $feContentData ],200);
+
+ } else {
+
+ return $this->respond(['status' => 'failed','code' => 404,'data' => 'No Data'],404);
+ }
+ } catch (\Throwable $th) {
+ return $this->respond(['status' => 'failed','code' => 500,'data' => $th],500);
+ }
+}
+
+public function getAdvertisementImage()
+{
+ try {
+
+ $img = $this->addImgModel->where('is_active',1)->findAll();
+
+ if (count($img) > 0) {
+ $data=[];
+ foreach ($img as $key => $value) {
+ $url = base_url('public/uploads/add_image_upload/').$value['name'];
+ array_push($data,$url);
+ }
+
+ return $this->respond(['status' => 'success','code' => 200,'data' => $data ],200);
+
+ } else {
+
+ return $this->respond(['status' => 'failed','code' => 404,'data' => 'No Data'],404);
+ }
+ } catch (\Throwable $th) {
+ return $this->respond(['status' => 'failed','code' => 500,'data' => $th],500);
+ }
+}
+
}
\ No newline at end of file
diff --git a/app/Models/AddImgModel.php b/app/Models/AddImgModel.php
new file mode 100644
index 00000000..130da9f6
--- /dev/null
+++ b/app/Models/AddImgModel.php
@@ -0,0 +1,21 @@
+
\ No newline at end of file
diff --git a/app/Models/FEContentModel.php b/app/Models/FEContentModel.php
new file mode 100644
index 00000000..c1b572d3
--- /dev/null
+++ b/app/Models/FEContentModel.php
@@ -0,0 +1,25 @@
+
\ No newline at end of file
diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index bb51b99d..219eb11c 100644
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -44,7 +44,7 @@ table.dataTable tbody td {
User List
-
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 18d6ee36..34a1cd9e 100644
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -1018,7 +1018,7 @@
80: "Eighty",
90: "Ninety"
};
-
+
function convertNumberToWords(number) {
if (number === 0) {
return numberWords[number];
@@ -1027,22 +1027,34 @@
let word = '';
if (number >= 10000000) {
- word += convertNumberToWords(Math.floor(number / 10000000)) + " Crore ";
+ const crore = Math.floor(number / 10000000);
+ if (crore > 0) {
+ word += convertNumberToWords(crore) + " Crore ";
+ }
number %= 10000000;
}
if (number >= 100000) {
- word += convertNumberToWords(Math.floor(number / 100000)) + " Lakh ";
+ const lakh = Math.floor(number / 100000);
+ if (lakh > 0) {
+ word += convertNumberToWords(lakh) + " Lakh ";
+ }
number %= 100000;
}
if (number >= 1000) {
- word += convertNumberToWords(Math.floor(number / 1000)) + " Thousand ";
+ const thousand = Math.floor(number / 1000);
+ if (thousand > 0) {
+ word += convertNumberToWords(thousand) + " Thousand ";
+ }
number %= 1000;
}
if (number >= 100) {
- word += convertNumberToWords(Math.floor(number / 100)) + " Hundred ";
+ const hundred = Math.floor(number / 100);
+ if (hundred > 0) {
+ word += convertNumberToWords(hundred) + " Hundred ";
+ }
number %= 100;
}
@@ -1059,44 +1071,66 @@
return word.trim();
}
+
function convertCommaNumberToWords(input) {
+
let number;
if (input instanceof HTMLElement) {
const inputValue = input.value;
- number = parseInt(inputValue.replace(/,/g, ''), 10);
- var convert_word_value = convertNumberToWords(number);
-
- if (input.nextElementSibling !== null) {
- input.nextElementSibling.textContent = convert_word_value;
- }
+ number = parseFloat(inputValue.replace(/,/g, ''), 10);
} else {
- number = parseInt(input.replace(/,/g, ''), 10);
+ number = parseFloat(input.replace(/,/g, ''), 10);
}
- var convert_word_value = convertNumberToWords(number);
- return convert_word_value;
+ const [integerPart, decimalPart] = number.toFixed(2).split('.');
+ const integerWord = convertNumberToWords(parseInt(integerPart, 10));
+ let result = `${integerWord}`;
+
+ console.log('decimalPart',decimalPart)
+ console.log('decimalPart',typeof decimalPart)
+
+ if (decimalPart != '00' && decimalPart != undefined) {
+ result += ` and `;
+ let decimalWord = convertNumberToWords(parseInt(decimalPart, 10))
+ result += `${decimalWord}`
+ result += ` Paisa`;
+ }
+
+ return result.trim();
}
+
function onlyNumbers(event) {
var charcode;
charcode = event.which || event.keyCode;
- if (charcode >= 48 && charcode <= 57) return true;
+ if (charcode >= 48 && charcode <= 57 || charcode == 46) return true;
return false;
}
function formatNumber(input, maxLength) {
- // console.log("input", input);
+ console.log("input", input);
+ console.log("input value", input.value);
+
maxLength = 16;
- let value = input.value.replace(/\D/g, ''); // Remove non-numeric characters
+ let value = input.value.replace(/[^\d.]/g, ''); // Remove non-numeric characters
+ console.log('Remove non-numeric characters', value)
+
// Limit the number of digits
value = value.slice(0, maxLength);
+ console.log('Limited value', value);
+
// Format the number with commas using Indian numbering system
- value = Number(value).toLocaleString('en-IN');
- input.value = value;
+ value = parseFloat(value).toLocaleString("en-IN",{
+ maximumFractionDigits: 2
+ });
+
+ console.log('formetted value', value);
+
+ input.value = (value);
basicPayMultiple(input)
if (input.id == 'gpa_si') {
diff --git a/app/Views/insurer_basic_info.php b/app/Views/insurer_basic_info.php
index a6671c62..8ba9dcc2 100644
--- a/app/Views/insurer_basic_info.php
+++ b/app/Views/insurer_basic_info.php
@@ -60,8 +60,6 @@ input:checked + .slider:before {
}
-
-
diff --git a/app/Views/insurer_list.php b/app/Views/insurer_list.php
index 9a24b1de..0487ca37 100644
--- a/app/Views/insurer_list.php
+++ b/app/Views/insurer_list.php
@@ -6,7 +6,7 @@
Insurer List
-
diff --git a/app/Views/kyc_list.php b/app/Views/kyc_list.php
index a4bb712a..ec460a28 100644
--- a/app/Views/kyc_list.php
+++ b/app/Views/kyc_list.php
@@ -6,7 +6,7 @@
KYC List
-
diff --git a/app/Views/login.php b/app/Views/login.php
index e6519f06..580a9a0e 100644
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -30,6 +30,18 @@
a:hover {
cursor: pointer;
}
+
+
+ /* .auth-fluid {
+ position: relative;
+ display: flex;
+ align-items: center;
+ min-height: 100vh;
+ flex-direction: row;
+ align-items: stretch;
+ background: url("= base_url()."public"; ?>/assets/images/login_bg.png") center !important;
+ background-size: cover;
+ } */
diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php
index dc1747d7..f69a7648 100644
--- a/app/Views/policy_grid.php
+++ b/app/Views/policy_grid.php
@@ -309,7 +309,7 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
Premium Multiplier*
-
+
@@ -319,13 +319,13 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
@@ -343,17 +343,17 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
Premium Multiplier*
-
+
@@ -387,18 +387,18 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
Premium Multiplier*
-
+
@@ -417,12 +417,12 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
`;
@@ -438,12 +438,12 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa