minor revisions
This commit is contained in:
parent
80dc7f0c8d
commit
3bb753e0a9
|
@ -93,7 +93,7 @@ typedef NS_ENUM(NSUInteger, STPBillingAddressFields) {
|
|||
#pragma clang diagnostic pop
|
||||
|
||||
- (BOOL)containsRequiredFields:(STPBillingAddressFields)requiredFields;
|
||||
- (BOOL)containsRequiredPKFields:(PKAddressField)requiredFields;
|
||||
- (BOOL)containsRequiredShippingAddressFields:(PKAddressField)requiredFields;
|
||||
|
||||
+ (PKAddressField)applePayAddressFieldsFromBillingAddressFields:(STPBillingAddressFields)billingAddressFields; FAUXPAS_IGNORED_ON_LINE(APIAvailability);
|
||||
|
||||
|
|
|
@ -11,6 +11,21 @@
|
|||
|
||||
@class STPToken;
|
||||
|
||||
/**
|
||||
* These values control the labels used in the shipping info collection form.
|
||||
*/
|
||||
typedef NS_ENUM(NSUInteger, STPShippingType) {
|
||||
/**
|
||||
* Shipping the purchase to the provided address using a third-party
|
||||
* shipping company.
|
||||
*/
|
||||
STPShippingTypeShipping,
|
||||
/**
|
||||
* Delivering the purchase by the seller.
|
||||
*/
|
||||
STPShippingTypeDelivery,
|
||||
};
|
||||
|
||||
/**
|
||||
* An enum representing the status of a payment requested from the user.
|
||||
*/
|
||||
|
|
|
@ -11,24 +11,8 @@
|
|||
#import "STPPaymentMethod.h"
|
||||
#import "STPTheme.h"
|
||||
|
||||
/**
|
||||
* These values control the labels used in the shipping info collection form.
|
||||
*/
|
||||
typedef NS_ENUM(NSUInteger, STPShippingType) {
|
||||
/**
|
||||
* Shipping the purchase to the provided address using a third-party
|
||||
* shipping company.
|
||||
*/
|
||||
STPShippingTypeShipping,
|
||||
/**
|
||||
* Delivering the purchase by the seller.
|
||||
*/
|
||||
STPShippingTypeDelivery,
|
||||
};
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
|
||||
/**
|
||||
An `STPPaymentConfiguration` represents all the options you can set or change
|
||||
around a payment.
|
||||
|
|
|
@ -84,7 +84,7 @@
|
|||
return containsFields;
|
||||
}
|
||||
|
||||
- (BOOL)containsRequiredPKFields:(PKAddressField)requiredFields {
|
||||
- (BOOL)containsRequiredShippingAddressFields:(PKAddressField)requiredFields {
|
||||
BOOL containsFields = YES;
|
||||
if (requiredFields & PKAddressFieldName) {
|
||||
containsFields = containsFields && [self.name length] > 0;
|
||||
|
|
|
@ -184,7 +184,7 @@
|
|||
return [self.address containsRequiredFields:self.requiredBillingAddressFields];
|
||||
}
|
||||
else {
|
||||
return [self.address containsRequiredPKFields:self.requiredShippingAddressFields];
|
||||
return [self.address containsRequiredShippingAddressFields:self.requiredShippingAddressFields];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -137,29 +137,29 @@
|
|||
XCTAssertTrue([address containsRequiredFields:STPBillingAddressFieldsFull]);
|
||||
}
|
||||
|
||||
- (void)testContainsRequiredPKFields {
|
||||
- (void)testContainsRequiredShippingAddressFields {
|
||||
STPAddress *address = [STPAddress new];
|
||||
XCTAssertTrue([address containsRequiredPKFields:PKAddressFieldNone]);
|
||||
XCTAssertFalse([address containsRequiredPKFields:PKAddressFieldAll]);
|
||||
XCTAssertTrue([address containsRequiredShippingAddressFields:PKAddressFieldNone]);
|
||||
XCTAssertFalse([address containsRequiredShippingAddressFields:PKAddressFieldAll]);
|
||||
|
||||
address.name = @"John Smith";
|
||||
XCTAssertTrue([address containsRequiredPKFields:PKAddressFieldName]);
|
||||
XCTAssertFalse([address containsRequiredPKFields:PKAddressFieldEmail]);
|
||||
XCTAssertTrue([address containsRequiredShippingAddressFields:PKAddressFieldName]);
|
||||
XCTAssertFalse([address containsRequiredShippingAddressFields:PKAddressFieldEmail]);
|
||||
|
||||
address.email = @"john@example.com";
|
||||
XCTAssertTrue([address containsRequiredPKFields:PKAddressFieldEmail|PKAddressFieldName]);
|
||||
XCTAssertFalse([address containsRequiredPKFields:PKAddressFieldAll]);
|
||||
XCTAssertTrue([address containsRequiredShippingAddressFields:PKAddressFieldEmail|PKAddressFieldName]);
|
||||
XCTAssertFalse([address containsRequiredShippingAddressFields:PKAddressFieldAll]);
|
||||
|
||||
address.phone = @"5555555555";
|
||||
XCTAssertTrue([address containsRequiredPKFields:PKAddressFieldEmail|PKAddressFieldName|PKAddressFieldPhone]);
|
||||
XCTAssertFalse([address containsRequiredPKFields:PKAddressFieldAll]);
|
||||
XCTAssertTrue([address containsRequiredShippingAddressFields:PKAddressFieldEmail|PKAddressFieldName|PKAddressFieldPhone]);
|
||||
XCTAssertFalse([address containsRequiredShippingAddressFields:PKAddressFieldAll]);
|
||||
|
||||
address.country = @"US";
|
||||
address.line1 = @"55 John St";
|
||||
address.city = @"New York";
|
||||
address.state = @"NY";
|
||||
address.postalCode = @"12345";
|
||||
XCTAssertTrue([address containsRequiredPKFields:PKAddressFieldAll]);
|
||||
XCTAssertTrue([address containsRequiredShippingAddressFields:PKAddressFieldAll]);
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
Loading…
Reference in New Issue