Merge branch 'develop' into issue/5032-new-push-notification-payload

# Conflicts:
#	config/Version.Public.xcconfig

Author: jaclync

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -19,11 +19,13 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .shippingLabelsMultiPackage:
             return true
-        case .whatsNewOnWooCommerce:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .pushNotificationsForAllStores:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .quickPayPrototype:
+        case .quickOrderPrototype:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .orderListFilters:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .filterProductsByCategory:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true

Experiments/Experiments/FeatureFlag.swift

@@ -38,15 +38,19 @@ public enum FeatureFlag: Int {
     ///
     case shippingLabelsMultiPackage
 
-    /// Display "What's new on WooCommerce" on App Launch and App Settings
-    ///
-    case whatsNewOnWooCommerce
-
     /// Push notifications for all stores
     ///
     case pushNotificationsForAllStores
 
-    /// Allows to create quick pay orders
+    /// Allows to create quick order orders
+    ///
+    case quickOrderPrototype
+
+    /// Display the bar for displaying the filters in the Order List
+    ///
+    case orderListFilters
+
+    /// Allows to filter products by a product category, persisting it so the filter can remain after restarting the app
     ///
-    case quickPayPrototype
+    case filterProductsByCategory
 }

Networking/Networking/Model/Product/StoredProductSettings.swift

@@ -12,17 +12,20 @@ public struct StoredProductSettings: Codable, Equatable, GeneratedFakeable {
         public let stockStatusFilter: ProductStockStatus?
         public let productStatusFilter: ProductStatus?
         public let productTypeFilter: ProductType?
+        public let productCategoryFilter: ProductCategory?
 
         public init(siteID: Int64,
                     sort: String?,
                     stockStatusFilter: ProductStockStatus?,
                     productStatusFilter: ProductStatus?,
-                    productTypeFilter: ProductType?) {
+                    productTypeFilter: ProductType?,
+                    productCategoryFilter: ProductCategory?) {
             self.siteID = siteID
             self.sort = sort
             self.stockStatusFilter = stockStatusFilter
             self.productStatusFilter = productStatusFilter
             self.productTypeFilter = productTypeFilter
+            self.productCategoryFilter = productCategoryFilter
         }
 
         public func numberOfActiveFilters() -> Int {
@@ -36,6 +39,11 @@ public struct StoredProductSettings: Codable, Equatable, GeneratedFakeable {
             if productTypeFilter != nil {
                 total += 1
             }
+
+            if productCategoryFilter != nil {
+                total += 1
+            }
+
             return total
         }
     }

Networking/Networking/Network/MockNetwork.swift

@@ -31,12 +31,12 @@ class MockNetwork: Network {
     ///
     required init(credentials: Credentials) { }
 
-    /// Dummy convenience initializer. Remember: Real Network wrappers will allways need credentials!
+    /// Dummy convenience initializer. Remember: Real Network wrappers will always need credentials!
     ///
-    /// Note: If the useResponseQueue param is `true`, any repsonses added via `simulateResponse` will stored in a FIFO queue
-    /// and used once for a matching request (then removed from the queue). Subsuquent requests will use the next response in the queue, and so on.
+    /// Note: If the useResponseQueue param is `true`, any responses added via `simulateResponse` will stored in a FIFO queue
+    /// and used once for a matching request (then removed from the queue). Subsequent requests will use the next response in the queue, and so on.
     ///
-    /// If the useResponseQueue param is `false`, any repsonses added via `simulateResponse` will stored in an array and can
+    /// If the useResponseQueue param is `false`, any responses added via `simulateResponse` will stored in an array and can
     /// be reused multiple times.
     ///
     /// - Parameter useResponseQueue: Use the response queue. Default is `false`.

Networking/Networking/Remote/OrdersRemote.swift

@@ -9,14 +9,17 @@ public class OrdersRemote: Remote {
     /// - Parameters:
     ///     - siteID: Site for which we'll fetch remote orders.
     ///     - status: Filters the Orders by the specified Status, if any.
-    ///     - before: If given, exclude orders created before this date/time. Passing a local date is fine. This
+    ///     - after: If given, limit response to orders published after a given compliant date.  Passing a local date is fine. This
+    ///               method will convert it to UTC ISO 8601 before calling the REST API.
+    ///     - before: If given, limit response to resources published before a given compliant date.. Passing a local date is fine. This
     ///               method will convert it to UTC ISO 8601 before calling the REST API.
     ///     - pageNumber: Number of page that should be retrieved.
     ///     - pageSize: Number of Orders to be retrieved per page.
     ///     - completion: Closure to be executed upon completion.
     ///
     public func loadAllOrders(for siteID: Int64,
                               statusKey: String? = nil,
+                              after: Date? = nil,
                               before: Date? = nil,
                               pageNumber: Int = Defaults.pageNumber,
                               pageSize: Int = Defaults.pageSize,
@@ -31,6 +34,9 @@ public class OrdersRemote: Remote {
                 ParameterKeys.fields: ParameterValues.listFieldValues,
             ]
 
+            if let after = after {
+                parameters[ParameterKeys.after] = utcDateFormatter.string(from: after)
+            }
             if let before = before {
                 parameters[ParameterKeys.before] = utcDateFormatter.string(from: before)
             }
@@ -233,6 +239,7 @@ public extension OrdersRemote {
         static let perPage: String          = "per_page"
         static let statusKey: String        = "status"
         static let fields: String           = "_fields"
+        static let after: String            = "after"
         static let before: String           = "before"
     }
 

RELEASE-NOTES.txt

@@ -3,7 +3,9 @@
 7.9
 -----
 - [*] Fix: after disconnecting a site or connecting to a new site, the sites in site picker (Settings > Switch Store) should be updated accordingly. The only exception is when the newly disconnected site is the currently selected site. [https://github.com/woocommerce/woocommerce-ios/pull/5241]
-
+- [*] Order Details: Show a button on the "Product" section of Order Details screen to allow recreating shipping labels. [https://github.com/woocommerce/woocommerce-ios/pull/5255]
+- [*] Edit Order Address - Enable `Done` button when `Use as {Shipping/Billing} Address` toggle is turned on. [https://github.com/woocommerce/woocommerce-ios/pull/5254]
+- [*] Add/Edit Product: fix an issue where the product name keyboard is English only. [https://github.com/woocommerce/woocommerce-ios/pull/5288]
 
 7.8
 -----

Storage/Storage.xcodeproj/project.pbxproj

@@ -297,6 +297,7 @@
 		26EA01D024EC3AEA00176A57 /* FeedbackType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackType.swift; sourceTree = "<group>"; };
 		26EA01D424EC44B300176A57 /* GeneralAppSettingsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralAppSettingsTests.swift; sourceTree = "<group>"; };
 		26F4E7F12566193500EA633B /* Model 39.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 39.xcdatamodel"; sourceTree = "<group>"; };
+		31C1D22D2727204200EDEE49 /* Model 56.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 56.xcdatamodel"; sourceTree = "<group>"; };
 		31D9C881266844B8000AC134 /* Model 52.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 52.xcdatamodel"; sourceTree = "<group>"; };
 		31D9C8C626684AEC000AC134 /* PaymentGatewayAccount+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "PaymentGatewayAccount+CoreDataClass.swift"; path = "../../../PaymentGatewayAccount+CoreDataClass.swift"; sourceTree = "<group>"; };
 		31D9C8C726684AEC000AC134 /* PaymentGatewayAccount+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "PaymentGatewayAccount+CoreDataProperties.swift"; path = "../../../PaymentGatewayAccount+CoreDataProperties.swift"; sourceTree = "<group>"; };
@@ -1686,6 +1687,7 @@
 		B59E11D820A9D00C004121A4 /* WooCommerce.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
+				31C1D22D2727204200EDEE49 /* Model 56.xcdatamodel */,
 				DE126D1026CE5A28007F901D /* Model 55.xcdatamodel */,
 				077F39C2269F1E2F00ABEADC /* Model 54.xcdatamodel */,
 				45E462022684B86F00011BF2 /* Model 53.xcdatamodel */,
@@ -1742,7 +1744,7 @@
 				746A9D14214071F90013F6FF /* Model 2.xcdatamodel */,
 				B59E11D920A9D00C004121A4 /* Model.xcdatamodel */,
 			);
-			currentVersion = DE126D1026CE5A28007F901D /* Model 55.xcdatamodel */;
+			currentVersion = 31C1D22D2727204200EDEE49 /* Model 56.xcdatamodel */;
 			path = WooCommerce.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;

Storage/Storage/Model/Copiable/Models+Copiable.generated.swift

@@ -9,19 +9,22 @@ extension GeneralAppSettings {
         installationDate: NullableCopiableProp<Date> = .copy,
         feedbacks: CopiableProp<[FeedbackType: FeedbackSettings]> = .copy,
         isViewAddOnsSwitchEnabled: CopiableProp<Bool> = .copy,
+        isQuickOrderSwitchEnabled: CopiableProp<Bool> = .copy,
         knownCardReaders: CopiableProp<[String]> = .copy,
         lastEligibilityErrorInfo: NullableCopiableProp<EligibilityErrorInfo> = .copy
     ) -> GeneralAppSettings {
         let installationDate = installationDate ?? self.installationDate
         let feedbacks = feedbacks ?? self.feedbacks
         let isViewAddOnsSwitchEnabled = isViewAddOnsSwitchEnabled ?? self.isViewAddOnsSwitchEnabled
+        let isQuickOrderSwitchEnabled = isQuickOrderSwitchEnabled ?? self.isQuickOrderSwitchEnabled
         let knownCardReaders = knownCardReaders ?? self.knownCardReaders
         let lastEligibilityErrorInfo = lastEligibilityErrorInfo ?? self.lastEligibilityErrorInfo
 
         return GeneralAppSettings(
             installationDate: installationDate,
             feedbacks: feedbacks,
             isViewAddOnsSwitchEnabled: isViewAddOnsSwitchEnabled,
+            isQuickOrderSwitchEnabled: isQuickOrderSwitchEnabled,
             knownCardReaders: knownCardReaders,
             lastEligibilityErrorInfo: lastEligibilityErrorInfo
         )

Storage/Storage/Model/GeneralAppSettings.swift

@@ -24,6 +24,10 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
     ///
     public let isViewAddOnsSwitchEnabled: Bool
 
+    /// The state(`true` or `false`) for the Quick Order feature switch.
+    ///
+    public let isQuickOrderSwitchEnabled: Bool
+
     /// A list (possibly empty) of known card reader IDs - i.e. IDs of card readers that should be reconnected to automatically
     /// e.g. ["CHB204909005931"]
     ///
@@ -36,11 +40,13 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
     public init(installationDate: Date?,
                 feedbacks: [FeedbackType: FeedbackSettings],
                 isViewAddOnsSwitchEnabled: Bool,
+                isQuickOrderSwitchEnabled: Bool,
                 knownCardReaders: [String],
                 lastEligibilityErrorInfo: EligibilityErrorInfo? = nil) {
         self.installationDate = installationDate
         self.feedbacks = feedbacks
         self.isViewAddOnsSwitchEnabled = isViewAddOnsSwitchEnabled
+        self.isQuickOrderSwitchEnabled = isQuickOrderSwitchEnabled
         self.knownCardReaders = knownCardReaders
         self.lastEligibilityErrorInfo = lastEligibilityErrorInfo
     }
@@ -66,8 +72,27 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
             installationDate: installationDate,
             feedbacks: updatedFeedbacks,
             isViewAddOnsSwitchEnabled: isViewAddOnsSwitchEnabled,
+            isQuickOrderSwitchEnabled: isQuickOrderSwitchEnabled,
             knownCardReaders: knownCardReaders,
             lastEligibilityErrorInfo: lastEligibilityErrorInfo
         )
     }
 }
+
+//// MARK: Custom Decoding
+extension GeneralAppSettings {
+    /// We need a custom decoding to make sure it doesn't fails when this type is updated (eg: when adding/removing new properties)
+    /// Otherwise we will lose previously stored information.
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+
+        self.installationDate = try container.decodeIfPresent(Date.self, forKey: .installationDate)
+        self.feedbacks = try container.decodeIfPresent([FeedbackType: FeedbackSettings].self, forKey: .feedbacks) ?? [:]
+        self.isViewAddOnsSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isViewAddOnsSwitchEnabled) ?? false
+        self.isQuickOrderSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isQuickOrderSwitchEnabled) ?? false
+        self.knownCardReaders = try container.decodeIfPresent([String].self, forKey: .knownCardReaders) ?? []
+        self.lastEligibilityErrorInfo = try container.decodeIfPresent(EligibilityErrorInfo.self, forKey: .lastEligibilityErrorInfo)
+
+        // Decode new properties with `decodeIfPresent` and provide a default value if necessary.
+    }
+}

Storage/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 56 (Release 7.9.0.0)
+- @allendav 2021-10-25
+- Added `active` attribute to `SystemPlugin` entity
+
 ## Model 55 (Release 7.5.0.0)
 - @itsmeichigo 2021-08-19
 - Added `commercialInvoiceURL` attribute to `ShippingLabel` entity.