Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 19 additions & 8 deletions WooCommerce/Classes/Bookings/BookingList/BookingListView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -143,19 +143,28 @@ private extension BookingListView {
}

func bookingItem(_ booking: Booking) -> some View {
VStack(alignment: .leading) {
Text(booking.startDate.toString(dateStyle: .short,
timeStyle: .short,
timeZone: BookingListTab.utcTimeZone))
VStack(alignment: .leading, spacing: BookingListViewLayout.bookingSummaryBadgeSpacing) {
VStack(alignment: .leading, spacing: BookingListViewLayout.bookingSummarySpacing) {
Text(booking.startDate.toString(dateStyle: .short,
timeStyle: .short,
timeZone: BookingListTab.utcTimeZone))
.font(.body)
.fontWeight(.medium)
.frame(maxWidth: .infinity, alignment: .leading)
.foregroundStyle(Color.primary)

Text(booking.summaryText)
.font(.footnote)
.fontWeight(.medium)
.foregroundStyle(Color.secondary)
if let productName = booking.productName {
Text(productName)
.font(.footnote)
.fontWeight(.medium)
.foregroundStyle(Color.secondary)
}

Text(booking.customerName)
.font(.footnote)
.fontWeight(.medium)
.foregroundStyle(Color.secondary)
}

HStack {
BookingBadgeView(booking.attendanceStatus)
Expand Down Expand Up @@ -249,6 +258,8 @@ fileprivate enum BookingListViewLayout {
static let emptyStateImageWidth: CGFloat = 67
static let cornerRadius: CGFloat = 8
static let defaultHeaderHeight: CGFloat = 98
static let bookingSummarySpacing: CGFloat = 2
static let bookingSummaryBadgeSpacing: CGFloat = 8
}

fileprivate enum BookingListViewLocalization {
Expand Down
6 changes: 0 additions & 6 deletions WooCommerce/Classes/Extensions/Booking+Helpers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ extension Booking {
return name.isEmpty ? Localization.guest : name
}

var summaryText: String {
return [productName, customerName]
.compactMap { $0 }
.joined(separator: " • ")
}

var isEligibleForMarkAsPaid: Bool {
bookingStatus == .unpaid
}
Expand Down
Loading