Six month old transactions option created for HQ login and mail integration implemented.

pom.xml

@@ -97,6 +97,12 @@
 			<scope>runtime</scope>
 			<optional>true</optional>
 		</dependency>
+
+		<!-- Email sending via JavaMailSender -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-mail</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/gcc/communityHall/controller/HQAPIController.java

@@ -170,6 +170,9 @@ public class HQAPIController {
     @Autowired
     private HallReasonRestrictionRepository hallReasonRestrictionRepository;
 
+    @Autowired
+    private BookingServiceImpl bookingServiceImpl;
+
     @Operation(summary = "Update HallDetails REST API", description = "REST API to update the Hall Details")
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "HTTP Status UPDATED", content = @Content(mediaType = "text/plain", schema = @Schema(implementation = HallDetails.class), examples = @ExampleObject(value = "Hall details updated successfully"))),
@@ -181,6 +184,7 @@ public class HQAPIController {
             @RequestParam("zone") String zone,
             @RequestParam("division") String division,
             @RequestParam("hallName") String hallName,
+            @RequestParam("hallArea") String hallArea,
             @RequestParam("doorNo") String doorNo,
             @RequestParam("street") String street,
             @RequestParam("area") String area,
@@ -210,6 +214,7 @@ public class HQAPIController {
         hallDetails.setZone(zone);
         hallDetails.setDivision(division);
         hallDetails.setHallName(hallName);
+        hallDetails.setHallArea(Float.parseFloat(hallArea));
         hallDetails.setDoorNo(doorNo);
         hallDetails.setStreet(street);
         hallDetails.setArea(area);
@@ -1499,4 +1504,92 @@ public class HQAPIController {
                     .body("File upload failed: " + e.getMessage());
         }
     }
+
+    @Operation(summary = "Settlement APPROVED REST API", description = "REST API for Updating the Refund Status to Approved by Settlement Id If the settlement is Approved")
+    // Updating the Refund Status to Approved by Settlement Id If the settlement is
+    // Approved
+    @PostMapping("/updateApprovedSettlementStatus/{bookingId}") // need to check this API for settlement approval
+    public ResponseEntity<Object> updateApprovedSettlementStatus(
+            @PathVariable("bookingId") int bookingId,
+            @RequestParam("status") BookingDetails.RefundStatus status,
+            @RequestParam("comments") String comments) {
+        Map<String, Object> response = new HashMap<>();
+
+        try {
+            System.out.println("settlementId1: " + bookingId);
+            System.out.println("status" + status);
+            System.out.println("comments" + comments);
+
+            // Update settlement status
+            Settlement updateSettlement = settlementService.updateSettlementStatus(bookingId, status, comments);
+            if (updateSettlement == null) {
+                return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+            }
+            System.out.println("updateSettlement12" + updateSettlement);
+            // ak
+            // Set approvedFlag and approvedFlagDate
+            updateSettlement.setApprovedFlag(1);
+            updateSettlement.setApprovedFlagDate(new Date());
+            settlementRepository.save(updateSettlement);
+            // ak
+
+            // Log the action
+            String adminname = (String) session.getAttribute("usertype");
+            Integer loginid = (Integer) session.getAttribute("id");
+            ApplicationLogs logs = new ApplicationLogs();
+            logs.setComments("Action by " + adminname);
+            logs.setLoginId(loginid);
+            logs.setBookingId(updateSettlement.getBookingDetails().getBookingId());
+            logs.setLogType("Booking Status: " + status.toString());
+
+            try {
+                InetAddress inetAddress = InetAddress.getLocalHost();
+                String hostname = InetAddress.getLocalHost().getHostName();
+                logs.setIpaddress(inetAddress.getHostAddress());
+                logs.setSystemName(hostname);
+            } catch (UnknownHostException e) {
+                e.printStackTrace();
+            }
+
+            applicationLogsRepository.save(logs);
+
+            // Process refund request
+            String refundResponse = bookingServiceImpl
+                    .processRefundRequest(updateSettlement.getBookingDetails().getBookingId());
+            // ak
+            // Prepare response map
+
+            response.put("settlement", updateSettlement);
+            response.put("approvedFlag", updateSettlement.getApprovedFlag());
+            response.put("approvedFlagDate", updateSettlement.getApprovedFlagDate());
+
+            if (refundResponse.contains("successful")) {
+                // Refund success, return updated settlement and status
+                // return new ResponseEntity<>(updateSettlement, HttpStatus.OK);
+                return new ResponseEntity<>(response, HttpStatus.OK);
+            } else {
+
+                // Refund failure, update refund status to FAILURE
+                bookingService.updateRefundStatus(updateSettlement.getBookingDetails().getBookingId(),
+                        BookingDetails.RefundStatus.FAILURE);
+                Map<String, Object> responses = new HashMap<>();
+                responses.put("approvedFlag", 1);
+                responses.put("message", "Refund processing failed: " + refundResponse);
+                responses.put("status", "FAILURE");
+
+                return new ResponseEntity<>(responses, HttpStatus.INTERNAL_SERVER_ERROR);
+                // return new ResponseEntity<>("Refund processing failed: " + refundResponse,
+                // HttpStatus.INTERNAL_SERVER_ERROR);
+            }
+
+        } catch (Exception e) {
+            response.put("approvedFlag", 1);
+            response.put("message", "Exception while approving settlement: " + e.getMessage());
+            return new ResponseEntity<>(response, HttpStatus.INTERNAL_SERVER_ERROR);
+
+            // return new ResponseEntity<>("An error occurred while processing the
+            // settlement for Settlement ID: " + settlementId,
+            // HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
 }

src/main/java/com/gcc/communityHall/controller/HeadquartersController.java

@@ -1,5 +1,9 @@
 package com.gcc.communityHall.controller;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -7,13 +11,27 @@ import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gcc.communityHall.entity.ApplicationLogs;
+import com.gcc.communityHall.entity.BookingHistory;
 import com.gcc.communityHall.entity.GccBlockingDate;
 import com.gcc.communityHall.entity.Login;
 import com.gcc.communityHall.entity.LoginHallId;
+import com.gcc.communityHall.entity.RefundTransaction;
+import com.gcc.communityHall.entity.Settlement;
+import com.gcc.communityHall.entity.SettlementHistory;
+import com.gcc.communityHall.entity.SixMonthMailLog;
 import com.gcc.communityHall.others.AppConfig;
+import com.gcc.communityHall.paymentService.entity.RefundResponse;
+import com.gcc.communityHall.paymentService.repository.TransRefundResRepository;
+import com.gcc.communityHall.repository.ApplicationLogsRepository;
+import com.gcc.communityHall.repository.BookingHistoryRepository;
 import com.gcc.communityHall.repository.GccBlockingDateRepository;
 import com.gcc.communityHall.repository.LoginHallIdRepository;
 import com.gcc.communityHall.repository.LoginRepository;
+import com.gcc.communityHall.repository.RefundTransactionRepository;
+import com.gcc.communityHall.repository.SettlementHistoryRepository;
+import com.gcc.communityHall.repository.SettlementRepository;
+import com.gcc.communityHall.repository.SixMonthMailLogRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Controller;
@@ -34,6 +52,7 @@ import com.gcc.communityHall.repository.HallDetailsRepository;
 import com.gcc.communityHall.repository.UsersRepository;
 import com.gcc.communityHall.service.BookingService;
 import com.gcc.communityHall.service.HallDetailService;
+import com.gcc.communityHall.service.MailService;
 import com.gcc.communityHall.service.ReasonMasterService;
 import com.gcc.communityHall.service.UserService;
 
@@ -76,6 +95,30 @@ public class HeadquartersController {
     @Autowired
     private HallDetailsRepository hallDetailsRepository;
 
+    @Autowired
+    private SixMonthMailLogRepository sixMonthMailLogRepository;
+
+    @Autowired
+    private MailService mailService;
+
+    @Autowired
+    private BookingHistoryRepository bookingHistoryRepository;
+
+    @Autowired
+    private SettlementHistoryRepository settlementHistoryRepository;
+
+    @Autowired
+    private SettlementRepository settlementRepository;
+
+    @Autowired
+    private RefundTransactionRepository refundTransactionRepository;
+
+    @Autowired
+    private TransRefundResRepository transRefundResRepository;
+
+    @Autowired
+    private ApplicationLogsRepository applicationLogsRepository;
+
     @GetMapping("/dashboard")
     public String viewDashboard(
             @RequestParam(required = false, defaultValue = "all zones") String zone,
@@ -1086,4 +1129,265 @@ public class HeadquartersController {
 
     }
 
+    // Six months old transaction details – redesigned with 4 tabs
+    @GetMapping("/sixmonthold-transactions")
+    public String SixMonthOldTransactions(Model model, HttpSession session) {
+        String headquartersname = (String) session.getAttribute("usertype");
+        if (headquartersname != null && "headquarters".equals(headquartersname)) {
+            model.addAttribute("headquartersname", headquartersname);
+            long mobileno = (long) session.getAttribute("mobileno");
+            model.addAttribute("mobileno", mobileno);
+            model.addAttribute("title", "sixmonthold-transactions");
+            String zone = (String) session.getAttribute("zone");
+            model.addAttribute("zone", zone);
+
+            List<Map<String, Object>> sixMonthOldBookings = normalizeMapKeys(
+                    bookingDetailsRepository.findSixMonthOldNonCancelledRejectedBookings());
+            List<Map<String, Object>> cancelledBookings = normalizeMapKeys(
+                    bookingDetailsRepository.findSixMonthOldCancelledBookings());
+            List<Map<String, Object>> rejectedBookings = normalizeMapKeys(
+                    bookingDetailsRepository.findSixMonthOldRejectedBookings());
+            List<Map<String, Object>> mailSentBookings = normalizeMapKeys(
+                    bookingDetailsRepository.findMailSentBookings());
+
+            model.addAttribute("sixMonthOldBookings", sixMonthOldBookings);
+            model.addAttribute("cancelledBookings", cancelledBookings);
+            model.addAttribute("rejectedBookings", rejectedBookings);
+            model.addAttribute("mailSentBookings", mailSentBookings);
+            return "headquarters/sixmonthold-transactions";
+        } else {
+            session.invalidate();
+            return "redirect:/communityhall/login";
+        }
+    }
+
+    private List<Map<String, Object>> normalizeMapKeys(List<Map<String, Object>> list) {
+        if (list == null)
+            return new ArrayList<>();
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (Map<String, Object> map : list) {
+            Map<String, Object> newMap = new HashMap<>();
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                if (entry.getKey() != null) {
+                    newMap.put(entry.getKey().toLowerCase(), entry.getValue());
+                }
+            }
+            result.add(newMap);
+        }
+        return result;
+    }
+
+    /**
+     * Marks a booking as "mail sent":
+     * 1. Stamps mail_sent = 1, mail_sent_date = NOW() on booking_details.
+     * 2. Inserts a row into six_month_mail_log for audit history.
+     */
+    @PostMapping("/sixmonthold-transactions/markMailSent")
+    @ResponseBody
+    @Transactional
+    public Map<String, Object> markMailSent(
+            @RequestParam("bookingId") int bookingId,
+            @RequestParam("bookingStatus") String bookingStatus,
+            @RequestParam(value = "transactionId", required = false) String transactionId,
+            @RequestParam(value = "tpslId", required = false) String tpslId,
+            @RequestParam(value = "transactionDate", required = false) String transactionDate,
+            @RequestParam(value = "refundAmount", required = false) Double refundAmount,
+            HttpSession session) {
+
+        Map<String, Object> response = new HashMap<>();
+        String headquartersname = (String) session.getAttribute("usertype");
+        if (headquartersname == null || !"headquarters".equals(headquartersname)) {
+            response.put("status", "error");
+            response.put("message", "Unauthorized");
+            return response;
+        }
+        try {
+            // 1. Send the actual SMTP email via JavaMailSender
+            String mailBody = mailService.sendRefundFollowupMail(
+                    bookingId, bookingStatus, transactionId, tpslId, transactionDate, refundAmount);
+
+            // 2. Stamp booking_details: mail_sent = 1, mail_sent_date = NOW()
+            bookingDetailsRepository.markMailSent(bookingId);
+
+            // 3. Write audit log entry
+            SixMonthMailLog log = new SixMonthMailLog(
+                    bookingId, bookingStatus, transactionId, tpslId, refundAmount, headquartersname, mailBody);
+            sixMonthMailLogRepository.save(log);
+
+            response.put("status", "success");
+            response.put("message", "Mail sent and recorded successfully for booking " + bookingId);
+        } catch (Exception e) {
+            response.put("status", "error");
+            response.put("message", "Error sending mail: " + e.getMessage());
+        }
+        return response;
+    }
+
+    /**
+     * Update Refund Details for Mail Sent Bookings (new method – does NOT touch
+     * existing endpoints).
+     *
+     * ID logic:
+     * - Cancelled / Rejected → bookingId is the primary reference.
+     * - Approved → settlementId is the primary reference;
+     * bookingId used to fetch BookingDetails.
+     *
+     * Tables updated (in order):
+     * 1. booking_history – archive current BookingDetails snapshot.
+     * 2. booking_details – bookingStatus=COMPLETED, refundStatus=COMPLETED.
+     * 3. settlement_history – archive Settlement snapshot (APPROVED only).
+     * 4. settlement – update comments + updatedDate (APPROVED only).
+     * 5. refund_transaction – upsert.
+     * 6. refund_response – upsert with arn_number.
+     * 7. application_logs – audit entry.
+     */
+    @PostMapping("/sixmonthold-transactions/updateRefundDetails")
+    @ResponseBody
+    @Transactional
+    public Map<String, Object> updateRefundDetails(
+            @RequestParam("bookingId") int bookingId,
+            @RequestParam(value = "settlementId", required = false) Integer settlementId,
+            @RequestParam("bookingStatus") String bookingStatus,
+            @RequestParam("refundStatus") String refundStatus,
+            @RequestParam("refundDate") String refundDate,
+            @RequestParam("comments") String comments,
+            @RequestParam(value = "arnNumber", required = false) String arnNumber,
+            HttpSession session) {
+
+        Map<String, Object> response = new HashMap<>();
+        String headquartersname = (String) session.getAttribute("usertype");
+        if (headquartersname == null || !"headquarters".equals(headquartersname)) {
+            response.put("status", "error");
+            response.put("message", "Unauthorized");
+            return response;
+        }
+
+        try {
+            // Step 1: Fetch BookingDetails
+            BookingDetails booking = bookingDetailsRepository.findById(bookingId).orElse(null);
+            if (booking == null) {
+                response.put("status", "error");
+                response.put("message", "Booking not found for ID: " + bookingId);
+                return response;
+            }
+
+            // Get refundAmount and transactionId from latest SixMonthMailLog
+            List<SixMonthMailLog> mailLogs = sixMonthMailLogRepository.findByBookingIdOrderBySentAtDesc(bookingId);
+            SixMonthMailLog latestLog = (mailLogs != null && !mailLogs.isEmpty()) ? mailLogs.get(0) : null;
+            double refundedAmount = (latestLog != null && latestLog.getRefundAmount() != null)
+                    ? latestLog.getRefundAmount()
+                    : 0.0;
+            String transactionIdFromLog = (latestLog != null) ? latestLog.getTransactionId() : null;
+
+            // Step 2: Archive BookingDetails → booking_history
+            BookingHistory bookingHistory = new BookingHistory();
+            bookingHistory.setBookingStatus(booking.getBookingStatus());
+            bookingHistory.setRefundStatus(booking.getRefundStatus());
+            bookingHistory.setComments("Archived before updateRefundDetails. " + comments);
+            bookingHistory.setUpdatedBy("HQ");
+            bookingHistory.setCdate(new Date());
+            bookingHistory.setStartDate(booking.getStartDate());
+            bookingHistory.setEndDate(booking.getEndDate());
+            bookingHistory.setBookingDetails(booking);
+            bookingHistoryRepository.save(bookingHistory);
+
+            // Step 3: Update BookingDetails
+            booking.setBookingStatus(BookingDetails.BookingStatus.COMPLETED);
+            booking.setRefundStatus(BookingDetails.RefundStatus.COMPLETED);
+            booking.setComments(comments);
+            booking.setUpdatedDate(new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            bookingDetailsRepository.save(booking);
+
+            // Steps 4 & 5: Settlement (APPROVED bookings only)
+            boolean isApproved = "APPROVED".equalsIgnoreCase(bookingStatus);
+            if (isApproved && booking.getSettlement() != null) {
+                Settlement settlement = booking.getSettlement();
+
+                // Step 4: Archive Settlement → settlement_history
+                SettlementHistory settlementHistory = new SettlementHistory();
+                settlementHistory.setSettlementId(settlement.getSettlementId());
+                settlementHistory.setComments(settlement.getComments());
+                settlementHistory.setCdate(settlement.getCdate());
+                settlementHistory.setDamageAmount(settlement.getDamageAmount());
+                settlementHistory.setEbAmount(settlement.getEbAmount());
+                settlementHistory.setDepositAmount(settlement.getDepositAmount());
+                settlementHistory.setRefundedAmount(settlement.getRefundedAmount());
+                settlementHistory.setUpdatedDate(settlement.getUpdatedDate());
+                settlementHistory.setUpdatedId(settlement.getUpdatedId());
+                settlementHistory.setChallon(settlement.getChallon());
+                settlementHistory.setDddate(settlement.getDddate());
+                settlementHistory.setDdnumber(settlement.getDdnumber());
+                settlementHistory.setBookingDetails(booking);
+                settlementHistory.setCollectionPending(settlement.getCollectionPending());
+                settlementHistory.setDdamount(settlement.getDdamount());
+                settlementHistory.setChallonnumber(settlement.getChallonnumber());
+                settlementHistory.setCollectionStatus(settlement.getCollectionStatus());
+                settlementHistory.setShDate(new Date());
+                settlementHistoryRepository.save(settlementHistory);
+
+                // Step 5: Update Settlement
+                settlement.setComments(comments);
+                settlement.setUpdatedDate(new Date());
+                settlement.setUpdatedId("HQ");
+                settlementRepository.save(settlement);
+            }
+
+            // Step 6: Upsert RefundTransaction
+            RefundTransaction refundTransaction = refundTransactionRepository.findByBookingId(bookingId);
+            if (refundTransaction == null) {
+                refundTransaction = new RefundTransaction();
+                refundTransaction.setBookingDetails(booking);
+            }
+            refundTransaction.setTransactionId(transactionIdFromLog);
+            refundTransaction.setAmountRefunded(refundedAmount);
+            refundTransaction.setCdate(new Date());
+            refundTransaction.setRefundStatus("0400");
+            refundTransactionRepository.save(refundTransaction);
+
+            // Step 7: Upsert RefundResponse
+            RefundResponse refundResponse = transRefundResRepository.findByBookingId(bookingId);
+            if (refundResponse == null) {
+                refundResponse = new RefundResponse();
+            }
+            refundResponse.setAmount(String.valueOf(booking.getAmountReceived()));
+            refundResponse.setBalaceAmount(String.valueOf(refundedAmount));
+            refundResponse.setBookingId(bookingId);
+            refundResponse.setDate(LocalDate.now());
+            refundResponse.setStatusCode("0400");
+            refundResponse.setTxansactionId(transactionIdFromLog);
+            refundResponse.setUserId("HQ");
+            refundResponse.setCdate(LocalDateTime.now());
+            refundResponse.setArnNumber(arnNumber);
+            refundResponse.setRefundedDate(LocalDate.parse(refundDate));
+            transRefundResRepository.save(refundResponse);
+
+            // Step 8: Application Log
+            ApplicationLogs appLog = new ApplicationLogs();
+            appLog.setBookingId(bookingId);
+            appLog.setLogType("UPDATE_REFUND_DETAILS");
+            appLog.setComments("RefundStatus set to " + refundStatus
+                    + " by HQ. ARN: " + arnNumber + ". Comments: " + comments);
+            Integer loginId = (Integer) session.getAttribute("id");
+            if (loginId != null)
+                appLog.setLoginId(loginId);
+            try {
+                InetAddress inetAddress = InetAddress.getLocalHost();
+                appLog.setIpaddress(inetAddress.getHostAddress());
+                appLog.setSystemName(InetAddress.getLocalHost().getHostName());
+            } catch (UnknownHostException uhe) {
+                // non-fatal
+            }
+            applicationLogsRepository.save(appLog);
+
+            response.put("status", "success");
+            response.put("message", "Refund details updated successfully for Booking ID " + bookingId);
+            response.put("bookingId", bookingId);
+
+        } catch (Exception e) {
+            response.put("status", "error");
+            response.put("message", "Error updating refund details: " + e.getMessage());
+        }
+        return response;
+    }
+
 }

src/main/java/com/gcc/communityHall/controller/OfficerAPIController.java

@@ -40,6 +40,7 @@ import com.gcc.communityHall.repository.BookingDetailsRepository;
 import com.gcc.communityHall.repository.BookingHistoryRepository;
 import com.gcc.communityHall.repository.CounterRefundListRepository;
 import com.gcc.communityHall.repository.GccBlockingDateRepository;
+import com.gcc.communityHall.repository.LoginRepository;
 import com.gcc.communityHall.repository.SettlementRepository;
 import com.gcc.communityHall.repository.UsersRepository;
 import com.gcc.communityHall.service.BookingService;
@@ -56,6 +57,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpSession;
+import jakarta.transaction.Transactional;
 import lombok.AllArgsConstructor;
 
 @Tag(name = "CRUD REST APIs for Officer in CommunityHall", description = "CRUD REST APIs in CommunityHall to CREATE, UPDATE, FETCH AND DELETE Booking details")
@@ -99,6 +101,8 @@ public class OfficerAPIController {
 	@Autowired
 	private HallDetailService hallDetailService;
 	@Autowired
+	private BookingHistoryRepository bookingHistoryRepository;
+	@Autowired
 	private WhatsappMsgServiceImpl whatsappMsgServiceImpl;
 	@Autowired
 	private PaymentsService paymentsService;
@@ -112,6 +116,9 @@ public class OfficerAPIController {
 	@Autowired
 	private ApplicationLogsRepository applicationLogsRepository;
 
+	@Autowired
+	private LoginRepository loginRepository;
+
 	@Operation(summary = "Retriving the User Details by userId REST API", description = "REST API for Retriving the User Details by UserId")
 	// Getting User Details by User Id
 	@GetMapping("/getUserDetails")
@@ -153,6 +160,44 @@ public class OfficerAPIController {
 		return ResponseEntity.ok(book);
 	}
 
+	@Operation(summary = "Booking History by Booking Id REST API", description = "REST API for Retrieving the Booking History records by Booking Id")
+	// Retrieving all Booking History records for a given booking
+	@GetMapping("/getBookingHistory")
+	public ResponseEntity<?> getBookingHistory(@RequestParam int bookingId) {
+		List<com.gcc.communityHall.entity.BookingHistory> historyList = bookingHistoryRepository
+				.findAllByBookingId(bookingId);
+		return ResponseEntity.ok(historyList);
+	}
+
+	@Operation(summary = "Acknowledge NOC Date-Change Notification REST API", description = "REST API to mark that the officer has seen the date-change alert for a rescheduled booking")
+	@PostMapping("/acknowledgeNocNotification")
+	@Transactional
+	public ResponseEntity<?> acknowledgeNocNotification(@RequestParam int bookingId) {
+		try {
+			// Fetch the officer's name from the login table using the session login ID
+			Integer loginId = (Integer) session.getAttribute("id");
+			String officerName = "Unknown";
+			if (loginId != null) {
+				com.gcc.communityHall.entity.Login login = loginRepository.findLoginById(loginId);
+				if (login != null && login.getName() != null) {
+					officerName = login.getName();
+				}
+			}
+			// Update the noc_acknowledged flag and the officer name in booking_details
+			bookingDetailsRepository.updateNocAcknowledged(bookingId, officerName);
+			Map<String, Object> response = new HashMap<>();
+			response.put("status", "success");
+			response.put("bookingId", bookingId);
+			response.put("acknowledgedBy", officerName);
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			Map<String, Object> error = new HashMap<>();
+			error.put("status", "error");
+			error.put("message", e.getMessage());
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
+		}
+	}
+
 	@Operation(summary = "Settlement APPROVED REST API", description = "REST API for Updating the Refund Status to Approved by Settlement Id If the settlement is Approved")
 	// Updating the Refund Status to Approved by Settlement Id If the settlement is
 	// Approved
@@ -653,6 +698,8 @@ public class OfficerAPIController {
 			@RequestParam(value = "document", required = false) MultipartFile[] documents, // Handle documents
 			HttpSession session) {
 
+		System.out.println("selectedBookings...." + selectedBookings);
+
 		// Your existing logic
 		String updatedBy = (String) session.getAttribute("employeeId");
 

src/main/java/com/gcc/communityHall/entity/BookingDetails.java

@@ -1,6 +1,7 @@
 package com.gcc.communityHall.entity;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -12,48 +13,52 @@ public class BookingDetails {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int bookingId;
+
     public enum BookingStatus {
-        PENDING, APPROVED, REJECTED, CANCELED, PAYMENT_FAILURE, GCC_BLOCKED, REFUNDED ,COMPLETED, GCC_UNBLOCKED , WAITING_FOR_NOC , WAITING_FOR_NOC_APPROVAL
+        PENDING, APPROVED, REJECTED, CANCELED, PAYMENT_FAILURE, GCC_BLOCKED, REFUNDED, COMPLETED, GCC_UNBLOCKED,
+        WAITING_FOR_NOC, WAITING_FOR_NOC_APPROVAL
     }
+
     public enum RefundStatus {
-        APPROVED, WAITING, INITIATED, REJECTED, COMPLETED, NA , FAILURE , CLOSED
+        APPROVED, WAITING, INITIATED, REJECTED, COMPLETED, NA, FAILURE, CLOSED
     }
+
     public enum BookingType {
-        ONLINE,OFFLINE
+        ONLINE, OFFLINE
     }
 
-    @Column(name="booking_type")
+    @Column(name = "booking_type")
     @Enumerated(EnumType.STRING)
     private BookingType bookingtype;
 
-    @Column(name="no_of_days")
+    @Column(name = "no_of_days")
     private double noOfDays;
-    @Column(name="start_date")
+    @Column(name = "start_date")
     private String startDate;
-    @Column(name="end_date")
+    @Column(name = "end_date")
     private String endDate;
-    @Column(name="starting_slot")
+    @Column(name = "starting_slot")
     private int startingSlot;
-    @Column(name="ending_slot")
+    @Column(name = "ending_slot")
     private int endingSlot;
-    @Column(name="booking_date")
+    @Column(name = "booking_date")
     private LocalDate bookingDate;
-    @Column(name="booking_status")
+    @Column(name = "booking_status")
     @Enumerated(EnumType.STRING)
     private BookingStatus bookingStatus = BookingStatus.PENDING;
-    @Column(name="deposit_amount")
+    @Column(name = "deposit_amount")
     private double depositAmount;
-    @Column(name="hall_amount")
+    @Column(name = "hall_amount")
     private double hallAmount;
-    @Column(name="amount_received")
+    @Column(name = "amount_received")
     private double amountReceived;
     private double gst;
-    @Column(name="approved_by")
+    @Column(name = "approved_by")
     private String approvedBy;
-    @Column(name="refund_status")
+    @Column(name = "refund_status")
     @Enumerated(EnumType.STRING)
     private RefundStatus refundStatus;
-    @Column(name="updated_date")
+    @Column(name = "updated_date")
     private String updatedDate;
     private String reason;
     private int scheduleCount;
@@ -61,46 +66,57 @@ public class BookingDetails {
     private String relationship;
     private String comments;
 
-    //ak
+    @Column(name = "noc_acknowledged", columnDefinition = "INT DEFAULT 0")
+    private int nocAcknowledged;
+
+    @Column(name = "noc_acknowledged_by")
+    private String nocAcknowledgedBy;
+
+    // ak
     @Column(name = "booking_ref_id")
-private String bookingRefId;
+    private String bookingRefId;
 
-    @OneToOne(cascade = CascadeType.ALL,fetch = FetchType.EAGER)
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     @JoinColumn(name = "counterdetails_counter_id")
     private CounterDetails counterDetails;
 
-    @ManyToOne(cascade = CascadeType.ALL,fetch = FetchType.EAGER)
+    @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     private Users users;
 
-    @ManyToOne(cascade = CascadeType.ALL,fetch = FetchType.EAGER)
+    @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     private HallDetails hallDetails;
 
-    @OneToMany(cascade = CascadeType.ALL,fetch = FetchType.EAGER,mappedBy = "bookingDetails")
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, mappedBy = "bookingDetails")
     private List<BookingHistory> bookingHistories;
 
-    @OneToMany(cascade = CascadeType.ALL,fetch = FetchType.LAZY,mappedBy = "bookingDetails")
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "bookingDetails")
     List<BookingDocuments> bookingDocumentsList;
 
-    @OneToOne(cascade = CascadeType.ALL,fetch = FetchType.EAGER,mappedBy = "bookingDetails")
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER, mappedBy = "bookingDetails")
     private Settlement settlement;
 
-    @OneToOne(cascade = CascadeType.ALL,fetch = FetchType.LAZY,mappedBy = "bookingDetails")
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "bookingDetails")
     private EbDetails ebDetails;
 
-    @OneToMany(cascade = CascadeType.ALL,fetch = FetchType.LAZY,mappedBy = "bookingDetails")
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "bookingDetails")
     private List<Damage> damageList;
 
-    @OneToOne(cascade = CascadeType.ALL,fetch = FetchType.LAZY,mappedBy = "bookingDetails")
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "bookingDetails")
     private Payments payments;
-    
-    @OneToOne(cascade = CascadeType.ALL,fetch = FetchType.LAZY,mappedBy = "bookingDetails")
+
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "bookingDetails")
     private ExtraPayments extrapayments;
 
-    @OneToOne(cascade = CascadeType.ALL,fetch = FetchType.LAZY,mappedBy = "bookingDetails")
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "bookingDetails")
     private RefundTransaction refundTransaction;
 
     private String counterId;
 
+    @Column(name = "mail_sent", columnDefinition = "Boolean DEFAULT 0")
+    private boolean mailSent;
+
+    @Column(name = "mailsent_date")
+    private LocalDateTime mailSentDate;
 
     public int getBookingId() {
         return bookingId;
@@ -116,14 +132,16 @@ private String bookingRefId;
 
     public void setNoOfDays(double days) {
         this.noOfDays = days;
-    }//ak
+    }
+
+    // ak
     public String getBookingRefId() {
-    return bookingRefId;
-}
+        return bookingRefId;
+    }
 
-public void setBookingRefId(String bookingRefId) {
-    this.bookingRefId = bookingRefId;
-}
+    public void setBookingRefId(String bookingRefId) {
+        this.bookingRefId = bookingRefId;
+    }
 
     public String getStartDate() {
         return startDate;
@@ -317,45 +335,61 @@ public void setBookingRefId(String bookingRefId) {
         this.bookingtype = bookingtype;
     }
 
-	public List<BookingHistory> getBookingHistories() {
-		return bookingHistories;
-	}
+    public List<BookingHistory> getBookingHistories() {
+        return bookingHistories;
+    }
+
+    public void setBookingHistories(List<BookingHistory> bookingHistories) {
+        this.bookingHistories = bookingHistories;
+    }
+
+    public int getScheduleCount() {
+        return scheduleCount;
+    }
+
+    public void setScheduleCount(int scheduleCount) {
+        this.scheduleCount = scheduleCount;
+    }
+
+    public String getRelationship() {
+        return relationship;
+    }
 
-	public void setBookingHistories(List<BookingHistory> bookingHistories) {
-		this.bookingHistories = bookingHistories;
-	}
+    public void setRelationship(String relationship) {
+        this.relationship = relationship;
+    }
 
-	public int getScheduleCount() {
-		return scheduleCount;
-	}
+    public String getComments() {
+        return comments;
+    }
 
-	public void setScheduleCount(int scheduleCount) {
-		this.scheduleCount = scheduleCount;
-	}
+    public void setComments(String comments) {
+        this.comments = comments;
+    }
 
-	public String getRelationship() {
-		return relationship;
-	}
+    public int getNocAcknowledged() {
+        return nocAcknowledged;
+    }
 
-	public void setRelationship(String relationship) {
-		this.relationship = relationship;
-	}
+    public void setNocAcknowledged(int nocAcknowledged) {
+        this.nocAcknowledged = nocAcknowledged;
+    }
 
-	public String getComments() {
-		return comments;
-	}
+    public String getNocAcknowledgedBy() {
+        return nocAcknowledgedBy;
+    }
 
-	public void setComments(String comments) {
-		this.comments = comments;
-	}
+    public void setNocAcknowledgedBy(String nocAcknowledgedBy) {
+        this.nocAcknowledgedBy = nocAcknowledgedBy;
+    }
 
-	public ExtraPayments getExtrapayments() {
-		return extrapayments;
-	}
+    public ExtraPayments getExtrapayments() {
+        return extrapayments;
+    }
 
-	public void setExtrapayments(ExtraPayments extrapayments) {
-		this.extrapayments = extrapayments;
-	}
+    public void setExtrapayments(ExtraPayments extrapayments) {
+        this.extrapayments = extrapayments;
+    }
 
     public String getCounterId() {
         return counterId;
@@ -364,5 +398,21 @@ public void setBookingRefId(String bookingRefId) {
     public void setCounterId(String counterId) {
         this.counterId = counterId;
     }
-	
+
+    public boolean getMailSent() {
+        return mailSent;
+    }
+
+    public void setMailSent(boolean mailSent) {
+        this.mailSent = mailSent;
+    }
+
+    public LocalDateTime getMailSentDate() {
+        return mailSentDate;
+    }
+
+    public void setMailSentDate(LocalDateTime mailSentDate) {
+        this.mailSentDate = mailSentDate;
+    }
+
 }

src/main/java/com/gcc/communityHall/entity/SixMonthMailLog.java

@@ -0,0 +1,105 @@
+package com.gcc.communityHall.entity;
+
+import jakarta.persistence.*;
+import java.time.LocalDateTime;
+
+/**
+ * Audit log table that records every refund-follow-up mail dispatched
+ * for 6-month-old bookings from the /sixmonthold-transactions page.
+ *
+ * DDL (run once):
+ *   CREATE TABLE six_month_mail_log (
+ *       id BIGINT AUTO_INCREMENT PRIMARY KEY,
+ *       booking_id INT NOT NULL,
+ *       booking_status VARCHAR(50),
+ *       transaction_id VARCHAR(100),
+ *       tpsl_id VARCHAR(100),
+ *       refund_amount DOUBLE,
+ *       sent_by VARCHAR(100),
+ *       sent_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+ *       mail_content TEXT
+ *   );
+ *
+ * Also add to booking_details (run once):
+ *   ALTER TABLE booking_details
+ *       ADD COLUMN mail_sent TINYINT(1) DEFAULT 0,
+ *       ADD COLUMN mail_sent_date DATETIME NULL;
+ */
+@Entity
+@Table(name = "six_month_mail_log")
+public class SixMonthMailLog {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "booking_id", nullable = false)
+    private int bookingId;
+
+    @Column(name = "booking_status", length = 50)
+    private String bookingStatus;
+
+    @Column(name = "transaction_id", length = 100)
+    private String transactionId;
+
+    @Column(name = "tpsl_id", length = 100)
+    private String tpslId;
+
+    @Column(name = "refund_amount")
+    private Double refundAmount;
+
+    @Column(name = "sent_by", length = 100)
+    private String sentBy;
+
+    @Column(name = "sent_at")
+    private LocalDateTime sentAt;
+
+    @Column(name = "mail_content", columnDefinition = "TEXT")
+    private String mailContent;
+
+    // ──── Constructors ────────────────────────────────────────────────────────
+
+    public SixMonthMailLog() {
+    }
+
+    public SixMonthMailLog(int bookingId, String bookingStatus, String transactionId,
+                            String tpslId, Double refundAmount, String sentBy, String mailContent) {
+        this.bookingId     = bookingId;
+        this.bookingStatus = bookingStatus;
+        this.transactionId = transactionId;
+        this.tpslId        = tpslId;
+        this.refundAmount  = refundAmount;
+        this.sentBy        = sentBy;
+        this.sentAt        = LocalDateTime.now();
+        this.mailContent   = mailContent;
+    }
+
+    // ──── Getters & Setters ───────────────────────────────────────────────────
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+
+    public int getBookingId() { return bookingId; }
+    public void setBookingId(int bookingId) { this.bookingId = bookingId; }
+
+    public String getBookingStatus() { return bookingStatus; }
+    public void setBookingStatus(String bookingStatus) { this.bookingStatus = bookingStatus; }
+
+    public String getTransactionId() { return transactionId; }
+    public void setTransactionId(String transactionId) { this.transactionId = transactionId; }
+
+    public String getTpslId() { return tpslId; }
+    public void setTpslId(String tpslId) { this.tpslId = tpslId; }
+
+    public Double getRefundAmount() { return refundAmount; }
+    public void setRefundAmount(Double refundAmount) { this.refundAmount = refundAmount; }
+
+    public String getSentBy() { return sentBy; }
+    public void setSentBy(String sentBy) { this.sentBy = sentBy; }
+
+    public LocalDateTime getSentAt() { return sentAt; }
+    public void setSentAt(LocalDateTime sentAt) { this.sentAt = sentAt; }
+
+    public String getMailContent() { return mailContent; }
+    public void setMailContent(String mailContent) { this.mailContent = mailContent; }
+}

src/main/java/com/gcc/communityHall/paymentService/entity/RefundResponse.java

@@ -1,6 +1,7 @@
 package com.gcc.communityHall.paymentService.entity;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -18,69 +19,118 @@ public class RefundResponse {
 	private int bookingId;
 	private String txansactionId;
 	private String statusCode;
-//	private String tpslTxnId;
+	// private String tpslTxnId;
 	@Column(name = "date")
 	private LocalDate date;
 
 	@Column(length = 5000)
 	private String response;
 	private String Amount;
+
+	@Column(name = "arn_number", length = 100)
+	private String arnNumber;
+
+	@Column(name = "cdate")
+	private LocalDateTime cdate;
 	private String balaceAmount;
 
+	@Column(name = "refunded_date")
+	private LocalDate refundedDate;
+
 	public Integer getId() {
 		return id;
 	}
+
 	public void setId(Integer id) {
 		this.id = id;
 	}
+
 	public String getUserId() {
 		return userId;
 	}
+
 	public void setUserId(String userId) {
 		this.userId = userId;
 	}
+
 	public int getBookingId() {
 		return bookingId;
 	}
+
 	public void setBookingId(int bookingId) {
 		this.bookingId = bookingId;
 	}
+
 	public String getTxansactionId() {
 		return txansactionId;
 	}
+
 	public void setTxansactionId(String txansactionId) {
 		this.txansactionId = txansactionId;
 	}
+
 	public String getStatusCode() {
 		return statusCode;
 	}
+
 	public void setStatusCode(String statusCode) {
 		this.statusCode = statusCode;
 	}
-	
+
 	public LocalDate getDate() {
 		return date;
 	}
+
 	public void setDate(LocalDate date) {
 		this.date = date;
 	}
+
 	public String getResponse() {
 		return response;
 	}
+
 	public void setResponse(String response) {
 		this.response = response;
 	}
+
 	public String getAmount() {
 		return Amount;
 	}
+
 	public void setAmount(String amount) {
 		Amount = amount;
 	}
+
 	public String getBalaceAmount() {
 		return balaceAmount;
 	}
+
 	public void setBalaceAmount(String balaceAmount) {
 		this.balaceAmount = balaceAmount;
 	}
 
+	public String getArnNumber() {
+		return arnNumber;
+	}
+
+	public void setArnNumber(String arnNumber) {
+		this.arnNumber = arnNumber;
+	}
+
+	public LocalDateTime getCdate() {
+		return cdate;
+	}
+
+	public void setCdate(LocalDateTime cdate) {
+		this.cdate = cdate;
+	}
+
+	public LocalDate getRefundedDate() {
+		return refundedDate;
+	}
+
+	public void setRefundedDate(LocalDate refundedDate) {
+		this.refundedDate = refundedDate;
+	}
+
 }

src/main/java/com/gcc/communityHall/paymentService/repository/TransRefundResRepository.java

@@ -10,26 +10,27 @@ import org.springframework.stereotype.Repository;
 import com.gcc.communityHall.entity.RefundTransaction;
 import com.gcc.communityHall.paymentService.entity.RefundResponse;
 
-
-
-
-
 @Repository
-public interface TransRefundResRepository  extends JpaRepository<RefundResponse,Integer>{
-
-	@Query(value = "SELECT * FROM refund_response where user_id=:userId", nativeQuery = true)
-	List<RefundResponse> getRefundResponseByuserId(String userId);
-
-	//List<Object[]> getRefundResponseByBookingId(String fromDate, String toDate, Long bookingId);
-	
-	 @Query(value = "SELECT rr.booking_id, bd.booking_date, bd.refund_status, rr.amount, rr.txansaction_id, rr.user_id, rr.balace_amount " +
-             "FROM refund_response rr " +
-             "JOIN booking_details bd ON rr.booking_id = bd.booking_id " +
-             "WHERE rr.date >= :fromDate " +
-             "AND rr.date <= :toDate " +
-             "AND (rr.booking_id = :bookingId OR :bookingId IS NULL)", nativeQuery = true)
-List<Object[]> getRefundResponseByBookingId(@Param("fromDate") String fromDate, 
-                                          @Param("toDate") String toDate, 
-                                          @Param("bookingId") Long bookingId);
+public interface TransRefundResRepository extends JpaRepository<RefundResponse, Integer> {
+
+    @Query(value = "SELECT * FROM refund_response where user_id=:userId", nativeQuery = true)
+    List<RefundResponse> getRefundResponseByuserId(String userId);
+
+    // List<Object[]> getRefundResponseByBookingId(String fromDate, String toDate,
+    // Long bookingId);
+
+    @Query(value = "SELECT rr.booking_id, bd.booking_date, bd.refund_status, rr.amount, rr.txansaction_id, rr.user_id, rr.balace_amount "
+            +
+            "FROM refund_response rr " +
+            "JOIN booking_details bd ON rr.booking_id = bd.booking_id " +
+            "WHERE rr.date >= :fromDate " +
+            "AND rr.date <= :toDate " +
+            "AND (rr.booking_id = :bookingId OR :bookingId IS NULL)", nativeQuery = true)
+    List<Object[]> getRefundResponseByBookingId(@Param("fromDate") String fromDate,
+            @Param("toDate") String toDate,
+            @Param("bookingId") Long bookingId);
+
+    @Query(value = "SELECT * FROM refund_response WHERE booking_id = :bookingId LIMIT 1", nativeQuery = true)
+    RefundResponse findByBookingId(@Param("bookingId") int bookingId);
 
 }

src/main/java/com/gcc/communityHall/paymentService/repository/TransactionResponseRepository.java

@@ -89,6 +89,6 @@ public interface TransactionResponseRepository extends JpaRepository<Transaction
 			+
 			"tr.user_id, bd.booking_date FROM transaction_response tr " +
 			"INNER JOIN booking_details bd ON tr.booking_id = bd.booking_id " +
-			"WHERE tr.status_code = 'temp' AND tr.cdate < DATE_SUB(NOW(), INTERVAL 1 HOUR);", nativeQuery = true)
+			"WHERE tr.status_code = 'temp' AND tr.cdate < DATE_SUB(NOW(), INTERVAL 1 HOUR)", nativeQuery = true)
 	List<Map<String, Object>> getTransResBycdateandStatus(String status);
 }

src/main/java/com/gcc/communityHall/repository/BookingDetailsRepository.java

@@ -46,6 +46,10 @@ public interface BookingDetailsRepository extends JpaRepository<BookingDetails,
         @Query("UPDATE BookingDetails b SET b.bookingRefId = :refId WHERE b.bookingId = :bookingId")
         void updateRefId(@Param("refId") String refId, @Param("bookingId") int bookingId);
 
+        @Modifying
+        @Query("UPDATE BookingDetails b SET b.nocAcknowledged = 1, b.nocAcknowledgedBy = :acknowledgedBy WHERE b.bookingId = :bookingId")
+        void updateNocAcknowledged(@Param("bookingId") int bookingId, @Param("acknowledgedBy") String acknowledgedBy);
+
         // ak
         @Query("SELECT b FROM BookingDetails b WHERE b.bookingRefId = :refId")
         BookingDetails findByRefId(@Param("refId") String refId);
@@ -256,10 +260,12 @@ public interface BookingDetailsRepository extends JpaRepository<BookingDetails,
                         "CONCAT(us.doorno, ', ', us.street, ', ', us.area, ', ', us.location, ', ', us.pin_code) AS address, "
                         +
                         "us.usertype, bd.reason, bd.start_date, bd.end_date, " +
-                        "bd.deposit_amount, bd.hall_amount, bd.gst, bd.amount_received, bd.booking_status " +
+                        "bd.deposit_amount, bd.hall_amount, bd.gst, bd.amount_received, bd.booking_status, " +
+                        "hd.zone, hd.division, tr.txansaction_id, tr.tpsl_txn_id " +
                         "FROM booking_details bd " +
                         "JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id " +
                         "JOIN users us ON bd.users_user_id = us.user_id " +
+                        "JOIN transaction_response tr on bd.booking_id = tr.booking_id " +
                         "WHERE DATE(bd.booking_date) >= :fromDate " +
                         "AND DATE(bd.booking_date) <= :toDate " +
                         "AND (:bookingId IS NULL OR bd.booking_id = :bookingId) order by bd.booking_id asc", nativeQuery = true)
@@ -271,10 +277,12 @@ public interface BookingDetailsRepository extends JpaRepository<BookingDetails,
                         "CONCAT(us.doorno, ', ', us.street, ', ', us.area, ', ', us.location, ', ', us.pin_code) AS address, "
                         +
                         "us.usertype, bd.reason, bd.start_date, bd.end_date, " +
-                        "bd.deposit_amount, bd.hall_amount, bd.gst, bd.amount_received, bd.booking_status " +
+                        "bd.deposit_amount, bd.hall_amount, bd.gst, bd.amount_received, bd.booking_status, " +
+                        "hd.zone, hd.division, tr.txansaction_id, tr.tpsl_txn_id " +
                         "FROM booking_details bd " +
                         "JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id " +
                         "JOIN users us ON bd.users_user_id = us.user_id " +
+                        "JOIN transaction_response tr on bd.booking_id = tr.booking_id " +
                         "WHERE DATE(bd.booking_date) >= :fromDate " +
                         "AND DATE(bd.booking_date) <= :toDate " +
                         "AND (:bookingId IS NULL OR bd.booking_id = :bookingId)" +
@@ -1296,10 +1304,12 @@ public interface BookingDetailsRepository extends JpaRepository<BookingDetails,
                         "CONCAT(us.doorno, ', ', us.street, ', ', us.area, ', ', us.location, ', ', us.pin_code) AS address, "
                         +
                         "us.usertype, bd.reason, bd.start_date, bd.end_date, " +
-                        "bd.deposit_amount, bd.hall_amount, bd.gst, bd.amount_received, bd.booking_status " +
+                        "bd.deposit_amount, bd.hall_amount, bd.gst, bd.amount_received, bd.booking_status, " +
+                        "hd.zone, hd.division, tr.txansaction_id, tr.tpsl_txn_id " +
                         "FROM booking_details bd " +
                         "JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id " +
                         "JOIN users us ON bd.users_user_id = us.user_id " +
+                        "JOIN transaction_response tr on bd.booking_id = tr.booking_id " +
                         "WHERE DATE(bd.booking_date) >= :fromDate " +
                         "AND DATE(bd.booking_date) <= :toDate " +
                         "AND (:zone IS NULL OR :zone = 'ALL' OR hd.zone = :zone) " +
@@ -1314,10 +1324,13 @@ public interface BookingDetailsRepository extends JpaRepository<BookingDetails,
                         "CONCAT(us.doorno, ', ', us.street, ', ', us.area, ', ', us.location, ', ', us.pin_code) AS address, "
                         +
                         "us.usertype, bd.reason, bd.start_date, bd.end_date, " +
-                        "bd.deposit_amount, bd.hall_amount, bd.gst, bd.amount_received, bd.booking_status " +
+                        "bd.deposit_amount, bd.hall_amount, bd.gst, bd.amount_received, bd.booking_status, "
+                        +
+                        "hd.zone, hd.division, tr.txansaction_id, tr.tpsl_txn_id " +
                         "FROM booking_details bd " +
                         "JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id " +
                         "JOIN users us ON bd.users_user_id = us.user_id " +
+                        "JOIN transaction_response tr on bd.booking_id = tr.booking_id " +
                         "WHERE DATE(bd.booking_date) >= :fromDate " +
                         "AND DATE(bd.booking_date) <= :toDate " +
                         "AND (:zone IS NULL OR :zone = 'ALL' OR hd.zone = :zone) " +
@@ -1333,10 +1346,12 @@ public interface BookingDetailsRepository extends JpaRepository<BookingDetails,
                         "CONCAT(us.doorno, ', ', us.street, ', ', us.area, ', ', us.location, ', ', us.pin_code) AS address, "
                         +
                         "us.usertype, bd.reason, bd.start_date, bd.end_date, " +
-                        "bd.deposit_amount, bd.hall_amount, bd.gst, bd.amount_received, bd.booking_status " +
+                        "bd.deposit_amount, bd.hall_amount, bd.gst, bd.amount_received, bd.booking_status, " +
+                        "hd.zone, hd.division, tr.txansaction_id, tr.tpsl_txn_id " +
                         "FROM booking_details bd " +
                         "JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id " +
                         "JOIN users us ON bd.users_user_id = us.user_id " +
+                        "JOIN transaction_response tr on bd.booking_id = tr.booking_id " +
                         "WHERE DATE(bd.start_date) >= :fromDate " +
                         "AND DATE(bd.end_date) <= :toDate " +
                         "AND (:zone IS NULL OR :zone = 'ALL' OR hd.zone = :zone) " +
@@ -1351,10 +1366,12 @@ public interface BookingDetailsRepository extends JpaRepository<BookingDetails,
                         "CONCAT(us.doorno, ', ', us.street, ', ', us.area, ', ', us.location, ', ', us.pin_code) AS address, "
                         +
                         "us.usertype, bd.reason, bd.start_date, bd.end_date, " +
-                        "bd.deposit_amount, bd.hall_amount, bd.gst, bd.amount_received, bd.booking_status " +
+                        "bd.deposit_amount, bd.hall_amount, bd.gst, bd.amount_received, bd.booking_status, " +
+                        "hd.zone, hd.division, tr.txansaction_id, tr.tpsl_txn_id " +
                         "FROM booking_details bd " +
                         "JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id " +
                         "JOIN users us ON bd.users_user_id = us.user_id " +
+                        "JOIN transaction_response tr on bd.booking_id = tr.booking_id " +
                         "WHERE DATE(bd.start_date) >= :fromDate " +
                         "AND DATE(bd.end_date) <= :toDate " +
                         "AND (:zone IS NULL OR :zone = 'ALL' OR hd.zone = :zone) " +
@@ -1719,6 +1736,113 @@ public interface BookingDetailsRepository extends JpaRepository<BookingDetails,
                         "GROUP BY bd.counter_id, bd.hall_details_hall_id ", nativeQuery = true)
         List<Object> getCounterWiseBookingList(String fromDate, String toDate);
 
-        @Query("select bd from BookingDetails bd where DATE(bd.startDate) = :date and bd.hallDetails.hallId = :hallId and bd.bookingStatus in ('APPROVED','WAITING_FOR_NOC','WAITING_FOR_NOC_APPROVAL') ")
+        @Query("select bd from BookingDetails bd where (DATE(bd.startDate) = :date or DATE(bd.endDate) = :date) and bd.hallDetails.hallId = :hallId and bd.bookingStatus in ('APPROVED','WAITING_FOR_NOC','WAITING_FOR_NOC_APPROVAL') ")
         List<BookingDetails> findByHallIdAndDate(@Param("date") LocalDate date, @Param("hallId") Integer hallId);
+
+        // ─────────────────────────────────────────────────────────────────────
+        // Six-month-old transactions page — 4 dedicated queries
+        // ─────────────────────────────────────────────────────────────────────
+
+        /**
+         * Tab 1 – 6-month-old bookings whose status is NOT PENDING / CANCELED /
+         * REJECTED.
+         * Uses LEFT JOIN settlement so bookings without a settlement record still
+         * appear
+         * (with NULL settlement columns → displayed as "Settlement Not Initiated").
+         * Excludes rows already marked mail_sent = 1.
+         */
+        @Query(value = "SELECT hd.zone, hd.division, hd.hall_name, bd.booking_id, " +
+                        "date_format(bd.booking_date,'%d-%m-%Y') AS booking_date, " +
+                        "date_format(bd.start_date,'%d-%m-%Y') AS event_start_date, " +
+                        "date_format(bd.end_date,'%d-%m-%Y') AS event_end_date, " +
+                        "s.settlement_id, " +
+                        "date_format(s.updated_date,'%d-%m-%Y %r') AS settlement_raised_date, " +
+                        "s.refunded_amount, bd.refund_status AS refund_status, bd.booking_status, " +
+                        "tr.txansaction_id, tr.tpsl_txn_id, " +
+                        "date_format(tr.cdate,'%d-%m-%Y') AS transaction_date, " +
+                        "bd.deposit_amount, bd.amount_received " +
+                        "FROM booking_details bd " +
+                        "LEFT JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id " +
+                        "LEFT JOIN settlement s ON bd.booking_id = s.booking_details_booking_id " +
+                        "LEFT JOIN transaction_response tr ON bd.booking_id = tr.booking_id " +
+                        "WHERE datediff(CURRENT_DATE, bd.booking_date) > 180 " +
+                        "AND bd.booking_status NOT IN ('PENDING','CANCELED','REJECTED') " +
+                        "AND (bd.mail_sent IS NULL OR bd.mail_sent = 0) " +
+                        "ORDER BY bd.booking_id ASC", nativeQuery = true)
+        List<Map<String, Object>> findSixMonthOldNonCancelledRejectedBookings();
+
+        /**
+         * Tab 2 – 6-month-old CANCELLED bookings.
+         * Refund amount = deposit_amount.
+         * No settlement data needed.
+         */
+        @Query(value = "SELECT hd.zone, hd.division, hd.hall_name, bd.booking_id, " +
+                        "date_format(bd.booking_date,'%d-%m-%Y') AS booking_date, " +
+                        "date_format(bd.start_date,'%d-%m-%Y') AS event_start_date, " +
+                        "date_format(bd.end_date,'%d-%m-%Y') AS event_end_date, " +
+                        "bd.booking_status, bd.deposit_amount AS refund_amount, " +
+                        "tr.txansaction_id, tr.tpsl_txn_id, " +
+                        "date_format(tr.cdate,'%d-%m-%Y') AS transaction_date, " +
+                        "bd.deposit_amount, bd.amount_received " +
+                        "FROM booking_details bd " +
+                        "LEFT JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id " +
+                        "LEFT JOIN transaction_response tr ON bd.booking_id = tr.booking_id " +
+                        "WHERE datediff(CURRENT_DATE, bd.booking_date) > 180 " +
+                        "AND bd.booking_status = 'CANCELED' " +
+                        "AND (bd.mail_sent IS NULL OR bd.mail_sent = 0) " +
+                        "ORDER BY bd.booking_id ASC", nativeQuery = true)
+        List<Map<String, Object>> findSixMonthOldCancelledBookings();
+
+        /**
+         * Tab 3 – 6-month-old REJECTED bookings.
+         * Refund amount = amount_received (full amount paid).
+         * No settlement data needed.
+         */
+        @Query(value = "SELECT hd.zone, hd.division, hd.hall_name, bd.booking_id, " +
+                        "date_format(bd.booking_date,'%d-%m-%Y') AS booking_date, " +
+                        "date_format(bd.start_date,'%d-%m-%Y') AS event_start_date, " +
+                        "date_format(bd.end_date,'%d-%m-%Y') AS event_end_date, " +
+                        "bd.booking_status, bd.amount_received AS refund_amount, " +
+                        "tr.txansaction_id, tr.tpsl_txn_id, " +
+                        "date_format(tr.cdate,'%d-%m-%Y') AS transaction_date, " +
+                        "bd.deposit_amount, bd.amount_received " +
+                        "FROM booking_details bd " +
+                        "LEFT JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id " +
+                        "LEFT JOIN transaction_response tr ON bd.booking_id = tr.booking_id " +
+                        "WHERE datediff(CURRENT_DATE, bd.booking_date) > 180 " +
+                        "AND bd.booking_status = 'REJECTED' " +
+                        "AND (bd.mail_sent IS NULL OR bd.mail_sent = 0) " +
+                        "ORDER BY bd.booking_id ASC", nativeQuery = true)
+        List<Map<String, Object>> findSixMonthOldRejectedBookings();
+
+        /**
+         * Tab 4 – Bookings where mail_sent = 1 (mail already dispatched).
+         */
+        @Query(value = "SELECT hd.zone, hd.division, hd.hall_name, bd.booking_id, " +
+                        "date_format(bd.booking_date,'%d-%m-%Y') AS booking_date, " +
+                        "date_format(bd.start_date,'%d-%m-%Y') AS event_start_date, " +
+                        "date_format(bd.end_date,'%d-%m-%Y') AS event_end_date, " +
+                        "bd.booking_status, bd.deposit_amount, bd.amount_received, " +
+                        "date_format(bd.mailsent_date,'%d-%m-%Y %r') AS mail_sent_date, " +
+                        "tr.txansaction_id, tr.tpsl_txn_id, " +
+                        "date_format(tr.cdate,'%d-%m-%Y') AS transaction_date, " +
+                        "s.settlement_id " +
+                        "FROM booking_details bd " +
+                        "LEFT JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id " +
+                        "LEFT JOIN transaction_response tr ON bd.booking_id = tr.booking_id " +
+                        "LEFT JOIN settlement s ON s.booking_details_booking_id = bd.booking_id " +
+                        "WHERE bd.mail_sent = 1 " +
+                        "ORDER BY bd.mailsent_date DESC", nativeQuery = true)
+        List<Map<String, Object>> findMailSentBookings();
+
+        /**
+         * Stamp mail_sent = 1 and capture timestamp when mail is confirmed.
+         * Requires the two columns to exist in booking_details:
+         * ALTER TABLE booking_details
+         * ADD COLUMN mail_sent TINYINT(1) DEFAULT 0,
+         * ADD COLUMN mail_sent_date DATETIME NULL;
+         */
+        @Modifying
+        @Query(value = "UPDATE booking_details SET mail_sent = 1, mailsent_date = NOW() WHERE booking_id = :bookingId", nativeQuery = true)
+        void markMailSent(@Param("bookingId") int bookingId);
 }

src/main/java/com/gcc/communityHall/repository/BookingHistoryRepository.java

@@ -1,16 +1,21 @@
 package com.gcc.communityHall.repository;
 
+import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import com.gcc.communityHall.entity.BookingHistory;
 
 @Repository
-public interface BookingHistoryRepository extends JpaRepository<BookingHistory,Integer> {
-	
+public interface BookingHistoryRepository extends JpaRepository<BookingHistory, Integer> {
+
 	@Query(value = "SELECT * FROM booking_history where booking_details_booking_id= :bookingId", nativeQuery = true)
 	BookingHistory findbybookingId(int bookingId);
+
+	@Query(value = "SELECT * FROM booking_history WHERE booking_details_booking_id = :bookingId ORDER BY history_id ASC limit 1", nativeQuery = true)
+	List<BookingHistory> findAllByBookingId(@Param("bookingId") int bookingId);
 }

src/main/java/com/gcc/communityHall/repository/SixMonthMailLogRepository.java

@@ -0,0 +1,13 @@
+package com.gcc.communityHall.repository;
+
+import com.gcc.communityHall.entity.SixMonthMailLog;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface SixMonthMailLogRepository extends JpaRepository<SixMonthMailLog, Long> {
+
+    List<SixMonthMailLog> findByBookingIdOrderBySentAtDesc(int bookingId);
+}

src/main/java/com/gcc/communityHall/service/Impl/BookingServiceImpl.java

@@ -948,7 +948,7 @@ public class BookingServiceImpl implements BookingService {
                         double EB = governmentevents.getHalfdayEBcharges();
                         double additionalcharges = cleaningCharges + PASystem + EB;
                         double gstAmount = Math.round(additionalcharges * hallDetails.getGst()) / 100.0;
-                        double depositAmount = hallDetails.getDepositAmount() * daysrange;
+                        double depositAmount = hallDetails.getHalfDepositAmount() * daysrange;
                         double totalAmount = additionalcharges + gstAmount + depositAmount;
                         double truncatedTotalAmount = Math.round(totalAmount * 100.0) / 100.0;
                         hs.put("actualhallamount", hallAmount);
@@ -1024,7 +1024,7 @@ public class BookingServiceImpl implements BookingService {
                         double rentAmount = discountAmount;
                         double netAmount = rentAmount + additionalcharges;
                         double gstAmount = Math.round(netAmount * hallDetails.getGst()) / 100.0;
-                        double depositAmount = hallDetails.getDepositAmount() * daysrange;
+                        double depositAmount = hallDetails.getHalfDepositAmount() * daysrange;
                         double totalAmount = netAmount + gstAmount + depositAmount;
                         double truncatedTotalAmount = Math.round(totalAmount * 100.0) / 100.0;
                         hs.put("actualhallamount", hallAmount);
@@ -2292,7 +2292,8 @@ public class BookingServiceImpl implements BookingService {
         Optional<BookingDetails> book = bookingDetailsRepository.findById(bookingId);
         BookingDetails bookingDetails = book.get();
         bookingDetails.setScheduleCount(bookingDetails.getScheduleCount() + 1);
-        if (bookingDetails.getReason().equals("Commercial")) {
+        if (bookingDetails.getReason().equals("Commercial") || bookingDetails.getReason().equals("State Govt Event")
+                || bookingDetails.getReason().equals("Central Govt Event")) {
             bookingDetails.setBookingStatus(BookingStatus.WAITING_FOR_NOC);
         }
         // Updating Bookinghistory startDate and End Date
@@ -2368,6 +2369,7 @@ public class BookingServiceImpl implements BookingService {
             // slots) ──
             for (String bookingIdStr : selectedBookings) {
                 Integer bookingId = Integer.parseInt(bookingIdStr);
+                System.out.println("bookingId..." + bookingId);
                 Optional<BookingDetails> optionalBooking = bookingDetailsRepository.findById(bookingId);
 
                 if (optionalBooking.isPresent()) {
@@ -2489,16 +2491,14 @@ public class BookingServiceImpl implements BookingService {
                     BookingCalendar data = getbyDates(aa, hallId.toString());
                     int userbookingbookingId = gccBookingIds.get(hallIdsList.indexOf(hallId));
                     if (data != null) {
-                        System.out.println("uniqueId...1" + uniqueId);
-                        data.setBookingId_1(String.valueOf(userbookingbookingId));
-                        data.setBookingId_2(String.valueOf(userbookingbookingId));
-                        data.setMorningSlot(true);
-                        data.setEveningSlot(true);
+                        // data.setBookingId_1(String.valueOf(userbookingbookingId));
+                        // data.setBookingId_2(String.valueOf(userbookingbookingId));
+                        // data.setMorningSlot(true);
+                        // data.setEveningSlot(true);
                         data.setIs_blocked(true);
                         data.setUnique_id(uniqueId);
                         updateBookingStatus(data);
                     } else {
-                        System.out.println("uniqueId...2" + uniqueId);
                         BookingCalendar book = new BookingCalendar();
                         book.setBdate(aa);
                         book.setBookingId_1(String.valueOf(userbookingbookingId));

src/main/java/com/gcc/communityHall/service/Impl/HallDetailServiceImpl.java

@@ -288,6 +288,7 @@ public class HallDetailServiceImpl implements HallDetailService {
             // Update hall details
             existingHall.setZone(hallDetails.getZone());
             existingHall.setDivision(hallDetails.getDivision());
+            existingHall.setHallArea(hallDetails.getHallArea());
             existingHall.setHallName(hallDetails.getHallName());
             existingHall.setDoorNo(hallDetails.getDoorNo());
             existingHall.setStreet(hallDetails.getStreet());

src/main/java/com/gcc/communityHall/service/MailService.java

@@ -0,0 +1,86 @@
+package com.gcc.communityHall.service;
+
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+
+@Service
+public class MailService {
+
+    @Autowired
+    private JavaMailSender mailSender;
+
+    @Value("${app.mail.from}")
+    private String fromAddress;
+
+    @Value("${app.mail.to}")
+    private String toAddresses;
+
+    @Value("${app.mail.cc}")
+    private String ccAddresses;
+
+    public String sendRefundFollowupMail(int bookingId, String bookingStatus,
+            String transactionId, String tpslId,
+            String transactionDate, Double refundAmount) throws Exception {
+
+        MimeMessage message = mailSender.createMimeMessage();
+        MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
+
+        helper.setFrom(new InternetAddress(fromAddress, "Community Hall Support"));
+
+        for (String addr : toAddresses.split(",")) {
+            if (!addr.trim().isEmpty()) {
+                helper.addTo(addr.trim());
+            }
+        }
+
+        for (String addr : ccAddresses.split(",")) {
+            if (!addr.trim().isEmpty()) {
+                helper.addCc(addr.trim());
+            }
+        }
+
+        helper.setSubject("Test Mail Refund Status Update Request - Community Hall Booking");
+
+        DecimalFormat df = new DecimalFormat("#,##0.00");
+        String amt = (refundAmount != null) ? "Rs. " + df.format(refundAmount) : "N/A";
+
+        String body = buildMailBody(bookingId, bookingStatus, transactionId, tpslId, transactionDate, amt);
+        helper.setText(body, true);
+
+        mailSender.send(message);
+        return body; // return body so caller can persist it in the audit log
+    }
+
+    private String buildMailBody(int bookingId, String bookingStatus,
+            String transactionId, String tpslId,
+            String transactionDate, String amt) {
+        return "Hi,<br><br>"
+                + "Kindly update refund status for the below mentioned transaction made for Community Hall Booking.<br><br>"
+                + "<b>Transaction Details:</b><br><br>"
+                + "&nbsp;&nbsp;Booking ID &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: " +
+                bookingId + "<br>"
+                // + "&nbsp;&nbsp;Booking Status &nbsp;&nbsp;&nbsp;: " + nvl(bookingStatus) +
+                // "<br>"
+                + "&nbsp;&nbsp;Transaction ID &nbsp;&nbsp;&nbsp;: " + nvl(transactionId) + "<br>"
+                + "&nbsp;&nbsp;TPSL ID &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: "
+                + nvl(tpslId) + "<br>"
+                + "&nbsp;&nbsp;Transaction Date : " + nvl(transactionDate) + "<br>"
+                + "&nbsp;&nbsp;<b>Refund Amount &nbsp;&nbsp;&nbsp;: " + amt + "</b><br><br>"
+                + "If refund was not initiated, <b>kindly initiate the refund</b> and update refund status at the earliest. "
+                + "Make sure that no duplicate refund was processed against this transaction.<br><br>"
+                + "Regards,<br>"
+                + "Community Hall Support<br>"
+                + "Greater Chennai Corporation";
+    }
+
+    private String nvl(String val) {
+        return (val != null && !val.isEmpty()) ? val : "N/A";
+    }
+}

src/main/resources/application-dev.properties

@@ -72,3 +72,24 @@ app.manualRefundCode=8520
 
 app.fullUrl=http://localhost:8062
 app.commErpUrl=http://coc-staging.egovernments.org:9980/pgr/external/mobileservice
+
+# ── Mail / SMTP Configuration (NICeMail via mgovcloud.in) ──────────────────
+spring.mail.host=smtp.mgovcloud.in
+spring.mail.port=465
+spring.mail.username=communityhallsupport@chennaicorporation.gov.in
+# Replace the value below with the Application-Specific Password generated from mail.gov.in
+spring.mail.password=XPe2JTFphMnN
+spring.mail.protocol=smtps
+spring.mail.properties.mail.smtp.ssl.enable=true
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.ssl.trust=smtp.mgovcloud.in
+spring.mail.properties.mail.smtp.ssl.checkserveridentity=false
+spring.mail.properties.mail.smtp.connectiontimeout=10000
+spring.mail.properties.mail.smtp.timeout=10000
+spring.mail.properties.mail.smtp.writetimeout=10000
+
+# Mail recipient constants
+app.mail.from=communityhallsupport@chennaicorporation.gov.in
+app.mail.to=ranjithkumar@federal.bank.in, kanimozhi@bontonsoftwares.com, ramya@bontonsoftwares.com, wasiqueahsan@bontonsoftwares.com
+#pgsupport@mail.in.worldline-solutions.com,megha.mattamana@federal.bank.in
+app.mail.cc=arohqcc@gmail.com,it@chennaicorporation.gov.in

src/main/resources/application-prod.properties

@@ -57,4 +57,23 @@ app.getOtpUrl=https://tmegov.onex-aura.com/api/sms?
 app.manualRefundCode=8520
 
 app.fullUrl=https://gccservices.in/communityhall
-app.commErpUrl=https://erp.chennaicorporation.gov.in/pgr/external/mobileservice
+app.commErpUrl=https://erp.chennaicorporation.gov.in/pgr/external/mobileservice
+
+# ── Mail / SMTP Configuration (NICeMail via mgovcloud.in) ──────────────────
+spring.mail.host=smtp.mgovcloud.in
+spring.mail.port=465
+spring.mail.username=communityhallsupport@chennaicorporation.gov.in
+spring.mail.password=XPe2JTFphMnN
+spring.mail.protocol=smtps
+spring.mail.properties.mail.smtp.ssl.enable=true
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.ssl.trust=smtp.mgovcloud.in
+spring.mail.properties.mail.smtp.ssl.checkserveridentity=false
+spring.mail.properties.mail.smtp.connectiontimeout=10000
+spring.mail.properties.mail.smtp.timeout=10000
+spring.mail.properties.mail.smtp.writetimeout=10000
+
+# Mail recipient constants
+app.mail.from=communityhallsupport@chennaicorporation.gov.in
+app.mail.to=ranjithkumar@federal.bank.in,pgsupport@mail.in.worldline-solutions.com,megha.mattamana@federal.bank.in
+app.mail.cc=arohqcc@gmail.com,it@chennaicorporation.gov.in

src/main/resources/resources/templates/headquarters/sixmonthold-transactions.html

@@ -0,0 +1,843 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="~{fragments/head-headquarters :: head}"></head>
+<style>
+	.nav-tabs .nav-link.active {
+		background: #1a73e8;
+		color: #fff !important;
+		border-color: #1a73e8;
+		border-radius: 6px 6px 0 0;
+	}
+
+	.nav-tabs .nav-link {
+		color: #444;
+		font-weight: 500;
+	}
+
+	.tab-badge {
+		background: #e8f0fe;
+		color: #1a73e8;
+		border-radius: 10px;
+		padding: 1px 8px;
+		font-size: 12px;
+		font-weight: 700;
+		margin-left: 4px;
+	}
+
+	.nav-tabs .nav-link.active .tab-badge {
+		background: rgba(255, 255, 255, 0.25);
+		color: #fff;
+	}
+
+	.table-responsive {
+		overflow-x: auto;
+	}
+
+	.card-body table {
+		width: 100%;
+	}
+
+	.card-body th,
+	td {
+		padding: 8px;
+		text-align: left;
+	}
+
+	.amount-cell {
+		text-align: right;
+		padding-right: 1rem;
+	}
+
+	.table {
+		width: 100% !important;
+	}
+
+	.btn-sendmail {
+		background: #1a73e8;
+		color: #fff;
+		border: none;
+		border-radius: 4px;
+		padding: 3px 10px;
+		cursor: pointer;
+		font-size: 12px;
+	}
+
+	.btn-sendmail:hover {
+		background: #1558b0;
+	}
+
+	.btn-viewdetails {
+		background: #f59e0b;
+		color: #fff;
+		border: none;
+		border-radius: 4px;
+		padding: 3px 10px;
+		cursor: pointer;
+		font-size: 12px;
+		margin-right: 4px;
+	}
+
+	.btn-viewdetails:hover {
+		background: #b45309;
+	}
+
+	.badge-cancelled {
+		background: #dc2626;
+		color: #fff;
+		padding: 3px 8px;
+		border-radius: 10px;
+		font-size: 11px;
+	}
+
+	.badge-rejected {
+		background: #7c3aed;
+		color: #fff;
+		padding: 3px 8px;
+		border-radius: 10px;
+		font-size: 11px;
+	}
+
+	.badge-approved {
+		background: #16a34a;
+		color: #fff;
+		padding: 3px 8px;
+		border-radius: 10px;
+		font-size: 11px;
+	}
+
+	.badge-other {
+		background: #64748b;
+		color: #fff;
+		padding: 3px 8px;
+		border-radius: 10px;
+		font-size: 11px;
+	}
+
+	.not-initiated {
+		color: #dc2626;
+		font-style: italic;
+		font-size: 12px;
+	}
+
+	/* Draft mail preview */
+	#draftMailBody {
+		background: #f8fafc;
+		border: 1px solid #cbd5e1;
+		border-radius: 6px;
+		padding: 16px;
+		font-family: Arial, sans-serif;
+		font-size: 14px;
+		white-space: pre-wrap;
+		line-height: 1.6;
+	}
+
+	.mail-header-row {
+		margin-bottom: 6px;
+		font-size: 13px;
+	}
+
+	.mail-header-row strong {
+		display: inline-block;
+		width: 50px;
+		color: #475569;
+	}
+</style>
+
+<body>
+	<!-- Page Container -->
+	<div id="page-container"
+		class="sidebar-o sidebar-dark enable-page-overlay side-scroll page-header-fixed page-header-dark">
+		<!-- Side Overlay aside (right)-->
+		<aside th:replace="~{fragments/aside-right :: aside}"></aside>
+		<!-- END Side Overlay (right)-->
+
+		<!-- Sidebar Nav-->
+		<nav th:replace="~{fragments/nav-headquarters :: nav}"></nav>
+		<!-- END Sidebar -->
+
+		<!-- Header -->
+		<header th:replace="~{fragments/header-headquarters :: header}"></header>
+		<!-- END Header -->
+
+		<!-- Main Container -->
+		<main id="main-container" class="container-fluid mt-4 px-4">
+			<div class="block block-rounded">
+				<div class="block-header block-header-default">
+					<h3 class="block-title">6 Months Old Transaction Details</h3>
+				</div>
+				<div class="block-content">
+
+					<!-- ── TABS ───────────────────────────────────────────── -->
+					<ul class="nav nav-tabs mb-0" id="sixMonthTab" role="tablist">
+						<li class="nav-item" role="presentation">
+							<a class="nav-link active" id="tab-sixmonth-lnk" data-toggle="tab" href="#tab-sixmonth"
+								role="tab" aria-controls="tab-sixmonth" aria-selected="true">
+								6 Month Old Bookings
+								<span class="tab-badge"
+									th:text="${sixMonthOldBookings != null ? #lists.size(sixMonthOldBookings) : 0}">0</span>
+							</a>
+						</li>
+						<li class="nav-item" role="presentation">
+							<a class="nav-link" id="tab-cancelled-lnk" data-toggle="tab" href="#tab-cancelled"
+								role="tab" aria-controls="tab-cancelled" aria-selected="false">
+								Cancelled Bookings
+								<span class="tab-badge"
+									th:text="${cancelledBookings != null ? #lists.size(cancelledBookings) : 0}">0</span>
+							</a>
+						</li>
+						<li class="nav-item" role="presentation">
+							<a class="nav-link" id="tab-rejected-lnk" data-toggle="tab" href="#tab-rejected"
+								role="tab" aria-controls="tab-rejected" aria-selected="false">
+								Rejected Bookings
+								<span class="tab-badge"
+									th:text="${rejectedBookings != null ? #lists.size(rejectedBookings) : 0}">0</span>
+							</a>
+						</li>
+						<li class="nav-item" role="presentation">
+							<a class="nav-link" id="tab-mailsent-lnk" data-toggle="tab" href="#tab-mailsent"
+								role="tab" aria-controls="tab-mailsent" aria-selected="false">
+								Mail Sent Bookings
+								<span class="tab-badge"
+									th:text="${mailSentBookings != null ? #lists.size(mailSentBookings) : 0}">0</span>
+							</a>
+						</li>
+					</ul>
+
+					<div class="tab-content border border-top-0 p-3" id="sixMonthTabContent">
+
+						<!-- ══════════════════════════════════════════════════
+						     TAB 1 – 6 Month Old Bookings (non-cancelled/rejected)
+						     ══════════════════════════════════════════════════ -->
+						<div class="tab-pane fade show active" id="tab-sixmonth" role="tabpanel" aria-labelledby="tab-sixmonth-lnk">
+							<div class="table-responsive">
+								<table class="table table-bordered table-striped table-vcenter js-dataTable-responsive"
+									id="tbl-sixmonth">
+									<thead class="thead-light">
+										<tr>
+											<th>S.No</th>
+											<th>Zone</th>
+											<th>Division</th>
+											<th>Hall Name</th>
+											<th>Booking Date</th>
+											<th>Event Date (Start – End)</th>
+											<th>Settlement Raised Date</th>
+											<th>Refund Amount (₹)</th>
+											<th>Refund Status</th>
+											<th>Booking Status</th>
+											<th>Action</th>
+										</tr>
+									</thead>
+									<tbody>
+										<tr th:each="row, rowStat : ${sixMonthOldBookings}">
+											<td class="text-center" th:text="${rowStat.index + 1}"></td>
+											<td th:text="${row['zone'] != null ? row['zone'] : ''}"></td>
+											<td th:text="${row['division'] != null ? row['division'] : ''}"></td>
+											<td th:text="${row['hall_name'] != null ? row['hall_name'] : ''}"></td>
+											<td class="text-center"
+												th:text="${row['booking_date'] != null ? row['booking_date'] : ''}">
+											</td>
+											<td class="text-center"
+												th:text="(${row['event_start_date'] != null ? row['event_start_date'] : ''}) + ' – ' + (${row['event_end_date'] != null ? row['event_end_date'] : ''})">
+											</td>
+											<!-- Settlement Raised Date: N/A if no settlement -->
+											<td class="text-center">
+												<span th:if="${row['settlement_raised_date'] != null}"
+													th:text="${row['settlement_raised_date']}"></span>
+												<span th:if="${row['settlement_raised_date'] == null}"
+													class="not-initiated">Settlement Not Initiated</span>
+											</td>
+											<!-- Refund Amount: from settlement.refunded_amount -->
+											<td class="text-right">
+												<span th:if="${row['refunded_amount'] != null}"
+													th:text="'₹ ' + ${row['refunded_amount']}"></span>
+												<span th:if="${row['refunded_amount'] == null}"
+													class="not-initiated">—</span>
+											</td>
+											<td class="text-center"
+												th:text="${row['refund_status'] != null ? row['refund_status'] : ''}">
+											</td>
+											<td class="text-center">
+												<span th:classappend="${row['booking_status'] == 'CANCELED' || row['booking_status'] == 'CANCELLED'} ? 'badge-cancelled' :
+												                       (${row['booking_status'] == 'REJECTED'} ? 'badge-rejected' :
+												                       (${row['booking_status'] == 'APPROVED'} ? 'badge-approved' : 'badge-other'))"
+													th:text="${row['booking_status'] != null ? row['booking_status'] : ''}"></span>
+											</td>
+											<td class="text-center">
+												<!-- View Details: calls getSettlementList if settlement exists -->
+												<button th:if="${row['settlement_id'] != null}" class="btn-viewdetails"
+													th:onclick="|viewSettlement(${row['settlement_id']})|">
+													View Details
+												</button>
+												<span th:if="${row['settlement_id'] == null}"
+													class="not-initiated d-block mb-1">Settlement Not Initiated</span>
+												<button class="btn-sendmail"
+													th:onclick="|openSendMail(${row['booking_id'] != null ? row['booking_id'] : 0}, '${row['booking_status'] != null ? row['booking_status'] : ''}', '${row['txansaction_id'] != null ? row['txansaction_id'] : ''}', '${row['tpsl_txn_id'] != null ? row['tpsl_txn_id'] : ''}', '${row['transaction_date'] != null ? row['transaction_date'] : ''}', ${row['refunded_amount'] != null ? row['refunded_amount'] : 0})|">
+													Send Mail
+												</button>
+											</td>
+										</tr>
+										<tr
+											th:if="${sixMonthOldBookings == null || #lists.isEmpty(sixMonthOldBookings)}">
+											<td colspan="11" class="text-center text-muted py-3">No records found</td>
+										</tr>
+									</tbody>
+								</table>
+							</div>
+						</div><!-- /tab-sixmonth -->
+
+						<!-- ══════════════════════════════════════════════════
+						     TAB 2 – Cancelled Bookings
+						     Refund Amount = deposit_amount
+						     No Settlement Raised Date column
+						     ══════════════════════════════════════════════════ -->
+						<div class="tab-pane fade" id="tab-cancelled" role="tabpanel" aria-labelledby="tab-cancelled-lnk">
+							<div class="table-responsive">
+								<table class="table table-bordered table-striped table-vcenter js-dataTable-responsive"
+									id="tbl-cancelled">
+									<thead class="thead-light">
+										<tr>
+											<th>S.No</th>
+											<th>Zone</th>
+											<th>Division</th>
+											<th>Hall Name</th>
+											<th>Booking Date</th>
+											<th>Event Date (Start – End)</th>
+											<th>Refund Amount (₹)</th>
+											<th>Booking Status</th>
+											<th>Action</th>
+										</tr>
+									</thead>
+									<tbody>
+										<tr th:each="row, rowStat : ${cancelledBookings}">
+											<td class="text-center" th:text="${rowStat.index + 1}"></td>
+											<td th:text="${row['zone'] != null ? row['zone'] : ''}"></td>
+											<td th:text="${row['division'] != null ? row['division'] : ''}"></td>
+											<td th:text="${row['hall_name'] != null ? row['hall_name'] : ''}"></td>
+											<td class="text-center"
+												th:text="${row['booking_date'] != null ? row['booking_date'] : ''}">
+											</td>
+											<td class="text-center"
+												th:text="(${row['event_start_date'] != null ? row['event_start_date'] : ''}) + ' – ' + (${row['event_end_date'] != null ? row['event_end_date'] : ''})">
+											</td>
+											<td class="text-right"
+												th:text="${row['refund_amount'] != null ? '₹ ' + row['refund_amount'] : '—'}">
+											</td>
+											<td class="text-center">
+												<span class="badge-cancelled"
+													th:text="${row['booking_status'] != null ? row['booking_status'] : ''}"></span>
+											</td>
+											<td class="text-center">
+												<button class="btn-viewdetails"
+													th:onclick="|viewBookingDetails(${row['booking_id'] != null ? row['booking_id'] : 0})|">
+													View Details
+												</button>
+												<button class="btn-sendmail"
+													th:onclick="|openSendMail(${row['booking_id'] != null ? row['booking_id'] : 0}, '${row['booking_status'] != null ? row['booking_status'] : ''}', '${row['txansaction_id'] != null ? row['txansaction_id'] : ''}', '${row['tpsl_txn_id'] != null ? row['tpsl_txn_id'] : ''}', '${row['transaction_date'] != null ? row['transaction_date'] : ''}', ${row['refund_amount'] != null ? row['refund_amount'] : 0})|">
+													Send Mail
+												</button>
+											</td>
+										</tr>
+										<tr th:if="${cancelledBookings == null || #lists.isEmpty(cancelledBookings)}">
+											<td colspan="9" class="text-center text-muted py-3">No records found</td>
+										</tr>
+									</tbody>
+								</table>
+							</div>
+						</div><!-- /tab-cancelled -->
+
+						<!-- ══════════════════════════════════════════════════
+						     TAB 3 – Rejected Bookings
+						     Refund Amount = amount_received (full amount)
+						     No Settlement Raised Date column
+						     ══════════════════════════════════════════════════ -->
+						<div class="tab-pane fade" id="tab-rejected" role="tabpanel" aria-labelledby="tab-rejected-lnk">
+							<div class="table-responsive">
+								<table class="table table-bordered table-striped table-vcenter js-dataTable-responsive"
+									id="tbl-rejected">
+									<thead class="thead-light">
+										<tr>
+											<th>S.No</th>
+											<th>Zone</th>
+											<th>Division</th>
+											<th>Hall Name</th>
+											<th>Booking Date</th>
+											<th>Event Date (Start – End)</th>
+											<th>Refund Amount (₹)</th>
+											<th>Booking Status</th>
+											<th>Action</th>
+										</tr>
+									</thead>
+									<tbody>
+										<tr th:each="row, rowStat : ${rejectedBookings}">
+											<td class="text-center" th:text="${rowStat.index + 1}"></td>
+											<td th:text="${row['zone'] != null ? row['zone'] : ''}"></td>
+											<td th:text="${row['division'] != null ? row['division'] : ''}"></td>
+											<td th:text="${row['hall_name'] != null ? row['hall_name'] : ''}"></td>
+											<td class="text-center"
+												th:text="${row['booking_date'] != null ? row['booking_date'] : ''}">
+											</td>
+											<td class="text-center"
+												th:text="(${row['event_start_date'] != null ? row['event_start_date'] : ''}) + ' – ' + (${row['event_end_date'] != null ? row['event_end_date'] : ''})">
+											</td>
+											<td class="text-right"
+												th:text="${row['refund_amount'] != null ? '₹ ' + row['refund_amount'] : '—'}">
+											</td>
+											<td class="text-center">
+												<span class="badge-rejected"
+													th:text="${row['booking_status'] != null ? row['booking_status'] : ''}"></span>
+											</td>
+											<td class="text-center">
+												<button class="btn-viewdetails"
+													th:onclick="|viewBookingDetails(${row['booking_id'] != null ? row['booking_id'] : 0})|">
+													View Details
+												</button>
+												<button class="btn-sendmail"
+													th:onclick="|openSendMail(${row['booking_id'] != null ? row['booking_id'] : 0}, '${row['booking_status'] != null ? row['booking_status'] : ''}', '${row['txansaction_id'] != null ? row['txansaction_id'] : ''}', '${row['tpsl_txn_id'] != null ? row['tpsl_txn_id'] : ''}', '${row['transaction_date'] != null ? row['transaction_date'] : ''}', ${row['refund_amount'] != null ? row['refund_amount'] : 0})|">
+													Send Mail
+												</button>
+											</td>
+										</tr>
+										<tr th:if="${rejectedBookings == null || #lists.isEmpty(rejectedBookings)}">
+											<td colspan="9" class="text-center text-muted py-3">No records found</td>
+										</tr>
+									</tbody>
+								</table>
+							</div>
+						</div><!-- /tab-rejected -->
+
+						<!-- ══════════════════════════════════════════════════
+						     TAB 4 – Mail Sent Bookings
+						     ══════════════════════════════════════════════════ -->
+						<div class="tab-pane fade" id="tab-mailsent" role="tabpanel" aria-labelledby="tab-mailsent-lnk">
+							<div class="table-responsive">
+								<table class="table table-bordered table-striped table-vcenter js-dataTable-responsive"
+									id="tbl-mailsent">
+									<thead class="thead-light">
+										<tr>
+											<th>S.No</th>
+											<th>Zone</th>
+											<th>Division</th>
+											<th>Hall Name</th>
+											<th>Booking Date</th>
+											<th>Event Date (Start – End)</th>
+											<th>Booking Status</th>
+											<th>Transaction ID</th>
+											<th>TPSL ID</th>
+											<th>Mail Sent Date</th>
+										</tr>
+									</thead>
+									<tbody>
+										<tr th:each="row, rowStat : ${mailSentBookings}">
+											<td class="text-center" th:text="${rowStat.index + 1}"></td>
+											<td th:text="${row['zone'] != null ? row['zone'] : ''}"></td>
+											<td th:text="${row['division'] != null ? row['division'] : ''}"></td>
+											<td th:text="${row['hall_name'] != null ? row['hall_name'] : ''}"></td>
+											<td class="text-center"
+												th:text="${row['booking_date'] != null ? row['booking_date'] : ''}">
+											</td>
+											<td class="text-center"
+												th:text="(${row['event_start_date'] != null ? row['event_start_date'] : ''}) + ' – ' + (${row['event_end_date'] != null ? row['event_end_date'] : ''})">
+											</td>
+											<td class="text-center">
+												<span th:classappend="${row['booking_status'] == 'CANCELED' || row['booking_status'] == 'CANCELLED'} ? 'badge-cancelled' :
+												                       (${row['booking_status'] == 'REJECTED'} ? 'badge-rejected' :
+												                       (${row['booking_status'] == 'APPROVED'} ? 'badge-approved' : 'badge-other'))"
+													th:text="${row['booking_status'] != null ? row['booking_status'] : ''}"></span>
+											</td>
+											<td class="text-center"
+												th:text="${row['txansaction_id'] != null ? row['txansaction_id'] : ''}">
+											</td>
+											<td class="text-center"
+												th:text="${row['tpsl_txn_id'] != null ? row['tpsl_txn_id'] : ''}"></td>
+											<td class="text-center"
+												th:text="${row['mail_sent_date'] != null ? row['mail_sent_date'] : ''}">
+											</td>
+										</tr>
+										<tr th:if="${mailSentBookings == null || #lists.isEmpty(mailSentBookings)}">
+											<td colspan="10" class="text-center text-muted py-3">No records found</td>
+										</tr>
+									</tbody>
+								</table>
+							</div>
+						</div><!-- /tab-mailsent -->
+
+					</div><!-- /tab-content -->
+				</div><!-- /block-content -->
+			</div><!-- /block -->
+		</main>
+		<!-- END Main Container -->
+
+		<!-- ══════════════════════════════════════════════════════════════════
+		     MODAL – Settlement View Details (Tab 1 with settlement)
+		     ══════════════════════════════════════════════════════════════════ -->
+		<div class="modal fade" id="settlementModal" data-backdrop="static" tabindex="-1" role="dialog"
+			aria-labelledby="settlementModalLabel" aria-hidden="true">
+			<div class="modal-dialog modal-lg" role="document">
+				<div class="modal-content">
+					<div class="block block-rounded block-themed block-transparent mb-0">
+						<div class="block-header bg-primary-dark">
+							<h3 class="block-title" id="settlementModalLabel">Settlement Information</h3>
+							<div class="block-options">
+								<button type="button" class="btn-block-option" data-dismiss="modal" aria-label="Close">
+									<i class="fa fa-fw fa-times"></i>
+								</button>
+							</div>
+						</div>
+						<div class="block-content row p-3" id="settlementModalBody">
+							<!-- Populated by JS -->
+						</div>
+						<div class="block-content block-content-full text-right bg-body">
+							<button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">Close</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!-- ══════════════════════════════════════════════════════════════════
+		     MODAL – Booking View Details (Tab 2 & 3 – cancelled/rejected)
+		     ══════════════════════════════════════════════════════════════════ -->
+		<div class="modal fade" id="bookingModal" data-backdrop="static" tabindex="-1" role="dialog"
+			aria-labelledby="bookingModalLabel" aria-hidden="true">
+			<div class="modal-dialog modal-lg" role="document">
+				<div class="modal-content">
+					<div class="block block-rounded block-themed block-transparent mb-0">
+						<div class="block-header bg-primary-dark">
+							<h3 class="block-title" id="bookingModalLabel">Booking Information</h3>
+							<div class="block-options">
+								<button type="button" class="btn-block-option" data-dismiss="modal" aria-label="Close">
+									<i class="fa fa-fw fa-times"></i>
+								</button>
+							</div>
+						</div>
+						<div class="block-content row p-3" id="bookingModalBody">
+							<!-- Populated by JS -->
+						</div>
+						<div class="block-content block-content-full text-right bg-body">
+							<button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">Close</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!-- ══════════════════════════════════════════════════════════════════
+		     MODAL – Draft Mail Preview & Confirm
+		     ══════════════════════════════════════════════════════════════════ -->
+		<div class="modal fade" id="draftMailModal" data-backdrop="static" tabindex="-1" role="dialog"
+			aria-labelledby="draftMailModalLabel" aria-hidden="true">
+			<div class="modal-dialog modal-lg" role="document">
+				<div class="modal-content">
+					<div class="modal-header" style="background:#1a73e8; color:#fff;">
+						<h5 class="modal-title" id="draftMailModalLabel">
+							<i class="fa fa-envelope mr-2"></i>Draft Mail Preview
+						</h5>
+						<button type="button" class="close text-white" data-dismiss="modal" aria-label="Close">
+							<span aria-hidden="true">&times;</span>
+						</button>
+					</div>
+					<div class="modal-body">
+						<!-- Mail Header Fields -->
+						<div class="mail-header-row"><strong>From:</strong>
+							communityhallsupport@chennaicorporation.gov.in</div>
+						<div class="mail-header-row">
+							<strong>To:</strong>
+							pgsupport@mail.in.worldline-solutions.com, ranjithkumar@federal.bank.in,
+							megha.mattamana@federal.bank.in
+						</div>
+						<div class="mail-header-row">
+							<strong>CC:</strong>
+							arohqcc@gmail.com, it@chennaicorporation.gov.in
+						</div>
+						<div class="mail-header-row"><strong>Sub:</strong> Refund Status Update Request – Community Hall
+							Booking</div>
+						<hr class="my-2">
+						<!-- Mail Body -->
+						<div id="draftMailBody"></div>
+
+						<!-- Hidden fields to carry data through to confirm step -->
+						<input type="hidden" id="dm_bookingId">
+						<input type="hidden" id="dm_bookingStatus">
+						<input type="hidden" id="dm_transactionId">
+						<input type="hidden" id="dm_tpslId">
+						<input type="hidden" id="dm_refundAmount">
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-secondary" data-dismiss="modal">
+							<i class="fa fa-times mr-1"></i>Close
+						</button>
+						<button type="button" class="btn btn-primary" id="btn-confirm-mail" onclick="confirmMailSent()">
+							<i class="fa fa-check mr-1"></i>Confirm &amp; Mark as Mail Sent
+						</button>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!-- File Preview Modal (for settlement images) -->
+		<div class="modal fade" id="fileModal" tabindex="-1" role="dialog" aria-hidden="true">
+			<div class="modal-dialog modal-lg">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h5 class="modal-title">File Preview</h5>
+						<button type="button" class="close" data-dismiss="modal"><span>&times;</span></button>
+					</div>
+					<div class="modal-body">
+						<embed id="filePreview" src="" width="100%" height="600px">
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<footer th:replace="~{fragments/footer2 :: footer}"></footer>
+	</div>
+	<!-- END Page Container -->
+
+	<div th:replace="~{fragments/resetpassword :: div}"></div>
+	<script th:replace="~{fragments/loginscript :: script}"></script>
+
+	<script>
+		// ─────────────────────────────────────────────────────────────────────
+		// DataTable initialisation & Tab Switch Handlers
+		// ─────────────────────────────────────────────────────────────────────
+		$(document).ready(function () {
+			var dtButtons = [
+				{ extend: 'pageLength', className: 'btn btn-primary' },
+				{ extend: 'copyHtml5', text: 'Copy', className: 'btn btn-primary' },
+				{ extend: 'excelHtml5', text: 'Excel', className: 'btn btn-primary' },
+				{ extend: 'csvHtml5', text: 'CSV', className: 'btn btn-primary' },
+				{ extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-primary' }
+			];
+			var dtOpts = {
+				dom: 'Bftip',
+				columnDefs: [{ targets: 'no-sort', orderable: false }],
+				lengthMenu: [[50, 100, 200, 500, -1], ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']],
+				buttons: dtButtons,
+				responsive: true,
+				searching: true,
+				autoWidth: false
+			};
+
+			// Initialize DataTables
+			$('#tbl-sixmonth').DataTable(dtOpts);
+			$('#tbl-cancelled').DataTable(dtOpts);
+			$('#tbl-rejected').DataTable(dtOpts);
+			$('#tbl-mailsent').DataTable(dtOpts);
+
+			// Explicit click handler to guarantee tab activation
+			$('#sixMonthTab a').on('click', function (e) {
+				e.preventDefault();
+				$(this).tab('show');
+			});
+
+			// Recalculate columns and responsive layout whenever any tab is shown
+			$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+				var targetTab = $(e.target).attr('href');
+				if (targetTab && $.fn.dataTable) {
+					try {
+						$(targetTab).find('table').each(function () {
+							if ($.fn.dataTable.isDataTable(this)) {
+								$(this).DataTable().columns.adjust().responsive.recalc();
+							}
+						});
+					} catch (err) {
+						console.log('Error adjusting table columns on tab switch:', err);
+					}
+				}
+			});
+		});
+
+		// ─────────────────────────────────────────────────────────────────────
+		// View Settlement Details (Tab 1 – uses /getSettlementList by settlementId)
+		// ─────────────────────────────────────────────────────────────────────
+		function viewSettlement(settlementId) {
+			$.ajax({
+				type: 'GET',
+				url: '/communityhall/api/officer/getSettlementList',
+				data: { settlementsid: settlementId },
+				success: function (data) {
+					populateSettlementModal(data);
+					$('#settlementModal').modal('show');
+				},
+				error: function () {
+					Swal.fire('Error', 'Failed to fetch settlement details.', 'error');
+				}
+			});
+		}
+
+		function populateSettlementModal(d) {
+			var html = '<div class="col-12">';
+			html += '<table class="table table-sm table-bordered">';
+			html += '<tr><th colspan="4" style="background:#f2f2f2;">User Details</th></tr>';
+			html += '<tr><th style="font-weight:normal">User Name:</th><td>' + (d.users ? d.users.name : '') + '</td>';
+			html += '<th style="font-weight:normal">Mobile No:</th><td>' + (d.users ? d.users.mobileNo : '') + '</td></tr>';
+			html += '<tr><th style="font-weight:normal">User Type:</th><td colspan="3">' + (d.users ? d.users.usertype : '') + '</td></tr>';
+			html += '<tr><th colspan="4" style="background:#f2f2f2;">Hall Details</th></tr>';
+			html += '<tr><th style="font-weight:normal">Hall Name:</th><td colspan="3">' + (d.hallDetails ? d.hallDetails.hallName : '') + '</td></tr>';
+			html += '<tr><th colspan="4" style="background:#f2f2f2;">Booking Details (ID: ' + d.bookingId + ')</th></tr>';
+			html += '<tr><th style="font-weight:normal">Booking Date:</th><td>' + d.bookingDate + '</td>';
+			html += '<th style="font-weight:normal">Deposit Amount:</th><td>₹ ' + parseFloat(d.depositAmount).toFixed(2) + '</td></tr>';
+			html += '<tr><th style="font-weight:normal">Start Date:</th><td>' + d.startDate + '</td>';
+			html += '<th style="font-weight:normal">End Date:</th><td>' + d.endDate + '</td></tr>';
+			// Settlement
+			if (d.settlement) {
+				html += '<tr><th colspan="4" style="background:#f2f2f2;">Settlement Details</th></tr>';
+				html += '<tr><th style="font-weight:normal">Refunded Amount:</th><td>₹ ' + parseFloat(d.settlement.refundedAmount || 0).toFixed(2) + '</td>';
+				html += '<th style="font-weight:normal">Damage Amount:</th><td>₹ ' + parseFloat(d.settlement.damageAmount || 0).toFixed(2) + '</td></tr>';
+			} else {
+				html += '<tr><td colspan="4" class="text-danger text-center font-italic">Settlement Not Initiated</td></tr>';
+			}
+			html += '</table></div>';
+			$('#settlementModalBody').html(html);
+		}
+
+		// ─────────────────────────────────────────────────────────────────────
+		// View Booking Details (Tab 2 & 3 – uses /getBookingDetails by bookingId)
+		// ─────────────────────────────────────────────────────────────────────
+		function viewBookingDetails(bookingId) {
+			if (!bookingId || bookingId === 0) {
+				Swal.fire('Warning', 'Invalid Booking ID.', 'warning');
+				return;
+			}
+			$.ajax({
+				type: 'GET',
+				url: '/communityhall/api/officer/getBookingDetails',
+				data: { bookingsId: bookingId },
+				success: function (data) {
+					populateBookingModal(data);
+					$('#bookingModal').modal('show');
+				},
+				error: function () {
+					Swal.fire('Error', 'Failed to fetch booking details.', 'error');
+				}
+			});
+		}
+
+		function populateBookingModal(d) {
+			var html = '<div class="col-12">';
+			html += '<table class="table table-sm table-bordered">';
+			html += '<tr><th colspan="4" style="background:#f2f2f2;">User Details</th></tr>';
+			html += '<tr><th style="font-weight:normal">User Name:</th><td>' + (d.users ? d.users.name : '') + '</td>';
+			html += '<th style="font-weight:normal">Mobile No:</th><td>' + (d.users ? d.users.mobileNo : '') + '</td></tr>';
+			html += '<tr><th style="font-weight:normal">User Type:</th><td colspan="3">' + (d.users ? d.users.usertype : '') + '</td></tr>';
+			html += '<tr><th colspan="4" style="background:#f2f2f2;">Hall Details</th></tr>';
+			html += '<tr><th style="font-weight:normal">Hall Name:</th><td colspan="3">' + (d.hallDetails ? d.hallDetails.hallName : '') + '</td></tr>';
+			html += '<tr><th colspan="4" style="background:#f2f2f2;">Booking Details (ID: ' + d.bookingId + ')</th></tr>';
+			html += '<tr><th style="font-weight:normal">Booking Date:</th><td>' + d.bookingDate + '</td>';
+			html += '<th style="font-weight:normal">Booking Status:</th><td>' + d.bookingStatus + '</td></tr>';
+			html += '<tr><th style="font-weight:normal">Start Date:</th><td>' + d.startDate + '</td>';
+			html += '<th style="font-weight:normal">End Date:</th><td>' + d.endDate + '</td></tr>';
+			html += '<tr><th style="font-weight:normal">Deposit Amount:</th><td>₹ ' + parseFloat(d.depositAmount).toFixed(2) + '</td>';
+			html += '<th style="font-weight:normal">Total Amount:</th><td>₹ ' + parseFloat(d.amountReceived).toFixed(2) + '</td></tr>';
+			// Payment
+			if (d.payments) {
+				html += '<tr><th colspan="4" style="background:#f2f2f2;">Payment Details</th></tr>';
+				html += '<tr><th style="font-weight:normal">Transaction ID:</th><td colspan="3">' + d.payments.transactionId + '</td></tr>';
+				html += '<tr><th style="font-weight:normal">Amount Received:</th><td>₹ ' + d.payments.amountReceived + '</td>';
+				html += '<th style="font-weight:normal">Payment Status:</th><td>' + d.payments.paymentStatus + '</td></tr>';
+			}
+			html += '</table></div>';
+			$('#bookingModalBody').html(html);
+		}
+
+		// ─────────────────────────────────────────────────────────────────────
+		// Send Mail Flow
+		// ─────────────────────────────────────────────────────────────────────
+		function openSendMail(bookingId, bookingStatus, transactionId, tpslId, transactionDate, refundAmount) {
+			Swal.fire({
+				title: 'Send Refund Follow-up Mail?',
+				html: 'This will send a refund status request mail for Booking ID <strong>' + bookingId + '</strong>.<br>Do you want to proceed?',
+				icon: 'question',
+				showCancelButton: true,
+				confirmButtonText: 'Yes, Show Draft',
+				cancelButtonText: 'Cancel',
+				confirmButtonColor: '#1a73e8'
+			}).then(function (result) {
+				if (result.isConfirmed) {
+					showDraftMail(bookingId, bookingStatus, transactionId, tpslId, transactionDate, refundAmount);
+				}
+			});
+		}
+
+		function showDraftMail(bookingId, bookingStatus, transactionId, tpslId, transactionDate, refundAmount) {
+			document.getElementById('dm_bookingId').value = bookingId;
+			document.getElementById('dm_bookingStatus').value = bookingStatus;
+			document.getElementById('dm_transactionId').value = transactionId || '';
+			document.getElementById('dm_tpslId').value = tpslId || '';
+			document.getElementById('dm_refundAmount').value = refundAmount || 0;
+
+			var amt = parseFloat(refundAmount || 0).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+
+			var body = 'Hi,\n\n';
+			body += 'Kindly update refund status for the foresaid transaction made for Community Hall Booking.\n\n';
+			body += 'Transaction Details:\n\n';
+			body += '  Transaction ID   : ' + (transactionId || 'N/A') + '\n';
+			body += '  TPSL ID          : ' + (tpslId || 'N/A') + '\n';
+			body += '  Transaction Date : ' + (transactionDate || 'N/A') + '\n';
+			body += '  Refund Amount    : ₹ ' + amt + '\n\n';
+			body += 'If refund was not initiated, kindly initiate the refund and update refund status at the earliest. ';
+			body += 'Make sure that no duplicate refund was processed against this transaction.\n\n';
+			body += 'Regards,\n';
+			body += 'Community Hall Support\n';
+			body += 'Greater Chennai Corporation';
+
+			document.getElementById('draftMailBody').textContent = body;
+			$('#draftMailModal').modal('show');
+		}
+
+		function confirmMailSent() {
+			var bookingId = document.getElementById('dm_bookingId').value;
+			var bookingStatus = document.getElementById('dm_bookingStatus').value;
+			var transactionId = document.getElementById('dm_transactionId').value;
+			var tpslId = document.getElementById('dm_tpslId').value;
+			var refundAmount = document.getElementById('dm_refundAmount').value;
+
+			var mailTo = "pgsupport@mail.in.worldline-solutions.com,ranjithkumar@federal.bank.in,megha.mattamana@federal.bank.in";
+			var mailCc = "arohqcc@gmail.com,it@chennaicorporation.gov.in";
+			var mailSubject = "Refund Status Update Request – Community Hall Booking";
+			var mailBody = document.getElementById('draftMailBody').textContent;
+			var mailtoLink = "mailto:" + mailTo + "?cc=" + mailCc + "&subject=" + encodeURIComponent(mailSubject) + "&body=" + encodeURIComponent(mailBody);
+
+			window.location.href = mailtoLink;
+			document.getElementById('btn-confirm-mail').disabled = true;
+
+			$.ajax({
+				type: 'POST',
+				url: '/communityhall/headquarters/sixmonthold-transactions/markMailSent',
+				data: {
+					bookingId: bookingId,
+					bookingStatus: bookingStatus,
+					transactionId: transactionId,
+					tpslId: tpslId,
+					refundAmount: refundAmount
+				},
+				success: function (resp) {
+					$('#draftMailModal').modal('hide');
+					if (resp.status === 'success') {
+						Swal.fire({
+							icon: 'success',
+							title: 'Mail Recorded!',
+							text: 'Booking ID ' + bookingId + ' has been moved to "Mail Sent Bookings" tab.',
+							confirmButtonColor: '#1a73e8'
+						}).then(function () {
+							location.reload();
+						});
+					} else {
+						Swal.fire('Error', resp.message || 'An error occurred.', 'error');
+						document.getElementById('btn-confirm-mail').disabled = false;
+					}
+				},
+				error: function () {
+					Swal.fire('Error', 'Failed to mark mail as sent. Please try again.', 'error');
+					document.getElementById('btn-confirm-mail').disabled = false;
+				}
+			});
+		}
+	</script>
+</body>
+
+</html>

src/main/resources/templates/admin/gccblocking-new.html

@@ -324,7 +324,7 @@
                                             <th class="text-center">
                                                 <input type="checkbox" id="selectAllBookings"
                                                     title="Select / Deselect all cancellable bookings">
-                                                &nbsp;Cancel?
+                                                &nbsp;Select All
                                             </th>
                                             <th class="text-center">#</th>
                                             <th class="text-center">Hall Name</th>
@@ -781,10 +781,20 @@
             // Wire select-all checkbox
             const selAll = document.getElementById('selectAllBookings');
             if (selAll) {
+                // Select All → toggle every enabled row checkbox
                 selAll.onchange = function () {
                     document.querySelectorAll('.booking-cb:not(:disabled)')
                         .forEach(cb => { cb.checked = selAll.checked; });
                 };
+
+                // Individual row checkboxes → sync Select All state
+                document.querySelectorAll('.booking-cb:not(:disabled)').forEach(cb => {
+                    cb.addEventListener('change', function () {
+                        const total = document.querySelectorAll('.booking-cb:not(:disabled)').length;
+                        const checked = document.querySelectorAll('.booking-cb:not(:disabled):checked').length;
+                        selAll.checked = (total > 0 && checked === total);
+                    });
+                });
             }
 
             if (hasTodayBooking) {

src/main/resources/templates/fragments/headquartersMenu.html

@@ -114,6 +114,13 @@
                 <span class="nav-main-link-name">Refund Failed List</span>
             </a>
         </li>
+
+        <li class="nav-main-item">
+            <a class="nav-main-link" href="/communityhall/headquarters/sixmonthold-transactions">
+                <i class="nav-main-link-icon fa fa-location-arrow"></i>
+                <span class="nav-main-link-name">6 Months Old Transactions</span>
+            </a>
+        </li>
         <!-- <li class="nav-main-item">
             <a class="nav-main-link" href="/communityhall/headquarters/Gccblocking">
                 <i class="nav-main-link-icon fa fa-location-arrow"></i>

src/main/resources/templates/headquarters/bookingwaiting.html

@@ -352,8 +352,61 @@
 					'bookingsId': bookingId
 				},
 				success: function (x) {
-					//console.log(x);
-					showBookingInfo(x);
+					// Check if the booking has been rescheduled (scheduleCount > 0)
+					if (x.scheduleCount > 0) {
+						// Fetch booking history to get the previously booked dates
+						$.ajax({
+							type: "GET",
+							url: '/communityhall/api/officer/getBookingHistory',
+							data: {
+								'bookingId': bookingId
+							},
+							success: function (historyList) {
+								if (historyList && historyList.length > 0) {
+									// The first history record holds the original (old) booking dates
+									var oldRecord = historyList[0];
+									var oldStartDate = oldRecord.startDate || 'N/A';
+									var oldEndDate   = oldRecord.endDate   || 'N/A';
+									var newStartDate = x.startDate || 'N/A';
+									var newEndDate   = x.endDate   || 'N/A';
+
+									Swal.fire({
+										icon: 'warning',
+										title: 'Date Change Notice',
+										html:
+											'<p>This booking was previously scheduled for:</p>' +
+											'<b>From: ' + oldStartDate + ' &nbsp; To: ' + oldEndDate + '</b>' +
+											'<br><br>' +
+											'<p>The date has since been changed to:</p>' +
+											'<b>From: ' + newStartDate + ' &nbsp; To: ' + newEndDate + '</b>',
+										confirmButtonText: 'OK, Proceed',
+										confirmButtonColor: '#3085d6'
+									}).then(function () {
+										// Record that the officer acknowledged this date-change notification
+										$.ajax({
+											type: 'POST',
+											url: '/communityhall/api/officer/acknowledgeNocNotification',
+											data: { 'bookingId': bookingId },
+											complete: function () {
+												// Open the modal whether the flag update succeeded or not
+												showBookingInfo(x);
+											}
+										});
+									});
+								} else {
+									// No history found — open modal directly
+									showBookingInfo(x);
+								}
+							},
+							error: function () {
+								// On history fetch error — open modal directly
+								showBookingInfo(x);
+							}
+						});
+					} else {
+						// scheduleCount === 0 — no rescheduling, open modal directly
+						showBookingInfo(x);
+					}
 				}
 			});
 

src/main/resources/templates/headquarters/gccblocking-new.html

@@ -317,7 +317,7 @@
                                             <th class="text-center">
                                                 <input type="checkbox" id="selectAllBookings"
                                                     title="Select / Deselect all cancellable bookings">
-                                                &nbsp;Cancel?
+                                                &nbsp;Select All
                                             </th>
                                             <th class="text-center">#</th>
                                             <th class="text-center">Hall Name</th>
@@ -791,10 +791,20 @@
             // Wire select-all checkbox
             const selAll = document.getElementById('selectAllBookings');
             if (selAll) {
+                // Select All → toggle every enabled row checkbox
                 selAll.onchange = function () {
                     document.querySelectorAll('.booking-cb:not(:disabled)')
                         .forEach(cb => { cb.checked = selAll.checked; });
                 };
+
+                // Individual row checkboxes → sync Select All state
+                document.querySelectorAll('.booking-cb:not(:disabled)').forEach(cb => {
+                    cb.addEventListener('change', function () {
+                        const total   = document.querySelectorAll('.booking-cb:not(:disabled)').length;
+                        const checked = document.querySelectorAll('.booking-cb:not(:disabled):checked').length;
+                        selAll.checked = (total > 0 && checked === total);
+                    });
+                });
             }
 
             if (hasTodayBooking) {

src/main/resources/templates/headquarters/halldetailslist.html

@@ -1319,6 +1319,7 @@
             }
             var zoneLabel = $('#zone2 option:selected').text();
             var divisionLabel = $('#division2 option:selected').text();
+            var hallArea = document.getElementById("hallAreaEdit").value;
             var doorNo = document.getElementById("doornoo").value;
             var street = document.getElementById("street").value;
             var pinCode = document.getElementById("pincod").value;
@@ -1390,6 +1391,7 @@
             formData.append("hallName", hallName);
             formData.append("zone", zoneLabel);
             formData.append("division", divisionLabel);
+            formData.append("hallArea", hallArea);
             formData.append("doorNo", doorNo);
             formData.append("street", street);
             formData.append("pinCode", pinCode);

src/main/resources/templates/headquarters/settlement-completed.html

@@ -1,22 +1,26 @@
 <!DOCTYPE html>
 
 <html xmlns:th="http://www.thymeleaf.org">
+
 <head th:replace="~{fragments/head-headquarters :: head}"></head>
 <style>
 	.card-body table {
 		width: 100%;
 		padding: 100px;
 	}
+
 	.card-body th,
 	td {
 		padding: 8px;
 		text-align: left;
 	}
+
 	.amount-cell {
 		text-align: right;
 		padding-right: 1rem;
 		/* Adjust padding as needed */
 	}
+
 	.table {
 		width: 100% !important;
 	}
@@ -30,6 +34,7 @@
 <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"
 	integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO"
 	crossorigin="anonymous"></script>
+
 <body>
 	<!-- Page Container -->
 	<div id="page-container"
@@ -96,7 +101,8 @@
 														th:text="${settlements.hallDetails.hallName}"></td>
 													<td class="text-center" th:text="${settlements.bookingId}"></td>
 													<td class="text-center" th:text="${settlements.bookingDate}"></td>
-													<td class="text-center" th:text="${settlements.settlement.updatedDate}"></td>
+													<td class="text-center"
+														th:text="${settlements.settlement.updatedDate}"></td>
 													<td class="text-center"
 														th:text="${settlements.settlement.settlementId}"></td>
 													<td class="text-center"
@@ -218,7 +224,8 @@
 														th:text="${rejectedbookings.users.usertype}"></td>
 													<td class="text-center" th:text="${rejectedbookings.reason}"></td>
 													<td class="text-center" th:text="${rejectedbookings.comments}"></td>
-													<td class="text-center" th:text="${rejectedbookings.amountReceived}">
+													<td class="text-center"
+														th:text="${rejectedbookings.amountReceived}">
 													</td>
 													<td>
 														<p>
@@ -371,7 +378,8 @@
 													Details</th>
 											</tr>
 											<tr>
-												<th style="padding: 0.45rem 0.45rem;font-weight: normal">Consumer Number:</th>
+												<th style="padding: 0.45rem 0.45rem;font-weight: normal">Consumer
+													Number:</th>
 												<td class="fw-semibold"
 													style="padding: 0.45rem 0.45rem;text-align:center;"
 													id="td_EBNumber"></td>
@@ -448,7 +456,8 @@
 											<tr id="pendingcolumn">
 
 												<th id="th_settel_label"
-													style="padding: 0.45rem 0.45rem;font-weight: normal">Collected Amount:</th>
+													style="padding: 0.45rem 0.45rem;font-weight: normal">Collected
+													Amount:</th>
 												<td class="fw-semibold amount-cell"
 													style="padding: 0.45rem 0.45rem; color: green;" id="td_pending_amt">
 													0</td>
@@ -738,7 +747,7 @@
 			$('#SettlementCompletedListTable').DataTable({
 				dom: 'Bftip',
 				columnDefs: [
-					{targets: 'no-sort', orderable: false}
+					{ targets: 'no-sort', orderable: false }
 				],
 				lengthMenu: [
 					[50, 100, 200, 500, -1],
@@ -756,7 +765,7 @@
 			$('#cancelledcompletedListTable').DataTable({
 				dom: 'Bftip',
 				columnDefs: [
-					{targets: 'no-sort', orderable: false}
+					{ targets: 'no-sort', orderable: false }
 				],
 				lengthMenu: [
 					[50, 100, 200, 500, -1],
@@ -774,7 +783,7 @@
 			$('#rejectedcompletedListTable').DataTable({
 				dom: 'Bftip',
 				columnDefs: [
-					{targets: 'no-sort', orderable: false}
+					{ targets: 'no-sort', orderable: false }
 				],
 				lengthMenu: [
 					[50, 100, 200, 500, -1],
@@ -838,7 +847,7 @@
 			document.getElementById("td_depositeAmount").innerHTML = '₹ ' + parseFloat(list.depositAmount).toFixed(2);
 			document.getElementById("td_hallAmount").innerHTML = '₹ ' + parseFloat(list.hallAmount).toFixed(2);
 			// Calculate GST and total amount
-			var gstAmount = (parseFloat(list.hallAmount) * (list.hallDetails.gst/100)).toFixed(2);
+			var gstAmount = (parseFloat(list.hallAmount) * (list.hallDetails.gst / 100)).toFixed(2);
 			var totalAmount = parseFloat(list.amountReceived).toFixed(2);
 			document.getElementById("td_gst").innerHTML = '₹ ' + gstAmount;
 			document.getElementById("td_totalAmount").innerHTML = '₹ ' + totalAmount;
@@ -879,7 +888,7 @@
 			// Create a div for table responsiveness
 			var tableResponsiveDiv = $('<div>').addClass('table-responsive');
 			// Create table with similar classes and styles to the modal table
-			var table = $('<table>').addClass('table table-bordered table-striped').css({'width': '97%', 'border-color': 'black', 'border-top-color': 'white'});
+			var table = $('<table>').addClass('table table-bordered table-striped').css({ 'width': '97%', 'border-color': 'black', 'border-top-color': 'white' });
 			var thead = $('<thead>').addClass('thead-light');
 			var tbody = $('<tbody>');
 			// Create Damage Details header row
@@ -892,76 +901,76 @@
 			}).appendTo(headerRow);
 			// Create table header row
 			var columnHeadersRow = $('<tr>').css('background-color', '#f2f2f2').appendTo(thead);
-			$('<th>').text('S.No').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(columnHeadersRow);
-			$('<th>').text('Asset Name').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(columnHeadersRow);
-			$('<th>').text('Damage Img').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(columnHeadersRow);
-			$('<th>').text('Cost').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(columnHeadersRow);
-			$('<th>').text('Qty').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(columnHeadersRow);
-			$('<th>').text('Amount').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(columnHeadersRow);
+			$('<th>').text('S.No').css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(columnHeadersRow);
+			$('<th>').text('Asset Name').css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(columnHeadersRow);
+			$('<th>').text('Damage Img').css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(columnHeadersRow);
+			$('<th>').text('Cost').css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(columnHeadersRow);
+			$('<th>').text('Qty').css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(columnHeadersRow);
+			$('<th>').text('Amount').css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(columnHeadersRow);
 			var totalAmount = 0;
 
-// Check if damageList is empty
-if (data.damageList.length === 0) {
-    var row = $('<tr>').appendTo(tbody);
-    $('<td>').attr('colspan', '6').text('No Damaged Items').css({
-        'padding': '0.45rem 0.45rem',
-        'text-align': 'center',
-        'font-weight': 'bold',
-        'background-color': '#f2f2f2'
-    }).appendTo(row);
-} else {
-    $.each(data.damageList, function (index, detail) {
-        var row = $('<tr>').appendTo(tbody);
-        $('<td>').text(index + 1).css({
-            'padding': '0.45rem 0.45rem',
-            'text-align': 'center'
-        }).appendTo(row);
-        $('<td>').text(detail.assetName).css({
-            'padding': '0.45rem 0.45rem',
-            'text-align': 'center'
-        }).appendTo(row);
+			// Check if damageList is empty
+			if (data.damageList.length === 0) {
+				var row = $('<tr>').appendTo(tbody);
+				$('<td>').attr('colspan', '6').text('No Damaged Items').css({
+					'padding': '0.45rem 0.45rem',
+					'text-align': 'center',
+					'font-weight': 'bold',
+					'background-color': '#f2f2f2'
+				}).appendTo(row);
+			} else {
+				$.each(data.damageList, function (index, detail) {
+					var row = $('<tr>').appendTo(tbody);
+					$('<td>').text(index + 1).css({
+						'padding': '0.45rem 0.45rem',
+						'text-align': 'center'
+					}).appendTo(row);
+					$('<td>').text(detail.assetName).css({
+						'padding': '0.45rem 0.45rem',
+						'text-align': 'center'
+					}).appendTo(row);
 
-        var viewLink = $('<a>').attr('href', 'javascript:void(0)').text('View').on('click', function () {
-            showDamageImage(detail.damageImageUrl);
-        });
-        $('<td>').css({
-            'padding': '0.45rem 0.45rem',
-            'text-align': 'center'
-        }).append(viewLink).appendTo(row);
+					var viewLink = $('<a>').attr('href', 'javascript:void(0)').text('View').on('click', function () {
+						showDamageImage(detail.damageImageUrl);
+					});
+					$('<td>').css({
+						'padding': '0.45rem 0.45rem',
+						'text-align': 'center'
+					}).append(viewLink).appendTo(row);
 
-        var assetamt = (detail.assetAmount / detail.quantity).toFixed(2);
-        $('<td>').text('₹ ' + assetamt).css({
-            'padding': '0.45rem 0.45rem',
-            'text-align': 'center'
-        }).appendTo(row);
+					var assetamt = (detail.assetAmount / detail.quantity).toFixed(2);
+					$('<td>').text('₹ ' + assetamt).css({
+						'padding': '0.45rem 0.45rem',
+						'text-align': 'center'
+					}).appendTo(row);
 
-        $('<td>').text(detail.quantity).css({
-            'padding': '0.45rem 0.45rem',
-            'text-align': 'center'
-        }).appendTo(row);
+					$('<td>').text(detail.quantity).css({
+						'padding': '0.45rem 0.45rem',
+						'text-align': 'center'
+					}).appendTo(row);
 
-        var amount = detail.assetAmount;
-        totalAmount += amount;
-        $('<td>').text('₹ ' + amount.toFixed(2)).css({
-            'padding': '0.45rem 0.45rem',
-            'text-align': 'right'
-        }).appendTo(row);
-    });
+					var amount = detail.assetAmount;
+					totalAmount += amount;
+					$('<td>').text('₹ ' + amount.toFixed(2)).css({
+						'padding': '0.45rem 0.45rem',
+						'text-align': 'right'
+					}).appendTo(row);
+				});
 
-    // Add row for total amount
-    var totalRow = $('<tr>').appendTo(tbody);
-    $('<td>').attr('colspan', '5').text('Total Amount').css({
-        'padding': '0.45rem 0.45rem',
-        'font-weight': 'bold',
-        'background-color': '#f2f2f2'
-    }).appendTo(totalRow);
-    $('<td>').text('₹ ' + totalAmount.toFixed(2)).css({
-        'padding': '0.45rem 0.45rem',
-        'text-align': 'right'
-    }).appendTo(totalRow);
+				// Add row for total amount
+				var totalRow = $('<tr>').appendTo(tbody);
+				$('<td>').attr('colspan', '5').text('Total Amount').css({
+					'padding': '0.45rem 0.45rem',
+					'font-weight': 'bold',
+					'background-color': '#f2f2f2'
+				}).appendTo(totalRow);
+				$('<td>').text('₹ ' + totalAmount.toFixed(2)).css({
+					'padding': '0.45rem 0.45rem',
+					'text-align': 'right'
+				}).appendTo(totalRow);
 
-    $("#td_dam_amt").html('₹ ' + totalAmount.toFixed(2));
-}
+				$("#td_dam_amt").html('₹ ' + totalAmount.toFixed(2));
+			}
 
 
 			// Append the table elements to the container div
@@ -998,7 +1007,7 @@ if (data.damageList.length === 0) {
 				var tableResponsiveDiv = $('<div>').addClass('table-responsive').css('margin-right', '-24px');
 
 				// Create table with similar classes and styles to the modal table
-				var table = $('<table>').addClass('table table-bordered table-striped').css({'width': '100%', 'border-color': 'black', 'border-top-color': 'white'});
+				var table = $('<table>').addClass('table table-bordered table-striped').css({ 'width': '100%', 'border-color': 'black', 'border-top-color': 'white' });
 				var thead = $('<thead>').addClass('thead-light');
 				var tbody = $('<tbody>');
 				var headerRow = $('<tr>').appendTo(thead);
@@ -1011,20 +1020,20 @@ if (data.damageList.length === 0) {
 				var columnRow = $('<tr>').css('background-color', '#f2f2f2').appendTo(thead);
 				//$('<th>').text('DD Number').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(columnRow);
 				//$('<th>').text('DD Date').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(columnRow);
-				$('<th>').text('Challan Number').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(columnRow);
-				$('<th>').text('Challan Amount').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(columnRow);
-				$('<th>').text('Challan Image').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(columnRow);
+				$('<th>').text('Challan Number').css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(columnRow);
+				$('<th>').text('Challan Amount').css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(columnRow);
+				$('<th>').text('Challan Image').css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(columnRow);
 
 				var row = $('<tr>').appendTo(tbody);
 				//$('<td>').text(data.settlement.ddnumber).css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(row);
 				//$('<td>').text(data.settlement.ddnumber).css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(row);
-				$('<td>').text(data.settlement.challonnumber).css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(row);
-				$('<td>').text(data.settlement.challonamount).css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(row);
+				$('<td>').text(data.settlement.challonnumber).css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(row);
+				$('<td>').text(data.settlement.challonamount).css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(row);
 				//$('<td>').text(data.settlement.dddate).css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(row);
-				var challanImgLink = $('<a>').attr('href', 'javascript:void(0)').text('View Image').on('click', function () {					
-				showchallonimage(data.settlement.challon);
-					});
-				$('<td>').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).append(challanImgLink).appendTo(row);
+				var challanImgLink = $('<a>').attr('href', 'javascript:void(0)').text('View Image').on('click', function () {
+					showchallonimage(data.settlement.challon);
+				});
+				$('<td>').css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).append(challanImgLink).appendTo(row);
 
 				table.append(thead, tbody);
 				challonTableContainer.append(table);
@@ -1047,7 +1056,7 @@ if (data.damageList.length === 0) {
 				var tableResponsiveDiv = $('<div>').addClass('table-responsive').css('margin-right', '-24px');
 
 				// Create table with similar classes and styles to the modal table
-				var table = $('<table>').addClass('table table-bordered table-striped').css({'width': '100%', 'border-color': 'black', 'border-top-color': 'white'});
+				var table = $('<table>').addClass('table table-bordered table-striped').css({ 'width': '100%', 'border-color': 'black', 'border-top-color': 'white' });
 				var thead = $('<thead>').addClass('thead-light');
 				var tbody = $('<tbody>');
 				var headerRow = $('<tr>').appendTo(thead);
@@ -1058,15 +1067,15 @@ if (data.damageList.length === 0) {
 					'color': 'black',
 				}).appendTo(headerRow);
 				var columnRow = $('<tr>').css('background-color', '#f2f2f2').appendTo(thead);
-				$('<th>').text('DD Number').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(columnRow);
-				$('<th>').text('DD Amount').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(columnRow);
-				$('<th>').text('DD Date').css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(columnRow);
+				$('<th>').text('DD Number').css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(columnRow);
+				$('<th>').text('DD Amount').css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(columnRow);
+				$('<th>').text('DD Date').css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(columnRow);
 
 				var row = $('<tr>').appendTo(tbody);
-				$('<td>').text(data.settlement.ddnumber).css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(row);
-				$('<td>').text(data.settlement.ddamount).css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(row);
+				$('<td>').text(data.settlement.ddnumber).css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(row);
+				$('<td>').text(data.settlement.ddamount).css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(row);
 
-				$('<td>').text(data.settlement.dddate).css({'padding': '0.45rem 0.45rem', 'text-align': 'center'}).appendTo(row);
+				$('<td>').text(data.settlement.dddate).css({ 'padding': '0.45rem 0.45rem', 'text-align': 'center' }).appendTo(row);
 
 				table.append(thead, tbody);
 				ddTableContainer.append(table);
@@ -1084,7 +1093,7 @@ if (data.damageList.length === 0) {
 			document.getElementById('filePreview').src = damageImageUrl;
 			$('#fileModal').modal('show');
 		}
-		function showchallonimage(challanImgLink){
+		function showchallonimage(challanImgLink) {
 			document.getElementById('filePreview').src = challanImgLink;
 			$('#fileModal').modal('show');
 		}
@@ -1138,7 +1147,7 @@ if (data.damageList.length === 0) {
 			document.getElementById("depositeAmount").innerHTML = '₹ ' + parseFloat(list.depositAmount).toFixed(2);
 			document.getElementById("hallAmount").innerHTML = '₹ ' + parseFloat(list.hallAmount).toFixed(2);
 			document.getElementById("totalAmount").innerHTML = '₹ ' + parseFloat(list.amountReceived).toFixed(2);
-			var gstcl = (list.hallAmount * (list.hallDetails.gst/100));
+			var gstcl = (list.hallAmount * (list.hallDetails.gst / 100));
 			var formattedGst = gstcl.toFixed(2);
 			document.getElementById("gst").innerHTML = formattedGst;
 			document.getElementById("startDate").innerHTML = list.startDate;
@@ -1237,9 +1246,10 @@ if (data.damageList.length === 0) {
 			openFileModal(fileURL);
 		});
 		function openFileModal(fileURL) {
-					$('#filePreview').attr('src', fileURL);
-					$('#fileModal').modal('show');
-				}
+			$('#filePreview').attr('src', fileURL);
+			$('#fileModal').modal('show');
+		}
 	</script>
 </body>
+
 </html>

src/main/resources/templates/officer/gccblocking-new.html

@@ -330,7 +330,7 @@
                                             <th class="text-center">
                                                 <input type="checkbox" id="selectAllBookings"
                                                     title="Select / Deselect all cancellable bookings">
-                                                &nbsp;Cancel?
+                                                &nbsp;Select All
                                             </th>
                                             <th class="text-center">#</th>
                                             <th class="text-center">Hall Name</th>
@@ -804,10 +804,20 @@
             // Wire select-all checkbox
             const selAll = document.getElementById('selectAllBookings');
             if (selAll) {
+                // Select All → toggle every enabled row checkbox
                 selAll.onchange = function () {
                     document.querySelectorAll('.booking-cb:not(:disabled)')
                         .forEach(cb => { cb.checked = selAll.checked; });
                 };
+
+                // Individual row checkboxes → sync Select All state
+                document.querySelectorAll('.booking-cb:not(:disabled)').forEach(cb => {
+                    cb.addEventListener('change', function () {
+                        const total = document.querySelectorAll('.booking-cb:not(:disabled)').length;
+                        const checked = document.querySelectorAll('.booking-cb:not(:disabled):checked').length;
+                        selAll.checked = (total > 0 && checked === total);
+                    });
+                });
             }
 
             if (hasTodayBooking) {
@@ -899,6 +909,8 @@
                     .forEach(cb => { if (cb.dataset.bookingId) selectedBookings.push(cb.dataset.bookingId); });
             }
 
+            console.log("selectedBookings...." + selectedBookings);
+
             const fd = new FormData();
             fd.append('fromDate', from);
             fd.append('toDate', to);
@@ -908,6 +920,7 @@
             if (fileEl.files && fileEl.files[0]) fd.append('document', fileEl.files[0]);
             if (selectedBookings.length) fd.append('selectedBookings', selectedBookings.join(','));
 
+
             Swal.fire({ title: 'Processing…', allowOutsideClick: false, didOpen: () => Swal.showLoading() });
 
             $.ajax({
@@ -992,9 +1005,9 @@
                 const myHalls = (hallsInZone || []).filter(function (h) {
                     const id = h.hallId || h.hall_id;
                     return OFFICER_HALL_IDS.size === 0 ||
-                           OFFICER_HALL_IDS.has(id) ||
-                           OFFICER_HALL_IDS.has(Number(id)) ||
-                           OFFICER_HALL_IDS.has(String(id));
+                        OFFICER_HALL_IDS.has(id) ||
+                        OFFICER_HALL_IDS.has(Number(id)) ||
+                        OFFICER_HALL_IDS.has(String(id));
                 });
 
                 if (!myHalls.length) {
@@ -1005,10 +1018,10 @@
 
                 /* ── SINGLE HALL: show readonly prefilled inputs ── */
                 if (myHalls.length === 1) {
-                    const hall     = myHalls[0];
-                    const zone     = OFFICER_ZONE;
+                    const hall = myHalls[0];
+                    const zone = OFFICER_ZONE;
                     const hallName = (hall.hallName || hall.hall_name || '').trim().replace(/^, */, '');
-                    const hallId   = String(hall.hallId || hall.hall_id);
+                    const hallId = String(hall.hallId || hall.hall_id);
 
                     // Zone – hide multiselect, show readonly text input
                     document.getElementById('zoneMultiselect').style.display = 'none';

src/main/resources/templates/user/hallbookingform.html

@@ -58,9 +58,16 @@
     }
 
     .disabled {
-        pointer-events: none;
+        cursor: not-allowed;
         opacity: 1;
-        /* Example: reduce opacity to indicate disabled state */
+    }
+
+    /* Move pointer-events:none to the inner anchor so the <td> can still receive
+       mouse events (needed for title-attribute tooltips and event delegation) */
+    .disabled a,
+    .disabled .ui-state-default {
+        pointer-events: none;
+        cursor: not-allowed;
     }
 
     /* ── Custom datepicker tooltip (works even when .disabled has pointer-events:none) ── */
@@ -974,7 +981,23 @@
     .highlight-blue a {
         background-color: blue;
         color: white;
+    }
+
+    /* Override ui-state-disabled fading for GCC-blocked (highlight-blue) cells.
+       jQuery UI applies opacity:0.35 to the <td> itself via .ui-widget-content .ui-state-disabled.
+       Opacity on a parent cannot be overridden on children — it always multiplies.
+       So we must reset opacity on the <td> directly, then style the inner element. */
+    td.highlight-blue.ui-state-disabled {
+        opacity: 1 !important;
+    }
 
+    td.highlight-blue.ui-state-disabled .ui-state-default,
+    td.highlight-blue.ui-state-disabled a,
+    td.highlight-blue.ui-state-disabled span {
+        background: blue !important;
+        color: #fff !important;
+        cursor: not-allowed !important;
+        pointer-events: auto !important;
     }
 
     /* css fror toast */
@@ -3242,12 +3265,12 @@
                             return handleAfter2PM(bookingStatus);
                         } else {
                             // Between 6 AM and 2 PM: Check status and disable morning slots
-                            return handleMorningSlots(bookingStatus);
+                            return handleMorningSlots(bookingStatus, isToday);
                         }
                     }
 
                     return handleBookingStatus(bookingStatus, "Slot Available");
-                },
+                }
             });
 
             // Show datepicker when hall is selected
@@ -3312,6 +3335,7 @@
         }
 
         function handleBookingStatus(bookingStatus, defaultMessage) {
+
             if (bookingStatus[2] && bookingStatus[0] && !bookingStatus[1]) {
                 return [true, "highlight-yellow disabled", "GCC Blocked"];
             } else if (bookingStatus[2] && bookingStatus[1] && !bookingStatus[0]) {
@@ -3319,9 +3343,9 @@
             } else if (bookingStatus[2] && bookingStatus[1] && bookingStatus[0] && bookingStatus[3] != 'GCC_BLOCKED' && bookingStatus[4] != 'GCC_BLOCKED') {
                 return [true, "highlight-pink disabled", "GCC Blocked"];
             } else if (bookingStatus[2] && bookingStatus[1] && bookingStatus[0] && bookingStatus[3] == 'GCC_BLOCKED' && bookingStatus[4] == 'GCC_BLOCKED') {
-                return [true, "highlight-blue disabled", "GCC Blocked"];
+                return [false, "highlight-blue disabled", "GCC Blocked"];
             } else if (bookingStatus[2]) {
-                return [true, "highlight-blue disabled", "GCC Blocked"];
+                return [false, "highlight-blue disabled", "GCC Blocked"];
             } else if (bookingStatus[0] && bookingStatus[1]) {
                 return [true, "highlight-pink disabled", "Slot Occupied"];
             } else if (bookingStatus[0] && !bookingStatus[1]) {
@@ -3334,9 +3358,6 @@
 
         // Helper function: Handles logic after 2 PM
         function handleAfter2PM(bookingStatus) {
-            // if (bookingStatus[2]) {
-            //     return [true, "highlight-blue disabled", "GCC Blocked"];
-            // } 
             if (bookingStatus[2] && bookingStatus[0] && !bookingStatus[1]) {
                 return [true, "highlight-yellow disabled", "GCC Blocked"];
             } else if (bookingStatus[2] && bookingStatus[1] && !bookingStatus[0]) {
@@ -3344,9 +3365,9 @@
             } else if (bookingStatus[2] && bookingStatus[1] && bookingStatus[0] && bookingStatus[3] != 'GCC_BLOCKED' && bookingStatus[4] != 'GCC_BLOCKED') {
                 return [true, "highlight-pink disabled", "GCC Blocked"];
             } else if (bookingStatus[2] && bookingStatus[1] && bookingStatus[0] && bookingStatus[3] == 'GCC_BLOCKED' && bookingStatus[4] == 'GCC_BLOCKED') {
-                return [true, "highlight-blue disabled", "GCC Blocked"];
+                return [false, "highlight-blue disabled", "GCC Blocked"];
             } else if (bookingStatus[2]) {
-                return [true, "highlight-blue disabled", "GCC Blocked"];
+                return [false, "highlight-blue disabled", "GCC Blocked"];
             } else if (bookingStatus[0] || bookingStatus[1]) {
                 return [true, "highlight-pink disabled", "Slot Occupied"];
             }
@@ -3354,20 +3375,21 @@
         }
 
         // Helper function: Handles morning slots between 6 AM and 2 PM
-        function handleMorningSlots(bookingStatus) {
-            // if (bookingStatus[2]) {
-            //     return [true, "highlight-blue disabled", "GCC Blocked"];
-            // } 
+        function handleMorningSlots(bookingStatus, isToday) {
+            console.log("isToday....." + isToday);
             if (bookingStatus[2] && bookingStatus[0] && !bookingStatus[1]) {
                 return [true, "highlight-yellow disabled", "GCC Blocked"];
             } else if (bookingStatus[2] && bookingStatus[1] && !bookingStatus[0]) {
+                if (isToday) {
+                    return [false, "highlight-disabled", "GCC Blocked"];
+                }
                 return [true, "highlight-violet disabled", "GCC Blocked"];
             } else if (bookingStatus[2] && bookingStatus[1] && bookingStatus[0] && bookingStatus[3] != 'GCC_BLOCKED' && bookingStatus[4] != 'GCC_BLOCKED') {
                 return [true, "highlight-pink disabled", "GCC Blocked"];
             } else if (bookingStatus[2] && bookingStatus[1] && bookingStatus[0] && bookingStatus[3] == 'GCC_BLOCKED' && bookingStatus[4] == 'GCC_BLOCKED') {
-                return [true, "highlight-blue disabled", "GCC Blocked"];
+                return [false, "highlight-blue disabled", "GCC Blocked"];
             } else if (bookingStatus[2]) {
-                return [true, "highlight-blue disabled", "GCC Blocked"];
+                return [false, "highlight-blue disabled", "GCC Blocked"];
             } else if (bookingStatus[0] && bookingStatus[1]) {
                 return [true, "highlight-pink disabled", "Slot Occupied"];
             } else if (bookingStatus[0] && !bookingStatus[1]) {

src/main/resources/templates/user/viewhallform.html

@@ -72,9 +72,16 @@
     }
 
     .disabled {
-        pointer-events: none;
+        cursor: not-allowed;
         opacity: 1;
-        /* Example: reduce opacity to indicate disabled state */
+    }
+
+    /* Move pointer-events:none to the inner anchor so the <td> can still receive
+       mouse events (needed for title-attribute tooltips and event delegation) */
+    .disabled a,
+    .disabled .ui-state-default {
+        pointer-events: none;
+        cursor: not-allowed;
     }
 
     /* ── Custom datepicker tooltip (works even when .disabled has pointer-events:none) ── */
@@ -1598,7 +1605,7 @@
                             return handleAfter2PM(bookingStatus);
                         } else {
                             // Between 6 AM and 2 PM: Check status and disable morning slots
-                            return handleMorningSlots(bookingStatus);
+                            return handleMorningSlots(bookingStatus, isToday);
                         }
                     }
 
@@ -1706,10 +1713,14 @@
         }
 
         // Helper function: Handles morning slots between 6 AM and 2 PM
-        function handleMorningSlots(bookingStatus) {
+        function handleMorningSlots(bookingStatus, isToday) {
+            console.log("isToday....." + isToday);
             if (bookingStatus[2] && bookingStatus[0] && !bookingStatus[1]) {
                 return [true, "highlight-yellow disabled", "GCC Blocked"];
             } else if (bookingStatus[2] && bookingStatus[1] && !bookingStatus[0]) {
+                if (isToday) {
+                    return [false, "highlight-disabled", "GCC Blocked"];
+                }
                 return [true, "highlight-violet disabled", "GCC Blocked"];
             } else if (bookingStatus[2] && bookingStatus[1] && bookingStatus[0] && bookingStatus[3] != 'GCC_BLOCKED' && bookingStatus[4] != 'GCC_BLOCKED') {
                 return [true, "highlight-pink disabled", "GCC Blocked"];

src/main/resources/templates/user/viewhistory.html

@@ -35,10 +35,35 @@
     }
 
     .disabled {
-        pointer-events: none;
+        cursor: not-allowed;
         opacity: 1;
     }
 
+    /* Move pointer-events:none to the inner anchor so the <td> can still receive
+       mouse events (needed for title-attribute tooltips and event delegation) */
+    .disabled a,
+    .disabled .ui-state-default {
+        pointer-events: none;
+        cursor: not-allowed;
+    }
+
+    /* ── Custom datepicker tooltip (works even when .disabled has pointer-events:none) ── */
+    #dp-tooltip {
+        position: fixed;
+        z-index: 9999;
+        background: rgba(30, 30, 30, 0.92);
+        color: #fff;
+        padding: 5px 11px;
+        border-radius: 6px;
+        font-size: 12px;
+        font-weight: 600;
+        pointer-events: none;
+        white-space: nowrap;
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
+        display: none;
+        transition: opacity 0.15s;
+    }
+
     .ui-widget {
         width: 40%
     }
@@ -704,14 +729,14 @@
                                                                             Booking</span>
                                                                     </a>
 
-                                                                    <!-- <a class="reschedule-button"
+                                                                    <a class="reschedule-button"
                                                                         th:if="${booking.booking_status == 'WAITING_FOR_NOC' and booking.schedule_count < 1}">
-                                                                    <span class="badge bg-danger"
-                                                                        style="cursor: pointer;"
-                                                                        th:onclick="openRescheduleModal([[${booking.booking_id}]], [[${booking.start_date}]], [[${booking.end_date}]],[[${booking.no_of_days}]],
+                                                                        <span class="badge bg-danger"
+                                                                            style="cursor: pointer;"
+                                                                            th:onclick="openRescheduleModal([[${booking.booking_id}]], [[${booking.start_date}]], [[${booking.end_date}]],[[${booking.no_of_days}]],
                                                                     [[${booking.hall_details_hall_id}]],[[${booking.starting_slot}]],[[${booking.ending_slot}]],[[${booking.reason}]])">Reschedule
-                                                                        Booking</span>
-                                                                    </a> -->
+                                                                            Booking</span>
+                                                                    </a>
                                                                 </p>
 
                                                                 <p th:case="'waitingfornocapproval'">
@@ -722,6 +747,14 @@
                                                                             th:onclick="cancelBooking([[${booking.booking_id}]], [[${booking.mobile_no}]], [[${booking.booking_type}]])">Cancel
                                                                             Booking</span>
                                                                     </a>
+                                                                    <a class="reschedule-button"
+                                                                        th:if="${booking.booking_status == 'WAITING_FOR_NOC_APPROVAL' and booking.schedule_count < 1}">
+                                                                        <span class="badge bg-danger"
+                                                                            style="cursor: pointer;"
+                                                                            th:onclick="openRescheduleModal([[${booking.booking_id}]], [[${booking.start_date}]], [[${booking.end_date}]],[[${booking.no_of_days}]],
+                                                                    [[${booking.hall_details_hall_id}]],[[${booking.starting_slot}]],[[${booking.ending_slot}]],[[${booking.reason}]])">Reschedule
+                                                                            Booking</span>
+                                                                    </a>
                                                                 </p>
                                                                 <!--<p th:case="'noaction'">
                                                             <a class="view-button">
@@ -753,8 +786,10 @@
                                                                             th:onclick="cancelBooking([[${booking.booking_id}]], [[${booking.mobile_no}]], [[${booking.booking_type}]])">Cancel
                                                                             Booking</span>
                                                                     </a>
+                                                                    <!-- <a class="reschedule-button" th:if="${booking.booking_status == 'APPROVED' and booking.reason != 'Commercial'}"> -->
                                                                     <a class="reschedule-button"
-                                                                        th:if="${booking.booking_status == 'APPROVED'}">
+                                                                        th:if="${booking.booking_status == 'APPROVED'
+                                                                        and !#lists.contains({'Commercial', 'State Govt Event', 'Central Govt Event'}, booking.reason)}">
                                                                         <span class="badge bg-danger"
                                                                             style="cursor: pointer;"
                                                                             th:onclick="openRescheduleModal([[${booking.booking_id}]], [[${booking.start_date}]], [[${booking.end_date}]],[[${booking.no_of_days}]],
@@ -2458,7 +2493,7 @@
                                 return handleAfter2PM(bookingStatus);
                             } else {
                                 // Between 6 AM and 2 PM: Check status and disable morning slots
-                                return handleMorningSlots(bookingStatus);
+                                return handleMorningSlots(bookingStatus, isToday);
                             }
                         }
 
@@ -2475,44 +2510,35 @@
                     updateEndDate(selectedDate, noofdays, startingSlot, endingSlot);
                 });
 
-                // Handle changes in the start date input
-                // $("#startDateInput").on("change", function () {
-                //     const selectedDate = $(this).val();
-                //     const bookingStatus = window.bookingResponse[selectedDate] || {};
-                //     const currentHours = new Date().getHours();
-                //     const currentDateString = $("#serverDate").val();
-
-                //     $("#startPeriodDropdown option").prop("disabled", false);
-                //     $("#startPeriodDropdown").val(0).prop("disabled", false);
-                //     $("#endPeriodDropdown").val(0).prop("disabled", false);
-                //     $("#numDaysCount").val('');
-                //     validateForm();
-
-                //     // Disable Morning slot for today between 6 AM and 2 PM
-                //     if (selectedDate === currentDateString && currentHours >= 6 && currentHours < 14) {
-                //         $("#startPeriodDropdown option[value='1']").prop("disabled", true);
-
-                //         Swal.fire({
-                //             title: 'Morning Slot Not Available',
-                //             text: 'You can only book Evening Slot for today between 6 AM and 2 PM.',
-                //             icon: 'warning',
-                //             confirmButtonText: 'OK'
-                //         });
-                //     } else {
-                //         if ((selectedDate === currentDateString && currentHours >= 6) || bookingStatus[0]) {
-                //             $("#startPeriodDropdown option[value='1']").prop("disabled", true);
-                //         } else if (bookingStatus[1]) {
-                //             $("#startPeriodDropdown option[value='2']").prop("disabled", true);
-                //         }
-                //     }
-
-                //     updateEndDate(selectedDate);
-                // });
+                // ── Custom tooltip for calendar cells (handles pointer-events:none on .disabled) ──
+                // The <td> itself still receives mouse events even when its child has pointer-events:none.
+                // We read the title attribute that jQuery UI datepicker sets via beforeShowDay's 3rd return value.
+                if (!document.getElementById('dp-tooltip')) {
+                    $('body').append('<div id="dp-tooltip"></div>');
+                }
+                $("#datepicker-container")
+                    .off('mouseenter.dptt mouseleave.dptt mousemove.dptt', 'td[title]')
+                    .on('mouseenter.dptt', 'td[title]', function (e) {
+                        var tip = $(this).attr('title');
+                        if (!tip) return;
+                        $('#dp-tooltip').text(tip).css({
+                            left: (e.clientX + 12) + 'px',
+                            top: (e.clientY - 30) + 'px'
+                        }).show();
+                    })
+                    .on('mousemove.dptt', 'td[title]', function (e) {
+                        $('#dp-tooltip').css({
+                            left: (e.clientX + 12) + 'px',
+                            top: (e.clientY - 30) + 'px'
+                        });
+                    })
+                    .on('mouseleave.dptt', 'td[title]', function () {
+                        $('#dp-tooltip').hide();
+                    });
 
             }
 
             function handleBookingStatus(bookingStatus, defaultMessage) {
-                console.log("bookingStatus.." + bookingStatus[0], bookingStatus[1], bookingStatus[2])
                 if (bookingStatus[2] && bookingStatus[0] && !bookingStatus[1]) {
                     return [true, "highlight-yellow disabled", "GCC Blocked"];
                 } else if (bookingStatus[2] && bookingStatus[1] && !bookingStatus[0]) {
@@ -2552,10 +2578,14 @@
             }
 
             // Helper function: Handles morning slots between 6 AM and 2 PM
-            function handleMorningSlots(bookingStatus) {
+            function handleMorningSlots(bookingStatus, isToday) {
+                console.log("isToday....." + isToday);
                 if (bookingStatus[2] && bookingStatus[0] && !bookingStatus[1]) {
                     return [true, "highlight-yellow disabled", "GCC Blocked"];
                 } else if (bookingStatus[2] && bookingStatus[1] && !bookingStatus[0]) {
+                    if (isToday) {
+                        return [false, "highlight-disabled", "GCC Blocked"];
+                    }
                     return [true, "highlight-violet disabled", "GCC Blocked"];
                 } else if (bookingStatus[2] && bookingStatus[1] && bookingStatus[0] && bookingStatus[3] != 'GCC_BLOCKED' && bookingStatus[4] != 'GCC_BLOCKED') {
                     return [true, "highlight-pink disabled", "GCC Blocked"];
@@ -2573,6 +2603,14 @@
                 return [true, "highlight-yellow", "Evening Slot Available"];
             }
 
+            // Helper: returns true if the given date string is GCC-blocked
+            function isGCCBlockedDate(dateStr) {
+                var status = window.bookingResponse[dateStr] || [];
+                return (status[2] == true || status[2] == 1 ||
+                    status[3] === 'GCC_BLOCKED' ||
+                    status[4] === 'GCC_BLOCKED');
+            }
+
             function updateEndDate(startDate, noofdays, startingSlot, endingSlot) {
                 if (startDate && noofdays !== undefined) {
                     var start = new Date(startDate);
@@ -2580,12 +2618,31 @@
                     var bookingStatus = window.bookingResponse[startFormatted] || [false, false];
                     var morningAvailable = !bookingStatus[0]; // false means available
                     var eveningAvailable = !bookingStatus[1]; // false means available
+                    var isgccBlock = bookingStatus[2];
+                    var bookingStatus1 = bookingStatus[3];
+                    var bookingStatus2 = bookingStatus[4];
                     var endDate;
                     var isValid = true; // Flag to determine if all slots are available
 
                     // Convert noofdays to a number for accurate calculations
                     noofdays = parseFloat(noofdays);
 
+                    // --- GCC Block checkpoint ---
+                    // Block reschedule if the start date is GCC-blocked via any of the three status flags
+                    if (isgccBlock == true || isgccBlock == 1 ||
+                        bookingStatus1 === 'GCC_BLOCKED' ||
+                        bookingStatus2 === 'GCC_BLOCKED') {
+                        Swal.fire({
+                            title: 'Date Not Available',
+                            text: 'The selected start date is blocked by GCC. Please choose a different date.',
+                            icon: 'warning',
+                            confirmButtonText: 'OK'
+                        });
+                        document.getElementById('endDateInput').value = "";
+                        return;
+                    }
+                    // --- End GCC Block checkpoint ---
+
                     // Handle slot availability and combinations
                     if (startingSlot === "2" && endingSlot === "2") { // Evening to Evening
                         //console.log("Handling Evening to Evening slot.");
@@ -2617,7 +2674,18 @@
 
                             if (eveningAvailable && morningAvailableOnEndDate && eveningAvailableOnEndDate) {
                                 endDate = endDateCandidate.toISOString().split('T')[0];
-                                document.getElementById('endDateInput').value = endDate;
+                                // --- GCC Block check for end date ---
+                                if (isGCCBlockedDate(endDate)) {
+                                    Swal.fire({
+                                        title: 'End Date Not Available',
+                                        text: 'The end date is blocked by GCC. Please choose a different start date.',
+                                        icon: 'warning',
+                                        confirmButtonText: 'OK'
+                                    });
+                                    document.getElementById('endDateInput').value = "";
+                                } else {
+                                    document.getElementById('endDateInput').value = endDate;
+                                }
                                 //console.log("End Date (Morning to Evening with 2 days):", endDate);
                             } else {
                                 Swal.fire({
@@ -2669,7 +2737,18 @@
 
                             if (morningAvailable && eveningAvailable && morningAvailableOnEndDate) {
                                 endDate = endDateCandidate.toISOString().split('T')[0];
-                                document.getElementById('endDateInput').value = endDate;
+                                // --- GCC Block check for end date ---
+                                if (isGCCBlockedDate(endDate)) {
+                                    Swal.fire({
+                                        title: 'End Date Not Available',
+                                        text: 'The end date is blocked by GCC. Please choose a different start date.',
+                                        icon: 'warning',
+                                        confirmButtonText: 'OK'
+                                    });
+                                    document.getElementById('endDateInput').value = "";
+                                } else {
+                                    document.getElementById('endDateInput').value = endDate;
+                                }
                                 //console.log("End Date (Morning to Evening with 2 days):", endDate);
                             } else {
                                 Swal.fire({
@@ -2721,7 +2800,18 @@
 
                             if (morningAvailable && eveningAvailable && morningAvailableOnEndDate && eveningAvailableOnEndDate) {
                                 endDate = endDateCandidate.toISOString().split('T')[0];
-                                document.getElementById('endDateInput').value = endDate;
+                                // --- GCC Block check for end date ---
+                                if (isGCCBlockedDate(endDate)) {
+                                    Swal.fire({
+                                        title: 'End Date Not Available',
+                                        text: 'The end date is blocked by GCC. Please choose a different start date.',
+                                        icon: 'warning',
+                                        confirmButtonText: 'OK'
+                                    });
+                                    document.getElementById('endDateInput').value = "";
+                                } else {
+                                    document.getElementById('endDateInput').value = endDate;
+                                }
                                 //console.log("End Date (Morning to Evening with 2 days):", endDate);
                             } else {
                                 Swal.fire({
@@ -2755,7 +2845,18 @@
 
                                 if (nextDayMorningAvailable) {
                                     endDate = nextDay.toISOString().split('T')[0];
-                                    document.getElementById('endDateInput').value = endDate;
+                                    // --- GCC Block check for end date ---
+                                    if (isGCCBlockedDate(endDate)) {
+                                        Swal.fire({
+                                            title: 'End Date Not Available',
+                                            text: 'The end date is blocked by GCC. Please choose a different start date.',
+                                            icon: 'warning',
+                                            confirmButtonText: 'OK'
+                                        });
+                                        document.getElementById('endDateInput').value = "";
+                                    } else {
+                                        document.getElementById('endDateInput').value = endDate;
+                                    }
                                     //console.log("End Date (Evening to Morning):", endDate);
                                 } else {
                                     Swal.fire({