Skip to content

Bookings: Split summary text into 2 lines for booking details header #16324

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

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

Bookings: Split summary text into 2 lines for booking details header #16324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5abee52
Split summary text into 2 lines for booking details header
itsmeichigo Nov 7, 2025
c8b94d3
Fix failed test
itsmeichigo Nov 7, 2025
d5c7f92
Separate customer and service variables
itsmeichigo Nov 7, 2025
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
18 changes: 11 additions & 7 deletions WooCommerce/Classes/Extensions/Booking+Helpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@ import Foundation
import struct Yosemite.Booking

extension Booking {
var productName: String? {
orderInfo?.productInfo?.name
}

var customerName: String {
guard let name = orderInfo?.customerInfo?.billingAddress.fullName else {
return Localization.guest
}
return name.isEmpty ? Localization.guest : name
}

var summaryText: String {
let productName = orderInfo?.productInfo?.name
let customerName: String = {
guard let name = orderInfo?.customerInfo?.billingAddress.fullName else {
return Localization.guest
}
return name.isEmpty ? Localization.guest : name
}()
return [productName, customerName]
.compactMap { $0 }
.joined(separator: " • ")
Expand Down
6 changes: 4 additions & 2 deletions WooCommerce/Classes/ViewModels/Booking Details/HeaderContent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ extension BookingDetailsViewModel {
@Published private(set) var bookingDate: String = ""
@Published private(set) var attendanceStatus: BookingAttendanceStatus = .unknown
@Published private(set) var bookingStatus: BookingStatus = .unknown
@Published private(set) var serviceAndCustomerLine: String = ""
@Published private(set) var serviceLine: String = ""
@Published private(set) var customerLine: String = ""

func update(with booking: Booking) {
bookingDate = booking.startDate.toString(
dateStyle: .short,
timeStyle: .short,
timeZone: BookingListTab.utcTimeZone
)
serviceAndCustomerLine = booking.summaryText
serviceLine = booking.productName ?? ""
customerLine = booking.customerName
attendanceStatus = booking.attendanceStatus
bookingStatus = booking.bookingStatus
}
Expand Down
4 changes: 2 additions & 2 deletions WooCommerce/Classes/ViewRelated/Bookings/Booking Details/BookingDetailsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ struct BookingDetailsView: View {
enum Layout {
static let contentSidePadding: CGFloat = 16
static let contentVerticalPadding: CGFloat = 16
static let headerContentVerticalPadding: CGFloat = 6
static let headerBadgesAdditionalTopPadding: CGFloat = 4
static let headerContentVerticalPadding: CGFloat = 2
static let headerBadgesAdditionalTopPadding: CGFloat = 6
static let sectionFooterTextVerticalPadding: CGFloat = 8
static let rowTextVerticalPadding: CGFloat = 11
}
Expand Down
11 changes: 8 additions & 3 deletions WooCommerce/Classes/ViewRelated/Bookings/Booking Details/HeaderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,14 @@ extension BookingDetailsView {
.font(TextFont.bodyMedium)
.foregroundColor(.primary)
}
if !content.serviceAndCustomerLine.isEmpty {
Text(content.serviceAndCustomerLine)
.font(.footnote.weight(.medium))
if !content.serviceLine.isEmpty {
Text(content.serviceLine)
.font(.body)
.foregroundColor(.secondary)
}
if !content.customerLine.isEmpty {
Text(content.customerLine)
.font(.body)
.foregroundColor(.secondary)
}
HStack {
Expand Down
5 changes: 3 additions & 2 deletions WooCommerce/WooCommerceTests/ViewRelated/Bookings/BookingDetailsViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ final class BookingDetailsViewModelTests: XCTestCase {
XCTAssertFalse(hasCustomerSection)
}

func test_header_content_uses_booking_summary_text() {
func test_header_content_uses_correct_contents() {
// Given
let billingAddress = Address.fake().copy(
firstName: "Jane",
Expand Down Expand Up @@ -159,7 +159,8 @@ final class BookingDetailsViewModelTests: XCTestCase {
return
}

XCTAssertEqual(headerContent.serviceAndCustomerLine, "Massage Therapy • Jane Smith")
XCTAssertEqual(headerContent.serviceLine, "Massage Therapy")
XCTAssertEqual(headerContent.customerLine, "Jane Smith")
}

func test_customer_content_populated_from_billing_address() {
Expand Down