feat: Expose ApplePay Shipping Options and align them with Web SDK #1049
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
borisprimer
commented
Nov 20, 2024
Comment on lines
81
to
123
| guard applePayOptions?.shippingOptions?.isCaptureShippingAddressEnabled == true else { | ||
| return [] | ||
| } | ||
| func mapContactFieldsFromOptions(applePayOptions: PrimerApplePayOptions?) -> (mappedShippingContactFields: Set<PKContactField>, mappedBillingContactFields: Set<PKContactField>) { | ||
|
|
||
| var fields: Set<PKContactField> = [.postalAddress] | ||
| var requiredShippingContactFields = Set<PKContactField>() | ||
| var requiredBillingContactFields = Set<PKContactField>() | ||
|
|
||
| if let additionalFields = applePayOptions?.shippingOptions?.additionalShippingContactFields { | ||
| additionalFields.forEach { | ||
| fields.insert($0.toPKContact()) | ||
| // Map required shipping contact fields | ||
| if let shippingContactFields = applePayOptions?.shippingOptions?.shippingContactFields, !shippingContactFields.isEmpty { | ||
| shippingContactFields.forEach { | ||
| requiredShippingContactFields.insert($0.toPKContact()) | ||
| } | ||
| } | ||
|
|
||
| return fields | ||
| // Map required billing contact fields | ||
| if let billingContactFields = applePayOptions?.billingOptions?.requiredBillingContactFields { | ||
| billingContactFields.forEach { | ||
| requiredBillingContactFields.insert($0.toPKContact()) | ||
| } | ||
| } | ||
|
|
||
| // Handle deprecated `isCaptureBillingAddressEnabled` | ||
| if requiredBillingContactFields.isEmpty, applePayOptions?.isCaptureBillingAddressEnabled == true { | ||
| requiredBillingContactFields.insert(.postalAddress) | ||
| requiredBillingContactFields.insert(.name) | ||
| } | ||
|
|
||
| // Move phone and email from billing to shipping if existing | ||
| let phoneField = PKContactField.phoneNumber | ||
| let emailField = PKContactField.emailAddress | ||
|
|
||
| if requiredBillingContactFields.contains(phoneField), !requiredShippingContactFields.contains(phoneField) { | ||
| requiredShippingContactFields.insert(phoneField) | ||
| } | ||
|
|
||
| if requiredBillingContactFields.contains(emailField), !requiredShippingContactFields.contains(emailField) { | ||
| requiredShippingContactFields.insert(emailField) | ||
| } | ||
|
|
||
| // Remove phone and email from billing fields | ||
| requiredBillingContactFields.remove(phoneField) | ||
| requiredBillingContactFields.remove(emailField) | ||
|
|
||
| return (requiredShippingContactFields, requiredBillingContactFields) |
There was a problem hiding this comment.
@euljr please check this and compare it to WEB code 🙏
semirp
reviewed
Nov 21, 2024
Sources/PrimerSDK/Classes/User Interface/ApplePayPresentationManager.swift
Outdated
Show resolved
Hide resolved
…ng-Options # Conflicts: # Debug App/Podfile.lock # Debug App/Resources/Localized Views/Base.lproj/Main.storyboard
Generated by 🚫 Danger Swift against f8a080e |
|
Appetize link: https://appetize.io/app/qzkd7u34436sys3syfrql4ikcq |
|
NQuinn27
approved these changes
Dec 4, 2024
semirp
approved these changes
Dec 4, 2024
NQuinn27
deleted the
bn/feature/ACC-4508-Expose-ApplePay-Shipping-Options
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JIRA