dnrops
/
stripe-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix shipping phone number validation

This commit is contained in:
Ben Guo 2016-11-08 13:38:07 -05:00
parent 4c5dba430b
commit 9432465ae4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Stripe/STPAddress.m
View File

@ -181,7 +181,7 @@
containsFields = containsFields && [STPEmailAddressValidator stringIsValidEmailAddress:self.email]; containsFields = containsFields && [STPEmailAddressValidator stringIsValidEmailAddress:self.email];
} }
if (requiredFields & PKAddressFieldPhone) { if (requiredFields & PKAddressFieldPhone) {
containsFields = containsFields && [STPPhoneNumberValidator stringIsValidPhoneNumber:self.phone]; containsFields = containsFields && [STPPhoneNumberValidator stringIsValidPhoneNumber:self.phone forCountryCode:self.country];
} }
if (requiredFields & PKAddressFieldPostalAddress) { if (requiredFields & PKAddressFieldPostalAddress) {
containsFields = containsFields && [self hasValidPostalAddress]; containsFields = containsFields && [self hasValidPostalAddress];

5
Tests/Tests/STPAddressTests.m
View File

@ -287,9 +287,14 @@
address.phone = @"5555555555"; address.phone = @"5555555555";
XCTAssertTrue([address containsRequiredShippingAddressFields:PKAddressFieldEmail|PKAddressFieldName|PKAddressFieldPhone]); XCTAssertTrue([address containsRequiredShippingAddressFields:PKAddressFieldEmail|PKAddressFieldName|PKAddressFieldPhone]);
address.phone = @"555";
XCTAssertFalse([address containsRequiredShippingAddressFields:PKAddressFieldEmail|PKAddressFieldName|PKAddressFieldPhone]);
XCTAssertFalse([address containsRequiredShippingAddressFields:PKAddressFieldAll]); XCTAssertFalse([address containsRequiredShippingAddressFields:PKAddressFieldAll]);
address.country = @"GB";
XCTAssertTrue([address containsRequiredShippingAddressFields:PKAddressFieldEmail|PKAddressFieldName|PKAddressFieldPhone]);
address.country = @"US"; address.country = @"US";
address.phone = @"5555555555";
address.line1 = @"55 John St"; address.line1 = @"55 John St";
address.city = @"New York"; address.city = @"New York";
address.state = @"NY"; address.state = @"NY";