From 16d4af035d0e89ab91682bc22164ab456b8a5c03 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Mon, 30 Jun 2025 10:09:14 +0530 Subject: [PATCH] FIX_BDS_POPUP_AND OTHERS : RV --- app/Controllers/ClientController.php | 55 +++++++--- app/Controllers/LeadsController.php | 101 +++++++----------- app/Views/layout/footer.php | 6 +- app/Views/newClientModal.php | 8 +- .../policy_transaction_inception_form.php | 86 +++++++++++---- 5 files changed, 155 insertions(+), 101 deletions(-) diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index 1d206b11..9d04e991 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -4229,6 +4229,7 @@ class ClientController extends AdminController $client_id = $this->request->getGet('client_id'); $client_branch_id = $this->request->getGet('client_branch_id'); $policy_type_id = $this->request->getGet('policy_type_id'); + $client_type = $this->request->getGet('client_type'); $data = $this->clientPolicyModel ->select(" @@ -4247,20 +4248,37 @@ class ClientController extends AdminController ->first(); if ($data) { - if ($data['client_id'] == $client_id && $data['client_branch_id'] == $client_branch_id) { - if ($data['policy_type_id'] == $policy_type_id) { - return $this->respond(['status' => true, 'data' => $data, 'code' => 200, 'received_data' => $received_data], 200); + if ($client_type == 1) { + if ($data['client_id'] == $client_id && $data['client_branch_id'] == $client_branch_id) { + + if ($data['policy_type_id'] == $policy_type_id) { + return $this->respond(['status' => true, 'data' => $data, 'code' => 200, 'received_data' => $received_data], 200); + } else { + $policy_type = $this->policyTypeModel->where('id', $policy_type_id)->first(); + $message = 'This policy number is mapped to the selected client with policy type: ' . (!empty($data['policy_type']) ? $data['policy_type'] : 'N/A') . '. You selected: ' . (!empty($policy_type['policy_type']) ? $policy_type['policy_type'] : 'N/A') . '. Please check.'; + return $this->respond(['status' => true, 'data' => $data, 'code' => 409, "message" => $message, 'received_data' => $received_data], 200); + } } else { - $policy_type = $this->policyTypeModel->where('id', $policy_type_id)->first(); - $message = 'This policy number is mapped to the selected client with policy type: ' . (!empty($data['policy_type']) ? $data['policy_type'] : 'N/A') . '. You selected: ' . (!empty($policy_type['policy_type']) ? $policy_type['policy_type'] : 'N/A') . '. Please check.'; - return $this->respond(['status' => true, 'data' => $data, 'code' => 409, "message" => $message, 'received_data' => $received_data], 200); + $message = 'This policy number is already linked to another client' . (!empty($data['client_name']) ? '. Client name : ' . $data['client_name'] : '') . '. Please check'; + return $this->respond(['status' => true, 'code' => 409, "message" => $message, 'received_data' => $received_data, 'db_data' => $data], 200); } - } else { - $message = 'This policy number is already linked to another client' . (!empty($data['client_name']) ? '. Client name : ' . $data['client_name'] : '') . '. Please check'; - return $this->respond(['status' => true, 'code' => 409, "message" => $message, 'received_data' => $received_data, 'db_data' => $data], 200); + if ($data['client_id'] == $client_id) { + + if ($data['policy_type_id'] == $policy_type_id) { + return $this->respond(['status' => true, 'data' => $data, 'code' => 200, 'received_data' => $received_data], 200); + } else { + $policy_type = $this->policyTypeModel->where('id', $policy_type_id)->first(); + $message = 'This policy number is mapped to the selected client with policy type: ' . (!empty($data['policy_type']) ? $data['policy_type'] : 'N/A') . '. You selected: ' . (!empty($policy_type['policy_type']) ? $policy_type['policy_type'] : 'N/A') . '. Please check.'; + return $this->respond(['status' => true, 'data' => $data, 'code' => 409, "message" => $message, 'received_data' => $received_data], 200); + } + } else { + $message = 'This policy number is already linked to another client' . (!empty($data['client_name']) ? '. Client name : ' . $data['client_name'] : '') . '. Please check'; + return $this->respond(['status' => true, 'code' => 409, "message" => $message, 'received_data' => $received_data, 'db_data' => $data], 200); + } } + } else { return $this->respond(['status' => false, 'message' => 'No Data Found', 'code' => 404, 'received_data' => $received_data], 200); } @@ -5082,6 +5100,17 @@ class ClientController extends AdminController // $return_value = check_cd_entry_exist($baseWhere); // dd($return_value); + + + + // $param = "533454"; + // $type = 'emp_code'; + // $client_policy_id = 64; + // $client_id = 51; + + // $result = $this->getTheEmpDataForClaimSearchByMobile($param, $type, $client_policy_id, $client_id); + // dd($result); + } // ------------------------------------------------------------------------------------------------------- @@ -5262,9 +5291,9 @@ class ClientController extends AdminController $query->where('employees.client_id', $client_id); } - if (!empty($client_policy_id)) { - $query->where('employee_polices.client_policy_id', $client_policy_id); - } + // if (!empty($client_policy_id)) { + // $query->where('employee_polices.client_policy_id', $client_policy_id); + // } $query->groupBy('employees.id') ->orderBy('employees.id', 'DESC'); @@ -5285,7 +5314,7 @@ class ClientController extends AdminController if(!empty($data) && count($data) > 0){ - $memberData = $this->employeeModel->getEmployeeByEmployeeCode($data['emp_code'], $data['policy_id'], $client_id); + $memberData = $this->employeeModel->getEmployeeByEmployeeCode($data['emp_code'], null, $client_id); $acms_datas = $this->employeeModel->getAcmUsingClientID($data['client_id']); // if(!empty($acms_datas)){ // $acms = $acms_datas; diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php index 8572a87b..59a9dea4 100644 --- a/app/Controllers/LeadsController.php +++ b/app/Controllers/LeadsController.php @@ -1360,7 +1360,7 @@ class LeadsController extends BaseController $rowNumber = 1; $mergeRange1 = "A{$rowNumber}:B{$rowNumber}"; - $sheet->mergeCells($mergeRange1); + // $sheet->mergeCells($mergeRange1); $sheet->setCellValue("A{$rowNumber}", "Nhance India Insurance Broking Pvt Ltd"); $sheet->getStyle("A{$rowNumber}")->applyFromArray([ 'font' => [ @@ -1374,9 +1374,8 @@ class LeadsController extends BaseController ]); // Apply center alignment to the cell - $sheet->getStyle("C{$rowNumber}")->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER); - $sheet->getStyle("C{$rowNumber}")->getAlignment()->setVertical(\PhpOffice\PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER); - + // $sheet->getStyle("C{$rowNumber}")->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER); + // $sheet->getStyle("C{$rowNumber}")->getAlignment()->setVertical(\PhpOffice\PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER); $rowNumber = $rowNumber + 1; @@ -1388,22 +1387,22 @@ class LeadsController extends BaseController // Merge A:B for key and C:D for value $mergeRangeKey = "A{$rowNumber}:B{$rowNumber}"; - $mergeRangeValue = "C{$rowNumber}"; + // $mergeRangeValue = "C{$rowNumber}"; $sheet->mergeCells($mergeRangeKey); - $sheet->mergeCells($mergeRangeValue); + // $sheet->mergeCells($mergeRangeValue); // Set values in merged cells $sheet->setCellValue("A{$rowNumber}", $key); $sheet->setCellValue("C{$rowNumber}", $value); - // Apply styles for alignment and bold text in A:B - $sheet->getStyle($mergeRangeKey)->applyFromArray([ - 'font' => ['bold' => true], - 'alignment' => [ - 'horizontal' => \PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER, - 'vertical' => \PhpOffice\PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER, - ], - ]); + // // Apply styles for alignment and bold text in A:B + // $sheet->getStyle($mergeRangeKey)->applyFromArray([ + // 'font' => ['bold' => true], + // 'alignment' => [ + // 'horizontal' => \PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER, + // 'vertical' => \PhpOffice\PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER, + // ], + // ]); // Apply bold style to B column if the key is "Insured" if ($key == "Insured") { @@ -1419,7 +1418,7 @@ class LeadsController extends BaseController $rowNumber++; } - // // Set column width based on max content length (adjusted for padding) + // Set column width based on max content length (adjusted for padding) $sheet->getColumnDimension('A')->setWidth($maxWidthA * 1.2); // $sheet->getColumnDimension('B')->setWidth($maxWidthA * 1.5); $sheet->getColumnDimension('C')->setWidth(35); @@ -1470,13 +1469,14 @@ class LeadsController extends BaseController $sheet->mergeCells($mergeRange); $rowNumber_for_remove_quote_asked = $rowNumber; $rowNumber = $rowNumber + 1; + if ($type == 2) { $subHeaderRow = $rowNumber + 1; } else { $subHeaderRow = $rowNumber_for_remove_quote_asked; } - $columnLetter = 'A'; + $columnLetter = 'A'; $header_actual_count = 0; foreach ($headers as $header) { // Kint::dump($header); @@ -1561,8 +1561,6 @@ class LeadsController extends BaseController $sheet->getColumnDimension('B')->setWidth(35); } - // die(); - // Apply border to the header range $prevColumn1 = $this->getPreviousColumn($columnLetter); $headerRange = "A{$rowNumber}:" . "{$prevColumn1}" . "{$subHeaderRow}"; @@ -1584,6 +1582,7 @@ class LeadsController extends BaseController } else { $rowNumber = $subHeaderRow + 2; } + // dd($rowNumber); $column_data = $data['table_data']['data']; $serial_no = 1; @@ -1627,36 +1626,37 @@ class LeadsController extends BaseController // Add premium data // dd($data); - $labelArray = ["Premium", "GST (%)", "GST Amount (₹)", "Total"]; + // $labelArray = ["Premium", "GST (%)", "GST Amount (₹)", "Total"]; + $labelArray = ["Premium", "GST Amount (₹)", "Total"]; $premiumData = $data['premium_data']['data']; - $premium = [$labelArray[0]]; - $gst = [$labelArray[1]]; - $gstAmt = [$labelArray[2]]; - $total = [$labelArray[3]]; + // $premium = [$labelArray[0]]; + // $gst = [$labelArray[1]]; + // $gstAmt = [$labelArray[1]]; + // $total = [$labelArray[2]]; foreach ($premiumData as $proposal => $insurers) { if ($proposal != 'Particulars') { foreach ($insurers as $insurer => $values) { if($insurer == 'Quote Asked'){ - $premium[] = ""; - $gst[] = ""; - $gstAmt[] = ""; - $total[] = ""; + $premium[] = $labelArray[0]; + // $gst[] = ""; + $gstAmt[] = $labelArray[1]; + $total[] = $labelArray[2]; }else{ $premium[] = formatIndianCurrency($values[$labelArray[0]]); - $gst[] = $values[$labelArray[1]]; - $gstAmt[] = formatIndianCurrency($values[$labelArray[2]]); - $total[] = formatIndianCurrency($values[$labelArray[3]]); + // $gst[] = $values[$labelArray[1]]; + $gstAmt[] = formatIndianCurrency($values[$labelArray[1]]); + $total[] = formatIndianCurrency($values[$labelArray[2]]); } } } } - foreach ([$premium, $gst, $gstAmt, $total] as $index => $rowData) { - $columnLetter = 'B'; + foreach ([$premium, $gstAmt, $total] as $index => $rowData) { + $columnLetter = 'C'; foreach ($rowData as $key => $value) { $sheet->setCellValue("{$columnLetter}{$rowNumber}", $value); - if ($key === 0) { + if (in_array($value, $labelArray)) { $sheet->getStyle("{$columnLetter}{$rowNumber}")->applyFromArray(['font' => ['bold' => true,],]); } $columnLetter++; @@ -1669,7 +1669,8 @@ class LeadsController extends BaseController } else { $prevColumn3 = $this->getPreviousColumn($columnLetter, 2); } - $premiumRange = "B" . ($rowNumber - 4) . ":" . "{$prevColumn3}" . ($rowNumber - 1); + + $premiumRange = "C" . ($rowNumber - 3) . ":" . "{$prevColumn3}" . ($rowNumber - 1); // dd($premiumRange); $sheet->getStyle($premiumRange)->applyFromArray([ @@ -1682,9 +1683,7 @@ class LeadsController extends BaseController ]); } - //set imgage and align the row and column - // Kint::dump($columnLetter); if ($type == 2) { if ($is_placement == true) { $columnLetter_img = $this->getPreviousColumn($columnLetter); @@ -1694,7 +1693,6 @@ class LeadsController extends BaseController } else { $columnLetter_img = $this->getPreviousColumn($columnLetter); } - // dd($columnLetter_img); $company_name = $this->getPreviousColumn($columnLetter_img); $mergeRange1 = "A1:{$company_name}1"; @@ -1722,39 +1720,19 @@ class LeadsController extends BaseController $drawing->setPath($path); $drawing->setCoordinates("{$columnLetter_img}1"); // Set position in column B $drawing->setHeight(35); // Adjust image - $columnWidth = $sheet->getColumnDimension("C")->getWidth(); // e.g., 20 - $cellPixelWidth = $columnWidth * 7; // Approximate conversion (1 unit ≈ 7 pixels) - $imagePixelWidth = 250; // Approximate width of your image (in pixels) - - $offsetX = max(0, ($cellPixelWidth - $imagePixelWidth) / 2); - $offsetX = $offsetX + 97; - // dd($length); - if ($length >= 4) { - $offsetX = 65; - } else if ($length == 3) { - $offsetX = 65; - } - - // Center align the image in the cell + $offsetX = 35; $drawing->setOffsetX($offsetX); // Adjust horizontal offset $drawing->setOffsetY(10); // Adjust vertical offset $drawing->setWorksheet($sheet); - //end - // Auto-size columns // foreach ($sheet->getColumnIterator() as $column) { // $sheet->getColumnDimension($column->getColumnIndex())->setAutoSize(true); // } $dataRange = $sheet->calculateWorksheetDimension(); - - $sheet->getStyle($dataRange)->getAlignment() - ->setHorizontal(Alignment::HORIZONTAL_CENTER) - ->setVertical(Alignment::VERTICAL_CENTER) - ->setWrapText(true); - + $sheet->getStyle($dataRange)->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER)->setVertical(Alignment::VERTICAL_CENTER)->setWrapText(true); $sheet->getStyle('A1')->applyFromArray([ 'alignment' => [ 'wrapText' => false, // Disables text wrapping for A1 @@ -1791,8 +1769,6 @@ class LeadsController extends BaseController ], ]); - - // Set filename $string = ($type == 2) ? ($is_placement == true ? 'Placement' : 'QCR') : 'RFQ'; $current_year = date('Y'); @@ -1809,7 +1785,6 @@ class LeadsController extends BaseController $filename = "{$rfq_data['client_name']}_{$rfq_data['policy_type']}_{$string}_" . $policy_year . '_' . '.xlsx'; } - // Save to temporary location $uploadFilePath = WRITEPATH . 'tmp/' . $filename; $writer = new Xlsx($spreadsheet); @@ -4026,7 +4001,7 @@ class LeadsController extends BaseController $offsetX = max(0, ($cellPixelWidth - $imagePixelWidth) / 2); $offsetX = $offsetX + 97; if ($length >= 4) { - $offsetX = 50; + $offsetX = 35; } else if ($length == 3) { $offsetX = 140; } diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php index c63f59f6..c150e074 100755 --- a/app/Views/layout/footer.php +++ b/app/Views/layout/footer.php @@ -302,9 +302,9 @@ }); - fetchMessages(); + // fetchMessages(); - setInterval(fetchMessages, 60000); // Fetch messages every sixty seconds + // setInterval(fetchMessages, 60000); // Fetch messages every sixty seconds }); $(document).ready(function() { @@ -823,6 +823,7 @@