Merge branch 'develop' into runmad.add-status-url-page-advanced-sample-app

Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.h

@@ -239,6 +239,11 @@
 @property (nonatomic, copy, readonly) NSString *customerId;
 
 /**
+ *  An optional note attached to the order
+ */
+@property (nonatomic, copy) NSString *note;
+
+/**
  *  The BUYOrder for a completed checkout
  */
 @property (nonatomic, strong, readonly) BUYOrder *order;

Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.m

@@ -53,7 +53,7 @@
 
 - (instancetype)initWithCart:(BUYCart *)cart
 {
-	self = [super initWithDictionary:@{}];
+	self = [super init];
 	if (self) {
 		_lineItems = [cart.lineItems copy];
 		[self markPropertyAsDirty:@"lineItems"];
@@ -160,6 +160,7 @@
 	self.updatedAtDate = [dateFormatter dateFromString:dictionary[@"updated_at"]];
 	self.creditCard = [BUYMaskedCreditCard convertObject:dictionary[@"credit_card"]];
 	self.customerId = [dictionary[@"customer_id"] copy];
+	self.note = dictionary[@"note"];
 	
 	self.privacyPolicyURL = [NSURL buy_urlWithString:dictionary[@"privacy_policy_url"]];
 	self.refundPolicyURL = [NSURL buy_urlWithString:dictionary[@"refund_policy_url"]];

Mobile Buy SDK/Mobile Buy SDK/Product View/BUYProductView.m

@@ -173,7 +173,7 @@
 																	 options:0
 																	 metrics:nil
 																	   views:NSDictionaryOfVariableBindings(_productViewFooter)]];
-		[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[_productViewFooter]|"
+		[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[_productViewFooter]-|"
 																	 options:0
 																	 metrics:nil
 																	   views:NSDictionaryOfVariableBindings(_productViewFooter)]];
@@ -203,7 +203,7 @@
 - (void)layoutSubviews
 {
 	[super layoutSubviews];
-	[self setInsets:UIEdgeInsetsMake(self.tableView.contentInset.top, self.tableView.contentInset.left, CGRectGetHeight(self.productViewFooter.frame), self.tableView.contentInset.right) appendToCurrentInset:NO];
+	[self setInsets:UIEdgeInsetsMake(self.tableView.contentInset.top, self.tableView.contentInset.left, CGRectGetHeight(self.bounds) - CGRectGetMinY(self.productViewFooter.frame), self.tableView.contentInset.right) appendToCurrentInset:NO];
 }
 
 - (void)setTheme:(BUYTheme *)theme

Mobile Buy SDK/Mobile Buy SDK/Product View/BUYProductViewController.m

@@ -90,6 +90,7 @@ CGFloat const BUYMaxProductViewHeight = 640.0;
 {
 	self = [super initWithClient:client];
 	if (self) {
+		
 		self.theme = theme? : [[BUYTheme alloc] init];
 		
 		self.modalPresentationStyle = UIModalPresentationCustom;
@@ -177,6 +178,10 @@ CGFloat const BUYMaxProductViewHeight = 640.0;
 	[super viewWillAppear:animated];
 	[self setupNavigationBarAppearance];
 	[self.navigationController setNavigationBarHidden:self.isLoading];
+	CGFloat bottomMargin = 0;
+	bottomMargin += self.tabBarController ? CGRectGetHeight(self.tabBarController.tabBar.bounds) : 0;
+	bottomMargin += self.navigationController.isToolbarHidden ? 0 : CGRectGetHeight(self.navigationController.toolbar.bounds);
+	_productView.layoutMargins = UIEdgeInsetsMake(self.productView.layoutMargins.top, self.productView.layoutMargins.left, bottomMargin, self.productView.layoutMargins.right);
 }
 
 - (void)viewDidLayoutSubviews

Mobile Buy SDK/Mobile Buy SDK/Utils/BUYAddress+Additions.m

@@ -57,5 +57,4 @@ NSString * const BUYPartialAddressPlaceholder = @"---";
 	return valid;
 }
 
-
 @end

Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayHelpers.m

@@ -264,8 +264,7 @@ const NSTimeInterval PollDelay = 0.5;
 					self.shippingRates = shippingRates;
 					
 					if ([self.shippingRates count] == 0) {
-						// Shipping address not supported
-						self.checkout.shippingRate = nil;
+						// Shipping address is not supported and no shipping rates were returned
 						if (completion) {
 							completion(PKPaymentAuthorizationStatusInvalidShippingPostalAddress, nil, [self.checkout buy_summaryItemsWithShopName:self.shop.name]);
 						}