From d94b9dc337a07d1d697bdac0dd972b12b083e62b Mon Sep 17 00:00:00 2001
From: androidlover5842 <androidlover5842@gmail.com>
Date: Mon, 2 Feb 2026 11:31:46 +0530
Subject: [PATCH] Make custom booking policy use single checkout cutoff time

---
 .../trisolarisserver/controller/booking/BookingFlow.kt       | 5 +----
 .../trisolarisserver/controller/dto/booking/BookingDtos.kt   | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingFlow.kt b/src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingFlow.kt
index 50e8f34..8c59197 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingFlow.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingFlow.kt
@@ -123,7 +123,6 @@ class BookingFlow(
         val (billingMode, billingCheckinTime, billingCheckoutTime) = resolveBookingBillingPolicy(
             property = property,
             modeRaw = request.billingMode,
-            billingCheckinTimeRaw = request.billingCheckinTime,
             billingCheckoutTimeRaw = request.billingCheckoutTime
         )
         val hasGuestCounts = request.maleCount != null || request.femaleCount != null || request.childCount != null
@@ -495,7 +494,6 @@ class BookingFlow(
         val (newMode, newCheckin, newCheckout) = resolveBookingBillingPolicy(
             property = booking.property,
             modeRaw = request.billingMode,
-            billingCheckinTimeRaw = request.billingCheckinTime,
             billingCheckoutTimeRaw = request.billingCheckoutTime
         )
         booking.billingMode = newMode
@@ -982,7 +980,6 @@ class BookingFlow(
     private fun resolveBookingBillingPolicy(
         property: com.android.trisolarisserver.models.property.Property,
         modeRaw: String?,
-        billingCheckinTimeRaw: String?,
         billingCheckoutTimeRaw: String?
     ): Triple<BookingBillingMode, String, String> {
         val mode = parseBillingMode(modeRaw)
@@ -994,7 +991,7 @@ class BookingFlow(
             )
             BookingBillingMode.CUSTOM_WINDOW -> Triple(
                 BookingBillingMode.CUSTOM_WINDOW,
-                normalizeBillingTime(billingCheckinTimeRaw, "billingCheckinTime"),
+                normalizeBillingTime(billingCheckoutTimeRaw, "billingCheckoutTime"),
                 normalizeBillingTime(billingCheckoutTimeRaw, "billingCheckoutTime")
             )
             BookingBillingMode.FULL_24H -> Triple(
diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/booking/BookingDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/booking/BookingDtos.kt
index dbf922f..398103d 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/booking/BookingDtos.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/booking/BookingDtos.kt
@@ -25,7 +25,6 @@ data class BookingCreateRequest(
     val expectedCheckInAt: String,
     val expectedCheckOutAt: String,
     val billingMode: String? = null,
-    val billingCheckinTime: String? = null,
     val billingCheckoutTime: String? = null,
     val guestPhoneE164: String? = null,
     val fromCity: String? = null,
@@ -126,7 +125,6 @@ data class BookingExpectedDatesUpdateRequest(
 
 data class BookingBillingPolicyUpdateRequest(
     val billingMode: String,
-    val billingCheckinTime: String? = null,
     val billingCheckoutTime: String? = null
 )