Skip to content

Commit 2aeee10

Browse files
authored
Merge pull request #6547 from woocommerce/issue/6543-stop-setting-the-receipt_email
Remove passing receipt email to Stripe
2 parents 51482fe + f48064c commit 2aeee10

File tree

6 files changed

+0
-56
lines changed

6 files changed

+0
-56
lines changed

Hardware/Hardware.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
8FFAA245E257B9EB98E2FCBD /* Pods_SampleReceiptPrinter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AFA997D6786C67B0A061854 /* Pods_SampleReceiptPrinter.framework */; };
2424
C5D2CB7D21CEE28FEBF18BF6 /* Pods_Hardware.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9F0AC202B287C1221EA2C99 /* Pods_Hardware.framework */; platformFilter = ios; };
2525
D80409A625FBE42B006F9BDA /* PaymentIntentParameters+Stripe.swift in Sources */ = {isa = PBXBuildFile; fileRef = D80409A525FBE42B006F9BDA /* PaymentIntentParameters+Stripe.swift */; };
26-
D80B464E260E18930092EDC0 /* Email.swift in Sources */ = {isa = PBXBuildFile; fileRef = D80B464D260E18930092EDC0 /* Email.swift */; };
2726
D80B4652260E19590092EDC0 /* PaymentIntentParametersTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D80B4651260E19590092EDC0 /* PaymentIntentParametersTests.swift */; };
2827
D80B4656260E1B290092EDC0 /* CurrencyCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D80B4655260E1B290092EDC0 /* CurrencyCode.swift */; };
2928
D80B465A260E1E160092EDC0 /* StatementDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D80B4659260E1E160092EDC0 /* StatementDescriptor.swift */; };
@@ -160,7 +159,6 @@
160159
C61D1642BE09D1A1AD6AA9FA /* Pods-HardwareTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HardwareTests.release.xcconfig"; path = "Target Support Files/Pods-HardwareTests/Pods-HardwareTests.release.xcconfig"; sourceTree = "<group>"; };
161160
C810BBAD03E7D4ECFD29D7AC /* Pods-SampleReceiptPrinter.release-alpha.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SampleReceiptPrinter.release-alpha.xcconfig"; path = "Target Support Files/Pods-SampleReceiptPrinter/Pods-SampleReceiptPrinter.release-alpha.xcconfig"; sourceTree = "<group>"; };
162161
D80409A525FBE42B006F9BDA /* PaymentIntentParameters+Stripe.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PaymentIntentParameters+Stripe.swift"; sourceTree = "<group>"; };
163-
D80B464D260E18930092EDC0 /* Email.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Email.swift; sourceTree = "<group>"; };
164162
D80B4651260E19590092EDC0 /* PaymentIntentParametersTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentIntentParametersTests.swift; sourceTree = "<group>"; };
165163
D80B4655260E1B290092EDC0 /* CurrencyCode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyCode.swift; sourceTree = "<group>"; };
166164
D80B4659260E1E160092EDC0 /* StatementDescriptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatementDescriptor.swift; sourceTree = "<group>"; };
@@ -420,7 +418,6 @@
420418
D81AE86325E6B77F00D9CFD3 /* CardReaderServiceError.swift */,
421419
03B440A92754DFC400759429 /* UnderlyingError.swift */,
422420
D8EDFE2925EED21D003D2213 /* CardReaderConfigProvider.swift */,
423-
D80B464D260E18930092EDC0 /* Email.swift */,
424421
D80B4655260E1B290092EDC0 /* CurrencyCode.swift */,
425422
D845BDB7262D97B300A3E40F /* ReceiptDetails.swift */,
426423
D80B4659260E1E160092EDC0 /* StatementDescriptor.swift */,
@@ -807,7 +804,6 @@
807804
D854FC22260A34B000A219CD /* UnderlyingError+Stripe.swift in Sources */,
808805
D8652CB7262F389800350F37 /* ReceiptLineItem.swift in Sources */,
809806
D88FDB2B25DD21B000CB0DBD /* CardReaderServiceStatus.swift in Sources */,
810-
D80B464E260E18930092EDC0 /* Email.swift in Sources */,
811807
D89B8F0225DDC7500001C726 /* PaymentIntentStatus.swift in Sources */,
812808
D8652E2A2630520300350F37 /* CardPresentReceiptParameters.swift in Sources */,
813809
D89B8F1E25DDCD3D0001C726 /* PaymentIntent+Stripe.swift in Sources */,

Hardware/Hardware/CardReader/Email.swift

Lines changed: 0 additions & 32 deletions
This file was deleted.

Hardware/Hardware/CardReader/PaymentIntentParameters.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ public struct PaymentIntentParameters {
2424
@StatementDescriptor
2525
public private(set) var statementDescription: String?
2626

27-
/// Email address that the receipt for the resulting payment will be sent to.
28-
@Email
29-
public private(set) var receiptEmail: String?
30-
3127
/// Set of key-value pairs that you can attach to an object.
3228
/// This can be useful for storing additional information about the object in a structured format.
3329
public let metadata: [AnyHashable: Any]?
@@ -42,14 +38,12 @@ public struct PaymentIntentParameters {
4238
currency: String,
4339
receiptDescription: String? = nil,
4440
statementDescription: String? = nil,
45-
receiptEmail: String? = nil,
4641
paymentMethodTypes: [String] = [],
4742
metadata: [AnyHashable: Any]? = nil) {
4843
self.amount = amount
4944
self.currency = currency
5045
self.receiptDescription = receiptDescription
5146
self.statementDescription = statementDescription
52-
self.receiptEmail = receiptEmail
5347
self.paymentMethodTypes = paymentMethodTypes
5448
self.metadata = metadata
5549
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ extension Hardware.PaymentIntentParameters {
3232
returnValue.statementDescriptor = descriptor
3333
}
3434

35-
returnValue.receiptEmail = receiptEmail
3635
returnValue.metadata = metadata
3736

3837
return returnValue

Hardware/HardwareTests/PaymentIntentParametersTests.swift

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,6 @@ import XCTest
22
@testable import Hardware
33

44
final class PaymentIntentParametersTests: XCTestCase {
5-
func test_validEmail_is_saved() {
6-
let params = PaymentIntentParameters(amount: 100, currency: "usd", receiptEmail: "[email protected]", paymentMethodTypes: ["card_present"])
7-
8-
XCTAssertNotNil(params.receiptEmail)
9-
}
10-
11-
func test_not_validEmail_is_ignored() {
12-
let params = PaymentIntentParameters(amount: 100, currency: "usd", receiptEmail: "woocommerce", paymentMethodTypes: ["card_present"])
13-
14-
XCTAssertNil(params.receiptEmail)
15-
}
16-
175
func test_currency_is_lowercased() {
186
let params = PaymentIntentParameters(amount: 100, currency: "USD", paymentMethodTypes: ["card_present"])
197

WooCommerce/Classes/ViewModels/CardPresentPayments/PaymentCaptureOrchestrator.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ private extension PaymentCaptureOrchestrator {
229229
currency: order.currency,
230230
receiptDescription: receiptDescription(orderNumber: order.number),
231231
statementDescription: statementDescriptor,
232-
receiptEmail: order.billingAddress?.email,
233232
paymentMethodTypes: paymentMethodTypes,
234233
metadata: metadata)
235234
}

0 commit comments

Comments
 (0)