Skip to content

[WOOMOB-1569] - Rename Pay at location to Pay on site #14809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2025
+9 −9
Merged

[WOOMOB-1569] - Rename Pay at location to Pay on site #14809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class BookingMapper @Inject constructor(
paymentMethod: String?,
): BookingStatus {
return if (orderStatus != "completed" && paymentMethod == "cod") {
BookingStatus.PayAtLocation
BookingStatus.PayOnSite
} else {
when (this) {
BookingEntity.Status.Paid -> BookingStatus.Paid
Expand Down
10 changes: 5 additions & 5 deletions WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/compose/BookingStatusTag.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ fun BookingStatusTag(
}

sealed interface BookingStatus {
data object PayAtLocation : BookingStatus
data object PayOnSite : BookingStatus
data object Unpaid : BookingStatus
data object PendingConfirmation : BookingStatus
data object Confirmed : BookingStatus
Expand All @@ -45,15 +45,15 @@ private fun BookingStatus.text(): String {
BookingStatus.Paid -> stringResource(R.string.booking_payment_status_paid)
BookingStatus.Cancelled -> stringResource(R.string.booking_payment_status_cancelled)
BookingStatus.Complete -> stringResource(R.string.booking_payment_status_complete)
BookingStatus.PayAtLocation -> stringResource(R.string.booking_payment_status_pay_at_location)
BookingStatus.PayOnSite -> stringResource(R.string.booking_payment_status_pay_on_site)
is BookingStatus.Unknown -> key
}
}

@Composable
fun BookingStatus.backgroundColor(): Color {
return when (this) {
BookingStatus.PayAtLocation -> R.color.tag_bg_booking_yellow
BookingStatus.PayOnSite -> R.color.tag_bg_booking_yellow
else -> R.color.tagView_bg
}.let { colorResource(it) }
}
Expand All @@ -70,10 +70,10 @@ private fun PaymentStatusTagPreview() {

@LightDarkThemePreviews
@Composable
private fun PaymentStatusTagPayAtLocationPreview() {
private fun PaymentStatusTagPayOnSitePreview() {
WooThemeWithBackground {
BookingStatusTag(
state = BookingStatus.PayAtLocation
state = BookingStatus.PayOnSite
)
}
}
2 changes: 1 addition & 1 deletion WooCommerce/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4246,7 +4246,7 @@
<string name="booking_payment_status_cancelled">Cancelled</string>
<string name="booking_payment_status_confirmed">Confirmed</string>
<string name="booking_payment_status_complete">Complete</string>
<string name="booking_payment_status_pay_at_location">Pay at location</string>
<string name="booking_payment_status_pay_on_site">Pay on site</string>
<string name="booking_attendance_status_booked">Booked</string>
<string name="booking_attendance_status_checked_in">Checked-in</string>
<string name="booking_attendance_status_cancelled">Cancelled</string>
Expand Down
4 changes: 2 additions & 2 deletions WooCommerce/src/test/kotlin/com/woocommerce/android/ui/bookings/BookingMapperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ class BookingMapperTest : BaseUnitTest() {
}

@Test
fun `given processing order with COD payment method, when mapped to summary model, then status is PayAtLocation`() {
fun `given processing order with COD payment method, when mapped to summary model, then status is PayOnSite`() {
// GIVEN
val booking = sampleBooking().let { original ->
val paymentInfo = BookingPaymentInfo(
Expand All @@ -274,7 +274,7 @@ class BookingMapperTest : BaseUnitTest() {
val model = mapper.run { booking.toBookingSummaryModel(AttendanceUpdateStatus.Idle) }

// THEN
assertThat(model.status).isEqualTo(BookingStatus.PayAtLocation)
assertThat(model.status).isEqualTo(BookingStatus.PayOnSite)
}

private fun sampleBooking(
Expand Down