Merge branch 'trunk' into fix/coupon_scrolling

adborbas · web-flow · commit 3667e1b30a38 · 2025-10-07T14:49:51.000+02:00
diff --git a/WooCommerce/Classes/Bookings/BookingList/BookingListContainerView.swift b/WooCommerce/Classes/Bookings/BookingList/BookingListContainerView.swift
@@ -3,38 +3,37 @@ import struct Yosemite.Booking
 
 struct BookingListContainerView: View {
     @ObservedObject private var viewModel: BookingListContainerViewModel
+    @Binding var selectedBooking: Booking?
 
-    init(viewModel: BookingListContainerViewModel) {
+    init(viewModel: BookingListContainerViewModel, selectedBooking: Binding<Booking?>) {
         self.viewModel = viewModel
+        self._selectedBooking = selectedBooking
     }
 
     var body: some View {
-        NavigationStack {
-            VStack(spacing: 0) {
-                headerView
-                TabView(selection: $viewModel.selectedTab) {
-                    ForEach(BookingListTab.allCases, id: \.rawValue) { tab in
-                        BookingListView(viewModel: viewModel.listViewModel(for: tab))
-                            .tag(tab)
-                    }
+        VStack(spacing: 0) {
+            headerView
+            TabView(selection: $viewModel.selectedTab) {
+                ForEach(BookingListTab.allCases, id: \.rawValue) { tab in
+                    BookingListView(
+                        viewModel: viewModel.listViewModel(for: tab),
+                        selectedBooking: $selectedBooking
+                    )
+                    .tag(tab)
                 }
-                .tabViewStyle(.page(indexDisplayMode: .never))
             }
-            .navigationTitle(Localization.viewTitle)
-            .toolbar {
-                ToolbarItem(placement: .confirmationAction) {
-                    Button {
-                        // TODO
-                    } label: {
-                        Image(systemName: "magnifyingglass")
-                    }
+            .tabViewStyle(.page(indexDisplayMode: .never))
+        }
+        .navigationTitle(Localization.viewTitle)
+        .toolbar {
+            ToolbarItem(placement: .confirmationAction) {
+                Button {
+                    // TODO
+                } label: {
+                    Image(systemName: "magnifyingglass")
                 }
             }
         }
-        .navigationDestination(for: Booking.self) { booking in
-            let viewModel = BookingDetailsViewModel(booking: booking)
-            BookingDetailsView(viewModel)
-        }
     }
 }
 
diff --git a/WooCommerce/Classes/Bookings/BookingList/BookingListView.swift b/WooCommerce/Classes/Bookings/BookingList/BookingListView.swift
@@ -3,9 +3,11 @@ import struct Yosemite.Booking
 
 struct BookingListView: View {
     @ObservedObject private var viewModel: BookingListViewModel
+    @Binding var selectedBooking: Booking?
 
-    init(viewModel: BookingListViewModel) {
+    init(viewModel: BookingListViewModel, selectedBooking: Binding<Booking?>) {
         self.viewModel = viewModel
+        self._selectedBooking = selectedBooking
     }
 
     var body: some View {
@@ -31,22 +33,20 @@ struct BookingListView: View {
 
 private extension BookingListView {
     var bookingList: some View {
-        ScrollView {
-            LazyVStack(spacing: 0) {
-                ForEach(viewModel.bookings) { item in
-                    NavigationLink(value: item) {
-                        bookingItem(item)
-                    }
-                    .buttonStyle(.plain)
-                }
-
-                InfiniteScrollIndicator(showContent: viewModel.shouldShowBottomActivityIndicator)
-                    .padding(.top, Layout.viewPadding)
-                    .onAppear {
-                        viewModel.onLoadNextPageAction()
-                    }
+        List(selection: $selectedBooking) {
+            ForEach(viewModel.bookings) { item in
+                bookingItem(item)
+                    .tag(item)
             }
+
+            InfiniteScrollIndicator(showContent: viewModel.shouldShowBottomActivityIndicator)
+                .padding(.top, Layout.viewPadding)
+                .onAppear {
+                    viewModel.onLoadNextPageAction()
+                }
         }
+        .listStyle(.plain)
+        .accentColor(Color(.listSelectedBackground))
         .refreshable {
             await viewModel.onRefreshAction()
         }
@@ -61,6 +61,7 @@ private extension BookingListView {
                     .font(.body)
                     .fontWeight(.medium)
                     .frame(maxWidth: .infinity, alignment: .leading)
+                    .foregroundStyle(Color.primary)
 
                 // TODO: fetch bookable products & customer to get names or wait for API update
                 Text(String(format: "%@  •  %@", "Women's Hair cut", "Marianne"))
@@ -76,17 +77,13 @@ private extension BookingListView {
                     Spacer()
                 }
             }
-            .padding(Layout.viewPadding)
-
-            Divider()
-                .padding(.leading, Layout.viewPadding)
         }
-        .background(Color(.listForeground(modal: false))) // TODO: update selected background color as part of selection handling
     }
 
     func statusBadge(text: String, color: Color) -> some View {
         Text(text)
             .font(.caption2)
+            .foregroundStyle(Color.primary)
             .padding(.horizontal, 8)
             .padding(.vertical, 4)
             .background(color.clipShape(RoundedRectangle(cornerRadius: 4)))
diff --git a/WooCommerce/Classes/Bookings/BookingsTabView.swift b/WooCommerce/Classes/Bookings/BookingsTabView.swift
@@ -1,4 +1,5 @@
 import SwiftUI
+import struct Yosemite.Booking
 
 /// Hosting view for `BookingsTabView`
 ///
@@ -37,19 +38,24 @@ private extension BookingsTabViewHostingController {
 /// Main content of the Bookings tab
 ///
 struct BookingsTabView: View {
-    @State private var visibility: NavigationSplitViewVisibility = .all
-
-    private let siteID: Int64
+    @State private var selectedBooking: Booking?
+    @State private var visibility: NavigationSplitViewVisibility = .automatic
+    @StateObject private var bookingListContainerViewModel: BookingListContainerViewModel
 
     init(siteID: Int64) {
-        self.siteID = siteID
+        _bookingListContainerViewModel = StateObject(wrappedValue: BookingListContainerViewModel(siteID: siteID))
     }
 
     var body: some View {
         NavigationSplitView(columnVisibility: $visibility) {
-            BookingListContainerView(viewModel: BookingListContainerViewModel(siteID: siteID))
+            BookingListContainerView(viewModel: bookingListContainerViewModel, selectedBooking: $selectedBooking)
         } detail: {
-            Text("Booking Detail Screen")
+            if let selectedBooking {
+                let viewModel = BookingDetailsViewModel(booking: selectedBooking)
+                BookingDetailsView(viewModel)
+            } else {
+                Text("Select a booking to see details.")
+            }
         }
         .navigationSplitViewStyle(.balanced)
     }
diff --git a/WooCommerce/Classes/ViewModels/Booking Details/AppointmentDetailsContent.swift b/WooCommerce/Classes/ViewModels/Booking Details/AppointmentDetailsContent.swift
@@ -1,6 +1,5 @@
 import Foundation
 import struct Networking.Booking
-import class WooFoundationCore.CurrencyFormatter
 
 extension BookingDetailsViewModel {
     struct AppointmentDetailsContent {
@@ -34,7 +33,10 @@ extension BookingDetailsViewModel {
                         to: booking.endDate
                     )
                 ),
-                Row(title: Localization.appointmentDetailsPriceTitle, value: Self.formatPrice(booking.cost))
+                Row(
+                    title: Localization.appointmentDetailsPriceTitle,
+                    value: BookingDetailsViewModel.formatPrice(for: booking, priceString: booking.cost)
+                )
             ]
         }
     }
@@ -51,15 +53,6 @@ private extension BookingDetailsViewModel.AppointmentDetailsContent {
     static func formatDuration(from startDate: Date, to endDate: Date) -> String {
         durationFormatter.string(from: startDate, to: endDate) ?? ""
     }
-
-    static func formatPrice(_ price: String) -> String {
-        guard let decimalPrice = Decimal(string: price) else {
-            return price
-        }
-        return CurrencyFormatter(
-            currencySettings: ServiceLocator.currencySettings
-        ).formatAmount(decimalPrice) ?? price
-    }
 }
 
 private extension BookingDetailsViewModel.AppointmentDetailsContent {
diff --git a/WooCommerce/Classes/ViewModels/Booking Details/BookingDetailsViewModel+PriceFormatting.swift b/WooCommerce/Classes/ViewModels/Booking Details/BookingDetailsViewModel+PriceFormatting.swift
@@ -0,0 +1,31 @@
+import Foundation
+import struct Networking.Booking
+import class WooFoundationCore.CurrencyFormatter
+import class WooFoundationCore.CurrencySettings
+import enum WooFoundationCore.CurrencyCode
+
+extension BookingDetailsViewModel {
+    static func formatPrice(for booking: Booking, priceString: String) -> String {
+        guard let decimalPrice = Decimal(string: priceString) else {
+            return priceString
+        }
+        return CurrencyFormatter(
+            currencySettings: Self.currencySettings(for: booking)
+        ).formatAmount(decimalPrice) ?? priceString
+    }
+
+    private static func currencySettings(for booking: Booking) -> CurrencySettings {
+        let siteCurrencySettings = ServiceLocator.currencySettings
+        guard let currencyCode = CurrencyCode(rawValue: booking.currency) else {
+            return siteCurrencySettings
+        }
+
+        return CurrencySettings(
+            currencyCode: currencyCode,
+            currencyPosition: siteCurrencySettings.currencyPosition,
+            thousandSeparator: siteCurrencySettings.groupingSeparator,
+            decimalSeparator: siteCurrencySettings.decimalSeparator,
+            numberOfDecimals: siteCurrencySettings.fractionDigits
+        )
+    }
+}
diff --git a/WooCommerce/Classes/ViewModels/Booking Details/BookingDetailsViewModel.swift b/WooCommerce/Classes/ViewModels/Booking Details/BookingDetailsViewModel.swift
@@ -5,7 +5,11 @@ final class BookingDetailsViewModel: ObservableObject {
     let sections: [Section]
     let navigationTitle: String
 
+    private let booking: Booking
+
     init(booking: Booking) {
+        self.booking = booking
+
         navigationTitle = Self.navigationTitle(for: booking)
 
         let headerSection = Section.init(
@@ -59,6 +63,27 @@ final class BookingDetailsViewModel: ObservableObject {
     }
 }
 
+extension BookingDetailsViewModel {
+    var cancellationAlertMessage: String {
+        // Temporary hardcoded
+        //TODO: - replace with associated customer data
+        let productName = "Women's Haircut"
+        let customerName = "Margarita Nikolaevna"
+
+        let date = booking.startDate.formatted(
+            date: .long,
+            time: .shortened
+        )
+
+        return String(
+            format: Localization.cancelBookingAlertMessage,
+            customerName,
+            productName,
+            date
+        )
+    }
+}
+
 private extension BookingDetailsViewModel {
     static func navigationTitle(for booking: Booking) -> String {
         let titleFormat = NSLocalizedString(
@@ -107,5 +132,11 @@ private extension BookingDetailsViewModel {
             value: "Booking notes",
             comment: "Header title for the 'Booking notes' section in the booking details screen."
         )
+
+        static let cancelBookingAlertMessage = NSLocalizedString(
+            "BookingDetailsView.cancelation.alert.message",
+            value: "%1$@ will no longer be able to attend “%2$@” on %3$@.",
+            comment: "Message for the booking cancellation confirmation alert. %1$@ is customer name, %2$@ is product name, %3$@ is booking date."
+        )
     }
 }
diff --git a/WooCommerce/Classes/ViewModels/Booking Details/PaymentContent.swift b/WooCommerce/Classes/ViewModels/Booking Details/PaymentContent.swift
@@ -9,31 +9,21 @@ extension BookingDetailsViewModel {
 
         init(booking: Booking) {
             amounts = [
-                .init(value: Self.formatPrice(booking.cost), type: .service),
-                .init(value: Self.formatPrice("0"), type: .tax),
+                .init(value: BookingDetailsViewModel.formatPrice(for: booking, priceString: booking.cost), type: .service),
+                .init(value: BookingDetailsViewModel.formatPrice(for: booking, priceString: "0"), type: .tax),
                 .init(value: "-", type: .discount),
-                .init(value: Self.formatPrice(booking.cost), type: .total, emphasized: true),
+                .init(value: BookingDetailsViewModel.formatPrice(for: booking, priceString: booking.cost), type: .total, emphasized: true),
             ]
 
             actions = [
                 .markAsPaid,
+                .issueRefund,
                 .viewOrder
             ]
         }
     }
 }
 
-private extension BookingDetailsViewModel.PaymentContent {
-    static func formatPrice(_ price: String) -> String {
-        guard let decimalPrice = Decimal(string: price) else {
-            return price
-        }
-        return CurrencyFormatter(
-            currencySettings: ServiceLocator.currencySettings
-        ).formatAmount(decimalPrice) ?? price
-    }
-}
-
 extension BookingDetailsViewModel.PaymentContent {
     struct Amount {
         enum AmountType {
@@ -83,7 +73,7 @@ extension BookingDetailsViewModel.PaymentContent.Amount.AmountType {
 extension BookingDetailsViewModel.PaymentContent {
     enum Action: String, Identifiable {
         case markAsPaid
-        case markAsRefunded
+        case issueRefund
         case viewOrder
 
         var id: String {
@@ -97,8 +87,8 @@ extension BookingDetailsViewModel.PaymentContent.Action {
         switch self {
         case .markAsPaid:
             return Localization.paymentMarkAsPaidButtonTitle
-        case .markAsRefunded:
-            return Localization.paymentMarkAsRefundedButtonTitle
+        case .issueRefund:
+            return Localization.paymentIssueRefundButtonTitle
         case .viewOrder:
             return Localization.paymentViewOrderButtonTitle
         }
@@ -108,7 +98,7 @@ extension BookingDetailsViewModel.PaymentContent.Action {
         switch self {
         case .markAsPaid:
             return true
-        case .markAsRefunded, .viewOrder:
+        case .issueRefund, .viewOrder:
             return false
         }
     }
@@ -145,10 +135,10 @@ private enum Localization {
         comment: "Title for 'Mark as paid' button in payment section in booking details view."
     )
 
-    static let paymentMarkAsRefundedButtonTitle = NSLocalizedString(
-        "BookingDetailsView.payment.markAsRefunded.title",
-        value: "Mark as refunded",
-        comment: "Title for 'Mark as refunded' button in payment section in booking details view."
+    static let paymentIssueRefundButtonTitle = NSLocalizedString(
+        "BookingDetailsView.payment.issueRefund.title",
+        value: "Issue refund",
+        comment: "Title for 'Issue refund' button in payment section in booking details view."
     )
 
     static let paymentViewOrderButtonTitle = NSLocalizedString(
diff --git a/WooCommerce/Classes/ViewRelated/Bookings/Booking Details/BookingDetailsView.swift b/WooCommerce/Classes/ViewRelated/Bookings/Booking Details/BookingDetailsView.swift
diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`import Foundation`
`2`	`2`	`import struct Networking.Booking`
`3`		`-import class WooFoundationCore.CurrencyFormatter`
`4`	`3`
`5`	`4`	`extension BookingDetailsViewModel {`
`6`	`5`	`struct AppointmentDetailsContent {`
`@@ -34,7 +33,10 @@ extension BookingDetailsViewModel {`
`34`	`33`	`to: booking.endDate`
`35`	`34`	`)`
`36`	`35`	`),`
`37`		`- Row(title: Localization.appointmentDetailsPriceTitle, value: Self.formatPrice(booking.cost))`
	`36`	`+ Row(`
	`37`	`+ title: Localization.appointmentDetailsPriceTitle,`
	`38`	`+ value: BookingDetailsViewModel.formatPrice(for: booking, priceString: booking.cost)`
	`39`	`+ )`
`38`	`40`	`]`
`39`	`41`	`}`
`40`	`42`	`}`
`@@ -51,15 +53,6 @@ private extension BookingDetailsViewModel.AppointmentDetailsContent {`
`51`	`53`	`static func formatDuration(from startDate: Date, to endDate: Date) -> String {`
`52`	`54`	`durationFormatter.string(from: startDate, to: endDate) ?? ""`
`53`	`55`	`}`
`54`		`-`
`55`		`- static func formatPrice(_ price: String) -> String {`
`56`		`- guard let decimalPrice = Decimal(string: price) else {`
`57`		`- return price`
`58`		`- }`
`59`		`- return CurrencyFormatter(`
`60`		`- currencySettings: ServiceLocator.currencySettings`
`61`		`- ).formatAmount(decimalPrice) ?? price`
`62`		`- }`
`63`	`56`	`}`
`64`	`57`
`65`	`58`	`private extension BookingDetailsViewModel.AppointmentDetailsContent {`