task: add support for cart items #32
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,7 +36,7 @@ class EmbedReactNative: NSObject { | |
| paymentSourceConverted = Gr4vyPaymentSource(rawValue: paymentSource!) | ||
| } | ||
|
|
||
| DispatchQueue.main.async(execute: { | ||
| guard let gr4vy = Gr4vy(gr4vyId: gr4vyId, | ||
| token: token, | ||
| amount: amount, | ||
|
|
@@ -67,7 +67,7 @@ class EmbedReactNative: NSObject { | |
| completion(gr4vy) | ||
| }) | ||
| } | ||
|
|
||
| func buildTheme(_ source: [String: [String: String?]?]?) -> Gr4vyTheme? { | ||
| guard let theme = source, | ||
| let fonts = theme["fonts"] ?? [:], | ||
|
|
@@ -148,7 +148,7 @@ class EmbedReactNative: NSObject { | |
| ) | ||
| ) | ||
| } | ||
|
|
||
| func convertStatementDescriptor(_ source: [String: String?]?) -> Gr4vyStatementDescriptor? { | ||
| guard let statementDescriptor = source, | ||
| let name = statementDescriptor["name"] ?? "", | ||
|
|
@@ -158,7 +158,7 @@ class EmbedReactNative: NSObject { | |
| let url = statementDescriptor["url"] ?? "" else { | ||
| return nil | ||
| } | ||
|
|
||
| return Gr4vyStatementDescriptor( | ||
| name: name, | ||
| description: description, | ||
|
|
@@ -167,7 +167,7 @@ class EmbedReactNative: NSObject { | |
| url: url | ||
| ) | ||
| } | ||
|
|
||
| func convertCartItems(_ cartItems: NSArray?) -> [Gr4vyCartItem] { | ||
| guard let cartItems = cartItems else { | ||
| return [] | ||
|
|
@@ -181,17 +181,39 @@ class EmbedReactNative: NSObject { | |
| let unitAmount = dict["unitAmount"] as? Int else { | ||
| return [] | ||
| } | ||
| let discountAmount = dict["discountAmount"] as? Int ?? 0 | ||
| let taxAmount = dict["taxAmount"] as? Int ?? 0 | ||
|
There was a problem hiding this comment. This is waiting for the type update in the iOS SDK https://github.com/gr4vy/gr4vy-ios/blob/main/gr4vy-iOS/Models/Gr4vyCartItem.swift. We don't want to pass a default of |
||
| let externalIdentifier = dict["externalIdentifier"] as? String | ||
| let sku = dict["sku"] as? String | ||
| let productUrl = dict["productUrl"] as? String | ||
| let imageUrl = dict["imageUrl"] as? String | ||
| let categories = dict["categories"] as? [String] | ||
| let productType = dict["productType"] as? String | ||
| result.append( | ||
| Gr4vyCartItem( | ||
| name: name, | ||
| quantity: quantity, | ||
| unitAmount: unitAmount, | ||
| discountAmount: discountAmount, | ||
| taxAmount: taxAmount, | ||
| externalIdentifier: externalIdentifier, | ||
| sku: sku, | ||
| productUrl: productUrl, | ||
| imageUrl: imageUrl, | ||
| categories: categories, | ||
| productType: productType | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| return result | ||
| } | ||
|
|
||
| func convertStore(_ store: Any?) -> Gr4vyStore? { | ||
| guard let storeValue = store else { | ||
| return nil | ||
| } | ||
|
|
||
| if let storeBool = storeValue as? Bool { | ||
| return storeBool ? .true : .false | ||
| } else if let storeString = store as? String { | ||
|
|
@@ -202,10 +224,10 @@ class EmbedReactNative: NSObject { | |
| return nil | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| @objc | ||
| func constantsToExport() -> [AnyHashable : Any]! { | ||
| return [ | ||
|
|
@@ -214,7 +236,7 @@ class EmbedReactNative: NSObject { | |
| GR4VY_ERROR: GR4VY_ERROR | ||
| ] | ||
| } | ||
|
|
||
| @objc | ||
| func showPaymentSheet(_ config: [String: Any]) | ||
| { | ||
|
|
@@ -253,7 +275,7 @@ class EmbedReactNative: NSObject { | |
| ) | ||
| return | ||
| } | ||
|
|
||
| gr4vyInit(gr4vyId: gr4vyId, | ||
| token: token, | ||
| amount: Int(amount), | ||
|
|
@@ -291,11 +313,11 @@ class EmbedReactNative: NSObject { | |
|
|
||
| DispatchQueue.main.async(execute: { | ||
| let presentingViewController = RCTPresentedViewController() | ||
|
|
||
| gr4vy!.launch( | ||
| presentingViewController: presentingViewController!, | ||
| onEvent: { event in | ||
|
|
||
| switch event { | ||
| case .transactionFailed(let transactionID, let status, let paymentMethodID): | ||
| EmbedReactNativeEvents.emitter.sendEvent( | ||
|
|
@@ -352,7 +374,7 @@ class EmbedReactNative: NSObject { | |
| }) | ||
| } | ||
| } | ||
|
|
||
| @objc | ||
| static func requiresMainQueueSetup() -> Bool { | ||
| return true | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ReadableMapdoesn't seem to have a method to get options values and fallback tonull, so adding one here