Merge branch 'trunk' into issue/woomob-1314-woo-poslocal-catalog-add-ios-remote-feature-flag-support

Author: joshheald

Modules/Sources/Fakes/Networking.generated.swift

@@ -343,7 +343,8 @@ extension Networking.Booking {
             attendanceStatusKey: .fake(),
             localTimezone: .fake(),
             currency: .fake(),
-            orderInfo: .fake()
+            orderInfo: .fake(),
+            note: .fake()
         )
     }
 }

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

@@ -24,6 +24,7 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
     public let localTimezone: String
     public let currency: String
     public let orderInfo: BookingOrderInfo?
+    public let note: String
 
     public var bookingStatus: BookingStatus {
         return BookingStatus(rawValue: statusKey) ?? .unknown
@@ -54,7 +55,8 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
                 attendanceStatusKey: String,
                 localTimezone: String,
                 currency: String,
-                orderInfo: BookingOrderInfo?) {
+                orderInfo: BookingOrderInfo?,
+                note: String) {
         self.siteID = siteID
         self.bookingID = bookingID
         self.allDay = allDay
@@ -75,6 +77,7 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
         self.localTimezone = localTimezone
         self.currency = currency
         self.orderInfo = orderInfo
+        self.note = note
     }
 
     /// The public initializer for Booking.
@@ -129,6 +132,7 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
         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
+        let note = try container.decode(String.self, forKey: .note)
 
         self.init(siteID: siteID,
                   bookingID: bookingID,
@@ -149,7 +153,8 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
                   attendanceStatusKey: attendanceStatusKey,
                   localTimezone: localTimezone,
                   currency: currency,
-                  orderInfo: orderInfo)
+                  orderInfo: orderInfo,
+                  note: note)
     }
 
     public func encode(to encoder: Encoder) throws {
@@ -203,6 +208,7 @@ private extension Booking {
         case attendanceStatusKey = "attendance_status"
         case localTimezone = "local_timezone"
         case currency
+        case note
     }
 }
 

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

@@ -450,7 +450,8 @@ extension Networking.Booking {
         attendanceStatusKey: CopiableProp<String> = .copy,
         localTimezone: CopiableProp<String> = .copy,
         currency: CopiableProp<String> = .copy,
-        orderInfo: NullableCopiableProp<BookingOrderInfo> = .copy
+        orderInfo: NullableCopiableProp<BookingOrderInfo> = .copy,
+        note: CopiableProp<String> = .copy
     ) -> Networking.Booking {
         let siteID = siteID ?? self.siteID
         let bookingID = bookingID ?? self.bookingID
@@ -472,6 +473,7 @@ extension Networking.Booking {
         let localTimezone = localTimezone ?? self.localTimezone
         let currency = currency ?? self.currency
         let orderInfo = orderInfo ?? self.orderInfo
+        let note = note ?? self.note
 
         return Networking.Booking(
             siteID: siteID,
@@ -493,7 +495,8 @@ extension Networking.Booking {
             attendanceStatusKey: attendanceStatusKey,
             localTimezone: localTimezone,
             currency: currency,
-            orderInfo: orderInfo
+            orderInfo: orderInfo,
+            note: note
         )
     }
 }

Modules/Sources/Networking/Remote/BookingsRemote.swift

@@ -19,7 +19,8 @@ public protocol BookingsRemoteProtocol {
     func updateBooking(
         from siteID: Int64,
         bookingID: Int64,
-        attendanceStatus: BookingAttendanceStatus
+        attendanceStatus: BookingAttendanceStatus?,
+        bookingStatus: BookingStatus?
     ) async throws -> Booking?
 
     func fetchResource(resourceID: Int64,
@@ -150,12 +151,20 @@ public final class BookingsRemote: Remote, BookingsRemoteProtocol {
     public func updateBooking(
         from siteID: Int64,
         bookingID: Int64,
-        attendanceStatus: BookingAttendanceStatus
+        attendanceStatus: BookingAttendanceStatus?,
+        bookingStatus: BookingStatus?
     ) async throws -> Booking? {
         let path = "\(Path.bookings)/\(bookingID)"
-        let parameters = [
-            ParameterKey.attendanceStatus: attendanceStatus.rawValue
-        ]
+        var parameters: [String: String] = [:]
+
+        if let attendanceStatus {
+            parameters[ParameterKey.attendanceStatus] = attendanceStatus.rawValue
+        }
+
+        if let bookingStatus {
+            parameters[ParameterKey.status] = bookingStatus.rawValue
+        }
+
         let request = JetpackRequest(
             wooApiVersion: .wcBookings,
             method: .put,
@@ -249,5 +258,6 @@ public extension BookingsRemote {
         static let resource: String        = "resource"
         static let bookingStatus: String   = "booking_status"
         static let attendanceStatus        = "attendance_status"
+        static let status: String          = "status"
     }
 }

Modules/Sources/Storage/Model/Booking/Booking+CoreDataProperties.swift

@@ -23,4 +23,5 @@ extension Booking {
     @NSManaged public var localTimezone: String?
     @NSManaged public var currency: String?
     @NSManaged public var orderInfo: BookingOrderInfo?
+    @NSManaged public var note: String?
 }

Modules/Sources/Storage/Model/MIGRATIONS.md

@@ -2,6 +2,10 @@
 
 This file documents changes in the WCiOS Storage data model. Please explain any changes to the data model as well as any custom migrations.
 
+## Model 130 (Release 23.7)
+- @adborbas 2025-11-06
+  - Added `note` attribute to `Booking` entity.
+
 ## Model 129 (Release X.X.X.X)
 - @rafaelkayumov 2025-10-17
   - Added `attendanceStatusKey` attribute to `Booking` entity.

Modules/Sources/Storage/Resources/WooCommerce.xcdatamodeld/.xccurrentversion

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>Model 129.xcdatamodel</string>
+	<string>Model 130.xcdatamodel</string>
 </dict>
 </plist>

Modules/Sources/Storage/Resources/WooCommerce.xcdatamodeld/Model 129.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="24299" systemVersion="24G90" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="24299" systemVersion="25A362" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Account" representedClassName="Account" syncable="YES">
         <attribute name="displayName" optional="YES" attributeType="String"/>
         <attribute name="email" optional="YES" attributeType="String"/>