Merge branch 'trunk' into WOOMOB-1236-booking-details-part-8

# Conflicts:
#	WooCommerce/Classes/ViewModels/Booking Details/AppointmentDetailsContent.swift
#	WooCommerce/Classes/ViewModels/Booking Details/BookingDetailsViewModel.swift
#	WooCommerce/Classes/ViewModels/Booking Details/CustomerContent.swift
#	WooCommerce/Classes/ViewModels/Booking Details/HeaderContent.swift
#	WooCommerce/Classes/ViewModels/Booking Details/PaymentContent.swift

Author: RafaelKayumov

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 23.5
+This update brings smoother store management and better control. You can now filter orders by source, and manage all POS orders directly within the POS interface. Plus, we fixed a scrolling issue on the Create Coupon screen for a more seamless experience.
+
 ## 23.4
 This update delivers important fixes for a smoother store management experience. We've resolved navigation issues in order details and corrected store widget display on iOS 26. Update now for a more polished and reliable app experience.
 

Modules/Sources/Fakes/Networking.generated.swift

@@ -344,6 +344,24 @@ extension Networking.Booking {
         )
     }
 }
+extension Networking.BookingResource {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> Networking.BookingResource {
+        .init(
+            siteID: .fake(),
+            resourceID: .fake(),
+            name: .fake(),
+            quantity: .fake(),
+            role: .fake(),
+            email: .fake(),
+            phoneNumber: .fake(),
+            imageID: .fake(),
+            imageURL: .fake(),
+            description: .fake()
+        )
+    }
+}
 extension Networking.CompositeComponentOptionType {
     /// Returns a "ready to use" type filled with fake values.
     ///

Modules/Sources/Networking/Mapper/BookingResourceMapper.swift

@@ -0,0 +1,27 @@
+import Foundation
+
+/// Mapper: BookingResource
+///
+struct BookingResourceMapper: Mapper {
+    let siteID: Int64
+
+    func map(response: Data) throws -> BookingResource {
+        let decoder = JSONDecoder()
+        decoder.userInfo = [
+            .siteID: siteID
+        ]
+        if hasDataEnvelope(in: response) {
+            return try decoder.decode(BookingResourceEnvelope.self, from: response).bookingResource
+        } else {
+            return try decoder.decode(BookingResource.self, from: response)
+        }
+    }
+}
+
+private struct BookingResourceEnvelope: Decodable {
+    let bookingResource: BookingResource
+
+    private enum CodingKeys: String, CodingKey {
+        case bookingResource = "data"
+    }
+}

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

@@ -22,7 +22,6 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
     public let statusKey: String
     public let localTimezone: String
     public let currency: String
-    // periphery: ignore - to be used later
     public let orderInfo: BookingOrderInfo?
 
     public var bookingStatus: BookingStatus {

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

@@ -16,4 +16,23 @@ public struct BookingOrderInfo: Hashable {
         self.customerInfo = customerInfo
         self.productInfo = productInfo
     }
+
+    public init(booking: Booking, order: Order) {
+        self.customerInfo = {
+            guard let billingAddress = order.billingAddress else {
+                return nil
+            }
+            return BookingCustomerInfo(billingAddress: billingAddress)
+        }()
+        self.productInfo = BookingProductInfo(name: order.items.first(where: { $0.productID == booking.productID })?.name ?? "")
+        self.paymentInfo = BookingPaymentInfo(
+            paymentMethodID: order.paymentMethodID,
+            paymentMethodTitle: order.paymentMethodTitle,
+            subtotal: order.items.map({ Double($0.subtotal) ?? 0 }).reduce(0, +).description,
+            subtotalTax: order.items.map({ Double($0.subtotalTax) ?? 0 }).reduce(0, +).description,
+            total: order.total,
+            totalTax: order.totalTax
+        )
+        self.statusKey = order.status.rawValue
+    }
 }

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

@@ -0,0 +1,86 @@
+import Codegen
+import Foundation
+
+public struct BookingResource: Hashable, Decodable, GeneratedFakeable, GeneratedCopiable {
+    public let siteID: Int64
+    public let resourceID: Int64
+    public let name: String
+    public let quantity: Int64
+    public let role: String
+    public let email: String?
+    public let phoneNumber: String?
+    public let imageID: Int64
+    public let imageURL: String?
+    public let description: String?
+
+    public init(siteID: Int64,
+                resourceID: Int64,
+                name: String,
+                quantity: Int64,
+                role: String,
+                email: String?,
+                phoneNumber: String?,
+                imageID: Int64,
+                imageURL: String?,
+                description: String?) {
+        self.siteID = siteID
+        self.resourceID = resourceID
+        self.name = name
+        self.quantity = quantity
+        self.role = role
+        self.email = email
+        self.phoneNumber = phoneNumber
+        self.imageID = imageID
+        self.imageURL = imageURL
+        self.description = description
+    }
+
+    public init(from decoder: Decoder) throws {
+        guard let siteID = decoder.userInfo[.siteID] as? Int64 else {
+            throw BookingResourceDecodingError.missingSiteID
+        }
+
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+
+        let resourceID = try container.decode(Int64.self, forKey: .resourceID)
+        let name = try container.decode(String.self, forKey: .name)
+        let quantity = try container.decode(Int64.self, forKey: .quantity)
+        let role = try container.decode(String.self, forKey: .role)
+        let email = try container.decodeIfPresent(String.self, forKey: .email)
+        let phoneNumber = try container.decodeIfPresent(String.self, forKey: .phoneNumber)
+        let imageID = try container.decode(Int64.self, forKey: .imageID)
+        let imageURL = try container.decodeIfPresent(String.self, forKey: .imageURL)
+        let description = try container.decodeIfPresent(String.self, forKey: .description)
+
+        self.init(siteID: siteID,
+                  resourceID: resourceID,
+                  name: name,
+                  quantity: quantity,
+                  role: role,
+                  email: email,
+                  phoneNumber: phoneNumber,
+                  imageID: imageID,
+                  imageURL: imageURL,
+                  description: description)
+    }
+}
+
+private extension BookingResource {
+    enum CodingKeys: String, CodingKey {
+        case resourceID = "id"
+        case name
+        case quantity = "qty"
+        case role
+        case email
+        case phoneNumber = "phone_number"
+        case imageID = "image_id"
+        case imageURL = "image_url"
+        case description
+    }
+}
+
+// MARK: - Decoding Errors
+//
+enum BookingResourceDecodingError: Error {
+    case missingSiteID
+}

Modules/Sources/Networking/Model/Copiable/Models+Copiable.generated.swift

@@ -494,6 +494,45 @@ extension Networking.Booking {
     }
 }
 
+extension Networking.BookingResource {
+    public func copy(
+        siteID: CopiableProp<Int64> = .copy,
+        resourceID: CopiableProp<Int64> = .copy,
+        name: CopiableProp<String> = .copy,
+        quantity: CopiableProp<Int64> = .copy,
+        role: CopiableProp<String> = .copy,
+        email: NullableCopiableProp<String> = .copy,
+        phoneNumber: NullableCopiableProp<String> = .copy,
+        imageID: CopiableProp<Int64> = .copy,
+        imageURL: NullableCopiableProp<String> = .copy,
+        description: NullableCopiableProp<String> = .copy
+    ) -> Networking.BookingResource {
+        let siteID = siteID ?? self.siteID
+        let resourceID = resourceID ?? self.resourceID
+        let name = name ?? self.name
+        let quantity = quantity ?? self.quantity
+        let role = role ?? self.role
+        let email = email ?? self.email
+        let phoneNumber = phoneNumber ?? self.phoneNumber
+        let imageID = imageID ?? self.imageID
+        let imageURL = imageURL ?? self.imageURL
+        let description = description ?? self.description
+
+        return Networking.BookingResource(
+            siteID: siteID,
+            resourceID: resourceID,
+            name: name,
+            quantity: quantity,
+            role: role,
+            email: email,
+            phoneNumber: phoneNumber,
+            imageID: imageID,
+            imageURL: imageURL,
+            description: description
+        )
+    }
+}
+
 extension Networking.Coupon {
     public func copy(
         siteID: CopiableProp<Int64> = .copy,

Modules/Sources/Networking/Remote/BookingsRemote.swift

@@ -16,6 +16,9 @@ public protocol BookingsRemoteProtocol {
 
     func loadBooking(bookingID: Int64,
                      siteID: Int64) async throws -> Booking?
+
+    func fetchResource(resourceID: Int64,
+                       siteID: Int64) async throws -> BookingResource?
 }
 
 /// Booking: Remote Endpoints
@@ -84,6 +87,24 @@ public final class BookingsRemote: Remote, BookingsRemoteProtocol {
 
         return try await enqueue(request, mapper: mapper)
     }
+
+    public func fetchResource(
+        resourceID: Int64,
+        siteID: Int64
+    ) async throws -> BookingResource? {
+        let path = "\(Path.resources)/\(resourceID)"
+        let request = JetpackRequest(
+            wooApiVersion: .wcBookings,
+            method: .get,
+            siteID: siteID,
+            path: path,
+            availableAsRESTRequest: true
+        )
+
+        let mapper = BookingResourceMapper(siteID: siteID)
+
+        return try await enqueue(request, mapper: mapper)
+    }
 }
 
 // MARK: - Constants
@@ -101,6 +122,7 @@ public extension BookingsRemote {
 
     private enum Path {
         static let bookings = "bookings"
+        static let resources = "resources/team-members"
     }
 
     private enum ParameterKey {

Modules/Sources/NetworkingCore/Network/AlamofireNetworkErrorHandler.swift

@@ -85,15 +85,23 @@ final class AlamofireNetworkErrorHandler {
         originalRequest: URLRequestConvertible,
         failure: Error?
     ) {
-        let retriedRequestIndex = retriedJetpackRequests.firstIndex { retriedRequest in
-            let urlRequest = try? originalRequest.asURLRequest()
-            let retriedRequest = try? retriedRequest.request.asURLRequest()
-            return urlRequest == retriedRequest
-        }
+        let retriedRequest: RetriedJetpackRequest? = queue.sync(flags: .barrier) { [weak self] in
+            guard let self else { return nil }
+            guard let urlRequest = try? originalRequest.asURLRequest() else { return nil }
+            let retriedRequestIndex = _retriedJetpackRequests.firstIndex { retriedRequest in
+                guard let retriedURLRequest = try? retriedRequest.request.asURLRequest() else {
+                    return false
+                }
+                return urlRequest.url == retriedURLRequest.url &&
+                       urlRequest.httpMethod == retriedURLRequest.httpMethod
+            }
 
-        guard let index = retriedRequestIndex else { return }
+            guard let index = retriedRequestIndex else { return nil }
+
+            return _retriedJetpackRequests.remove(at: index)
+        }
 
-        let retriedRequest = retriedJetpackRequests.remove(at: index)
+        guard let retriedRequest else { return }
 
         if failure == nil {
             let siteID = retriedRequest.request.siteID
@@ -141,10 +149,15 @@ final class AlamofireNetworkErrorHandler {
     }
 
     func isRequestRetried(_ request: URLRequestConvertible) -> Bool {
-        retriedJetpackRequests.contains { retriedRequest in
-            let urlRequest = try? request.asURLRequest()
-            let currentItem = try? retriedRequest.request.asURLRequest()
-            return currentItem == urlRequest
+        guard let urlRequest = try? request.asURLRequest() else {
+            return false
+        }
+        return retriedJetpackRequests.contains { retriedRequest in
+            guard let currentItem = try? retriedRequest.request.asURLRequest() else {
+                return false
+            }
+            return currentItem.url == urlRequest.url &&
+                   currentItem.httpMethod == urlRequest.httpMethod
         }
     }
 

Modules/Sources/Storage/Model/Booking/BookingResource+CoreDataClass.swift

@@ -0,0 +1,7 @@
+import Foundation
+import CoreData
+
+@objc(BookingResource)
+public class BookingResource: NSManagedObject {
+
+}