Merge pull request #175 from Shopify/task/154-cleanup-applepay-helpers

Clean up BUYApplePayHelpers

Merge pull request #175 from Shopify/task/154-cleanup-applepay-helpers
Clean up BUYApplePayHelpers
e64df449 · Gabriel O'Flaherty-Chan · be59c98e · 20dab27d · e64df449 · e64df449
Commit e64df449 authored May 25, 2016 by Gabriel O'Flaherty-Chan
9 changed files
--- a/Mobile Buy SDK/Mobile Buy SDK Tests/BUYApplePayAdditionsTest.m
+++ b/Mobile Buy SDK/Mobile Buy SDK Tests/BUYApplePayAdditionsTest.m
@@ -34,7 +34,7 @@
 #import "BUYPKContact.h"
 #import "BUYNSPersonNameComponents.h"
 #import "BUYCNPostalAddress.h"
+#import "BUYModelManager+ApplePay.h"
 @interface BUYApplePayAdditionsTest : XCTestCase
 @end

--- a/Mobile Buy SDK/Mobile Buy SDK Tests/BUYPaymentProviderTests.m
+++ b/Mobile Buy SDK/Mobile Buy SDK Tests/BUYPaymentProviderTests.m
@@ -67,7 +67,7 @@
 	NSURLComponents *components = [NSURLComponents componentsWithURL:request.URL resolvingAgainstBaseURL:NO];
 	if ([components.path isEqualToString:@"/meta.json"]) {
-		return [OHHTTPStubsResponse responseWithJSONObject:@{@"id": @"123", @"country": @"US", @"currency": @"USD"} statusCode:200 headers:nil];
+		return [OHHTTPStubsResponse responseWithJSONObject:@{@"id": @"123", @"name": @"test_shop", @"country": @"US", @"currency": @"USD"} statusCode:200 headers:nil];
 	}
 	else if ([components.path isEqualToString:@"/api/checkouts.json"]) {
 		return [OHHTTPStubsResponse responseWithJSONObject:@{@"checkout":@{@"payment_due": @(99), @"web_checkout_url": @"https://example.com"}} statusCode:200 headers:nil];

--- a/Mobile Buy SDK/Mobile Buy SDK.xcodeproj/project.pbxproj
+++ b/Mobile Buy SDK/Mobile Buy SDK.xcodeproj/project.pbxproj
@@ -267,7 +267,7 @@
 		84DD12D01CC6401400A2442D /* BUYCustomer.m in Sources */ = {isa = PBXBuildFile; fileRef = 84D915731CC0416800D334FB /* BUYCustomer.m */; };
 		9003969B1B601DF400226B73 /* BUYCartLineItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 900396991B601DF400226B73 /* BUYCartLineItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9003969C1B601DF400226B73 /* BUYCartLineItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 9003969A1B601DF400226B73 /* BUYCartLineItem.m */; };
-		901930E31BC5B9BC00D1134E /* BUYApplePayHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = BE33B4EE1B15FF4D0067982B /* BUYApplePayHelpers.m */; };
+		901930E31BC5B9BC00D1134E /* BUYApplePayAuthorizationDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = BE33B4EE1B15FF4D0067982B /* BUYApplePayAuthorizationDelegate.m */; };
 		901930E81BC5B9BC00D1134E /* BUYImageLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF52A7A1A700B0A0087DB2C /* BUYImageLink.m */; };
 		901930E91BC5B9BC00D1134E /* BUYProductVariant.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF52A821A700B0A0087DB2C /* BUYProductVariant.m */; };
 		901930EC1BC5B9BC00D1134E /* BUYError.m in Sources */ = {isa = PBXBuildFile; fileRef = BE47340E1B66C4EF00AA721A /* BUYError.m */; };
@@ -291,7 +291,7 @@
 		901931201BC5B9BC00D1134E /* BUYCreditCard.m in Sources */ = {isa = PBXBuildFile; fileRef = F77374AB19C796BD0039681C /* BUYCreditCard.m */; };
 		901931221BC5B9BC00D1134E /* BUYShop.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF52A841A700B0A0087DB2C /* BUYShop.m */; };
 		901931231BC5B9BC00D1134E /* BUYObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF52A941A7010B20087DB2C /* BUYObject.m */; };
-		901931281BC5B9BC00D1134E /* BUYApplePayHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = BE33B4ED1B15FF4D0067982B /* BUYApplePayHelpers.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		901931281BC5B9BC00D1134E /* BUYApplePayAuthorizationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE33B4ED1B15FF4D0067982B /* BUYApplePayAuthorizationDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9019312A1BC5B9BC00D1134E /* BUYCreditCard.h in Headers */ = {isa = PBXBuildFile; fileRef = F77374AA19C796BD0039681C /* BUYCreditCard.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9019312B1BC5B9BC00D1134E /* BUYOption.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AF52A7F1A700B0A0087DB2C /* BUYOption.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9019312F1BC5B9BC00D1134E /* BUYLineItem.h in Headers */ = {isa = PBXBuildFile; fileRef = F7FDA16C19C939FF00AF4E93 /* BUYLineItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -374,6 +374,11 @@
 		9A47CF221CE5112A00A6D5BA /* BUYAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A47CF211CE5112A00A6D5BA /* BUYAssert.h */; };
 		9A47CF231CE5112A00A6D5BA /* BUYAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A47CF211CE5112A00A6D5BA /* BUYAssert.h */; };
 		9A6B03791CDA5D4F0054C26E /* BUYAccountCredentialsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A6B03781CDA5D4F0054C26E /* BUYAccountCredentialsTests.m */; };
+		B2653EC31CEF55CC0012D57D /* BUYModelManager+ApplePay.h in Headers */ = {isa = PBXBuildFile; fileRef = B2653EC11CEF55CC0012D57D /* BUYModelManager+ApplePay.h */; };
+		B2653EC41CEF55CC0012D57D /* BUYModelManager+ApplePay.h in Headers */ = {isa = PBXBuildFile; fileRef = B2653EC11CEF55CC0012D57D /* BUYModelManager+ApplePay.h */; };
+		B2653EC51CEF55CC0012D57D /* BUYModelManager+ApplePay.m in Sources */ = {isa = PBXBuildFile; fileRef = B2653EC21CEF55CC0012D57D /* BUYModelManager+ApplePay.m */; };
+		B2653EC61CEF55CC0012D57D /* BUYModelManager+ApplePay.m in Sources */ = {isa = PBXBuildFile; fileRef = B2653EC21CEF55CC0012D57D /* BUYModelManager+ApplePay.m */; };
+		B2653EC71CEF55CC0012D57D /* BUYModelManager+ApplePay.m in Sources */ = {isa = PBXBuildFile; fileRef = B2653EC21CEF55CC0012D57D /* BUYModelManager+ApplePay.m */; };
 		BE47340F1B66C4EF00AA721A /* BUYError.h in Headers */ = {isa = PBXBuildFile; fileRef = BE47340D1B66C4EF00AA721A /* BUYError.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BE4734101B66C4EF00AA721A /* BUYError.m in Sources */ = {isa = PBXBuildFile; fileRef = BE47340E1B66C4EF00AA721A /* BUYError.m */; };
 		BE5DC3631B71022D00B2BC1E /* BUYMaskedCreditCard.h in Headers */ = {isa = PBXBuildFile; fileRef = BE5DC3611B71022D00B2BC1E /* BUYMaskedCreditCard.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -418,8 +423,8 @@
 		BE9A646D1B503D1C0033E558 /* BUYApplePayAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = F70CE40E1A8BF1D90055BEB8 /* BUYApplePayAdditions.m */; };
 		BE9A646E1B503D1E0033E558 /* BUYRuntime.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AF52A731A700AC80087DB2C /* BUYRuntime.h */; };
 		BE9A646F1B503D210033E558 /* BUYRuntime.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF52A741A700AC80087DB2C /* BUYRuntime.m */; };
-		BE9A64741B503D2E0033E558 /* BUYApplePayHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = BE33B4ED1B15FF4D0067982B /* BUYApplePayHelpers.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		BE9A64741B503D2E0033E558 /* BUYApplePayAuthorizationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE33B4ED1B15FF4D0067982B /* BUYApplePayAuthorizationDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		BE9A64751B503D370033E558 /* BUYApplePayHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = BE33B4EE1B15FF4D0067982B /* BUYApplePayHelpers.m */; };
+		BE9A64751B503D370033E558 /* BUYApplePayAuthorizationDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = BE33B4EE1B15FF4D0067982B /* BUYApplePayAuthorizationDelegate.m */; };
 		BEB74A901B55A3D00005A300 /* BUYCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB74A8E1B55A3D00005A300 /* BUYCollection.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BEB9AE781BA8627B00575F8A /* test_shop_data.json in Resources */ = {isa = PBXBuildFile; fileRef = BEB9AE721BA73E6C00575F8A /* test_shop_data.json */; };
 		BEB9AE7D1BA885E300575F8A /* BUYClientTestBase.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB9AE7C1BA8685600575F8A /* BUYClientTestBase.m */; };
@@ -650,8 +655,10 @@
 		9A47CF1F1CE50EBB00A6D5BA /* BUYApplePayTestToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYApplePayTestToken.m; sourceTree = "<group>"; };
 		9A47CF211CE5112A00A6D5BA /* BUYAssert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BUYAssert.h; path = ../Additions/BUYAssert.h; sourceTree = "<group>"; };
 		9A6B03781CDA5D4F0054C26E /* BUYAccountCredentialsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYAccountCredentialsTests.m; sourceTree = "<group>"; };
-		BE33B4ED1B15FF4D0067982B /* BUYApplePayHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYApplePayHelpers.h; sourceTree = "<group>"; };
+		B2653EC11CEF55CC0012D57D /* BUYModelManager+ApplePay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "BUYModelManager+ApplePay.h"; sourceTree = "<group>"; };
-		BE33B4EE1B15FF4D0067982B /* BUYApplePayHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYApplePayHelpers.m; sourceTree = "<group>"; };
+		B2653EC21CEF55CC0012D57D /* BUYModelManager+ApplePay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "BUYModelManager+ApplePay.m"; sourceTree = "<group>"; };
+		BE33B4ED1B15FF4D0067982B /* BUYApplePayAuthorizationDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYApplePayAuthorizationDelegate.h; sourceTree = "<group>"; };
+		BE33B4EE1B15FF4D0067982B /* BUYApplePayAuthorizationDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYApplePayAuthorizationDelegate.m; sourceTree = "<group>"; };
 		BE47340D1B66C4EF00AA721A /* BUYError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYError.h; sourceTree = "<group>"; };
 		BE47340E1B66C4EF00AA721A /* BUYError.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYError.m; sourceTree = "<group>"; };
 		BE5DC3611B71022D00B2BC1E /* BUYMaskedCreditCard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYMaskedCreditCard.h; sourceTree = "<group>"; };
@@ -1085,8 +1092,10 @@
 				9A47CF211CE5112A00A6D5BA /* BUYAssert.h */,
 				F70CE40D1A8BF1D90055BEB8 /* BUYApplePayAdditions.h */,
 				F70CE40E1A8BF1D90055BEB8 /* BUYApplePayAdditions.m */,
-				BE33B4ED1B15FF4D0067982B /* BUYApplePayHelpers.h */,
+				BE33B4ED1B15FF4D0067982B /* BUYApplePayAuthorizationDelegate.h */,
-				BE33B4EE1B15FF4D0067982B /* BUYApplePayHelpers.m */,
+				BE33B4EE1B15FF4D0067982B /* BUYApplePayAuthorizationDelegate.m */,
+				B2653EC11CEF55CC0012D57D /* BUYModelManager+ApplePay.h */,
+				B2653EC21CEF55CC0012D57D /* BUYModelManager+ApplePay.m */,
 				8498DCA71CDD1B1C00BD12A8 /* BUYError+BUYAdditions.h */,
 				8498DCA81CDD1B1C00BD12A8 /* BUYError+BUYAdditions.m */,
 				2AF52A731A700AC80087DB2C /* BUYRuntime.h */,
@@ -1172,7 +1181,7 @@
 				84DD12AB1CC63FE600A2442D /* _BUYProduct.h in Headers */,
 				84DD12AD1CC63FE600A2442D /* _BUYProductVariant.h in Headers */,
 				84980F2A1CB75AC200CFAB58 /* BUYObjectProtocol.h in Headers */,
-				901931281BC5B9BC00D1134E /* BUYApplePayHelpers.h in Headers */,
+				901931281BC5B9BC00D1134E /* BUYApplePayAuthorizationDelegate.h in Headers */,
 				9A47CF231CE5112A00A6D5BA /* BUYAssert.h in Headers */,
 				9019312A1BC5B9BC00D1134E /* BUYCreditCard.h in Headers */,
 				9019312B1BC5B9BC00D1134E /* BUYOption.h in Headers */,
@@ -1199,6 +1208,7 @@
 				8498DCB61CDD1B5400BD12A8 /* BUYClient+Internal.h in Headers */,
 				841ADE201CB6C942000004B0 /* NSURL+BUYAdditions.h in Headers */,
 				841ADE241CB6C942000004B0 /* NSURLComponents+BUYAdditions.h in Headers */,
+				B2653EC41CEF55CC0012D57D /* BUYModelManager+ApplePay.h in Headers */,
 				841ADE141CB6C942000004B0 /* NSException+BUYAdditions.h in Headers */,
 				841ADE041CB6C942000004B0 /* NSDate+BUYAdditions.h in Headers */,
 				84980F2D1CB75B5E00CFAB58 /* BUYModelManagerProtocol.h in Headers */,
@@ -1270,7 +1280,7 @@
 				84DD12BB1CC63FEE00A2442D /* _BUYShippingRate.h in Headers */,
 				84DD128B1CC63FE600A2442D /* _BUYLineItem.h in Headers */,
 				84980F291CB75AC200CFAB58 /* BUYObjectProtocol.h in Headers */,
-				BE9A64741B503D2E0033E558 /* BUYApplePayHelpers.h in Headers */,
+				BE9A64741B503D2E0033E558 /* BUYApplePayAuthorizationDelegate.h in Headers */,
 				9A47CF221CE5112A00A6D5BA /* BUYAssert.h in Headers */,
 				BE9A64551B503CC50033E558 /* BUYCreditCard.h in Headers */,
 				BE9A645F1B503CE90033E558 /* BUYOption.h in Headers */,
@@ -1297,6 +1307,7 @@
 				8498DCB31CDD1B5400BD12A8 /* BUYClient+Internal.h in Headers */,
 				841ADE0F1CB6C942000004B0 /* NSDictionary+BUYAdditions.h in Headers */,
 				841ADE1F1CB6C942000004B0 /* NSURL+BUYAdditions.h in Headers */,
+				B2653EC31CEF55CC0012D57D /* BUYModelManager+ApplePay.h in Headers */,
 				841ADE231CB6C942000004B0 /* NSURLComponents+BUYAdditions.h in Headers */,
 				84980F2C1CB75B5E00CFAB58 /* BUYModelManagerProtocol.h in Headers */,
 				84D73C031CDD1944000F978A /* BUYAddress.h in Headers */,
@@ -1535,7 +1546,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				901930E31BC5B9BC00D1134E /* BUYApplePayHelpers.m in Sources */,
+				B2653EC71CEF55CC0012D57D /* BUYModelManager+ApplePay.m in Sources */,
+				901930E31BC5B9BC00D1134E /* BUYApplePayAuthorizationDelegate.m in Sources */,
 				84DD12AA1CC63FE600A2442D /* _BUYOrder.m in Sources */,
 				841ADE1E1CB6C942000004B0 /* NSString+BUYAdditions.m in Sources */,
 				84980F5B1CB7617500CFAB58 /* BUYURLTransformer.m in Sources */,
@@ -1629,6 +1641,7 @@
 				8491103A1CCE718100E53B93 /* BUYExceptionAdditionsTests.m in Sources */,
 				849110441CCE9F3F00E53B93 /* BUYTransformerTests.m in Sources */,
 				8498DCCC1CDD208200BD12A8 /* BUYCustomerTests.m in Sources */,
+				B2653EC51CEF55CC0012D57D /* BUYModelManager+ApplePay.m in Sources */,
 				8498DCCE1CDD208200BD12A8 /* BUYOrderTests.m in Sources */,
 				9A0B0C831CEB981C0037D68F /* BUYClient+RoutingTests.m in Sources */,
 				849110351CCE70CE00E53B93 /* BUYDictionaryAdditionsTests.m in Sources */,
@@ -1669,7 +1682,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BE9A64751B503D370033E558 /* BUYApplePayHelpers.m in Sources */,
+				B2653EC61CEF55CC0012D57D /* BUYModelManager+ApplePay.m in Sources */,
+				BE9A64751B503D370033E558 /* BUYApplePayAuthorizationDelegate.m in Sources */,
 				84DD12921CC63FE600A2442D /* _BUYOrder.m in Sources */,
 				841ADE1D1CB6C942000004B0 /* NSString+BUYAdditions.m in Sources */,
 				84980F5A1CB7617500CFAB58 /* BUYURLTransformer.m in Sources */,

--- a/Mobile Buy SDK/Mobile Buy SDK/Buy.h
+++ b/Mobile Buy SDK/Mobile Buy SDK/Buy.h
@@ -56,7 +56,7 @@ FOUNDATION_EXPORT const unsigned char BuyVersionString[];
 #import <Buy/BUYTaxLine.h>
 #import <Buy/BUYApplePayAdditions.h>
-#import <Buy/BUYApplePayHelpers.h>
+#import <Buy/BUYApplePayAuthorizationDelegate.h>
 #import <Buy/BUYApplePayPaymentProvider.h>
 #import <Buy/BUYPaymentController.h>
 #import <Buy/BUYPaymentProvider.h>

--- a/Mobile Buy SDK/Mobile Buy SDK/Payment Providers/BUYApplePayPaymentProvider.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Payment Providers/BUYApplePayPaymentProvider.m
@@ -28,7 +28,7 @@
 #import "BUYApplePayPaymentProvider.h"
 #import "BUYCheckout.h"
-#import "BUYApplePayHelpers.h"
+#import "BUYApplePayAuthorizationDelegate.h"
 #import "BUYApplePayAdditions.h"
 #import "BUYShop.h"
 #import "BUYClient+CheckoutHelpers.h"
@@ -38,7 +38,7 @@ NSString *const BUYApplePayPaymentProviderId = @"BUYApplePayPaymentProviderId";
 @interface BUYApplePayPaymentProvider () <PKPaymentAuthorizationViewControllerDelegate>
 @property (nonatomic, strong) BUYShop *shop;
-@property (nonatomic, strong) BUYApplePayHelpers *applePayHelper;
+@property (nonatomic, strong) BUYApplePayAuthorizationDelegate *applePayAuthorizationDelegate;
 @property (nonatomic, strong) BUYCheckout *checkout;
 @property (nonatomic, assign) PKPaymentAuthorizationStatus paymentAuthorizationStatus;
 @property (nonatomic, strong) BUYClient *client;
@@ -171,7 +171,7 @@ NSString *const BUYApplePayPaymentProviderId = @"BUYApplePayPaymentProviderId";
 - (void)proceedWithApplePay
 {
-	self.applePayHelper = [[BUYApplePayHelpers alloc] initWithClient:self.client checkout:self.checkout shop:self.shop];
+	self.applePayAuthorizationDelegate = [[BUYApplePayAuthorizationDelegate alloc] initWithClient:self.client checkout:self.checkout shopName:self.shop.name];
 	PKPaymentRequest *request = [self paymentRequest];
 	request.paymentSummaryItems = [self.checkout buy_summaryItemsWithShopName:self.shop.name];
@@ -221,19 +221,19 @@ NSString *const BUYApplePayPaymentProviderId = @"BUYApplePayPaymentProviderId";
 - (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didAuthorizePayment:(PKPayment *)payment completion:(void (^)(PKPaymentAuthorizationStatus status))completion
 {
-	[self.applePayHelper paymentAuthorizationViewController:controller didAuthorizePayment:payment completion:^(PKPaymentAuthorizationStatus status) {
+	[self.applePayAuthorizationDelegate paymentAuthorizationViewController:controller didAuthorizePayment:payment completion:^(PKPaymentAuthorizationStatus status) {
 		self.paymentAuthorizationStatus = status;
 		switch (status) {
 			case PKPaymentAuthorizationStatusFailure:
 				if ([self.delegate respondsToSelector:@selector(paymentProvider:didFailWithError:)]) {
-					[self.delegate paymentProvider:self didFailWithError:self.applePayHelper.lastError];
+					[self.delegate paymentProvider:self didFailWithError:self.applePayAuthorizationDelegate.lastError];
 				}
 				[[NSNotificationCenter defaultCenter] postNotificationName:BUYPaymentProviderDidFailCheckoutNotificationKey object:self];
 				break;
 			case PKPaymentAuthorizationStatusInvalidShippingPostalAddress:
 				if ([self.delegate respondsToSelector:@selector(paymentProvider:didFailWithError:)]) {
-					[self.delegate paymentProvider:self didFailWithError:self.applePayHelper.lastError];
+					[self.delegate paymentProvider:self didFailWithError:self.applePayAuthorizationDelegate.lastError];
 				}
 				[[NSNotificationCenter defaultCenter] postNotificationName:BUYPaymentProviderDidFailToUpdateCheckoutNotificationKey object:self];
 				break;
@@ -261,10 +261,10 @@ NSString *const BUYApplePayPaymentProviderId = @"BUYApplePayPaymentProviderId";
 - (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didSelectShippingMethod:(nonnull PKShippingMethod *)shippingMethod completion:(nonnull void (^)(PKPaymentAuthorizationStatus, NSArray<PKPaymentSummaryItem *> * _Nonnull))completion
 {
-	[self.applePayHelper paymentAuthorizationViewController:controller didSelectShippingMethod:shippingMethod completion:^(PKPaymentAuthorizationStatus status, NSArray<PKPaymentSummaryItem *> * _Nonnull summaryItems) {
+	[self.applePayAuthorizationDelegate paymentAuthorizationViewController:controller didSelectShippingMethod:shippingMethod completion:^(PKPaymentAuthorizationStatus status, NSArray<PKPaymentSummaryItem *> * _Nonnull summaryItems) {
 		if (status == PKPaymentAuthorizationStatusInvalidShippingPostalAddress) {
 			if ([self.delegate respondsToSelector:@selector(paymentProvider:didFailWithError:)]) {
-				[self.delegate paymentProvider:self didFailWithError:self.applePayHelper.lastError];
+				[self.delegate paymentProvider:self didFailWithError:self.applePayAuthorizationDelegate.lastError];
 			}
 			[[NSNotificationCenter defaultCenter] postNotificationName:BUYPaymentProviderDidFailToUpdateCheckoutNotificationKey object:self];
 		}
@@ -274,10 +274,10 @@ NSString *const BUYApplePayPaymentProviderId = @"BUYApplePayPaymentProviderId";
 -(void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didSelectShippingAddress:(ABRecordRef)address completion:(void (^)(PKPaymentAuthorizationStatus, NSArray<PKShippingMethod *> * _Nonnull, NSArray<PKPaymentSummaryItem *> * _Nonnull))completion
 {
-	[self.applePayHelper paymentAuthorizationViewController:controller didSelectShippingAddress:address completion:^(PKPaymentAuthorizationStatus status, NSArray<PKShippingMethod *> * _Nonnull shippingMethods, NSArray<PKPaymentSummaryItem *> * _Nonnull summaryItems) {
+	[self.applePayAuthorizationDelegate paymentAuthorizationViewController:controller didSelectShippingAddress:address completion:^(PKPaymentAuthorizationStatus status, NSArray<PKShippingMethod *> * _Nonnull shippingMethods, NSArray<PKPaymentSummaryItem *> * _Nonnull summaryItems) {
 		if (status == PKPaymentAuthorizationStatusInvalidShippingPostalAddress) {
 			if ([self.delegate respondsToSelector:@selector(paymentProvider:didFailWithError:)]) {
-				[self.delegate paymentProvider:self didFailWithError:self.applePayHelper.lastError];
+				[self.delegate paymentProvider:self didFailWithError:self.applePayAuthorizationDelegate.lastError];
 			}
 			[[NSNotificationCenter defaultCenter] postNotificationName:BUYPaymentProviderDidFailToUpdateCheckoutNotificationKey object:self];
 		}
@@ -287,10 +287,10 @@ NSString *const BUYApplePayPaymentProviderId = @"BUYApplePayPaymentProviderId";
 - (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didSelectShippingContact:(PKContact *)contact completion:(void (^)(PKPaymentAuthorizationStatus, NSArray<PKShippingMethod *> * _Nonnull, NSArray<PKPaymentSummaryItem *> * _Nonnull))completion
 {
-	[self.applePayHelper paymentAuthorizationViewController:controller didSelectShippingContact:contact completion:^(PKPaymentAuthorizationStatus status, NSArray<PKShippingMethod *> * _Nonnull shippingMethods, NSArray<PKPaymentSummaryItem *> * _Nonnull summaryItems) {
+	[self.applePayAuthorizationDelegate paymentAuthorizationViewController:controller didSelectShippingContact:contact completion:^(PKPaymentAuthorizationStatus status, NSArray<PKShippingMethod *> * _Nonnull shippingMethods, NSArray<PKPaymentSummaryItem *> * _Nonnull summaryItems) {
 		if (status == PKPaymentAuthorizationStatusInvalidShippingPostalAddress) {
 			if ([self.delegate respondsToSelector:@selector(paymentProvider:didFailWithError:)]) {
-				[self.delegate paymentProvider:self didFailWithError:self.applePayHelper.lastError];
+				[self.delegate paymentProvider:self didFailWithError:self.applePayAuthorizationDelegate.lastError];
 			}
 			[[NSNotificationCenter defaultCenter] postNotificationName:BUYPaymentProviderDidFailToUpdateCheckoutNotificationKey object:self];
 		}

--- a/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayHelpers.h
+++ b/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayHelpers.h
 //
-//  BUYApplePayHelpers.h
+//  BUYApplePayAuthorizationDelegate.h
 //  Mobile Buy SDK
 //
 //  Created by Shopify.
@@ -27,24 +27,13 @@
 @import Foundation;
 @import PassKit;
-#import <Buy/BUYModelManager.h>
-@class BUYAddress;
 @class BUYClient;
 @class BUYCheckout;
 @class BUYShop;
-@interface BUYApplePayHelpers : NSObject <PKPaymentAuthorizationViewControllerDelegate>
+NS_ASSUME_NONNULL_BEGIN
-/**
+@interface BUYApplePayAuthorizationDelegate : NSObject <PKPaymentAuthorizationViewControllerDelegate>
- *  Initializes a helper to support Apple Pay
- *
- *  @param client   A configured client
- *  @param checkout The checkout which is to be completed using Apple Pay
- *
- *  @return helper object
- */
- (instancetype)initWithClient:(BUYClient *)client checkout:(BUYCheckout *)checkout;
 /**
 *  Initializes a helper to support Apple Pay
@@ -55,39 +44,8 @@
 *
 *  @return helper object
 */
- (instancetype)initWithClient:(BUYClient *)client checkout:(BUYCheckout *)checkout shop:(BUYShop *)shop;
+- (instancetype)initWithClient:(BUYClient *)client checkout:(BUYCheckout *)checkout shopName:(NSString *)shopName NS_DESIGNATED_INITIALIZER;
+- (instancetype)init NS_UNAVAILABLE;
-/**
- *  Call this method in the PKPaymentAuthorizationViewControllerDelegate `paymentAuthorizationViewController:didAuthorizePayment:completion`
- *
- *  @param payment    the authorized payment
- *  @param completion completion block thats called after Shopify authorizes the payment
- */
- (void)updateAndCompleteCheckoutWithPayment:(PKPayment *)payment completion:(void (^)(PKPaymentAuthorizationStatus status))completion NS_DEPRECATED_IOS(8_0, 9_0, "Use `PKPaymentAuthorizationViewControllerDelegate` instead");
-/**
- *  Call this method in the PKPaymentAuthorizationViewControllerDelegate `paymentAuthorizationViewController:didSelectShippingMethod:completion`
- *
- *  @param shippingMethod The selected shipping method
- *  @param completion     the completion block called after shipping method is updated on the checkout
- */
- (void)updateCheckoutWithShippingMethod:(PKShippingMethod *)shippingMethod completion:(void (^)(PKPaymentAuthorizationStatus status, NSArray *methods))completion NS_DEPRECATED_IOS(8_0, 9_0, "Use `PKPaymentAuthorizationViewControllerDelegate` instead");
-/**
- *  Call this method in the PKPaymentAuthorizationViewControllerDelegate `paymentAuthorizationViewController:didSelectShippingAddress:completion`
- *
- *  @param address    The selected shipping address
- *  @param completion the completion block called after the shipping address is updated on the checkout
- */
- (void)updateCheckoutWithAddress:(ABRecordRef)address completion:(void (^)(PKPaymentAuthorizationStatus status, NSArray *shippingMethods, NSArray *summaryItems))completion NS_DEPRECATED_IOS(8_0, 9_0, "Use the CNContact backed `updateCheckoutWithContact:completion:` instead");
-/**
- *  Call this method in the PKPaymentAuthorizationViewControllerDelegate `paymentAuthorizationViewController:didSelectShippingAddress:completion`
- *
- *  @param contact    The selected contact
- *  @param completion the completion block called after the shipping address is updated on the checkout
- */
- (void)updateCheckoutWithContact:(PKContact*)contact completion:(void (^)(PKPaymentAuthorizationStatus, NSArray *shippingMethods, NSArray *summaryItems))completion NS_DEPRECATED_IOS(8_0, 9_0, "Use `PKPaymentAuthorizationViewControllerDelegate` instead");
 /**
 *  The current checkout
@@ -105,30 +63,10 @@
 @property (nonatomic, strong, readonly) NSError *lastError;
 /** 
- *  The shop object
+ *  The shop name
 */
-@property (nonatomic, strong, readonly) BUYShop *shop;
+@property (nonatomic, strong, readonly) NSString *shopName;
 @end
-@interface BUYModelManager (ApplePay)
+NS_ASSUME_NONNULL_END
-/**
- *  Creates a BUYAddress from an ABRecordRef
- *
- *  @param record ABRecordRef to create a BUYAddress from
- *
- *  @return The BUYAddress created from an ABRecordRef
- */
- (BUYAddress *)buyAddressWithABRecord:(ABRecordRef)addressRecord NS_DEPRECATED_IOS(8_0, 9_0, "Use the CNContact backed `buyAddressWithContact:` instead");
-/**
- *  Creates a BUYAddress from a PKContact
- *
- *  @param contact PKContact to create a BUYAddress from
- *
- *  @return The BUYAddress created from a PKContact
- */
- (BUYAddress *)buyAddressWithContact:(PKContact *)contact NS_AVAILABLE_IOS(9_0);
-@end
--- a/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayHelpers.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayHelpers.m
 //
-//  BUYApplePayHelpers.m
+//  BUYApplePayAuthorizationDelegate.m
 //  Mobile Buy SDK
 //
 //  Created by Shopify.
@@ -24,67 +24,48 @@
 //  THE SOFTWARE.
 //
-#import "BUYApplePayHelpers.h"
+#import "BUYApplePayAuthorizationDelegate.h"
-#import "BUYAddress.h"
 #import "BUYApplePayAdditions.h"
+#import "BUYApplePayToken.h"
+#import "BUYAssert.h"
 #import "BUYClient+Checkout.h"
 #import "BUYClient+Storefront.h"
 #import "BUYCheckout.h"
 #import "BUYError.h"
-#import "BUYModelManager.h"
+#import "BUYModelManager+ApplePay.h"
 #import "BUYShop.h"
 #import "BUYShopifyErrorCodes.h"
-#import "BUYApplePayToken.h"
 const NSTimeInterval PollDelay = 0.5;
-@interface BUYApplePayHelpers ()
+@interface BUYApplePayAuthorizationDelegate ()
 @property (nonatomic, strong) BUYCheckout *checkout;
-@property (nonatomic, strong) BUYClient *client;
 @property (nonatomic, strong) NSArray *shippingRates;
 @property (nonatomic, strong) NSError *lastError;
-@property (nonatomic, strong) BUYShop *shop;
 @end
-@implementation BUYApplePayHelpers
+@implementation BUYApplePayAuthorizationDelegate
- (instancetype)initWithClient:(BUYClient *)client checkout:(BUYCheckout *)checkout
-{
-	return [self initWithClient:client checkout:checkout shop:nil];
-}
- (instancetype)initWithClient:(BUYClient *)client checkout:(BUYCheckout *)checkout shop:(BUYShop *)shop
+- (instancetype)initWithClient:(BUYClient *)client checkout:(BUYCheckout *)checkout shopName:(NSString *)shopName
 {
-	NSParameterAssert(client);
+	BUYAssert(client, @"Failed to initialize BUYApplePayAuthorizationDelegate. Client must not be nil.");
-	NSParameterAssert(checkout);
+	BUYAssert(checkout, @"Failed to initialize BUYApplePayAuthorizationDelegate. Checkout must not be nil.");
+	BUYAssert(shopName, @"Failed to initialize BUYApplePayAuthorizationDelegate. Shop name must not be nil.");
 	self = [super init];
 	if (self) {
-		self.client = client;
+		_client = client;
-		self.checkout = checkout;
+		_checkout = checkout;
+		_shopName = shopName;
-		// We need a shop object to display the business name in the pay sheet
-		if (shop) {
-			self.shop = shop;
-		}
-		else {
-			[self.client getShop:^(BUYShop *shop, NSError *error) {
-				if (shop) {
-					self.shop = shop;
-				}
-			}];
-		}
 	}
 	return self;
 }
 #pragma mark - PKPaymentAuthorizationDelegate methods
 - (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller
@@ -176,7 +157,7 @@ const NSTimeInterval PollDelay = 0.5;
 		else {
 			self.lastError = error;
 		}
-		completion(error == nil ? PKPaymentAuthorizationStatusSuccess : PKPaymentAuthorizationStatusFailure, [self.checkout buy_summaryItemsWithShopName:self.shop.name]);
+		completion(error == nil ? PKPaymentAuthorizationStatusSuccess : PKPaymentAuthorizationStatusFailure, [self.checkout buy_summaryItemsWithShopName:self.shopName]);
 	}];
 }
@@ -200,40 +181,15 @@ const NSTimeInterval PollDelay = 0.5;
 			}
 			else {
 				self.lastError = error;
-				completion(PKPaymentAuthorizationStatusInvalidShippingPostalAddress, nil, [self.checkout buy_summaryItemsWithShopName:self.shop.name]);
+				completion(PKPaymentAuthorizationStatusInvalidShippingPostalAddress, nil, [self.checkout buy_summaryItemsWithShopName:self.shopName]);
 			}
 		}];
 	}
 	else {
-		completion(PKPaymentAuthorizationStatusInvalidShippingPostalAddress, nil, [self.checkout buy_summaryItemsWithShopName:self.shop.name]);
+		completion(PKPaymentAuthorizationStatusInvalidShippingPostalAddress, nil, [self.checkout buy_summaryItemsWithShopName:self.shopName]);
 	}
 }
- (void)updateAndCompleteCheckoutWithPayment:(PKPayment *)payment
-								  completion:(void (^)(PKPaymentAuthorizationStatus))completion
-{
-	// Since we're deprecating this method and the controller is not used in the delegate method, we can pass in a not-null PKPaymentAuthorizationViewController
-	[self paymentAuthorizationViewController:[PKPaymentAuthorizationViewController new] didAuthorizePayment:payment completion:completion];
-}
- (void)updateCheckoutWithShippingMethod:(PKShippingMethod *)shippingMethod completion:(void (^)(PKPaymentAuthorizationStatus status, NSArray *methods))completion
-{
-	// Since we're deprecating this method and the controller is not used in the delegate method, we can pass in a not-null PKPaymentAuthorizationViewController
-	[self paymentAuthorizationViewController:[PKPaymentAuthorizationViewController new] didSelectShippingMethod:shippingMethod completion:completion];
-}
- (void)updateCheckoutWithAddress:(ABRecordRef)address completion:(void (^)(PKPaymentAuthorizationStatus, NSArray *shippingMethods, NSArray *summaryItems))completion
-{
-	// Since we're deprecating this method and the controller is not used in the delegate method, we can pass in a not-null PKPaymentAuthorizationViewController
-	[self paymentAuthorizationViewController:[PKPaymentAuthorizationViewController new] didSelectShippingAddress:address completion:completion];
-}
- (void)updateCheckoutWithContact:(PKContact*)contact completion:(void (^)(PKPaymentAuthorizationStatus, NSArray *shippingMethods, NSArray *summaryItems))completion
-{
-	// Since we're deprecating this method and the controller is not used in the delegate method, we can pass in a not-null PKPaymentAuthorizationViewController
-	[self paymentAuthorizationViewController:[PKPaymentAuthorizationViewController new] didSelectShippingContact:contact completion:completion];
-}
 #pragma mark - internal
 - (BUYShippingRate *)rateForShippingMethod:(PKShippingMethod *)method
@@ -255,7 +211,7 @@ const NSTimeInterval PollDelay = 0.5;
 	// We then turn our BUYShippingRate objects into PKShippingMethods for Apple to present to the user.
 	if ([self.checkout requiresShipping] == NO) {
-		completion(PKPaymentAuthorizationStatusSuccess, nil, [self.checkout buy_summaryItemsWithShopName:self.shop.name]);
+		completion(PKPaymentAuthorizationStatusSuccess, nil, [self.checkout buy_summaryItemsWithShopName:self.shopName]);
 	}
 	else {
 		[self fetchShippingRates:^(PKPaymentAuthorizationStatus status, NSArray *methods, NSArray *summaryItems) {
@@ -266,12 +222,12 @@ const NSTimeInterval PollDelay = 0.5;
 					if (checkout && error == nil) {
 						self.checkout = checkout;
 					}
-					completion(error ? PKPaymentAuthorizationStatusFailure : PKPaymentAuthorizationStatusSuccess, shippingMethods, [self.checkout buy_summaryItemsWithShopName:self.shop.name]);
+					completion(error ? PKPaymentAuthorizationStatusFailure : PKPaymentAuthorizationStatusSuccess, shippingMethods, [self.checkout buy_summaryItemsWithShopName:self.shopName]);
 				}];
 			}
 			else {
 				self.lastError = [NSError errorWithDomain:BUYShopifyError code:BUYShopifyError_NoShippingMethodsToAddress userInfo:nil];
-				completion(status, nil, [self.checkout buy_summaryItemsWithShopName:self.shop.name]);
+				completion(status, nil, [self.checkout buy_summaryItemsWithShopName:self.shopName]);
 			}
 		}];
 	}
@@ -290,7 +246,7 @@ const NSTimeInterval PollDelay = 0.5;
 				shippingStatus = status;
 				if (error) {
-					completion(PKPaymentAuthorizationStatusInvalidShippingPostalAddress, nil, [self.checkout buy_summaryItemsWithShopName:self.shop.name]);
+					completion(PKPaymentAuthorizationStatusInvalidShippingPostalAddress, nil, [self.checkout buy_summaryItemsWithShopName:self.shopName]);
 				}
 				else if (shippingStatus == BUYStatusComplete) {
 					self.shippingRates = shippingRates;
@@ -298,11 +254,11 @@ const NSTimeInterval PollDelay = 0.5;
 					if ([self.shippingRates count] == 0) {
 						// Shipping address is not supported and no shipping rates were returned
 						if (completion) {
-							completion(PKPaymentAuthorizationStatusInvalidShippingPostalAddress, nil, [self.checkout buy_summaryItemsWithShopName:self.shop.name]);
+							completion(PKPaymentAuthorizationStatusInvalidShippingPostalAddress, nil, [self.checkout buy_summaryItemsWithShopName:self.shopName]);
 						}
 					} else {
 						if (completion) {
-							completion(PKPaymentAuthorizationStatusSuccess, self.shippingRates, [self.checkout buy_summaryItemsWithShopName:self.shop.name]);
+							completion(PKPaymentAuthorizationStatusSuccess, self.shippingRates, [self.checkout buy_summaryItemsWithShopName:self.shopName]);
 						}
 					}
@@ -357,22 +313,3 @@ const NSTimeInterval PollDelay = 0.5;
 }
 @end
-@implementation BUYModelManager (ApplePay)
- (BUYAddress *)buyAddressWithABRecord:(ABRecordRef)addressRecord
-{
-	BUYAddress *address = [self insertAddressWithJSONDictionary:nil];
-	[address updateWithRecord:addressRecord];
-	return address;
-}
- (BUYAddress *)buyAddressWithContact:(PKContact *)contact
-{
-	BUYAddress *address = [self insertAddressWithJSONDictionary:nil];
-	[address updateWithContact:contact];
-	return address;
-}
-@end
\ No newline at end of file
--- a/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYModelManager+ApplePay.h
+++ b/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYModelManager+ApplePay.h
+//
+//  BUYModelManager+ApplePay.h
+//  Mobile Buy SDK
+//
+//  Created by Shopify.
+//  Copyright (c) 2015 Shopify Inc. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+#import <Buy/BUYModelManager.h>
+@import PassKit;
+@class BUYAddress;
+@interface BUYModelManager (ApplePay)
+/**
+ *  Creates a BUYAddress from an ABRecordRef
+ *
+ *  @param record ABRecordRef to create a BUYAddress from
+ *
+ *  @return The BUYAddress created from an ABRecordRef
+ */
+- (BUYAddress *)buyAddressWithABRecord:(ABRecordRef)addressRecord NS_DEPRECATED_IOS(8_0, 9_0, "Use the CNContact backed `buyAddressWithContact:` instead");
+/**
+ *  Creates a BUYAddress from a PKContact
+ *
+ *  @param contact PKContact to create a BUYAddress from
+ *
+ *  @return The BUYAddress created from a PKContact
+ */
+- (BUYAddress *)buyAddressWithContact:(PKContact *)contact NS_AVAILABLE_IOS(9_0);
+@end
\ No newline at end of file
--- a/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYModelManager+ApplePay.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYModelManager+ApplePay.m
+//
+//  BUYModelManager+ApplePay.m
+//  Mobile Buy SDK
+//
+//  Created by Shopify.
+//  Copyright (c) 2015 Shopify Inc. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+#import "BUYAddress.h"
+#import "BUYApplePayAdditions.h"
+#import "BUYModelManager+ApplePay.h"
+@implementation BUYModelManager (ApplePay)
+- (BUYAddress *)buyAddressWithABRecord:(ABRecordRef)addressRecord
+{
+	BUYAddress *address = [self insertAddressWithJSONDictionary:nil];
+	[address updateWithRecord:addressRecord];
+	return address;
+}
+- (BUYAddress *)buyAddressWithContact:(PKContact *)contact
+{
+	BUYAddress *address = [self insertAddressWithJSONDictionary:nil];
+	[address updateWithContact:contact];
+	return address;
+}
+@end