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: #1250 incorrectly providing amount to confirmplatformpaysetupint… #1255

Merged
merged 2 commits into from
May 26, 2023
Merged

FIX: #1250 incorrectly providing amount to confirmplatformpaysetupint… #1255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
814266b
FIX: #1250 incorrectly providing amount to confirmplatformpaysetupint…
May 23, 2023
8343908
Merge branch 'main' into fix-amount-google-pay
jamesblasco May 26, 2023
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: 0 additions & 1 deletion example/lib/screens/wallets/google_pay_stripe_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ class _GooglePayStripeScreenState extends State<GooglePayStripeScreen> {
clientSecret: clientSecret,
confirmParams: PlatformPayConfirmParams.googlePay(
googlePay: GooglePayParams(
amount: 30,
testEnv: true,
merchantName: 'Example Merchant Name',
merchantCountryCode: 'Es',
Expand Down
6 changes: 3 additions & 3 deletions packages/stripe_platform_interface/lib/src/models/platform_pay.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,6 @@ class GooglePayParams with _$GooglePayParams {
/// ISO 4217 alphabetic currency code.
required String currencyCode,

/// Total monetary value of the transaction.
required int amount,

/// Merchant name, displayed in the Google Pay sheet.
String? merchantName,

Expand Down Expand Up @@ -220,6 +217,9 @@ class GooglePayPaymentMethodParams with _$GooglePayPaymentMethodParams {
/// Defaults to false.
bool? existingPaymentMethodRequired,

/// Total monetary value of the transaction.
required int amount,

/// Describes the configuration for billing address collection in the Google Pay sheet.
GooglePayBillingAddressConfig? billingAddressConfig,

Expand Down
60 changes: 30 additions & 30 deletions packages/stripe_platform_interface/lib/src/models/platform_pay.freezed.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2765,9 +2765,6 @@ mixin _$GooglePayParams {
/// ISO 4217 alphabetic currency code.
String get currencyCode => throw _privateConstructorUsedError;

/// Total monetary value of the transaction.
int get amount => throw _privateConstructorUsedError;

/// Merchant name, displayed in the Google Pay sheet.
String? get merchantName => throw _privateConstructorUsedError;

Expand Down Expand Up @@ -2797,7 +2794,6 @@ abstract class $GooglePayParamsCopyWith<$Res> {
{bool testEnv,
String merchantCountryCode,
String currencyCode,
int amount,
String? merchantName,
bool? isEmailRequired,
bool? allowCreditCards});
Expand All @@ -2819,7 +2815,6 @@ class _$GooglePayParamsCopyWithImpl<$Res, $Val extends GooglePayParams>
Object? testEnv = null,
Object? merchantCountryCode = null,
Object? currencyCode = null,
Object? amount = null,
Object? merchantName = freezed,
Object? isEmailRequired = freezed,
Object? allowCreditCards = freezed,
Expand All @@ -2837,10 +2832,6 @@ class _$GooglePayParamsCopyWithImpl<$Res, $Val extends GooglePayParams>
? _value.currencyCode
: currencyCode // ignore: cast_nullable_to_non_nullable
as String,
amount: null == amount
? _value.amount
: amount // ignore: cast_nullable_to_non_nullable
as int,
merchantName: freezed == merchantName
? _value.merchantName
: merchantName // ignore: cast_nullable_to_non_nullable
Expand Down Expand Up @@ -2869,7 +2860,6 @@ abstract class _$$_GooglePayParamsCopyWith<$Res>
{bool testEnv,
String merchantCountryCode,
String currencyCode,
int amount,
String? merchantName,
bool? isEmailRequired,
bool? allowCreditCards});
Expand All @@ -2889,7 +2879,6 @@ class __$$_GooglePayParamsCopyWithImpl<$Res>
Object? testEnv = null,
Object? merchantCountryCode = null,
Object? currencyCode = null,
Object? amount = null,
Object? merchantName = freezed,
Object? isEmailRequired = freezed,
Object? allowCreditCards = freezed,
Expand All @@ -2907,10 +2896,6 @@ class __$$_GooglePayParamsCopyWithImpl<$Res>
? _value.currencyCode
: currencyCode // ignore: cast_nullable_to_non_nullable
as String,
amount: null == amount
? _value.amount
: amount // ignore: cast_nullable_to_non_nullable
as int,
merchantName: freezed == merchantName
? _value.merchantName
: merchantName // ignore: cast_nullable_to_non_nullable
Expand All @@ -2935,7 +2920,6 @@ class _$_GooglePayParams implements _GooglePayParams {
{this.testEnv = false,
required this.merchantCountryCode,
required this.currencyCode,
required this.amount,
this.merchantName,
this.isEmailRequired,
this.allowCreditCards});
Expand All @@ -2962,10 +2946,6 @@ class _$_GooglePayParams implements _GooglePayParams {
@override
final String currencyCode;

/// Total monetary value of the transaction.
@override
final int amount;

/// Merchant name, displayed in the Google Pay sheet.
@override
final String? merchantName;
Expand All @@ -2984,7 +2964,7 @@ class _$_GooglePayParams implements _GooglePayParams {

@override
String toString() {
return 'GooglePayParams(testEnv: $testEnv, merchantCountryCode: $merchantCountryCode, currencyCode: $currencyCode, amount: $amount, merchantName: $merchantName, isEmailRequired: $isEmailRequired, allowCreditCards: $allowCreditCards)';
return 'GooglePayParams(testEnv: $testEnv, merchantCountryCode: $merchantCountryCode, currencyCode: $currencyCode, merchantName: $merchantName, isEmailRequired: $isEmailRequired, allowCreditCards: $allowCreditCards)';
}

@override
Expand All @@ -2997,7 +2977,6 @@ class _$_GooglePayParams implements _GooglePayParams {
other.merchantCountryCode == merchantCountryCode) &&
(identical(other.currencyCode, currencyCode) ||
other.currencyCode == currencyCode) &&
(identical(other.amount, amount) || other.amount == amount) &&
(identical(other.merchantName, merchantName) ||
other.merchantName == merchantName) &&
(identical(other.isEmailRequired, isEmailRequired) ||
Expand All @@ -3009,7 +2988,7 @@ class _$_GooglePayParams implements _GooglePayParams {
@JsonKey(ignore: true)
@override
int get hashCode => Object.hash(runtimeType, testEnv, merchantCountryCode,
currencyCode, amount, merchantName, isEmailRequired, allowCreditCards);
currencyCode, merchantName, isEmailRequired, allowCreditCards);

@JsonKey(ignore: true)
@override
Expand All @@ -3030,7 +3009,6 @@ abstract class _GooglePayParams implements GooglePayParams {
{final bool testEnv,
required final String merchantCountryCode,
required final String currencyCode,
required final int amount,
final String? merchantName,
final bool? isEmailRequired,
final bool? allowCreditCards}) = _$_GooglePayParams;
Expand All @@ -3057,10 +3035,6 @@ abstract class _GooglePayParams implements GooglePayParams {
String get currencyCode;
@override

/// Total monetary value of the transaction.
int get amount;
@override

/// Merchant name, displayed in the Google Pay sheet.
String? get merchantName;
@override
Expand Down Expand Up @@ -3093,6 +3067,9 @@ mixin _$GooglePayPaymentMethodParams {
/// Defaults to false.
bool? get existingPaymentMethodRequired => throw _privateConstructorUsedError;

/// Total monetary value of the transaction.
int get amount => throw _privateConstructorUsedError;

/// Describes the configuration for billing address collection in the Google Pay sheet.
GooglePayBillingAddressConfig? get billingAddressConfig =>
throw _privateConstructorUsedError;
Expand All @@ -3117,6 +3094,7 @@ abstract class $GooglePayPaymentMethodParamsCopyWith<$Res> {
@useResult
$Res call(
{bool? existingPaymentMethodRequired,
int amount,
GooglePayBillingAddressConfig? billingAddressConfig,
GooglePayShippingAddressConfig? shippingAddressConfig});

Expand All @@ -3139,6 +3117,7 @@ class _$GooglePayPaymentMethodParamsCopyWithImpl<$Res,
@override
$Res call({
Object? existingPaymentMethodRequired = freezed,
Object? amount = null,
Object? billingAddressConfig = freezed,
Object? shippingAddressConfig = freezed,
}) {
Expand All @@ -3147,6 +3126,10 @@ class _$GooglePayPaymentMethodParamsCopyWithImpl<$Res,
? _value.existingPaymentMethodRequired
: existingPaymentMethodRequired // ignore: cast_nullable_to_non_nullable
as bool?,
amount: null == amount
? _value.amount
: amount // ignore: cast_nullable_to_non_nullable
as int,
billingAddressConfig: freezed == billingAddressConfig
? _value.billingAddressConfig
: billingAddressConfig // ignore: cast_nullable_to_non_nullable
Expand Down Expand Up @@ -3196,6 +3179,7 @@ abstract class _$$_GooglePayPaymentMethodParamsCopyWith<$Res>
@useResult
$Res call(
{bool? existingPaymentMethodRequired,
int amount,
GooglePayBillingAddressConfig? billingAddressConfig,
GooglePayShippingAddressConfig? shippingAddressConfig});

Expand All @@ -3219,6 +3203,7 @@ class __$$_GooglePayPaymentMethodParamsCopyWithImpl<$Res>
@override
$Res call({
Object? existingPaymentMethodRequired = freezed,
Object? amount = null,
Object? billingAddressConfig = freezed,
Object? shippingAddressConfig = freezed,
}) {
Expand All @@ -3227,6 +3212,10 @@ class __$$_GooglePayPaymentMethodParamsCopyWithImpl<$Res>
? _value.existingPaymentMethodRequired
: existingPaymentMethodRequired // ignore: cast_nullable_to_non_nullable
as bool?,
amount: null == amount
? _value.amount
: amount // ignore: cast_nullable_to_non_nullable
as int,
billingAddressConfig: freezed == billingAddressConfig
? _value.billingAddressConfig
: billingAddressConfig // ignore: cast_nullable_to_non_nullable
Expand All @@ -3245,6 +3234,7 @@ class __$$_GooglePayPaymentMethodParamsCopyWithImpl<$Res>
class _$_GooglePayPaymentMethodParams implements _GooglePayPaymentMethodParams {
const _$_GooglePayPaymentMethodParams(
{this.existingPaymentMethodRequired,
required this.amount,
this.billingAddressConfig,
this.shippingAddressConfig});

Expand All @@ -3257,6 +3247,10 @@ class _$_GooglePayPaymentMethodParams implements _GooglePayPaymentMethodParams {
@override
final bool? existingPaymentMethodRequired;

/// Total monetary value of the transaction.
@override
final int amount;

/// Describes the configuration for billing address collection in the Google Pay sheet.
@override
final GooglePayBillingAddressConfig? billingAddressConfig;
Expand All @@ -3267,7 +3261,7 @@ class _$_GooglePayPaymentMethodParams implements _GooglePayPaymentMethodParams {

@override
String toString() {
return 'GooglePayPaymentMethodParams(existingPaymentMethodRequired: $existingPaymentMethodRequired, billingAddressConfig: $billingAddressConfig, shippingAddressConfig: $shippingAddressConfig)';
return 'GooglePayPaymentMethodParams(existingPaymentMethodRequired: $existingPaymentMethodRequired, amount: $amount, billingAddressConfig: $billingAddressConfig, shippingAddressConfig: $shippingAddressConfig)';
}

@override
Expand All @@ -3279,6 +3273,7 @@ class _$_GooglePayPaymentMethodParams implements _GooglePayPaymentMethodParams {
existingPaymentMethodRequired) ||
other.existingPaymentMethodRequired ==
existingPaymentMethodRequired) &&
(identical(other.amount, amount) || other.amount == amount) &&
(identical(other.billingAddressConfig, billingAddressConfig) ||
other.billingAddressConfig == billingAddressConfig) &&
(identical(other.shippingAddressConfig, shippingAddressConfig) ||
Expand All @@ -3288,7 +3283,7 @@ class _$_GooglePayPaymentMethodParams implements _GooglePayPaymentMethodParams {
@JsonKey(ignore: true)
@override
int get hashCode => Object.hash(runtimeType, existingPaymentMethodRequired,
billingAddressConfig, shippingAddressConfig);
amount, billingAddressConfig, shippingAddressConfig);

@JsonKey(ignore: true)
@override
Expand All @@ -3309,6 +3304,7 @@ abstract class _GooglePayPaymentMethodParams
implements GooglePayPaymentMethodParams {
const factory _GooglePayPaymentMethodParams(
{final bool? existingPaymentMethodRequired,
required final int amount,
final GooglePayBillingAddressConfig? billingAddressConfig,
final GooglePayShippingAddressConfig? shippingAddressConfig}) =
_$_GooglePayPaymentMethodParams;
Expand All @@ -3324,6 +3320,10 @@ abstract class _GooglePayPaymentMethodParams
bool? get existingPaymentMethodRequired;
@override

/// Total monetary value of the transaction.
int get amount;
@override

/// Describes the configuration for billing address collection in the Google Pay sheet.
GooglePayBillingAddressConfig? get billingAddressConfig;
@override
Expand Down
4 changes: 2 additions & 2 deletions packages/stripe_platform_interface/lib/src/models/platform_pay.g.dart
View file
Open in desktop

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