Merge branch 'trunk' into woomob-1332-add-support-for-network-switching-in-pos

Author: itsmeichigo

Modules/Sources/Fakes/Networking.generated.swift

@@ -1774,7 +1774,10 @@ extension Networking.Site {
             isAdmin: .fake(),
             wasEcommerceTrial: .fake(),
             hasSSOEnabled: .fake(),
-            applicationPasswordAvailable: .fake()
+            applicationPasswordAvailable: .fake(),
+            isGarden: false,
+            gardenName: nil,
+            gardenPartner: nil
         )
     }
 }

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

@@ -2747,7 +2747,10 @@ extension Networking.Site {
         isAdmin: CopiableProp<Bool> = .copy,
         wasEcommerceTrial: CopiableProp<Bool> = .copy,
         hasSSOEnabled: CopiableProp<Bool> = .copy,
-        applicationPasswordAvailable: CopiableProp<Bool> = .copy
+        applicationPasswordAvailable: CopiableProp<Bool> = .copy,
+        isGarden: CopiableProp<Bool> = .copy,
+        gardenName: CopiableProp<String?> = .copy,
+        gardenPartner: CopiableProp<String?> = .copy
     ) -> Networking.Site {
         let siteID = siteID ?? self.siteID
         let name = name ?? self.name
@@ -2772,6 +2775,9 @@ extension Networking.Site {
         let wasEcommerceTrial = wasEcommerceTrial ?? self.wasEcommerceTrial
         let hasSSOEnabled = hasSSOEnabled ?? self.hasSSOEnabled
         let applicationPasswordAvailable = applicationPasswordAvailable ?? self.applicationPasswordAvailable
+        let isGarden = isGarden ?? self.isGarden
+        let gardenName = gardenName ?? self.gardenName
+        let gardenPartner = gardenPartner ?? self.gardenPartner
 
         return Networking.Site(
             siteID: siteID,
@@ -2796,7 +2802,10 @@ extension Networking.Site {
             isAdmin: isAdmin,
             wasEcommerceTrial: wasEcommerceTrial,
             hasSSOEnabled: hasSSOEnabled,
-            applicationPasswordAvailable: applicationPasswordAvailable
+            applicationPasswordAvailable: applicationPasswordAvailable,
+            isGarden: isGarden,
+            gardenName: gardenName,
+            gardenPartner: gardenPartner
         )
     }
 }

Modules/Sources/Networking/Model/Site.swift

@@ -97,6 +97,18 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
     ///
     public let applicationPasswordAvailable: Bool
 
+    /// Whether the site is running on Garden architecture
+    ///
+    public let isGarden: Bool
+
+    /// The site Garden name is present
+    ///
+    public let gardenName: String?
+
+    /// The site Garden partner if present
+    ///
+    public let gardenPartner: String?
+
     /// Decodable Conformance.
     ///
     public init(from decoder: Decoder) throws {
@@ -140,6 +152,10 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
             return jetpackModules.contains(OptionKeys.sso.rawValue) == true
         }()
 
+        let isGarden = try siteContainer.decodeIfPresent(Bool.self, forKey: .isGarden) ?? false
+        let gardenName = try siteContainer.decodeIfPresent(String.self, forKey: .gardenName)
+        let gardenPartner = try siteContainer.decodeIfPresent(String.self, forKey: .gardenPartner)
+
         self.init(siteID: siteID,
                   name: name,
                   description: description,
@@ -162,7 +178,10 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
                   isAdmin: isAdmin,
                   wasEcommerceTrial: wasEcommerceTrial,
                   hasSSOEnabled: hasSSOEnabled,
-                  applicationPasswordAvailable: false) // to be updated by fetching SiteAPI
+                  applicationPasswordAvailable: false, // to be updated by fetching SiteAPI
+                  isGarden: isGarden,
+                  gardenName: gardenName,
+                  gardenPartner: gardenPartner)
     }
 
     /// Designated Initializer.
@@ -189,7 +208,10 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
                 isAdmin: Bool,
                 wasEcommerceTrial: Bool,
                 hasSSOEnabled: Bool,
-                applicationPasswordAvailable: Bool) {
+                applicationPasswordAvailable: Bool,
+                isGarden: Bool,
+                gardenName: String?,
+                gardenPartner: String?) {
         self.siteID = siteID
         self.name = name
         self.description = description
@@ -213,6 +235,9 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
         self.wasEcommerceTrial = wasEcommerceTrial
         self.hasSSOEnabled = hasSSOEnabled
         self.applicationPasswordAvailable = applicationPasswordAvailable
+        self.isGarden = isGarden
+        self.gardenName = gardenName
+        self.gardenPartner = gardenPartner
     }
 }
 
@@ -264,6 +289,9 @@ private extension Site {
         case isJetpackConnected          = "jetpack_connection"
         case wasEcommerceTrial           = "was_ecommerce_trial"
         case jetpackModules = "jetpack_modules"
+        case isGarden = "is_garden"
+        case gardenName = "garden_name"
+        case gardenPartner = "garden_partner"
     }
 
     enum PlanInfo: String, CodingKey {

Modules/Sources/Networking/Model/WordPressSite.swift

@@ -110,7 +110,10 @@ public extension WordPressSite {
               isAdmin: false,
               wasEcommerceTrial: false,
               hasSSOEnabled: false,
-              applicationPasswordAvailable: false)
+              applicationPasswordAvailable: false,
+              isGarden: false,
+              gardenName: nil,
+              gardenPartner: nil)
     }
 
     struct Authentication: Decodable {

Modules/Sources/Networking/Remote/SiteRemote.swift

@@ -338,12 +338,37 @@ extension SiteRemote {
     enum SiteParameter {
         enum Fields {
             static let key = "fields"
-            static let value = "ID,name,description,URL,options,jetpack,jetpack_connection,capabilities,was_ecommerce_trial,plan,jetpack_modules"
+            static let value = [
+                "ID",
+                "name",
+                "description",
+                "URL",
+                "options",
+                "jetpack",
+                "jetpack_connection",
+                "capabilities",
+                "was_ecommerce_trial",
+                "plan",
+                "jetpack_modules",
+                "is_garden",
+                "garden_name",
+                "garden_partner"
+            ].joined(separator: ",")
         }
         enum Options {
             static let key = "options"
-            static let value =
-            "timezone,is_wpcom_store,woocommerce_is_active,gmt_offset,jetpack_connection_active_plugins,admin_url,login_url,frame_nonce,blog_public,can_blaze"
+            static let value = [
+                "timezone",
+                "is_wpcom_store",
+                "woocommerce_is_active",
+                "gmt_offset",
+                "jetpack_connection_active_plugins",
+                "admin_url",
+                "login_url",
+                "frame_nonce",
+                "blog_public",
+                "can_blaze"
+            ].joined(separator: ",")
         }
     }
 }

Modules/Sources/NetworkingCore/Remote/OrdersRemote.swift

@@ -598,6 +598,24 @@ public extension OrdersRemote {
         case customerID
         case currency
     }
+
+    /// Loads a single order asynchronously for POS
+    /// - Parameters:
+    ///   - siteID: Site for which we'll fetch the order.
+    ///   - orderID: ID of the order to load.
+    /// - Returns: The loaded Order.
+    /// - Throws: Network or parsing errors.
+    func loadPOSOrder(siteID: Int64, orderID: Int64) async throws -> Order {
+        let path = "\(Constants.ordersPath)/\(orderID)"
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                   method: .get,
+                                   siteID: siteID,
+                                   path: path,
+                                   availableAsRESTRequest: true)
+        let mapper = OrderMapper(siteID: siteID)
+
+        return try await enqueue(request, mapper: mapper)
+    }
 }
 
 private extension OrdersRemote.OrderCreationSource {

Modules/Sources/NetworkingCore/Remote/POSOrdersRemoteProtocol.swift

@@ -19,6 +19,8 @@ public protocol POSOrdersRemoteProtocol {
                         order: Order,
                         fields: [OrdersRemote.CreateOrderField]) async throws -> Order
 
+    func loadPOSOrder(siteID: Int64, orderID: Int64) async throws -> Order
+
     func loadPOSOrders(siteID: Int64,
                        pageNumber: Int,
                        pageSize: Int) async throws -> PagedItems<Order>

Modules/Sources/Storage/Model/MIGRATIONS.md

@@ -2,6 +2,12 @@
 
 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 126 (Release 23.3.0.0)
+- @rafaelkayumov 2025-09-15
+  - Added `isGarden` attribute to `Site` entity.
+  - Added `gardenName` attribute to `Site` entity.
+  - Added `gardenPartner` attribute to `Site` entity.
+
 ## Model 125 (Release 23.2.0.0)
 - @itsmeichigo 2025-09-04
   - Added `hazmatCategory` attribute to `ShippingLabel` entity.

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

@@ -29,6 +29,9 @@ extension Site {
     @NSManaged public var canBlaze: Bool
     @NSManaged public var wasEcommerceTrial: Bool
     @NSManaged public var hasSSOEnabled: Bool
+    @NSManaged public var isGarden: Bool
+    @NSManaged public var gardenName: String?
+    @NSManaged public var gardenPartner: String?
 
 }
 

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

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