Update booking details view to contain customer note

Author: RafaelKayumov

WooCommerce/Classes/ViewModels/Booking Details/BookingDetailsViewModel.swift

@@ -92,8 +92,10 @@ private extension BookingDetailsViewModel {
         headerContent.update(with: booking)
 
         setupCustomerSectionVisibility()
-        if let billingAddress = booking.orderInfo?.customerInfo?.billingAddress, !billingAddress.isEmpty {
-            customerContent.update(with: billingAddress)
+        if let orderInfo = booking.orderInfo,
+           let customerInfo = orderInfo.customerInfo,
+           customerInfo.billingAddress.isEmpty == false {
+            customerContent.update(with: customerInfo)
         }
 
         appointmentDetailsContent.update(with: booking, resource: bookingResource)

WooCommerce/Classes/ViewModels/Booking Details/CustomerContent.swift

@@ -7,12 +7,15 @@ extension BookingDetailsViewModel {
         @Published var emailText: String?
         @Published var phoneText: String?
         @Published var billingAddressText: String?
+        @Published var noteText: String?
 
-        func update(with billingAddress: Address) {
+        func update(with customerInfo: BookingCustomerInfo) {
+            let billingAddress = customerInfo.billingAddress
             nameText = billingAddress.fullName
             emailText = billingAddress.email ?? ""
             phoneText = billingAddress.phone ?? ""
             billingAddressText = formatAddress(billingAddress)
+            noteText = formattedNote(customerInfo.note)
         }
 
         private func formatAddress(_ address: Address) -> String {
@@ -28,5 +31,13 @@ extension BookingDetailsViewModel {
             .filter { !$0.isEmpty }
             .joined(separator: "\n")
         }
+
+        private func formattedNote(_ note: String?) -> String? {
+            guard let trimmedNote = note?.trimmingCharacters(in: .whitespacesAndNewlines),
+                  trimmedNote.isEmpty == false else {
+                return nil
+            }
+            return trimmedNote
+        }
     }
 }

WooCommerce/Classes/ViewRelated/Bookings/Booking Details/CustomerDetailsView.swift

@@ -13,6 +13,7 @@ extension BookingDetailsView {
             case email(String)
             case phone(String)
             case billingAddress(String)
+            case note(String)
         }
 
         private var rows: [Row] {
@@ -29,6 +30,9 @@ extension BookingDetailsView {
             if let address = content.billingAddressText, !address.isEmpty {
                 result.append(.billingAddress(address))
             }
+            if let note = content.noteText, !note.isEmpty {
+                result.append(.note(note))
+            }
             return result
         }
 
@@ -56,6 +60,8 @@ extension BookingDetailsView {
                 phoneView(with: phoneText)
             case .billingAddress(let billingAddressText):
                 billingAddressView(with: billingAddressText)
+            case .note(let noteText):
+                noteView(with: noteText)
             }
         }
 
@@ -136,6 +142,21 @@ extension BookingDetailsView {
             }
             .padding(.vertical, Layout.rowTextVerticalPadding)
         }
+
+        private func noteView(with noteText: String) -> some View {
+            HStack {
+                VStack(alignment: .leading) {
+                    Text(Localization.noteRowTitle)
+                        .rowTextStyle()
+                    Text(noteText)
+                        .font(TextFont.bodyMedium)
+                        .foregroundStyle(.secondary)
+                        .multilineTextAlignment(.leading)
+                }
+                Spacer()
+            }
+            .padding(.vertical, Layout.rowTextVerticalPadding)
+        }
     }
 }
 
@@ -177,5 +198,11 @@ private extension BookingDetailsView.CustomerDetailsView {
             value: "Billing address",
             comment: "Billing address row title in customer section in booking details view."
         )
+
+        static let noteRowTitle = NSLocalizedString(
+            "BookingDetailsView.customer.note.title",
+            value: "Note",
+            comment: "Customer note row title in customer section in booking details view."
+        )
     }
 }