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

Add FPX to Basic Integration #1390

Merged
merged 10 commits into from
Sep 27, 2019
Merged

Add FPX to Basic Integration #1390

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5811a27
Add FPX to Basic Integration
davidme-stripe Sep 26, 2019
d1e9120
Fix comments and custom integration
davidme-stripe Sep 26, 2019
111b12c
Fix entitlements
davidme-stripe Sep 26, 2019
77a0ca6
Fix bank icons
davidme-stripe Sep 26, 2019
97c9541
Fix test
davidme-stripe Sep 26, 2019
7b561e0
Add analytics, fix up table view to handle 0 cards with APMs
davidme-stripe Sep 26, 2019
84bb535
Fix CollectionView to not lose items on reload
davidme-stripe Sep 26, 2019
4b6a8ec
Fix Apple Pay appearing when not supported
davidme-stripe Sep 26, 2019
37b0300
Update based on feedback
davidme-stripe Sep 27, 2019
4312a4c
Fix previous bad fix, the individual responsible has been sacked
davidme-stripe Sep 27, 2019
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
2 changes: 1 addition & 1 deletion Stripe/STPPaymentIntentParams.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ - (nullable NSString *)setupFutureUsageRawString {

- (void)configureWithPaymentResult:(STPPaymentResult *)paymentResult {
if (paymentResult.paymentMethod) {
_paymentMethodId = paymentResult.paymentMethod.stripeId;
_paymentMethodId = [paymentResult.paymentMethod.stripeId copy];
} else if (paymentResult.paymentMethodParams) {
_paymentMethodParams = paymentResult.paymentMethodParams;
}
Expand Down
8 changes: 4 additions & 4 deletions Stripe/STPPaymentOptionsInternalViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,19 +173,19 @@ - (BOOL)isPaymentOptionDetachable:(id<STPPaymentOption>)paymentOption {
return [self.paymentOptions filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id<STPPaymentOption> _Nullable evaluatedObject, NSDictionary<NSString *,id> * __unused _Nullable bindings) {
if ([evaluatedObject isKindOfClass:[STPPaymentMethodParams class]]) {
STPPaymentMethodParams *paymentMethodParams = (STPPaymentMethodParams *)evaluatedObject;
if (paymentMethodParams.type == STPPaymentMethodTypeFPX) {
return NO;
if (paymentMethodParams.type == STPPaymentMethodTypeCard) {
return YES;
}
}
return YES;
return NO;
Copy link
Contributor

Choose a reason for hiding this comment

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

couldn'e this still be yes in case it's an STPPaymentMethod?

}]];
}

- (NSArray<id<STPPaymentOption>> *)apmPaymentOptions {
return [self.paymentOptions filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id<STPPaymentOption> _Nullable evaluatedObject, NSDictionary<NSString *,id> * __unused _Nullable bindings) {
if ([evaluatedObject isKindOfClass:[STPPaymentMethodParams class]]) {
STPPaymentMethodParams *paymentMethodParams = (STPPaymentMethodParams *)evaluatedObject;
if (paymentMethodParams.type == STPPaymentMethodTypeFPX) {
if (paymentMethodParams.type == STPPaymentMethodTypeFPX) { // Add other APMs as we gain support for them in Basic Integration
return YES;
}
}
Expand Down