kylefang/braintree-ios-drop-in
1
0
Fork 0
mirror of https://github.com/zhigang1992/braintree-ios-drop-in.git synced 2026-04-30 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge master.

Browse Source
This commit is contained in:
demerino
2018-08-14 14:46:29 -07:00
parent 64e7de875d 2de271e46a
commit 12807c8b17
12 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BraintreeDropIn.podspec
View File

@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "BraintreeDropIn"
s.version = "7.0.0"
s.version = "6.4.0"
s.summary = "Braintree v.zero: A modern foundation for accepting payments"
s.description = <<-DESC
Braintree is a full-stack payments platform for developers

2
BraintreeDropIn/BTPaymentSelectionViewController.m
View File

@@ -232,7 +232,7 @@
NSArray *supportedCardTypes = [self.configuration.json[@"creditCards"][@"supportedCardTypes"] asArray];
for (NSString *supportedCardType in supportedCardTypes) {
BTUIKPaymentOptionType paymentOptionType = [BTUIKViewUtil paymentOptionTypeForPaymentInfoType:supportedCardType];
if ([BTUIKViewUtil isPaymentOptionTypeACreditCard:paymentOptionType]) {
if ([BTUIKViewUtil isPaymentOptionTypeACreditCard:paymentOptionType] && !self.dropInRequest.cardDisabled) {
// Add credit cards if they are supported
[activePaymentOptions addObject:@(BTUIKPaymentOptionTypeUnknown)];
break;

4
BraintreeDropIn/Info.plist
View File

@@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>6.2.0</string>
<string>6.4.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>6.2.0</string>
<string>6.4.0</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>

1
BraintreeDropIn/Models/BTDropInRequest.m
View File

@@ -14,6 +14,7 @@
request.applePayDisabled = self.applePayDisabled;
request.paypalDisabled = self.paypalDisabled;
request.venmoDisabled = self.venmoDisabled;
request.cardDisabled = self.cardDisabled;
request.threeDSecureVerification = self.threeDSecureVerification;
request.shouldMaskSecurityCode = self.shouldMaskSecurityCode;
request.vaultManager = self.vaultManager;

3
BraintreeDropIn/Public/BTDropInRequest.h
View File

@@ -28,6 +28,9 @@ NS_ASSUME_NONNULL_BEGIN
/// Defaults to false. Set to true to hide the Venmo option even if enabled for your account.
@property (nonatomic, assign) BOOL venmoDisabled;
/// Defaults to false. Set to true to hide the Card option even if enabled for your account.
@property (nonatomic, assign) BOOL cardDisabled;
/// Optional: If true and an amount is set, ThreeDSecure will be used to verify new cards. ThreeDSecure must be enabled in the control panel.
/// Defaults to false.
@property (nonatomic, assign) BOOL threeDSecureVerification;

4
BraintreeUIKit/Info.plist
View File

@@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>6.2.0</string>
<string>6.4.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>6.2.0</string>
<string>6.4.0</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>

7
CHANGELOG.md
View File

@@ -1,5 +1,12 @@
# Braintree iOS Drop-in SDK - Release Notes
## 6.4.0 (2018-07-17)
* Require Braintree ~> 4.17.0
* Ensures GraphQL is available for `vaultManager`
* Add `cardDisabled` option
* Fix issue where Carthage integrations were failing
## 6.3.0 (2018-07-13)
* Add `vaultManager` option

1
DropInDemo/Features/Drop In/BraintreeDemoDropInViewController.m
View File

@@ -251,6 +251,7 @@
dropInRequest.paypalDisabled = [BraintreeDemoSettings paypalDisabled];
dropInRequest.venmoDisabled = [BraintreeDemoSettings venmoDisabled];
dropInRequest.cardDisabled = [[[NSProcessInfo processInfo] arguments] containsObject:@"-CardDisabled"];
dropInRequest.shouldMaskSecurityCode = [BraintreeDemoSettings maskSecurityCode];
if ([[[NSProcessInfo processInfo] arguments] containsObject:@"-PayPalOneTime"]) {

4
DropInDemo/Supporting Files/Braintree-Demo-Info.plist
View File

@@ -29,7 +29,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>6.2.0</string>
<string>6.4.0</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@@ -44,7 +44,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>6.2.0</string>
<string>6.4.0</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>com.braintreepayments.DropInDemo.payments</string>

20
Podfile.lock
View File

@@ -45,16 +45,16 @@ PODS:
- Braintree/Venmo (4.17.0):
- Braintree/Core
- Braintree/PayPalDataCollector
- BraintreeDropIn (6.2.0):
- BraintreeDropIn/DropIn (= 6.2.0)
- BraintreeDropIn/DropIn (6.2.0):
- Braintree/Card (~> 4.11)
- Braintree/Core (~> 4.11)
- Braintree/PaymentFlow (~> 4.11)
- Braintree/PayPal (~> 4.11)
- Braintree/UnionPay (~> 4.11)
- BraintreeDropIn (6.4.0):
- BraintreeDropIn/DropIn (= 6.4.0)
- BraintreeDropIn/DropIn (6.4.0):
- Braintree/Card (~> 4.17)
- Braintree/Core (~> 4.17)
- Braintree/PaymentFlow (~> 4.17)
- Braintree/PayPal (~> 4.17)
- Braintree/UnionPay (~> 4.17)
- BraintreeDropIn/UIKit
- BraintreeDropIn/UIKit (6.2.0)
- BraintreeDropIn/UIKit (6.4.0)
- CardIO (5.4.1)
- Expecta (1.0.6)
- FLEX (2.4.0)
@@ -102,7 +102,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
Braintree: 9681cef8240c8ad9e67493d5c19418041e6c259a
BraintreeDropIn: dea906c9e4be27247406d9a8a5f22f5ab3cebd1f
BraintreeDropIn: 74e69f65a6f56e7b4b36c3447aed89e41d21ee7d
CardIO: 56983b39b62f495fc6dae9ad7cf875143df06443
Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
FLEX: bd1a39e55b56bb413b6f1b34b3c10a0dc44ef079

24
UITests/BraintreeDropIn_UITests.swift
View File

@@ -150,6 +150,30 @@ class BraintreeDropIn_securityCodeValidation_CardForm_UITests: XCTestCase {
}
}
class BraintreeDropIn_CardDisabled_UITests: XCTestCase {
var app: XCUIApplication!
override func setUp() {
super.setUp()
continueAfterFailure = false
app = XCUIApplication()
app.launchArguments.append("-EnvironmentSandbox")
app.launchArguments.append("-TokenizationKey")
app.launchArguments.append("-CardDisabled")
app.launchArguments.append("-Integration:BraintreeDemoDropInViewController")
app.launch()
sleep(1)
self.waitForElementToBeHittable(app.buttons["Add Payment Method"])
app.buttons["Add Payment Method"].tap()
}
func testDropIn_maskSecurityCodeOption_enablesSecureTextEntry() {
XCTAssertTrue(app.staticTexts["PayPal"].exists);
XCTAssertFalse(app.staticTexts["Credit or Debit Card"].exists);
}
}
class BraintreeDropIn_CardForm_RequestOptions_UITests: XCTestCase {
var app: XCUIApplication!

1
UnitTests/BTDropInRequestTests.m
View File

@@ -16,6 +16,7 @@
originalRequest.applePayDisabled = YES;
originalRequest.paypalDisabled = YES;
originalRequest.venmoDisabled = YES;
originalRequest.cardDisabled = YES;
originalRequest.threeDSecureVerification = YES;
originalRequest.shouldMaskSecurityCode = YES;
originalRequest.vaultManager = YES;