Merge branch 'trunk' into task/WOOMOB-1290-remove-IAP-usage

Author: iamgabrielma

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

@@ -339,7 +339,26 @@ extension Networking.Booking {
             startDate: .fake(),
             statusKey: .fake(),
             localTimezone: .fake(),
-            currency: .fake()
+            currency: .fake(),
+            orderInfo: .fake()
+        )
+    }
+}
+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()
         )
     }
 }

Modules/Sources/Networking/Mapper/BookingMapper.swift

@@ -0,0 +1,28 @@
+import Foundation
+
+/// Mapper: Booking
+///
+struct BookingMapper: Mapper {
+    let siteID: Int64
+
+    func map(response: Data) throws -> Booking {
+        let decoder = JSONDecoder()
+        decoder.dateDecodingStrategy = .formatted(DateFormatter.Defaults.dateTimeFormatter)
+        decoder.userInfo = [
+            .siteID: siteID
+        ]
+        if hasDataEnvelope(in: response) {
+            return try decoder.decode(BookingEnvelope.self, from: response).booking
+        } else {
+            return try decoder.decode(Booking.self, from: response)
+        }
+    }
+}
+
+private struct BookingEnvelope: Decodable {
+    let booking: Booking
+
+    private enum CodingKeys: String, CodingKey {
+        case booking = "data"
+    }
+}

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,8 +22,8 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
     public let statusKey: String
     public let localTimezone: String
     public let currency: String
+    public let orderInfo: BookingOrderInfo?
 
-    // periphery: ignore - to be used later
     public var bookingStatus: BookingStatus {
         return BookingStatus(rawValue: statusKey) ?? .unknown
     }
@@ -47,7 +47,8 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
                 startDate: Date,
                 statusKey: String,
                 localTimezone: String,
-                currency: String) {
+                currency: String,
+                orderInfo: BookingOrderInfo?) {
         self.siteID = siteID
         self.bookingID = bookingID
         self.allDay = allDay
@@ -66,6 +67,7 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
         self.statusKey = statusKey
         self.localTimezone = localTimezone
         self.currency = currency
+        self.orderInfo = orderInfo
     }
 
     /// The public initializer for Booking.
@@ -99,6 +101,7 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
         let statusKey = try container.decode(String.self, forKey: .statusKey)
         let localTimezone = try container.decode(String.self, forKey: .localTimezone)
         let currency = try container.decode(String.self, forKey: .currency)
+        let orderInfo: BookingOrderInfo? = nil // to be prefilled when synced
 
         self.init(siteID: siteID,
                   bookingID: bookingID,
@@ -117,7 +120,8 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
                   startDate: startDate,
                   statusKey: statusKey,
                   localTimezone: localTimezone,
-                  currency: currency)
+                  currency: currency,
+                  orderInfo: orderInfo)
     }
 
     public func encode(to encoder: Encoder) throws {

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

@@ -0,0 +1,9 @@
+import Foundation
+
+public struct BookingCustomerInfo: Hashable {
+    public let billingAddress: Address
+
+    public init(billingAddress: Address) {
+        self.billingAddress = billingAddress
+    }
+}

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

@@ -0,0 +1,38 @@
+// periphery:ignore:all
+import Foundation
+
+public struct BookingOrderInfo: Hashable {
+    public let statusKey: String
+    public let paymentInfo: BookingPaymentInfo?
+    public let customerInfo: BookingCustomerInfo?
+    public let productInfo: BookingProductInfo?
+
+    public init(statusKey: String,
+                paymentInfo: BookingPaymentInfo?,
+                customerInfo: BookingCustomerInfo?,
+                productInfo: BookingProductInfo?) {
+        self.statusKey = statusKey
+        self.paymentInfo = paymentInfo
+        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/BookingPaymentInfo.swift

@@ -0,0 +1,24 @@
+import Foundation
+
+public struct BookingPaymentInfo: Hashable {
+    public let paymentMethodID: String
+    public let paymentMethodTitle: String
+    public let subtotal: String
+    public let subtotalTax: String
+    public let total: String
+    public let totalTax: String
+
+    public init(paymentMethodID: String,
+                paymentMethodTitle: String,
+                subtotal: String,
+                subtotalTax: String,
+                total: String,
+                totalTax: String) {
+        self.paymentMethodID = paymentMethodID
+        self.paymentMethodTitle = paymentMethodTitle
+        self.subtotal = subtotal
+        self.subtotalTax = subtotalTax
+        self.total = total
+        self.totalTax = totalTax
+    }
+}

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

@@ -0,0 +1,9 @@
+import Foundation
+
+public struct BookingProductInfo: Hashable {
+    public let name: String
+
+    public init(name: String) {
+        self.name = name
+    }
+}

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
+}