From fc9589cd53a71657e2eff3a7a0dd457b15741f1c Mon Sep 17 00:00:00 2001 From: Andrea Bizzotto Date: Wed, 10 May 2017 15:17:42 +0100 Subject: [PATCH] Add originalTransaction from SKPaymentTransaction.original to Payment type --- SwiftyStoreKit/CompleteTransactionsController.swift | 2 +- SwiftyStoreKit/PaymentsController.swift | 2 +- SwiftyStoreKit/RestorePurchasesController.swift | 2 +- SwiftyStoreKit/SwiftyStoreKit+Types.swift | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SwiftyStoreKit/CompleteTransactionsController.swift b/SwiftyStoreKit/CompleteTransactionsController.swift index 617e398c..72023983 100644 --- a/SwiftyStoreKit/CompleteTransactionsController.swift +++ b/SwiftyStoreKit/CompleteTransactionsController.swift @@ -55,7 +55,7 @@ class CompleteTransactionsController: TransactionController { if transactionState != .purchasing { - let purchase = Purchase(productId: transaction.payment.productIdentifier, quantity: transaction.payment.quantity, transaction: transaction, needsFinishTransaction: !completeTransactions.atomically) + let purchase = Purchase(productId: transaction.payment.productIdentifier, quantity: transaction.payment.quantity, transaction: transaction, originalTransaction: transaction.original, needsFinishTransaction: !completeTransactions.atomically) purchases.append(purchase) diff --git a/SwiftyStoreKit/PaymentsController.swift b/SwiftyStoreKit/PaymentsController.swift index 70a23357..4391e195 100644 --- a/SwiftyStoreKit/PaymentsController.swift +++ b/SwiftyStoreKit/PaymentsController.swift @@ -73,7 +73,7 @@ class PaymentsController: TransactionController { if transactionState == .purchased { - let purchase = Purchase(productId: transactionProductIdentifier, quantity: transaction.payment.quantity, transaction: transaction, needsFinishTransaction: !payment.atomically) + let purchase = Purchase(productId: transactionProductIdentifier, quantity: transaction.payment.quantity, transaction: transaction, originalTransaction: transaction.original, needsFinishTransaction: !payment.atomically) payment.callback(.purchased(purchase: purchase)) diff --git a/SwiftyStoreKit/RestorePurchasesController.swift b/SwiftyStoreKit/RestorePurchasesController.swift index 08dc9572..4e37414d 100644 --- a/SwiftyStoreKit/RestorePurchasesController.swift +++ b/SwiftyStoreKit/RestorePurchasesController.swift @@ -51,7 +51,7 @@ class RestorePurchasesController: TransactionController { let transactionProductIdentifier = transaction.payment.productIdentifier - let purchase = Purchase(productId: transactionProductIdentifier, quantity: transaction.payment.quantity, transaction: transaction, needsFinishTransaction: !atomically) + let purchase = Purchase(productId: transactionProductIdentifier, quantity: transaction.payment.quantity, transaction: transaction, originalTransaction: transaction.original, needsFinishTransaction: !atomically) if atomically { paymentQueue.finishTransaction(transaction) } diff --git a/SwiftyStoreKit/SwiftyStoreKit+Types.swift b/SwiftyStoreKit/SwiftyStoreKit+Types.swift index 82c132e4..22254a2c 100644 --- a/SwiftyStoreKit/SwiftyStoreKit+Types.swift +++ b/SwiftyStoreKit/SwiftyStoreKit+Types.swift @@ -31,6 +31,7 @@ public struct Purchase { public let productId: String public let quantity: Int public let transaction: PaymentTransaction + public let originalTransaction: PaymentTransaction? public let needsFinishTransaction: Bool }