From 5e7f67f56cd93446e7ae6ae25344086776c41854 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Wed, 13 Aug 2025 18:06:29 +0530 Subject: [PATCH] FIX_RFQ_EXCEL : RV --- app/Controllers/LeadsController.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php index 2daa6305..4d7e2170 100644 --- a/app/Controllers/LeadsController.php +++ b/app/Controllers/LeadsController.php @@ -44,6 +44,8 @@ use Google\Service\FactCheckTools\Resource\Claims; use GPBMetadata\Google\Type\Datetime; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; +use function PHPSTORM_META\type; + class LeadsController extends BaseController { use ResponseTrait; @@ -1617,7 +1619,8 @@ class LeadsController extends BaseController if ($type == 2) { $subHeaderRow = $rowNumber + 1; } else { - $subHeaderRow = $rowNumber_for_remove_quote_asked; + // $subHeaderRow = $rowNumber_for_remove_quote_asked; + $subHeaderRow = $rowNumber + 1; } $columnLetter = 'A'; @@ -1638,6 +1641,13 @@ class LeadsController extends BaseController if (!in_array($header['parentHeader'], ['Item Key', 'Action', 'Sno', 'Particulars'])) { $header_actual_count++; + + //Quote asked not showed in the QCR excel so some proposel has only one Quote Asked, So that case avoid the proposel name + $subHeaderCount = count($header['subHeaders'] ?? []) ?? 0; + if($subHeaderCount <= 1 && $type == 2 && $is_placement == false){ + // print_rr($header); + continue; + } } if ($header['parentHeader'] === 'Sno') { @@ -1666,7 +1676,6 @@ class LeadsController extends BaseController $subHeaderCount = count($header['subHeaders']); // Number of subheaders for this parent header } - // Set parent header value if ($is_placement == true && !in_array($header['parentHeader'], ['Particulars', 'S.No.'])) { $sheet->setCellValue("{$startColumn}{$rowNumber}", "Terms"); @@ -1680,6 +1689,7 @@ class LeadsController extends BaseController $sheet->setCellValue("{$startColumn}{$rowNumber}", "Proposal Terms " . $headerIndex); } } + $sheet->getStyle("{$startColumn}{$rowNumber}")->applyFromArray([ 'font' => ['bold' => true], 'alignment' => [ @@ -1703,7 +1713,7 @@ class LeadsController extends BaseController continue; } - if ($type == 2 && $is_placement == false) { + if ($is_placement == false) { $sheet->setCellValue("{$columnLetter}{$subHeaderRow}", $subHeader); } @@ -1728,7 +1738,7 @@ class LeadsController extends BaseController $length++; } } - + if($header_actual_count == 1 && $type == 1){ $sheet->getColumnDimension('B')->setWidth(80); }else{