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

# Conflicts:
#	config/Version.Public.xcconfig

Author: jaclync

Gemfile.lock

@@ -16,10 +16,10 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.516.0)
-    aws-sdk-core (3.121.2)
+    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.50.0)
@@ -89,7 +89,7 @@ GEM
     escape (0.0.4)
     ethon (0.14.0)
       ffi (>= 1.15.0)
-    excon (0.87.0)
+    excon (0.88.0)
     faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -115,7 +115,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.5)
-    fastlane (2.196.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.12.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,7 +229,7 @@ GEM
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
-    json (2.6.0)
+    json (2.6.1)
     jsonlint (0.3.0)
       oj (~> 3)
       optimist (~> 3)
@@ -246,26 +246,26 @@ GEM
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.12.2)
+    nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    nokogiri (1.12.2-x86_64-darwin)
+    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
@@ -346,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/CardPresentTransactionDetails.swift

@@ -28,6 +28,26 @@ public struct CardPresentTransactionDetails: Codable, Equatable {
 
     /// (Only applicable to EMV payments) The authorization data from the card issuer.
     public let emvAuthData: String?
+
+    public init(last4: String,
+                expMonth: Int,
+                expYear: Int,
+                cardholderName: String?,
+                brand: CardBrand,
+                fingerprint: String,
+                generatedCard: String?,
+                receipt: ReceiptDetails?,
+                emvAuthData: String?) {
+        self.last4 = last4
+        self.expMonth = expMonth
+        self.expYear = expYear
+        self.cardholderName = cardholderName
+        self.brand = brand
+        self.fingerprint = fingerprint
+        self.generatedCard = generatedCard
+        self.receipt = receipt
+        self.emvAuthData = emvAuthData
+    }
 }
 
 extension CardPresentTransactionDetails {

Hardware/Hardware/Printer/CardPresentReceiptParameters.swift

@@ -1,6 +1,6 @@
 /// Encapsulates the information necessary to print a receipt for a
 /// card present payment
-public struct CardPresentReceiptParameters: Codable {
+public struct CardPresentReceiptParameters: Codable, Equatable {
     /// The total amount
     public let amount: UInt
 

Podfile.lock

@@ -45,7 +45,7 @@ PODS:
   - Sourcery (1.0.3)
   - StripeTerminal (1.4.0)
   - SVProgressHUD (2.2.5)
-  - UIDeviceIdentifier (1.6.0)
+  - UIDeviceIdentifier (1.7.1)
   - WordPress-Aztec-iOS (1.11.0)
   - WordPress-Editor-iOS (1.11.0):
     - WordPress-Aztec-iOS (= 1.11.0)
@@ -178,7 +178,7 @@ SPEC CHECKSUMS:
   Sourcery: 70a6048014bd4f37ea80e6bd4354d47bf3b760e1
   StripeTerminal: be33ec308dba387ce707bf08aafa90debf29ea7f
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
-  UIDeviceIdentifier: f4bf3b343581a1beacdbf5fb1a8825bd5f05a4a4
+  UIDeviceIdentifier: d0fee204f467dacf8808b7ac14ce43affeb271a5
   WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
   WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
   WordPressAuthenticator: 06278534519c741ecea346f504ad8d08082bfb0d

RELEASE-NOTES.txt

@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+8.0
+-----
+
+
 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]

WooCommerce/Classes/ViewModels/CardPresentPayments/PaymentCaptureOrchestrator.swift

@@ -95,21 +95,6 @@ final class PaymentCaptureOrchestrator {
         ServiceLocator.stores.dispatch(action)
     }
 
-    func printReceipt(for order: Order, params: CardPresentReceiptParameters) {
-        let action = ReceiptAction.print(order: order, parameters: params) { (result) in
-            switch result {
-            case .success:
-                ServiceLocator.analytics.track(.receiptPrintSuccess)
-            case .cancel:
-                ServiceLocator.analytics.track(.receiptPrintCanceled)
-            case .failure(let error):
-                ServiceLocator.analytics.track(.receiptPrintFailed, withError: error)
-            }
-        }
-
-        ServiceLocator.stores.dispatch(action)
-    }
-
     func emailReceipt(for order: Order, params: CardPresentReceiptParameters, onContent: @escaping (String) -> Void) {
         let action = ReceiptAction.generateContent(order: order, parameters: params) { emailContent in
             onContent(emailContent)

WooCommerce/Classes/ViewModels/CardPresentPayments/ReceiptActionCoordinator.swift

@@ -0,0 +1,22 @@
+import Foundation
+import Yosemite
+
+struct ReceiptActionCoordinator {
+    static func printReceipt(for order: Order, params: CardPresentReceiptParameters) {
+        ServiceLocator.analytics.track(.receiptPrintTapped)
+
+        let action = ReceiptAction.print(order: order, parameters: params) { (result) in
+            switch result {
+            case .success:
+                ServiceLocator.analytics.track(.receiptPrintSuccess)
+            case .cancel:
+                ServiceLocator.analytics.track(.receiptPrintCanceled)
+            case .failure(let error):
+                ServiceLocator.analytics.track(.receiptPrintFailed, withError: error)
+                DDLogError("⛔️ Failed to print receipt: \(error.localizedDescription)")
+            }
+        }
+
+        ServiceLocator.stores.dispatch(action)
+    }
+}

WooCommerce/Classes/ViewModels/CardPresentPayments/ReceiptViewModel.swift

@@ -29,17 +29,6 @@ final class ReceiptViewModel {
 
     /// Prints the receipt
     func printReceipt() {
-        ServiceLocator.analytics.track(.receiptPrintTapped)
-        let action = ReceiptAction.print(order: order, parameters: receipt) { (result) in
-            switch result {
-            case .success:
-                ServiceLocator.analytics.track(.receiptPrintSuccess)
-            case .cancel:
-                ServiceLocator.analytics.track(.receiptPrintCanceled)
-            case .failure(let error):
-                ServiceLocator.analytics.track(.receiptPrintFailed, withError: error)
-            }
-        }
-        ServiceLocator.stores.dispatch(action)
+        ReceiptActionCoordinator.printReceipt(for: order, params: receipt)
     }
 }

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsViewModel.swift

@@ -565,8 +565,7 @@ extension OrderDetailsViewModel {
     }
 
     func printReceipt(params: CardPresentReceiptParameters) {
-        ServiceLocator.analytics.track(.receiptPrintTapped)
-        paymentOrchestrator.printReceipt(for: order, params: params)
+        ReceiptActionCoordinator.printReceipt(for: order, params: params)
     }
 
     func emailReceipt(params: CardPresentReceiptParameters, onContent: @escaping (String) -> Void) {