Merge branch 'develop' into issue/dry-receipt-printing

# Conflicts:
#	WooCommerce/WooCommerce.xcodeproj/project.pbxproj

Author: joshheald

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
 }

Gemfile.lock

@@ -16,17 +16,17 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.510.0)
-    aws-sdk-core (3.121.1)
+    aws-partitions (1.522.0)
+    aws-sdk-core (3.121.5)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.520.1)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.49.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-kms (1.50.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.103.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-s3 (1.104.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)
@@ -89,7 +89,7 @@ GEM
     escape (0.0.4)
     ethon (0.14.0)
       ffi (>= 1.15.0)
-    excon (0.86.0)
+    excon (0.88.0)
     faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -112,10 +112,10 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday_middleware (1.1.0)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.5)
-    fastlane (2.195.0)
+    fastlane (2.197.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -165,7 +165,7 @@ GEM
       xctest_list (>= 1.2.1)
     fastlane-plugin-trainer (0.4.1)
       trainer (>= 0.7.0)
-    fastlane-plugin-wpmreleasetoolkit (1.4.0)
+    fastlane-plugin-wpmreleasetoolkit (2.1.0)
       activesupport (~> 5)
       bigdecimal (~> 1.4)
       chroma (= 0.2.0)
@@ -176,15 +176,15 @@ GEM
       octokit (~> 4.18)
       parallel (~> 1.14)
       progress_bar (~> 1.3)
-      rake (~> 12.3)
+      rake (>= 12.3, < 14.0)
       rake-compiler (~> 1.0)
     ffi (1.15.4)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     git (1.9.1)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.11.0)
+    google-apis-androidpublisher_v3 (0.13.0)
       google-apis-core (>= 0.4, < 2.a)
     google-apis-core (0.4.1)
       addressable (~> 2.5, >= 2.5.1)
@@ -195,11 +195,11 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.7.0)
+    google-apis-iamcredentials_v1 (0.8.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.5.0)
+    google-apis-playcustomapp_v1 (0.6.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.8.0)
+    google-apis-storage_v1 (0.9.0)
       google-apis-core (>= 0.4, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
@@ -215,7 +215,7 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.0.0)
+    googleauth (1.1.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -229,14 +229,15 @@ GEM
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
-    json (2.5.1)
+    json (2.6.1)
     jsonlint (0.3.0)
       oj (~> 3)
       optimist (~> 3)
     jwt (2.3.0)
     memoist (0.16.2)
     mini_magick (4.11.0)
-    mini_mime (1.1.1)
+    mini_mime (1.1.2)
+    mini_portile2 (2.6.1)
     minitest (5.14.4)
     molinillo (0.8.0)
     multi_json (1.15.0)
@@ -245,23 +246,26 @@ GEM
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.12.2-x86_64-darwin)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.13.0)
+    oj (3.13.9)
     optimist (3.0.1)
     options (2.3.2)
     optparse (0.1.1)
     os (1.1.1)
-    parallel (1.20.1)
+    parallel (1.21.0)
     plist (3.6.0)
     progress_bar (1.3.3)
       highline (>= 1.6, < 3)
       options (~> 2.3.0)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rake (12.3.3)
     rake-compiler (1.1.1)
       rake
@@ -342,7 +346,7 @@ DEPENDENCIES
   fastlane-plugin-sentry (~> 1.0)
   fastlane-plugin-test_center (~> 3.0)
   fastlane-plugin-trainer (~> 0.4.1)
-  fastlane-plugin-wpmreleasetoolkit (~> 1.4)
+  fastlane-plugin-wpmreleasetoolkit (~> 2.0)
   rake (~> 12.3)
   rmagick (~> 3.2.0)
   xcode-install

Hardware/Hardware/CardReader/CardReaderServiceError.swift

@@ -186,6 +186,9 @@ public enum UnderlyingError: Error {
     /// The SDK will attempt to auto-disconnect for you and you should instruct your user to reconnect it.
     case readerSessionExpired
 
+    /// The underlying request returned an API error.
+    case processorAPIError
+
     /// Catch-all error case. Indicates there is something wrong with the
     /// internal state of the CardReaderService.
     case internalServiceError
@@ -305,6 +308,9 @@ updating the application or using a different reader
         case .readerSessionExpired:
             return NSLocalizedString("The card reader session has expired - please disconnect and reconnect the card reader and then try again",
                                      comment: "Error message when the card reader session has timed out.")
+        case .processorAPIError:
+            return NSLocalizedString("The payment can not be processed by the payment processor.",
+                                     comment: "Error message when the payment can not be processed (i.e. order amount is below the minimum amount allowed.)")
         case .internalServiceError:
             return NSLocalizedString("Sorry, this payment couldn’t be processed",
                                      comment: "Error message when the card reader service experiences an unexpected internal service error.")

Hardware/Hardware/CardReader/StripeCardReader/UnderlyingError+Stripe.swift

@@ -79,6 +79,8 @@ extension UnderlyingError {
             self = .requestTimedOut
         case ErrorCode.Code.sessionExpired.rawValue:
             self = .readerSessionExpired
+        case ErrorCode.Code.stripeAPIError.rawValue:
+            self = .processorAPIError
         default:
             self = .internalServiceError
         }

Hardware/HardwareTests/ErrorCodesTests.swift

@@ -154,6 +154,10 @@ final class CardReaderServiceErrorTests: XCTestCase {
         XCTAssertEqual(.readerSessionExpired, domainError(stripeCode: 9060))
     }
 
+    func test_stripe_error_api_maps_to_stripeAPI() {
+        XCTAssertEqual(.processorAPIError, domainError(stripeCode: 9020))
+    }
+
     func test_stripe_catch_all_error() {
         // Any error code not mapped to an specific error will be
         // mapped to `internalServiceError`