Skip to content

Commit 7dd8996

Browse files
Merge pull request #14809 from woocommerce/issue/WOOMOB-1569_pay_on_site
[WOOMOB-1569] - Rename Pay at location to Pay on site
2 parents 27b6bed + fd6f23a commit 7dd8996

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingMapper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class BookingMapper @Inject constructor(
113113
paymentMethod: String?,
114114
): BookingStatus {
115115
return if (orderStatus != "completed" && paymentMethod == "cod") {
116-
BookingStatus.PayAtLocation
116+
BookingStatus.PayOnSite
117117
} else {
118118
when (this) {
119119
BookingEntity.Status.Paid -> BookingStatus.Paid

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/compose/BookingStatusTag.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fun BookingStatusTag(
2626
}
2727

2828
sealed interface BookingStatus {
29-
data object PayAtLocation : BookingStatus
29+
data object PayOnSite : BookingStatus
3030
data object Unpaid : BookingStatus
3131
data object PendingConfirmation : BookingStatus
3232
data object Confirmed : BookingStatus
@@ -45,15 +45,15 @@ private fun BookingStatus.text(): String {
4545
BookingStatus.Paid -> stringResource(R.string.booking_payment_status_paid)
4646
BookingStatus.Cancelled -> stringResource(R.string.booking_payment_status_cancelled)
4747
BookingStatus.Complete -> stringResource(R.string.booking_payment_status_complete)
48-
BookingStatus.PayAtLocation -> stringResource(R.string.booking_payment_status_pay_at_location)
48+
BookingStatus.PayOnSite -> stringResource(R.string.booking_payment_status_pay_on_site)
4949
is BookingStatus.Unknown -> key
5050
}
5151
}
5252

5353
@Composable
5454
fun BookingStatus.backgroundColor(): Color {
5555
return when (this) {
56-
BookingStatus.PayAtLocation -> R.color.tag_bg_booking_yellow
56+
BookingStatus.PayOnSite -> R.color.tag_bg_booking_yellow
5757
else -> R.color.tagView_bg
5858
}.let { colorResource(it) }
5959
}
@@ -70,10 +70,10 @@ private fun PaymentStatusTagPreview() {
7070

7171
@LightDarkThemePreviews
7272
@Composable
73-
private fun PaymentStatusTagPayAtLocationPreview() {
73+
private fun PaymentStatusTagPayOnSitePreview() {
7474
WooThemeWithBackground {
7575
BookingStatusTag(
76-
state = BookingStatus.PayAtLocation
76+
state = BookingStatus.PayOnSite
7777
)
7878
}
7979
}

WooCommerce/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4254,7 +4254,7 @@
42544254
<string name="booking_payment_status_cancelled">Cancelled</string>
42554255
<string name="booking_payment_status_confirmed">Confirmed</string>
42564256
<string name="booking_payment_status_complete">Complete</string>
4257-
<string name="booking_payment_status_pay_at_location">Pay at location</string>
4257+
<string name="booking_payment_status_pay_on_site">Pay on site</string>
42584258
<string name="booking_attendance_status_booked">Booked</string>
42594259
<string name="booking_attendance_status_checked_in">Checked-in</string>
42604260
<string name="booking_attendance_status_cancelled">Cancelled</string>

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/bookings/BookingMapperTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ class BookingMapperTest : BaseUnitTest() {
255255
}
256256

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

276276
// THEN
277-
assertThat(model.status).isEqualTo(BookingStatus.PayAtLocation)
277+
assertThat(model.status).isEqualTo(BookingStatus.PayOnSite)
278278
}
279279

280280
private fun sampleBooking(

0 commit comments

Comments
 (0)