Skip to content

Bookings: Hide payment status and canceled attendance status #16367

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

Closed
wants to merge 3 commits into from
+16 −15
Closed

Bookings: Hide payment status and canceled attendance status #16367

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf8f60c
Hide payment status and canceled attendance status
itsmeichigo Nov 19, 2025
77c2010
Fix periphery issue
itsmeichigo Nov 19, 2025
1528195
Merge branch 'trunk' into woomob-1711-ios-hide-any-filter-that-doesnt…
itsmeichigo Nov 19, 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
31 changes: 16 additions & 15 deletions WooCommerce/Classes/Bookings/BookingFilters/BookingFiltersViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ final class BookingFiltersViewModel: FilterListViewModel {
private let productFilterViewModel: FilterTypeViewModel
private let customerFilterViewModel: FilterTypeViewModel
private let attendanceStatusFilterViewModel: FilterTypeViewModel
private let paymentStatusFilterViewModel: FilterTypeViewModel
// private let paymentStatusFilterViewModel: FilterTypeViewModel
private let dateTimeFilterViewModel: FilterTypeViewModel


Expand All @@ -21,14 +21,14 @@ final class BookingFiltersViewModel: FilterListViewModel {
productFilterViewModel = BookingListFilter.product(siteID: siteID).createViewModel(filters: filter)
customerFilterViewModel = BookingListFilter.customer(siteID: siteID).createViewModel(filters: filter)
attendanceStatusFilterViewModel = BookingListFilter.attendanceStatus.createViewModel(filters: filter)
paymentStatusFilterViewModel = BookingListFilter.paymentStatus.createViewModel(filters: filter)
// paymentStatusFilterViewModel = BookingListFilter.paymentStatus.createViewModel(filters: filter)
dateTimeFilterViewModel = BookingListFilter.dateTime.createViewModel(filters: filter)

filterTypeViewModels = [
teamMemberFilterViewModel,
productFilterViewModel,
attendanceStatusFilterViewModel,
paymentStatusFilterViewModel,
// paymentStatusFilterViewModel,
customerFilterViewModel,
dateTimeFilterViewModel
]
Expand All @@ -39,14 +39,14 @@ final class BookingFiltersViewModel: FilterListViewModel {
let products = (productFilterViewModel.selectedValue as? MultipleFilterSelection)?.items as? [BookingProductFilter] ?? []
let customers = (customerFilterViewModel.selectedValue as? MultipleFilterSelection)?.items as? [BookingCustomerFilter] ?? []
let attendanceStatuses = (attendanceStatusFilterViewModel.selectedValue as? MultipleFilterSelection)?.items as? [BookingAttendanceStatus] ?? []
let paymentStatuses = (paymentStatusFilterViewModel.selectedValue as? MultipleFilterSelection)?.items as? [BookingPaymentStatus] ?? []
// let paymentStatuses = (paymentStatusFilterViewModel.selectedValue as? MultipleFilterSelection)?.items as? [BookingPaymentStatus] ?? []
let dateRange = dateTimeFilterViewModel.selectedValue as? BookingDateRangeFilter
let numberOfActiveFilters = filterTypeViewModels.numberOfActiveFilters

return Filters(teamMembers: teamMembers,
products: products,
attendanceStatuses: attendanceStatuses,
paymentStatuses: paymentStatuses,
paymentStatuses: /*paymentStatuses*/ [],
customers: customers,
dateRange: dateRange,
numberOfActiveFilters: numberOfActiveFilters)
Expand Down Expand Up @@ -78,7 +78,7 @@ final class BookingFiltersViewModel: FilterListViewModel {
productFilterViewModel.selectedValue = BookingProductFilter?.none
customerFilterViewModel.selectedValue = CustomerFilter?.none
attendanceStatusFilterViewModel.selectedValue = BookingAttendanceStatus?.none
paymentStatusFilterViewModel.selectedValue = BookingPaymentStatus?.none
// paymentStatusFilterViewModel.selectedValue = BookingPaymentStatus?.none
dateTimeFilterViewModel.selectedValue = BookingDateRangeFilter?.none
}

Expand Down Expand Up @@ -157,7 +157,7 @@ extension BookingFiltersViewModel {
case teamMember(siteID: Int64)
case product(siteID: Int64)
case attendanceStatus
case paymentStatus
// case paymentStatus
case customer(siteID: Int64)
case dateTime
}
Expand All @@ -174,8 +174,8 @@ private extension BookingFiltersViewModel.BookingListFilter {
return Localization.rowTitleCustomer
case .attendanceStatus:
return Localization.rowTitleAttendanceStatus
case .paymentStatus:
return Localization.rowTitlePaymentStatus
// case .paymentStatus:
// return Localization.rowTitlePaymentStatus
case .dateTime:
return Localization.rowTitleDateTime
}
Expand All @@ -198,15 +198,15 @@ extension BookingFiltersViewModel.BookingListFilter {
listSelectorConfig: .bookingCustomers(siteID: siteID),
selectedValue: MultipleFilterSelection(items: filters.customers))
case .attendanceStatus:
let options: [BookingAttendanceStatus?] = [.booked, .checkedIn, .noShow, .cancelled]
let options: [BookingAttendanceStatus?] = [.booked, .checkedIn, .noShow/*, .cancelled*/]
return FilterTypeViewModel(title: title,
listSelectorConfig: .multiSelectStaticOptions(options: options),
selectedValue: MultipleFilterSelection(items: filters.attendanceStatuses))
case .paymentStatus:
let options: [BookingPaymentStatus?] = [.paid, .unpaid, .refunded]
return FilterTypeViewModel(title: title,
listSelectorConfig: .multiSelectStaticOptions(options: options),
selectedValue: MultipleFilterSelection(items: filters.paymentStatuses))
// case .paymentStatus:
// let options: [BookingPaymentStatus?] = [.paid, .unpaid, .refunded]
// return FilterTypeViewModel(title: title,
// listSelectorConfig: .multiSelectStaticOptions(options: options),
// selectedValue: MultipleFilterSelection(items: filters.paymentStatuses))
case .dateTime:
return FilterTypeViewModel(title: title,
listSelectorConfig: .bookingDateTime,
Expand Down Expand Up @@ -342,6 +342,7 @@ private extension BookingFiltersViewModel.BookingListFilter {
value: "Attendance Status",
comment: "Row title for filtering bookings by attendance status.")

// periphery: ignore - to be used again later when payment status filter is restored.
static let rowTitlePaymentStatus = NSLocalizedString(
"bookingFilters.rowTitlePaymentStatus",
value: "Payment Status",
Expand Down