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

# Conflicts:
#	Experiments/Experiments/DefaultFeatureFlagService.swift

Author: jaclync

.circleci/config.yml

@@ -15,15 +15,15 @@ parameters:
     default: false
 
 xcode_version: &xcode_version
-  xcode-version: "12.5.0"
+  xcode-version: "13.0.0"
 
 iphone_test_device: &iphone_test_device
-  device: iPhone 11
-  ios-version: "14.4"
+  device: iPhone 13
+  ios-version: "15.0"
 
 ipad_test_device: &ipad_test_device
   device: iPad Air (4th generation)
-  ios-version: "14.4"
+  ios-version: "15.0"
 
 commands:
   fix-image:
@@ -38,7 +38,7 @@ commands:
               echo "Manually added `/usr/local/bin` to the $PATH:"
               echo $PATH
             fi
-            chruby ruby-2.6.6
+            chruby ruby-$(cat .ruby-version)
             gem install bundler
 
             # Add support for fetching SPM packages from GitHub

.ruby-version

@@ -1 +1 @@
-2.6.4
+2.7.4

.xcversion

@@ -1 +1 @@
-12.5
+13.0

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -21,12 +21,14 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .pushNotificationsForAllStores:
             return true
-        case .quickOrderPrototype:
+        case .simplePaymentsPrototype:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .orderListFilters:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .filterProductsByCategory:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .jetpackConnectionPackageSupport:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Experiments/Experiments/FeatureFlag.swift

@@ -42,9 +42,9 @@ public enum FeatureFlag: Int {
     ///
     case pushNotificationsForAllStores
 
-    /// Allows to create quick order orders
+    /// Allows to create simple payments orders
     ///
-    case quickOrderPrototype
+    case simplePaymentsPrototype
 
     /// Display the bar for displaying the filters in the Order List
     ///
@@ -53,4 +53,8 @@ public enum FeatureFlag: Int {
     /// Allows to filter products by a product category, persisting it so the filter can remain after restarting the app
     ///
     case filterProductsByCategory
+
+    /// Allows sites with plugins that include Jetpack Connection Package and without Jetpack-the-plugin to connect to the app
+    ///
+    case jetpackConnectionPackageSupport
 }

Fakes/Fakes/Networking.generated.swift

@@ -489,7 +489,9 @@ extension PaymentGatewayAccount {
             defaultCurrency: .fake(),
             supportedCurrencies: .fake(),
             country: .fake(),
-            isCardPresentEligible: .fake()
+            isCardPresentEligible: .fake(),
+            isLive: .fake(),
+            isInTestMode: .fake()
         )
     }
 }
@@ -1457,7 +1459,8 @@ extension SystemPlugin {
             url: .fake(),
             authorName: .fake(),
             authorUrl: .fake(),
-            networkActivated: .fake()
+            networkActivated: .fake(),
+            active: .fake()
         )
     }
 }

Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift

@@ -499,10 +499,10 @@ extension StripeCardReaderService: BluetoothReaderDelegate {
 
     public func reader(_ reader: Reader, didFinishInstallingUpdate update: ReaderSoftwareUpdate?, error: Error?) {
         if let error = error {
-            let underlyingError = UnderlyingError(with: error)
-            if underlyingError != .commandCancelled {
-                softwareUpdateSubject.send(.failed(error: error))
-            }
+            softwareUpdateSubject.send(.failed(
+                error: CardReaderServiceError.softwareUpdate(underlyingError: UnderlyingError(with: error),
+                                                             batteryLevel: reader.batteryLevel?.doubleValue))
+            )
             softwareUpdateSubject.send(.available)
         } else {
             softwareUpdateSubject.send(.completed)

Hardware/Hardware/Printer/AirPrintReceipt/ReceiptRenderer.swift

@@ -3,9 +3,7 @@ import UIKit
 /// Renders a receipt in an AirPrint enabled printer.
 ///
 public final class ReceiptRenderer: UIPrintPageRenderer {
-    private let lines: [ReceiptLineItem]
-    private let parameters: CardPresentReceiptParameters
-    private let cartTotals: [ReceiptTotalLine]
+    private let content: ReceiptContent
 
     private let dateFormatter: DateFormatter = {
         let formatter = DateFormatter()
@@ -17,9 +15,7 @@ public final class ReceiptRenderer: UIPrintPageRenderer {
     }()
 
     public init(content: ReceiptContent) {
-        self.lines = content.lineItems
-        self.parameters = content.parameters
-        self.cartTotals = content.cartTotals
+        self.content = content
 
         super.init()
 
@@ -49,7 +45,7 @@ public extension ReceiptRenderer {
                         background-color:#F5F5F5;
                         width:100%;
                         color: #707070;
-                        margin: \(Constants.margin / 2)pt 0 0 0;
+                        margin: \(Constants.margin / 2)pt 0;
                         padding: \(Constants.margin / 2)pt;
                     }
                     table td:last-child { width: 30%; text-align: right; }
@@ -77,19 +73,20 @@ public extension ReceiptRenderer {
                         <h1>\(receiptTitle)</h1>
                         <h3>\(Localization.amountPaidSectionTitle.uppercased())</h3>
                         <p>
-                            \(parameters.formattedAmount) \(parameters.currency.uppercased())
+                            \(content.parameters.formattedAmount) \(content.parameters.currency.uppercased())
                         </p>
                         <h3>\(Localization.datePaidSectionTitle.uppercased())</h3>
                         <p>
-                            \(dateFormatter.string(from: parameters.date))
+                            \(dateFormatter.string(from: content.parameters.date))
                         </p>
                         <h3>\(Localization.paymentMethodSectionTitle.uppercased())</h3>
                         <p>
-                            <span class="card-icon \(parameters.cardDetails.brand.iconName)-icon"></span> - \(parameters.cardDetails.last4)
+                            <span class="card-icon \(content.parameters.cardDetails.brand.iconName)-icon"></span> - \(content.parameters.cardDetails.last4)
                         </p>
                     </header>
                     <h3>\(summarySectionTitle.uppercased())</h3>
                     \(summaryTable())
+                    \(orderNoteSection())
                     <footer>
                         <p>
                             \(requiredItems())
@@ -112,8 +109,8 @@ private extension ReceiptRenderer {
 
     private func summaryTable() -> String {
         var summaryContent = "<table>"
-        for line in lines {
-            summaryContent += "<tr><td>\(line.title) × \(line.quantity)</td><td>\(line.amount) \(parameters.currency.uppercased())</td></tr>"
+        for line in content.lineItems {
+            summaryContent += "<tr><td>\(line.title) × \(line.quantity)</td><td>\(line.amount) \(content.parameters.currency.uppercased())</td></tr>"
         }
         summaryContent += totalRows()
         summaryContent += "</table>"
@@ -123,7 +120,7 @@ private extension ReceiptRenderer {
 
     private func totalRows() -> String {
         var rows = ""
-        for total in cartTotals {
+        for total in content.cartTotals {
             rows += summaryRow(title: total.description, amount: total.amount)
         }
         return rows
@@ -136,14 +133,24 @@ private extension ReceiptRenderer {
                     \(title)
                 </td>
                 <td>
-                    \(amount) \(parameters.currency.uppercased())
+                    \(amount) \(content.parameters.currency.uppercased())
                 </td>
             </tr>
         """
     }
 
+    private func orderNoteSection() -> String {
+        guard let orderNote = content.orderNote else {
+            return ""
+        }
+        return """
+        <h3>\(Localization.orderNoteSectionTitle.uppercased())</h3>
+        <p>\(orderNote)</p>
+        """
+    }
+
     private func requiredItems() -> String {
-        guard let emv = parameters.cardDetails.receipt else {
+        guard let emv = content.parameters.cardDetails.receipt else {
             return "<br/>"
         }
 
@@ -163,15 +170,15 @@ private extension ReceiptRenderer {
     }
 
     private var receiptTitle: String {
-        guard let storeName = parameters.storeName else {
+        guard let storeName = content.parameters.storeName else {
             return Localization.receiptTitle
         }
 
         return .localizedStringWithFormat(Localization.receiptFromFormat, storeName)
     }
 
     private var summarySectionTitle: String {
-        guard let orderID = parameters.orderID else {
+        guard let orderID = content.parameters.orderID else {
             return Localization.summarySectionTitle
         }
         return String(format: Localization.summarySectionTitleWithOrderFormat, String(orderID))
@@ -218,6 +225,10 @@ private extension ReceiptRenderer {
             comment: "Title of 'Summary' section in the receipt when the order number is unknown"
         )
 
+        static let orderNoteSectionTitle = NSLocalizedString(
+            "Notes",
+            comment: "Title of order note section in the receipt, commonly used for Quick Orders.")
+
         static let summarySectionTitleWithOrderFormat = NSLocalizedString(
             "Summary: Order #%1$@",
             comment: "Title of 'Summary' section in the receipt. %1$@ is the order number, e.g. 4920"

Hardware/Hardware/Printer/ReceiptContent.swift

@@ -4,11 +4,16 @@ public struct ReceiptContent: Codable {
     public let lineItems: [ReceiptLineItem]
     public let parameters: CardPresentReceiptParameters
     public let cartTotals: [ReceiptTotalLine]
+    public let orderNote: String?
 
-    public init(parameters: CardPresentReceiptParameters, lineItems: [ReceiptLineItem], cartTotals: [ReceiptTotalLine]) {
+    public init(parameters: CardPresentReceiptParameters,
+                lineItems: [ReceiptLineItem],
+                cartTotals: [ReceiptTotalLine],
+                orderNote: String?) {
         self.lineItems = lineItems
         self.parameters = parameters
         self.cartTotals = cartTotals
+        self.orderNote = orderNote
     }
 }
 
@@ -17,6 +22,7 @@ extension ReceiptContent {
         case lineItems = "line_items"
         case parameters = "parameters"
         case cartTotals = "cart_totals"
+        case orderNote = "order_note"
     }
 }
 

Networking/Networking/Mapper/SystemStatusMapper.swift

@@ -19,14 +19,16 @@ struct SystemStatusMapper: Mapper {
 
         let systemStatus = try decoder.decode(SystemStatusEnvelope.self, from: response).systemStatus
 
-        /// For now, we're going to override the networkActivated Bool in each plugin to convey active or inactive -- in order to
-        /// avoid a core data change to add a Bool for activated
-        /// This will be undone in #5269
+        /// Active and in-active plugins share identical structure, but are stored in separate parts of the remote response
+        /// (and without an active attribute in the response). So... we use the same decoder for active and in-active plugins
+        /// and here we apply the correct value for active (or not)
+        ///
         let activePlugins = systemStatus.activePlugins.map {
-            $0.overrideNetworkActivated(isNetworkActivated: true)
+            $0.copy(active: true)
         }
+
         let inactivePlugins = systemStatus.inactivePlugins.map {
-            $0.overrideNetworkActivated(isNetworkActivated: false)
+            $0.copy(active: false)
         }
 
         return activePlugins + inactivePlugins