Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/deferred payment methods #1839

Merged
merged 7 commits into from
Jul 17, 2024
Merged

Fix/deferred payment methods #1839

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
38abb92
Fixes #1834
GiacomoTui Jul 8, 2024
943d1d7
Fixes #1837
GiacomoTui Jul 9, 2024
2c39aa7
Rollback Stripe Sdk Changes, Alternative solution for flutter-stripe#…
GiacomoTui Jul 10, 2024
e89c92e
Merge branch 'main' into fix/deferred_payment_methods
remonh87 Jul 17, 2024
7f557b1
Rollback Change on Stripe Ios Sdk
GiacomoTui Jul 17, 2024
e6f083c
Merge remote-tracking branch 'origin/fix/deferred_payment_methods' in…
GiacomoTui Jul 17, 2024
fa630d2
Merge branch 'main' into fix/deferred_payment_methods
remonh87 Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions example/lib/screens/payment_sheet/payment_sheet_deffered_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ class _PaymentSheetScreenState extends State<PaymentSheetDefferedScreen> {
await Stripe.instance.initPaymentSheet(
paymentSheetParameters: SetupPaymentSheetParameters(
// Main params
returnURL: 'flutterstripe://stripe-redirect"',
merchantDisplayName: 'Flutter Stripe Store Demo',
intentConfiguration: IntentConfiguration(
mode: IntentMode(
Expand Down
2 changes: 2 additions & 0 deletions packages/stripe_android/android/src/main/kotlin/com/facebook/react/bridge/ReadableMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ public ReadableType getType(String key) {
return ReadableType.Boolean;
} else if (value instanceof Iterable) {
return ReadableType.Array;
} else if (value instanceof JSONArray) {
return ReadableType.Array;
} else if (value instanceof Number) {
return ReadableType.Number;
} else if (value instanceof Map || (value instanceof JSONObject)) {
Expand Down
8 changes: 5 additions & 3 deletions packages/stripe_ios/ios/Classes/Stripe Sdk/StripeSdk+PaymentSheet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,11 @@ extension StripeSdk {
mode = PaymentSheet.IntentConfiguration.Mode.payment(
amount: amount,
currency: modeParams["currencyCode"] as? String ?? "",
setupFutureUsage: modeParams["setupFutureUsage"] != nil
? (modeParams["setupFutureUsage"] as? String == "OffSession" ? .offSession : .onSession)
: nil,
setupFutureUsage: { return switch modeParams["setupFutureUsage"] as? String {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you remove this change and let's go for a fix in dart or we need to make a change to stripe ios

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought to have removed it in last commit, while fixing it in dart, let me check when I return home

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, check it now again, please

case "OffSession": .offSession
case "OnSession": .onSession
default: nil
} }(),
captureMethod: captureMethod
)
} else {
Expand Down
2 changes: 1 addition & 1 deletion packages/stripe_platform_interface/lib/src/models/payment_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class IntentConfiguration with _$IntentConfiguration {

@freezed
class IntentMode with _$IntentMode {
@JsonSerializable(explicitToJson: true)
@JsonSerializable(explicitToJson: true,includeIfNull: false)
const factory IntentMode({
required String currencyCode,
required int amount,
Expand Down
40 changes: 20 additions & 20 deletions packages/stripe_platform_interface/lib/src/models/payment_sheet.freezed.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 19 additions & 9 deletions packages/stripe_platform_interface/lib/src/models/payment_sheet.g.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading