Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

fix payment discount (iOS Promotional Offers) into being actually usable #6099

Closed
crystalstorm wants to merge 2 commits into from
Closed

fix payment discount (iOS Promotional Offers) into being actually usable #6099

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
61421a8
fix payment discount (iOS Promotional Offers) into being actually usable
crystalstorm Jul 13, 2022
95bd0df
fix long value for payment discount's timestamp overflowing integer c…
crystalstorm Aug 11, 2022
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
4 changes: 2 additions & 2 deletions packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/FIAObjectTranslator.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ + (NSDictionary *)getMapFromSKStorefront:(SKStorefront *)storefront

+ (SKPaymentDiscount *)getSKPaymentDiscountFromMap:(NSDictionary *)map
withError:(NSString **)error {
if (!map || map.count <= 0) {
if (!map || [map isKindOfClass:[NSNull class]] || map.count <= 0) {
return nil;
}

Expand Down Expand Up @@ -273,7 +273,7 @@ + (SKPaymentDiscount *)getSKPaymentDiscountFromMap:(NSDictionary *)map
return nil;
}

if (!timestamp || ![timestamp isKindOfClass:NSNumber.class] || [timestamp intValue] <= 0) {
if (!timestamp || ![timestamp isKindOfClass:NSNumber.class] || timestamp <= 0) {
if (error) {
*error = @"When specifying a payment discount the 'timestamp' field is mandatory.";
}
Expand Down
14 changes: 14 additions & 0 deletions ...s/in_app_purchase/in_app_purchase_storekit/lib/src/in_app_purchase_storekit_platform.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,20 @@ class InAppPurchaseStoreKitPlatform extends InAppPurchasePlatform {
return true; // There's no error feedback from iOS here to return.
}

static Future<bool> buyNonConsumableWithDiscount(
{required PurchaseParam purchaseParam, SKPaymentDiscountWrapper? discount}) async {
await _skPaymentQueueWrapper.addPayment(SKPaymentWrapper(
Comment on lines +84 to +86
Copy link
Contributor

@cyanglaz cyanglaz Jul 13, 2022

Choose a reason for hiding this comment

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

Why is it a static method while it is using an instance variable?

Copy link
Contributor

@cyanglaz cyanglaz Jul 13, 2022

Choose a reason for hiding this comment

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

I would imagine the discount can be part of the PurchaseParam

Copy link
Contributor Author

@crystalstorm crystalstorm Jul 13, 2022

Choose a reason for hiding this comment

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

@cyanglaz the instance variable is also static. I agree it is not the best option. I merely wanted a working solution to open a pull request with. Then have a discussion about how to resolve it, or have it resolved by someone from the maintainers.

If it's part of PurchaseParam, this method would not be needed at all but I presume there should be also Android counterpart . In the original Pull request I saw only iOS implementation. I don't know how the Android offers work (if there are any).

productIdentifier: purchaseParam.productDetails.id,
quantity: purchaseParam is AppStorePurchaseParam ? purchaseParam.quantity : 1,
applicationUsername: purchaseParam.applicationUserName,
simulatesAskToBuyInSandbox: purchaseParam is AppStorePurchaseParam && purchaseParam.simulatesAskToBuyInSandbox,
requestData: null,
paymentDiscount: discount,
));

return true; // There's no error feedback from iOS here to return.
}

@override
Future<bool> buyConsumable(
{required PurchaseParam purchaseParam, bool autoConsume = true}) {
Expand Down
3 changes: 2 additions & 1 deletion ...urchase/in_app_purchase_storekit/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,8 @@ class SKPaymentWrapper {
'applicationUsername': applicationUsername,
'requestData': requestData,
'quantity': quantity,
'simulatesAskToBuyInSandbox': simulatesAskToBuyInSandbox
'simulatesAskToBuyInSandbox': simulatesAskToBuyInSandbox,
'paymentDiscount': paymentDiscount?.toMap(),
};
}

Expand Down