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

agents -_-

Browse Source
This commit is contained in:
androidlover5842
2026-02-04 15:32:44 +05:30
parent 56f13f5e79
commit d69ed60a6e
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/android/trisolarispms/data/api/model/BookingModels.kt
View File

@@ -56,6 +56,7 @@ data class BookingListItem(
val guestId: String? = null, val guestId: String? = null,
val guestName: String? = null, val guestName: String? = null,
val guestPhone: String? = null, val guestPhone: String? = null,
val vehicleNumbers: List<String> = emptyList(),
val roomNumbers: List<Int> = emptyList(), val roomNumbers: List<Int> = emptyList(),
val source: String? = null, val source: String? = null,
val fromCity: String? = null, val fromCity: String? = null,

2
app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateScreen.kt
View File

@@ -59,7 +59,7 @@ fun BookingCreateScreen(
val checkOutTime = remember { mutableStateOf("11:00") } val checkOutTime = remember { mutableStateOf("11:00") }
val checkInNow = remember { mutableStateOf(true) } val checkInNow = remember { mutableStateOf(true) }
val sourceMenuExpanded = remember { mutableStateOf(false) } val sourceMenuExpanded = remember { mutableStateOf(false) }
val sourceOptions = listOf("WALKIN", "OTA", "AGENT") val sourceOptions = listOf("DIRECT", "AGENT")
val relationMenuExpanded = remember { mutableStateOf(false) } val relationMenuExpanded = remember { mutableStateOf(false) }
val relationOptions = listOf("FRIENDS", "FAMILY", "GROUP", "ALONE") val relationOptions = listOf("FRIENDS", "FAMILY", "GROUP", "ALONE")
val transportMenuExpanded = remember { mutableStateOf(false) } val transportMenuExpanded = remember { mutableStateOf(false) }

2
app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateState.kt
View File

@@ -12,7 +12,7 @@ data class BookingCreateState(
val expectedCheckOutAt: String = "", val expectedCheckOutAt: String = "",
val billingMode: BookingBillingMode = BookingBillingMode.PROPERTY_POLICY, val billingMode: BookingBillingMode = BookingBillingMode.PROPERTY_POLICY,
val billingCheckoutTime: String = "", val billingCheckoutTime: String = "",
val source: String = "WALKIN", val source: String = "DIRECT",
val fromCity: String = "", val fromCity: String = "",
val toCity: String = "", val toCity: String = "",
val memberRelation: String = "", val memberRelation: String = "",

12
app/src/main/java/com/android/trisolarispms/ui/roomstay/ActiveRoomStaysScreen.kt
View File

@@ -253,10 +253,6 @@ private fun CheckedInBookingCard(
color = MaterialTheme.colorScheme.onSurfaceVariant 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 expectedCount = booking.expectedGuestCount
val totalCount = booking.totalGuestCount val totalCount = booking.totalGuestCount
val countLine = when { val countLine = when {
@@ -281,6 +277,14 @@ private fun CheckedInBookingCard(
color = MaterialTheme.colorScheme.error 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 checkInAt = booking.checkInAt?.takeIf { it.isNotBlank() }
val checkOutAt = booking.expectedCheckOutAt?.takeIf { it.isNotBlank() } val checkOutAt = booking.expectedCheckOutAt?.takeIf { it.isNotBlank() }
if (checkInAt != null && checkOutAt != null) { if (checkInAt != null && checkOutAt != null) {