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

Added ability to purchase multiple quantity of one product #5711

Merged
fluttergithubbot merged 10 commits into from
Jun 27, 2022
Merged

Added ability to purchase multiple quantity of one product #5711

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a53e1fd
Added ability to to purchase multiple quantity of one product
vlad0209 May 13, 2022
03b6758
Moved the quantity param the AppStorePurchaseParam
vlad0209 May 16, 2022
43cae14
Added a version update in pubspec.yaml and a CHANGELOG entry. Correct…
vlad0209 May 19, 2022
d4b97de
Applied the patch to make the formatter happy.
vlad0209 Jun 1, 2022
8164f9c
Applied changes suggested by the formatter.
vlad0209 Jun 1, 2022
d1d3816
Updated the version number to 0.3.1
vlad0209 Jun 9, 2022
2768b6a
Merge branch 'main' into main
Jun 17, 2022
4dba240
Fix CHANGELOG to match style guide
stuartmorgan-g Jun 22, 2022
402ecee
Update packages/in_app_purchase/in_app_purchase_storekit/lib/src/type…
stuartmorgan-g Jun 22, 2022
e30795a
Made the quantity param final
vlad0209 Jun 23, 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
2 changes: 1 addition & 1 deletion ...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 @@ -71,7 +71,7 @@ class InAppPurchaseStoreKitPlatform extends InAppPurchasePlatform {
Future<bool> buyNonConsumable({required PurchaseParam purchaseParam}) async {
Copy link
Contributor

@cyanglaz cyanglaz May 13, 2022

Choose a reason for hiding this comment

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

Don't we need to change the function signature of the parent class too?
And it looks like quantity should be part of PurchaseParam as well.

Copy link
Contributor Author

@vlad0209 vlad0209 May 14, 2022

Choose a reason for hiding this comment

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

Thanks for your comment. According to your suggestions I will move the quantity param to PurchaseParam and change the function signature of the parent class. Then I will create issue describing the feature.

await _skPaymentQueueWrapper.addPayment(SKPaymentWrapper(
productIdentifier: purchaseParam.productDetails.id,
quantity: 1,
quantity: purchaseParam is AppStorePurchaseParam ? purchaseParam.quantity : 1,
applicationUsername: purchaseParam.applicationUserName,
simulatesAskToBuyInSandbox: purchaseParam is AppStorePurchaseParam &&
purchaseParam.simulatesAskToBuyInSandbox,
Expand Down
4 changes: 4 additions & 0 deletions ...ages/in_app_purchase/in_app_purchase_storekit/lib/src/types/app_store_purchase_param.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class AppStorePurchaseParam extends PurchaseParam {
AppStorePurchaseParam({
required ProductDetails productDetails,
String? applicationUserName,
this.quantity = 1,
this.simulatesAskToBuyInSandbox = false,
}) : super(
productDetails: productDetails,
Expand All @@ -28,4 +29,7 @@ class AppStorePurchaseParam extends PurchaseParam {
///
/// See also [SKPaymentWrapper.simulatesAskToBuyInSandbox].
final bool simulatesAskToBuyInSandbox;

/// Quantity of the product user requested to buy
int quantity;
Copy link
Contributor

@stuartmorgan-g stuartmorgan-g Jun 22, 2022

Choose a reason for hiding this comment

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

This should be final (unless there's a compelling reason it shouldn't be that I'm missing context for).

Copy link
Contributor Author

@vlad0209 vlad0209 Jun 23, 2022

Choose a reason for hiding this comment

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

OK, I've made the quantity param final in my last commit.

}
39 changes: 23 additions & 16 deletions packages/in_app_purchase/in_app_purchase_storekit/test/fakes/fake_storekit_platform.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,31 +56,32 @@ class FakeStoreKitPlatform {
queueIsActive = false;
}

SKPaymentTransactionWrapper createPendingTransaction(String id) {
SKPaymentTransactionWrapper createPendingTransaction(String id, {int quantity = 1}) {
return SKPaymentTransactionWrapper(
transactionIdentifier: '',
payment: SKPaymentWrapper(productIdentifier: id),
payment: SKPaymentWrapper(productIdentifier: id, quantity: quantity),
transactionState: SKPaymentTransactionStateWrapper.purchasing,
transactionTimeStamp: 123123.121,
error: null,
originalTransaction: null);
originalTransaction: null,
);
}

SKPaymentTransactionWrapper createPurchasedTransaction(
String productId, String transactionId) {
String productId, String transactionId, {int quantity = 1}) {
return SKPaymentTransactionWrapper(
payment: SKPaymentWrapper(productIdentifier: productId),
payment: SKPaymentWrapper(productIdentifier: productId, quantity: quantity),
transactionState: SKPaymentTransactionStateWrapper.purchased,
transactionTimeStamp: 123123.121,
transactionIdentifier: transactionId,
error: null,
originalTransaction: null);
}

SKPaymentTransactionWrapper createFailedTransaction(String productId) {
SKPaymentTransactionWrapper createFailedTransaction(String productId, {int quantity = 1}) {
return SKPaymentTransactionWrapper(
transactionIdentifier: '',
payment: SKPaymentWrapper(productIdentifier: productId),
payment: SKPaymentWrapper(productIdentifier: productId, quantity: quantity),
transactionState: SKPaymentTransactionStateWrapper.failed,
transactionTimeStamp: 123123.121,
error: const SKError(
Expand All @@ -91,10 +92,10 @@ class FakeStoreKitPlatform {
}

SKPaymentTransactionWrapper createCanceledTransaction(
String productId, int errorCode) {
String productId, int errorCode, {int quantity = 1}) {
return SKPaymentTransactionWrapper(
transactionIdentifier: '',
payment: SKPaymentWrapper(productIdentifier: productId),
payment: SKPaymentWrapper(productIdentifier: productId, quantity: quantity),
transactionState: SKPaymentTransactionStateWrapper.failed,
transactionTimeStamp: 123123.121,
error: SKError(
Expand All @@ -105,9 +106,9 @@ class FakeStoreKitPlatform {
}

SKPaymentTransactionWrapper createRestoredTransaction(
String productId, String transactionId) {
String productId, String transactionId, {int quantity = 1}) {
return SKPaymentTransactionWrapper(
payment: SKPaymentWrapper(productIdentifier: productId),
payment: SKPaymentWrapper(productIdentifier: productId, quantity: quantity),
transactionState: SKPaymentTransactionStateWrapper.restored,
transactionTimeStamp: 123123.121,
transactionIdentifier: transactionId,
Expand Down Expand Up @@ -166,33 +167,39 @@ class FakeStoreKitPlatform {
return Future<void>.sync(() {});
case '-[InAppPurchasePlugin addPayment:result:]':
final String id = call.arguments['productIdentifier'] as String;
final int quantity = call.arguments['quantity'] as int;
final SKPaymentTransactionWrapper transaction =
createPendingTransaction(id);
createPendingTransaction(id, quantity: quantity);
transactions.add(transaction);
InAppPurchaseStoreKitPlatform.observer.updatedTransactions(
transactions: <SKPaymentTransactionWrapper>[transaction]);
sleep(const Duration(milliseconds: 30));
if (testTransactionFail) {
final SKPaymentTransactionWrapper transactionFailed =
createFailedTransaction(id);
createFailedTransaction(id, quantity: quantity);
InAppPurchaseStoreKitPlatform.observer.updatedTransactions(
transactions: <SKPaymentTransactionWrapper>[transactionFailed]);
} else if (testTransactionCancel > 0) {
final SKPaymentTransactionWrapper transactionCanceled =
createCanceledTransaction(id, testTransactionCancel);
createCanceledTransaction(id, testTransactionCancel,
quantity: quantity);
InAppPurchaseStoreKitPlatform.observer.updatedTransactions(
transactions: <SKPaymentTransactionWrapper>[transactionCanceled]);
} else {
final SKPaymentTransactionWrapper transactionFinished =
createPurchasedTransaction(
id, transaction.transactionIdentifier ?? '');
id, transaction.transactionIdentifier ?? '',
quantity: quantity);
InAppPurchaseStoreKitPlatform.observer.updatedTransactions(
transactions: <SKPaymentTransactionWrapper>[transactionFinished]);
}
break;
case '-[InAppPurchasePlugin finishTransaction:result:]':
finishedTransactions.add(createPurchasedTransaction(
call.arguments['productIdentifier'] as String,
call.arguments['transactionIdentifier'] as String));
call.arguments['transactionIdentifier'] as String,
quantity: transactions.first.payment.quantity
));
break;
case '-[SKPaymentQueue startObservingTransactionQueue]':
queueIsActive = true;
Expand Down
58 changes: 58 additions & 0 deletions ...in_app_purchase/in_app_purchase_storekit/test/in_app_purchase_storekit_platform_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,64 @@ void main() {
final PurchaseStatus purchaseStatus = await completer.future;
expect(purchaseStatus, PurchaseStatus.canceled);
});

test('buying non consumable, should be able to purchase multiple quantity of one product', () async {
final List<PurchaseDetails> details = <PurchaseDetails>[];
final Completer<List<PurchaseDetails>> completer =
Completer<List<PurchaseDetails>>();
final Stream<List<PurchaseDetails>> stream =
iapStoreKitPlatform.purchaseStream;
late StreamSubscription<List<PurchaseDetails>> subscription;
subscription = stream.listen((List<PurchaseDetails> purchaseDetailsList) {
details.addAll(purchaseDetailsList);
for (final PurchaseDetails purchaseDetails in purchaseDetailsList) {
if (purchaseDetails.pendingCompletePurchase) {
iapStoreKitPlatform.completePurchase(purchaseDetails);
completer.complete(details);
subscription.cancel();
}
}
});
final AppStorePurchaseParam purchaseParam = AppStorePurchaseParam(
productDetails:
AppStoreProductDetails.fromSKProduct(dummyProductWrapper),
Copy link
Contributor

@cyanglaz cyanglaz May 17, 2022

Choose a reason for hiding this comment

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

nits:
The formatting here is a little weird. I think it is because of the line max limit from the auto formatter?
Maybe we can assign a local variable to the product details and pass it to the function call:

final AppStoreProductDetails productDetails = AppStoreProductDetails.fromSKProduct(dummyProductWrapper);
final AppStorePurchaseParam purchaseParam = AppStorePurchaseParam(
        productDetails: productDetails,
        quantity: 5,
        applicationUserName: 'appName');
...

Copy link
Contributor Author

@vlad0209 vlad0209 May 19, 2022

Choose a reason for hiding this comment

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

I've added the changes you suggested.

quantity: 5,
applicationUserName: 'appName');
await iapStoreKitPlatform.buyNonConsumable(
purchaseParam: purchaseParam
);
await completer.future;
expect(fakeStoreKitPlatform.finishedTransactions.first.payment.quantity, 5);
});

test('buying consumable, should be able to purchase multiple quantity of one product', () async {
final List<PurchaseDetails> details = <PurchaseDetails>[];
final Completer<List<PurchaseDetails>> completer =
Completer<List<PurchaseDetails>>();
final Stream<List<PurchaseDetails>> stream =
iapStoreKitPlatform.purchaseStream;
late StreamSubscription<List<PurchaseDetails>> subscription;
subscription = stream.listen((List<PurchaseDetails> purchaseDetailsList) {
details.addAll(purchaseDetailsList);
for (final PurchaseDetails purchaseDetails in purchaseDetailsList) {
if (purchaseDetails.pendingCompletePurchase) {
iapStoreKitPlatform.completePurchase(purchaseDetails);
completer.complete(details);
subscription.cancel();
}
}
});
final AppStorePurchaseParam purchaseParam = AppStorePurchaseParam(
productDetails:
AppStoreProductDetails.fromSKProduct(dummyProductWrapper),
quantity: 5,
applicationUserName: 'appName');
await iapStoreKitPlatform.buyConsumable(
purchaseParam: purchaseParam
);
await completer.future;
expect(fakeStoreKitPlatform.finishedTransactions.first.payment.quantity, 5);
});
});

group('complete purchase', () {
Expand Down