Commit 8cfe7c1a by Dima Bart

Merge branch 'develop' into integration/sdk-2.0

parents 949f3d13 abe6045a
...@@ -28,7 +28,26 @@ ...@@ -28,7 +28,26 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"> shouldUseLaunchSchemeArgsEnv = "YES">
<Testables> <Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "90F592EB1B0D5EFE0026B382"
BuildableName = "Mobile Buy SDK Tests.xctest"
BlueprintName = "Mobile Buy SDK Tests"
ReferencedContainer = "container:Mobile Buy SDK.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables> </Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "901930E11BC5B9BC00D1134E"
BuildableName = "Buy.framework"
BlueprintName = "Buy"
ReferencedContainer = "container:Mobile Buy SDK.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</TestAction> </TestAction>
......
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
/** /**
* Customer ID associated with the checkout * Customer ID associated with the checkout
*/ */
@property (nonatomic, copy, readonly) NSString *customerId; @property (nonatomic, copy, readonly) NSNumber *customerId;
/** /**
* An optional note attached to the order * An optional note attached to the order
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
@property (nonatomic, copy) NSDate *updatedAtDate; @property (nonatomic, copy) NSDate *updatedAtDate;
@property (nonatomic, strong) BUYMaskedCreditCard *creditCard; @property (nonatomic, strong) BUYMaskedCreditCard *creditCard;
@property (nonatomic, strong) BUYOrder *order; @property (nonatomic, strong) BUYOrder *order;
@property (nonatomic, copy) NSString *customerId; @property (nonatomic, copy) NSNumber *customerId;
@property (nonatomic, strong) NSURL *privacyPolicyURL; @property (nonatomic, strong) NSURL *privacyPolicyURL;
@property (nonatomic, strong) NSURL *refundPolicyURL; @property (nonatomic, strong) NSURL *refundPolicyURL;
@property (nonatomic, strong) NSURL *termsOfServiceURL; @property (nonatomic, strong) NSURL *termsOfServiceURL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment