Merge branch 'trunk' into WOOMOB-1553-hide-card-reader-for-CIAB-sites

# Conflicts:
#	Modules/Sources/Yosemite/Tools/CIAB/CIABEligibilityCheckerProtocol.swift
#	WooCommerce/Classes/ViewRelated/Dashboard/Settings/POS/POSTabVisibilityChecker.swift

Author: RafaelKayumov

Modules/Sources/Networking/Model/Bookings/Booking.swift

@@ -29,7 +29,6 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
         return BookingStatus(rawValue: statusKey) ?? .unknown
     }
 
-    /// periphery: ignore - will be used in UI in upcoming PRs
     public var attendanceStatus: BookingAttendanceStatus {
         return BookingAttendanceStatus(rawValue: attendanceStatusKey) ?? .unknown
     }
@@ -208,7 +207,6 @@ public enum BookingStatus: String, CaseIterable {
     case unknown
 }
 
-/// periphery: ignore - will be used in UI in upcoming PRs
 public enum BookingAttendanceStatus: String, CaseIterable {
     case booked
     case checkedIn = "checked-in"

Modules/Sources/Networking/Remote/BookingsRemote.swift

@@ -17,6 +17,12 @@ public protocol BookingsRemoteProtocol {
     func loadBooking(bookingID: Int64,
                      siteID: Int64) async throws -> Booking?
 
+    func updateBooking(
+        from siteID: Int64,
+        bookingID: Int64,
+        attendanceStatus: BookingAttendanceStatus
+    ) async throws -> Booking?
+
     func fetchResource(resourceID: Int64,
                        siteID: Int64) async throws -> BookingResource?
 }
@@ -88,6 +94,28 @@ public final class BookingsRemote: Remote, BookingsRemoteProtocol {
         return try await enqueue(request, mapper: mapper)
     }
 
+    public func updateBooking(
+        from siteID: Int64,
+        bookingID: Int64,
+        attendanceStatus: BookingAttendanceStatus
+    ) async throws -> Booking? {
+        let path = "\(Path.bookings)/\(bookingID)"
+        let parameters = [
+            ParameterKey.attendanceStatus: attendanceStatus.rawValue
+        ]
+        let request = JetpackRequest(
+            wooApiVersion: .wcBookings,
+            method: .put,
+            siteID: siteID,
+            path: path,
+            parameters: parameters,
+            availableAsRESTRequest: true
+        )
+
+        let mapper = BookingMapper(siteID: siteID)
+        return try await enqueue(request, mapper: mapper)
+    }
+
     public func fetchResource(
         resourceID: Int64,
         siteID: Int64
@@ -132,5 +160,6 @@ public extension BookingsRemote {
         static let startDateAfter: String  = "start_date_after"
         static let search: String          = "search"
         static let order: String           = "order"
+        static let attendanceStatus        = "attendance_status"
     }
 }

Modules/Sources/Yosemite/Actions/BookingAction.swift

@@ -52,4 +52,16 @@ public enum BookingAction: Action {
     case fetchResource(siteID: Int64,
                        resourceID: Int64,
                        onCompletion: (Result<BookingResource, Error>) -> Void)
+
+    /// Updates a booking attendance status.
+    ///
+    /// - Parameter siteID: The site ID of the booking.
+    /// - Parameter bookingID: The ID of the booking to be updated.
+    /// - Parameter status: The new attendance status.
+    /// - Parameter onCompletion: called when update completes, returns an error in case of a failure.
+    ///
+    case updateBookingAttendanceStatus(siteID: Int64,
+                                       bookingID: Int64,
+                                       status: BookingAttendanceStatus,
+                                       onCompletion: (Error?) -> Void)
 }

Modules/Sources/Yosemite/Model/Bookings/BookingDateRangeFilter.swift

@@ -0,0 +1,25 @@
+// periphery:ignore:all - will be used for booking filters
+import Foundation
+
+/// Used to filter bookings by date range
+///
+public struct BookingDateRangeFilter: Codable, Equatable, Hashable {
+    /// Start date of the range (inclusive)
+    ///
+    public let startDate: Date?
+
+    /// End date of the range (inclusive)
+    ///
+    public let endDate: Date?
+
+    public init(startDate: Date? = nil,
+                endDate: Date? = nil) {
+        self.startDate = startDate
+        self.endDate = endDate
+    }
+
+    enum CodingKeys: String, CodingKey {
+        case startDate = "start_date"
+        case endDate = "end_date"
+    }
+}

Modules/Sources/Yosemite/Model/Bookings/BookingProductFilter.swift

@@ -0,0 +1,20 @@
+// periphery:ignore:all - will be used for booking filters
+import Foundation
+
+/// Used to filter bookings by product
+///
+public struct BookingProductFilter: Codable, Hashable {
+    /// ID of the product
+    ///
+    public let id: Int64
+
+    /// Name of the product
+    ///
+    public let name: String
+
+    public init(id: Int64,
+         name: String) {
+        self.id = id
+        self.name = name
+    }
+}

Modules/Sources/Yosemite/Model/Model.swift

@@ -26,11 +26,13 @@ public typealias BlazeTargetOptions = Networking.BlazeTargetOptions
 public typealias BlazeTargetLocation = Networking.BlazeTargetLocation
 public typealias BlazeTargetTopic = Networking.BlazeTargetTopic
 public typealias Booking = Networking.Booking
+public typealias BookingStatus = Networking.BookingStatus
 public typealias BookingOrderInfo = Networking.BookingOrderInfo
 public typealias BookingCustomerInfo = Networking.BookingCustomerInfo
 public typealias BookingPaymentInfo = Networking.BookingPaymentInfo
 public typealias BookingProductInfo = Networking.BookingProductInfo
 public typealias BookingResource = Networking.BookingResource
+public typealias BookingAttendanceStatus = Networking.BookingAttendanceStatus
 public typealias CreateBlazeCampaign = Networking.CreateBlazeCampaign
 public typealias FallibleCancelable = Hardware.FallibleCancelable
 public typealias CommentStatus = Networking.CommentStatus

Modules/Sources/Yosemite/PointOfSale/Eligibility/POSCountryCurrencyValidator.swift

@@ -0,0 +1,50 @@
+import Foundation
+import enum WooFoundation.CountryCode
+import enum WooFoundation.CurrencyCode
+
+/// Validator for POS country and currency support
+/// Single source of truth for supported countries and currencies
+public enum POSCountryCurrencyValidator {
+    /// Supported countries for POS feature
+    public static let supportedCountries: [CountryCode] = [.US, .GB]
+
+    /// Supported currencies per country for POS feature
+    public static let supportedCurrencies: [CountryCode: [CurrencyCode]] = [
+        .US: [.USD],
+        .GB: [.GBP]
+    ]
+
+    /// Validates if a country and currency combination is eligible for POS
+    /// - Parameters:
+    ///   - countryCode: The store's country code
+    ///   - currencyCode: The store's currency code
+    /// - Returns: Eligibility state with reason if ineligible
+    public static func validate(countryCode: CountryCode, currencyCode: CurrencyCode) -> ValidationResult {
+        // Check country first
+        guard supportedCountries.contains(countryCode) else {
+            return .ineligible(reason: .unsupportedCountry(supportedCountries: supportedCountries))
+        }
+
+        // Check currency for the country
+        let supportedCurrenciesForCountry = supportedCurrencies[countryCode] ?? []
+        guard supportedCurrenciesForCountry.contains(currencyCode) else {
+            return .ineligible(reason: .unsupportedCurrency(countryCode: countryCode, supportedCurrencies: supportedCurrenciesForCountry))
+        }
+
+        return .eligible
+    }
+}
+
+// MARK: - Validation Result
+
+public extension POSCountryCurrencyValidator {
+    enum ValidationResult: Equatable {
+        case eligible
+        case ineligible(reason: IneligibleReason)
+    }
+
+    enum IneligibleReason: Equatable {
+        case unsupportedCountry(supportedCountries: [CountryCode])
+        case unsupportedCurrency(countryCode: CountryCode, supportedCurrencies: [CurrencyCode])
+    }
+}

Modules/Sources/Yosemite/Stores/BookingStore.swift

@@ -63,11 +63,17 @@ public class BookingStore: Store {
                            onCompletion: onCompletion)
         case let .fetchResource(siteID, resourceID, onCompletion):
             fetchResource(siteID: siteID, resourceID: resourceID, onCompletion: onCompletion)
+        case .updateBookingAttendanceStatus(let siteID, let bookingID, let status, let onCompletion):
+            performUpdateBookingAttendanceStatus(
+                siteID: siteID,
+                bookingID: bookingID,
+                status: status,
+                onCompletion: onCompletion
+            )
         }
     }
 }
 
-
 // MARK: - Services
 //
 private extension BookingStore {
@@ -246,6 +252,50 @@ private extension BookingStore {
             }
         }
     }
+
+    func performUpdateBookingAttendanceStatus(
+        siteID: Int64,
+        bookingID: Int64,
+        status: BookingAttendanceStatus,
+        onCompletion: @escaping (Error?) -> Void
+    ) {
+        updateBookingAttendanceStatusLocally(
+            siteID: siteID,
+            bookingID: bookingID,
+            statusKey: status
+        ) { _ in
+            //TODO: - booking status remote update + rollback status in case of error
+            onCompletion(nil)
+        }
+    }
+
+    /// Updates local (Storage) Booking attendance status
+    func updateBookingAttendanceStatusLocally(
+        siteID: Int64,
+        bookingID: Int64,
+        statusKey: BookingAttendanceStatus,
+        onCompletion: @escaping (BookingAttendanceStatus) -> Void
+    ) {
+        storageManager.performAndSave({ storage -> BookingAttendanceStatus in
+            guard let booking = storage.loadBooking(
+                siteID: siteID,
+                bookingID: bookingID
+            ) else {
+                return statusKey
+            }
+
+            let oldStatus = booking.attendanceStatusKey
+            booking.attendanceStatusKey = statusKey.rawValue
+            return BookingAttendanceStatus(rawValue: oldStatus ?? "") ?? .unknown
+        }, completion: { result in
+            switch result {
+            case .success(let status):
+                onCompletion(status)
+            case .failure:
+                onCompletion(statusKey)
+            }
+        }, on: .main)
+    }
 }
 
 

Modules/Tests/YosemiteTests/Mocks/MockBookingsRemote.swift

@@ -46,4 +46,8 @@ final class MockBookingsRemote: BookingsRemoteProtocol {
         }
         return try result.get()
     }
+
+    func updateBooking(from siteID: Int64, bookingID: Int64, attendanceStatus: Networking.BookingAttendanceStatus) async throws -> Networking.Booking? {
+        return nil
+    }
 }