From d69ed60a6e4cdc15775b51cc0b0af16f9bc0dce9 Mon Sep 17 00:00:00 2001 From: androidlover5842 Date: Wed, 4 Feb 2026 15:32:44 +0530 Subject: [PATCH] agents -_- --- .../trisolarispms/data/api/model/BookingModels.kt | 1 + .../trisolarispms/ui/booking/BookingCreateScreen.kt | 2 +- .../trisolarispms/ui/booking/BookingCreateState.kt | 2 +- .../ui/roomstay/ActiveRoomStaysScreen.kt | 12 ++++++++---- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/android/trisolarispms/data/api/model/BookingModels.kt b/app/src/main/java/com/android/trisolarispms/data/api/model/BookingModels.kt index 39ad902..72c6430 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/model/BookingModels.kt +++ b/app/src/main/java/com/android/trisolarispms/data/api/model/BookingModels.kt @@ -56,6 +56,7 @@ data class BookingListItem( val guestId: String? = null, val guestName: String? = null, val guestPhone: String? = null, + val vehicleNumbers: List = emptyList(), val roomNumbers: List = emptyList(), val source: String? = null, val fromCity: String? = null, diff --git a/app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateScreen.kt b/app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateScreen.kt index 8db46bf..4c79abb 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateScreen.kt +++ b/app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateScreen.kt @@ -59,7 +59,7 @@ fun BookingCreateScreen( val checkOutTime = remember { mutableStateOf("11:00") } val checkInNow = remember { mutableStateOf(true) } val sourceMenuExpanded = remember { mutableStateOf(false) } - val sourceOptions = listOf("WALKIN", "OTA", "AGENT") + val sourceOptions = listOf("DIRECT", "AGENT") val relationMenuExpanded = remember { mutableStateOf(false) } val relationOptions = listOf("FRIENDS", "FAMILY", "GROUP", "ALONE") val transportMenuExpanded = remember { mutableStateOf(false) } diff --git a/app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateState.kt b/app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateState.kt index 4d05b24..dfb5529 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateState.kt +++ b/app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateState.kt @@ -12,7 +12,7 @@ data class BookingCreateState( val expectedCheckOutAt: String = "", val billingMode: BookingBillingMode = BookingBillingMode.PROPERTY_POLICY, val billingCheckoutTime: String = "", - val source: String = "WALKIN", + val source: String = "DIRECT", val fromCity: String = "", val toCity: String = "", val memberRelation: String = "", diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomstay/ActiveRoomStaysScreen.kt b/app/src/main/java/com/android/trisolarispms/ui/roomstay/ActiveRoomStaysScreen.kt index 6ecfad5..4fd4e54 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomstay/ActiveRoomStaysScreen.kt +++ b/app/src/main/java/com/android/trisolarispms/ui/roomstay/ActiveRoomStaysScreen.kt @@ -253,10 +253,6 @@ private fun CheckedInBookingCard( color = MaterialTheme.colorScheme.onSurfaceVariant ) } - val source = booking.source?.takeIf { it.isNotBlank() } - if (source != null) { - Text(text = source, style = MaterialTheme.typography.bodySmall) - } val expectedCount = booking.expectedGuestCount val totalCount = booking.totalGuestCount val countLine = when { @@ -281,6 +277,14 @@ private fun CheckedInBookingCard( color = MaterialTheme.colorScheme.error ) } + val vehicleNumbers = booking.vehicleNumbers.filter { it.isNotBlank() } + if (vehicleNumbers.isNotEmpty()) { + Spacer(modifier = Modifier.height(6.dp)) + Text( + text = vehicleNumbers.joinToString(", "), + style = MaterialTheme.typography.bodySmall + ) + } val checkInAt = booking.checkInAt?.takeIf { it.isNotBlank() } val checkOutAt = booking.expectedCheckOutAt?.takeIf { it.isNotBlank() } if (checkInAt != null && checkOutAt != null) {