androidlover5842/TrisolarisServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make custom booking policy use single checkout cutoff time
All checks were successful
build-and-deploy / build-deploy (push) Successful in 17s
Details

Browse Source
This commit is contained in:
androidlover5842
2026-02-02 11:31:46 +05:30
parent 8ba0fedd8b
commit d94b9dc337
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingFlow.kt
View File

@@ -123,7 +123,6 @@ class BookingFlow(
val (billingMode, billingCheckinTime, billingCheckoutTime) = resolveBookingBillingPolicy( val (billingMode, billingCheckinTime, billingCheckoutTime) = resolveBookingBillingPolicy(
property = property, property = property,
modeRaw = request.billingMode, modeRaw = request.billingMode,
billingCheckinTimeRaw = request.billingCheckinTime,
billingCheckoutTimeRaw = request.billingCheckoutTime billingCheckoutTimeRaw = request.billingCheckoutTime
) )
val hasGuestCounts = request.maleCount != null || request.femaleCount != null || request.childCount != null val hasGuestCounts = request.maleCount != null || request.femaleCount != null || request.childCount != null
@@ -495,7 +494,6 @@ class BookingFlow(
val (newMode, newCheckin, newCheckout) = resolveBookingBillingPolicy( val (newMode, newCheckin, newCheckout) = resolveBookingBillingPolicy(
property = booking.property, property = booking.property,
modeRaw = request.billingMode, modeRaw = request.billingMode,
billingCheckinTimeRaw = request.billingCheckinTime,
billingCheckoutTimeRaw = request.billingCheckoutTime billingCheckoutTimeRaw = request.billingCheckoutTime
) )
booking.billingMode = newMode booking.billingMode = newMode
@@ -982,7 +980,6 @@ class BookingFlow(
private fun resolveBookingBillingPolicy( private fun resolveBookingBillingPolicy(
property: com.android.trisolarisserver.models.property.Property, property: com.android.trisolarisserver.models.property.Property,
modeRaw: String?, modeRaw: String?,
billingCheckinTimeRaw: String?,
billingCheckoutTimeRaw: String? billingCheckoutTimeRaw: String?
): Triple<BookingBillingMode, String, String> { ): Triple<BookingBillingMode, String, String> {
val mode = parseBillingMode(modeRaw) val mode = parseBillingMode(modeRaw)
@@ -994,7 +991,7 @@ class BookingFlow(
) )
BookingBillingMode.CUSTOM_WINDOW -> Triple( BookingBillingMode.CUSTOM_WINDOW -> Triple(
BookingBillingMode.CUSTOM_WINDOW, BookingBillingMode.CUSTOM_WINDOW,
normalizeBillingTime(billingCheckinTimeRaw, "billingCheckinTime"), normalizeBillingTime(billingCheckoutTimeRaw, "billingCheckoutTime"),
normalizeBillingTime(billingCheckoutTimeRaw, "billingCheckoutTime") normalizeBillingTime(billingCheckoutTimeRaw, "billingCheckoutTime")
) )
BookingBillingMode.FULL_24H -> Triple( BookingBillingMode.FULL_24H -> Triple(

2
src/main/kotlin/com/android/trisolarisserver/controller/dto/booking/BookingDtos.kt
View File

@@ -25,7 +25,6 @@ data class BookingCreateRequest(
val expectedCheckInAt: String, val expectedCheckInAt: String,
val expectedCheckOutAt: String, val expectedCheckOutAt: String,
val billingMode: String? = null, val billingMode: String? = null,
val billingCheckinTime: String? = null,
val billingCheckoutTime: String? = null, val billingCheckoutTime: String? = null,
val guestPhoneE164: String? = null, val guestPhoneE164: String? = null,
val fromCity: String? = null, val fromCity: String? = null,
@@ -126,7 +125,6 @@ data class BookingExpectedDatesUpdateRequest(
data class BookingBillingPolicyUpdateRequest( data class BookingBillingPolicyUpdateRequest(
val billingMode: String, val billingMode: String,
val billingCheckinTime: String? = null,
val billingCheckoutTime: String? = null val billingCheckoutTime: String? = null
) )